changed float to double

VectoCore/Models/Connector/Ports/ITnPort.cs

@@ -17,6 +17,6 @@ namespace TUGraz.VectoCore.Models.Connector.Ports
 
     public interface ITnOutPort : ITnPort
     {
-        void Request(TimeSpan absTime, TimeSpan dt, float torque, float engineSpeed);
+        void Request(TimeSpan absTime, TimeSpan dt, double torque, double engineSpeed);
     }
 }

VectoCore/Models/Connector/Ports/Impl/TnOutPort.cs

@@ -8,7 +8,7 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
 {
     public class TnOutPort : OutPort, ITnOutPort
     {
-        public void Request(TimeSpan absTime, TimeSpan dt, float torque, float engineSpeed)
+        public void Request(TimeSpan absTime, TimeSpan dt, double torque, double engineSpeed)
         {
             throw new NotImplementedException();
         }

VectoCore/Models/SimulationComponent/Data/ModalResult.cs

@@ -7,43 +7,44 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
         public static DataTable getDataTable()
         {
             DataTable data = new DataTable();
-            data.Columns.Add(ModalResultFields.time.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.dist.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.v_act.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.v_targ.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.acc.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.grad.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.n.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Tq_eng.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Tq_clutch.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Tq_full.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Tq_drag.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Pe_eng.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Pe_full.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Pe_drag.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Pe_clutch.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Gear.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.PlossGB.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.PlossDiff.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.PlossRetarder.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.PaEng.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.PaGB.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.PaVeh.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Proll.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Pair.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Pgrad.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Paux.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Pwheel.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Pbrake.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.Paux_xxx.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.FC.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.FC_AUXc.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.FC_WHTCc.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.TCν.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.TCμ.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.TC_M_Out.ToString(), typeof(float));
-            data.Columns.Add(ModalResultFields.TC_n_Out.ToString(), typeof(float));
+            data.Columns.Add(ModalResultFields.time.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.dist.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.v_act.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.v_targ.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.acc.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.grad.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.n.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Tq_eng.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Tq_clutch.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Tq_full.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Tq_drag.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Pe_eng.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Pe_full.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Pe_drag.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Pe_clutch.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Gear.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.PlossGB.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.PlossDiff.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.PlossRetarder.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.PaEng.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.PaGB.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.PaVeh.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Proll.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Pair.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Pgrad.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Paux.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Pwheel.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Pbrake.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.Paux_xxx.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.FC.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.FC_AUXc.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.FC_WHTCc.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.TCν.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.TCμ.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.TC_M_Out.ToString(), typeof(double));
+            data.Columns.Add(ModalResultFields.TC_n_Out.ToString(), typeof(double));
             return data;
         }
+
     }
 }

VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs

@@ -29,10 +29,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 
             var port = (ITnOutPort)engine.OutPort();
 
-            TimeSpan absTime = new TimeSpan(seconds: 0, minutes: 0, hours: 0);
-            TimeSpan dt = new TimeSpan(seconds: 1, minutes: 0, hours: 0);
-            const int torque = 400;
-            const int engineSpeed = 1500;
+            var absTime = new TimeSpan(seconds: 0, minutes: 0, hours: 0);
+            var dt = new TimeSpan(seconds: 1, minutes: 0, hours: 0);
+            var torque = 400.0;
+            var engineSpeed = 1500.0;
 
             port.Request(absTime, dt, torque, engineSpeed);
         }
@@ -44,16 +44,16 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
             var engine = new CombustionEngine(engineData);
             var port = (ITnOutPort)engine.OutPort();
 
-            TimeSpan absTime = new TimeSpan(seconds: 0, minutes: 0, hours: 0);
-            TimeSpan dt = new TimeSpan(seconds: 1, minutes: 0, hours: 0);
+            var absTime = new TimeSpan(seconds: 0, minutes: 0, hours: 0);
+            var dt = new TimeSpan(seconds: 1, minutes: 0, hours: 0);
 
             //todo: set correct input values to test
-            const int torque = 400;
-            const int engineSpeed = 1500;
+            var torque = 400.0;
+            var engineSpeed = 1500.0;
             port.Request(absTime, dt, torque, engineSpeed);
 
 
-            TestDataWriter dataWriter = new TestDataWriter();
+            var dataWriter = new TestDataWriter();
             engine.CommitSimulationStep(dataWriter);
 
             //todo: test with correct output values, add other fields to test
@@ -72,15 +72,15 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 
             var data = EngineOnlyDrivingCycle.read("Coach Engine Only.vdri");
 
-            TimeSpan absTime = new TimeSpan(seconds: 0, minutes: 0, hours: 0);
-            TimeSpan dt = new TimeSpan(seconds: 1, minutes: 0, hours: 0);
+            var absTime = new TimeSpan(seconds: 0, minutes: 0, hours: 0);
+            var dt = new TimeSpan(seconds: 1, minutes: 0, hours: 0);
 
-            TestDataWriter dataWriter = new TestDataWriter();
+            var dataWriter = new TestDataWriter();
 
             foreach (DataRow row in data.Rows)
             {
-                float torque = (float)row[EngineOnlyDrivingCycleFields.Pe.ToString()];
-                float engineSpeed = (float)row[EngineOnlyDrivingCycleFields.n.ToString()];
+                var torque = (double)row[EngineOnlyDrivingCycleFields.Pe.ToString()];
+                var engineSpeed = (double)row[EngineOnlyDrivingCycleFields.n.ToString()];
                 port.Request(absTime, dt, torque, engineSpeed);
 
                 engine.CommitSimulationStep(dataWriter);