Aidan Gallagher
testing forking
Fork of
ConsolTest
by 
Pipeline Technology Centre
Calculate.cpp@9:d4e9311c4cb1, 2015-07-03 (annotated)
- Committer:
- aidanPJG
- Date:
- Fri Jul 03 13:44:11 2015 +0000
- Revision:
- 9:d4e9311c4cb1
- Parent:
- 7:d6f78ba7c5f7
testman;
Who changed what in which revision?
| User | Revision | Line number | New contents of line |
|---|---|---|---|
| aidanPJG | 7:d6f78ba7c5f7 | 1 | //#include "Calculate.h" |
| aidanPJG | 7:d6f78ba7c5f7 | 2 | //#include <iostream> |
| aidanPJG | 7:d6f78ba7c5f7 | 3 | // |
| aidanPJG | 7:d6f78ba7c5f7 | 4 | //float instSpeed() |
| aidanPJG | 7:d6f78ba7c5f7 | 5 | //{ |
| aidanPJG | 7:d6f78ba7c5f7 | 6 | // float trueDistance = trueDistance(); |
| aidanPJG | 7:d6f78ba7c5f7 | 7 | // int time = 5; //sensorLater - sensorEarlier |
| aidanPJG | 7:d6f78ba7c5f7 | 8 | // float speed = trueDistance / time; |
| aidanPJG | 7:d6f78ba7c5f7 | 9 | // return speed; |
| aidanPJG | 7:d6f78ba7c5f7 | 10 | //} |
| aidanPJG | 7:d6f78ba7c5f7 | 11 | //float trueDistance(float radius,float distance_between_sensors) |
| aidanPJG | 6:b1490f657b21 | 12 | //{ |
| aidanPJG | 7:d6f78ba7c5f7 | 13 | // float trueDistance = 1; |
| aidanPJG | 7:d6f78ba7c5f7 | 14 | // |
| aidanPJG | 7:d6f78ba7c5f7 | 15 | // return trueDistance; |
| aidanPJG | 7:d6f78ba7c5f7 | 16 | //} |
| aidanPJG | 7:d6f78ba7c5f7 | 17 | //int sensors() |
| aidanPJG | 7:d6f78ba7c5f7 | 18 | //{ |
| aidanPJG | 7:d6f78ba7c5f7 | 19 | // |
| aidanPJG | 7:d6f78ba7c5f7 | 20 | //} |
| aidanPJG | 7:d6f78ba7c5f7 | 21 | // |
| aidanPJG | 7:d6f78ba7c5f7 | 22 | ////float progression(bool Sensor1, bool Sensor2, bool Sensor3, bool sensor4, float radius) |
| aidanPJG | 7:d6f78ba7c5f7 | 23 | ////{ |
| aidanPJG | 7:d6f78ba7c5f7 | 24 | //// float distance = 2.34E+22f; |
| aidanPJG | 7:d6f78ba7c5f7 | 25 | //// |
| aidanPJG | 7:d6f78ba7c5f7 | 26 | //// return distance; |
| aidanPJG | 7:d6f78ba7c5f7 | 27 | ////} |