![](/media/cache/img/default_profile.jpg.50x50_q85.jpg)
testing forking
Fork of ConsolTest by
Diff: Calculate.cpp
- Revision:
- 7:d6f78ba7c5f7
- Parent:
- 6:b1490f657b21
diff -r b1490f657b21 -r d6f78ba7c5f7 Calculate.cpp --- a/Calculate.cpp Thu Jul 02 14:40:20 2015 +0000 +++ b/Calculate.cpp Fri Jul 03 13:36:06 2015 +0000 @@ -1,27 +1,27 @@ -#include "Calculate.h" -#include <iostream> - -float instSpeed() -{ - float trueDistance = trueDistance(); - int time = 5; //sensorLater - sensorEarlier - float speed = trueDistance / time; - return speed; -} -float trueDistance(float radius,float distance_between_sensors) -{ - float trueDistance = 1; - - return trueDistance; -} -int sensors() -{ - -} - -//float progression(bool Sensor1, bool Sensor2, bool Sensor3, bool sensor4, float radius) +//#include "Calculate.h" +//#include <iostream> +// +//float instSpeed() +//{ +// float trueDistance = trueDistance(); +// int time = 5; //sensorLater - sensorEarlier +// float speed = trueDistance / time; +// return speed; +//} +//float trueDistance(float radius,float distance_between_sensors) //{ -// float distance = 2.34E+22f; -// -// return distance; -//} \ No newline at end of file +// float trueDistance = 1; +// +// return trueDistance; +//} +//int sensors() +//{ +// +//} +// +////float progression(bool Sensor1, bool Sensor2, bool Sensor3, bool sensor4, float radius) +////{ +//// float distance = 2.34E+22f; +//// +//// return distance; +////} \ No newline at end of file