Diff: Calculate.cpp

Revision:

6:b1490f657b21

Parent:

5:ddbc9c48480d

Child:

7:d6f78ba7c5f7

--- a/Calculate.cpp	Wed Jul 01 13:51:02 2015 +0000
+++ b/Calculate.cpp	Thu Jul 02 14:40:20 2015 +0000
@@ -1,16 +1,27 @@
 #include "Calculate.h"
 #include <iostream>
 
-float calculate() 
-{  
+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 speed = 2.34E+22f;
-    return speed;
 }
 
-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
+//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