diff --git a/VectoCore/FileIO/Reader/DrivingCycleDataReader.cs b/VectoCore/FileIO/Reader/DrivingCycleDataReader.cs index 55ebed3c817fde052f76d15dbb8114987535bce2..09b7b7c4038ae74a72f9afbba39cc92eca298e05 100644 --- a/VectoCore/FileIO/Reader/DrivingCycleDataReader.cs +++ b/VectoCore/FileIO/Reader/DrivingCycleDataReader.cs @@ -277,12 +277,12 @@ namespace TUGraz.VectoCore.FileIO.Reader } if (!header.Contains(Fields.VehicleSpeed)) { - throw new VectoException(string.Format((string)"Column '{0}' is missing.", - (object)Fields.VehicleSpeed)); + throw new VectoException(string.Format("Column '{0}' is missing.", + Fields.VehicleSpeed)); } if (!header.Contains(Fields.Distance)) { - throw new VectoException(string.Format((string)"Column '{0}' is missing.", (object)Fields.Distance)); + throw new VectoException(string.Format("Column '{0}' is missing.", Fields.Distance)); } if (header.Contains(Fields.AirSpeedRelativeToVehicle) ^ @@ -347,8 +347,8 @@ namespace TUGraz.VectoCore.FileIO.Reader } if (!header.Contains(Fields.VehicleSpeed)) { - throw new VectoException(string.Format((string)"Column '{0}' is missing.", - (object)Fields.VehicleSpeed)); + throw new VectoException(string.Format("Column '{0}' is missing.", + Fields.VehicleSpeed)); } if (header.Contains(Fields.AirSpeedRelativeToVehicle) ^ @@ -415,8 +415,8 @@ namespace TUGraz.VectoCore.FileIO.Reader } if (!header.Contains(Fields.EngineSpeed)) { - throw new VectoException(string.Format((string)"Column '{0}' is missing.", - (object)Fields.EngineSpeed)); + throw new VectoException(string.Format("Column '{0}' is missing.", + Fields.EngineSpeed)); } if (!(header.Contains(Fields.EngineTorque) || header.Contains(Fields.EnginePower))) { diff --git a/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs b/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs index 07c090b73435d53278dbd6dfeefcca5791401e1c..0d27afc4597e22c332cc148b7656281e1924f409 100644 --- a/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs +++ b/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs @@ -80,13 +80,13 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation dt = 1.SI<Second>(); absTime = 500.SI<Second>(); - response = cycle.OutPort().Request((Second)absTime, (Second)dt); + response = cycle.OutPort().Request(absTime, dt); Assert.IsInstanceOfType(response, typeof(ResponseFailTimeInterval)); dt = 0.25.SI<Second>(); for (int i = 0; i < 2; i++) { - response = cycle.OutPort().Request((Second)absTime, (Second)dt); + response = cycle.OutPort().Request(absTime, dt); Assert.IsInstanceOfType(response, typeof(ResponseSuccess)); dataWriter = new MockModalDataWriter(); diff --git a/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs b/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs index 52c15e7281ddb4712b9582b7a479f2732b38330e..00a23ad32af5677854bb4b115e3d3c2346eec8ae 100644 --- a/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs +++ b/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs @@ -47,7 +47,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent absTime += response.SimulationInterval; - response = cycle.OutPort().Request((Second)absTime, 1.SI<Meter>()); + response = cycle.OutPort().Request(absTime, 1.SI<Meter>()); Assert.IsInstanceOfType(response, typeof(ResponseSuccess)); @@ -59,7 +59,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent absTime += response.SimulationInterval; - response = cycle.OutPort().Request((Second)absTime, 1.SI<Meter>()); + response = cycle.OutPort().Request(absTime, 1.SI<Meter>()); Assert.IsInstanceOfType(response, typeof(ResponseSuccess)); @@ -71,7 +71,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent absTime += response.SimulationInterval; - response = cycle.OutPort().Request((Second)absTime, 300.SI<Meter>()); + response = cycle.OutPort().Request(absTime, 300.SI<Meter>()); Assert.IsInstanceOfType(response, typeof(ResponseDrivingCycleDistanceExceeded)); var tmp = response as ResponseDrivingCycleDistanceExceeded; @@ -88,7 +88,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent } catch (VectoSimulationException e) { Assert.AreEqual("Previous request did not succeed!", e.Message); } - response = cycle.OutPort().Request((Second)absTime, tmp.MaxDistance); + response = cycle.OutPort().Request(absTime, tmp.MaxDistance); Assert.AreEqual(5.SI<MeterPerSecond>().Value(), driver.LastRequest.TargetVelocity.Value(), Tolerance); Assert.AreEqual(0.02667562971628240, driver.LastRequest.Gradient.Value(), 1E-12);