diff --git a/VectoCoreTest/Integration/SimpleDrivingCycles.cs b/VectoCoreTest/Integration/SimpleDrivingCycles.cs index 80ca9514393add548e54057d0241e9d28145c2dc..aaff00a1052eb5370e5f430bce33f82c0f731ef0 100644 --- a/VectoCoreTest/Integration/SimpleDrivingCycles.cs +++ b/VectoCoreTest/Integration/SimpleDrivingCycles.cs @@ -20,6 +20,7 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using TUGraz.VectoCore.InputData.Reader; using TUGraz.VectoCore.Models.SimulationComponent.Data; +using TUGraz.VectoCore.Tests.Utils; using TUGraz.VectoCore.Utils; namespace TUGraz.VectoCore.Tests.Integration @@ -29,22 +30,11 @@ namespace TUGraz.VectoCore.Tests.Integration { public static DrivingCycleData CreateCycleData(string[] entries) { - var cycleData = InputDataAsStream("<s>,<v>,<grad>,<stop>", entries); + var cycleData = InputDataHelper.InputDataAsStream("<s>,<v>,<grad>,<stop>", entries); return DrivingCycleDataReader.ReadFromStream(cycleData, CycleType.DistanceBased); } - public static MemoryStream InputDataAsStream(string header, string[] entries) - { - var cycleData = new MemoryStream(); - var writer = new StreamWriter(cycleData); - writer.WriteLine(header); - foreach (var entry in entries) { - writer.WriteLine(entry); - } - writer.Flush(); - cycleData.Seek(0, SeekOrigin.Begin); - return cycleData; - } + #region Accelerate diff --git a/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs b/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs index 9a6ec8b0ccd4435684fc122f2d616a709ebad38b..529803caa15e897d6aed5ab8edcc4ea50e0666ca 100644 --- a/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs +++ b/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs @@ -301,10 +301,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData "2100, 2500" }; var dataEng = - VectoCSVFile.ReadStream(SimpleDrivingCycles.InputDataAsStream("n [U/min],Mfull [Nm],Mdrag [Nm]", engineFLDString)); + VectoCSVFile.ReadStream(InputDataHelper.InputDataAsStream("n [U/min],Mfull [Nm],Mdrag [Nm]", engineFLDString)); var engineFLD = EngineFullLoadCurve.Create(dataEng, true); - var dataGbx = VectoCSVFile.ReadStream(SimpleDrivingCycles.InputDataAsStream("n [U/min],Mfull [Nm]", gbxFLDString)); + var dataGbx = VectoCSVFile.ReadStream(InputDataHelper.InputDataAsStream("n [U/min],Mfull [Nm]", gbxFLDString)); var gbxFLD = FullLoadCurve.Create(dataGbx, true); var fullLoadCurve = AbstractSimulationDataAdapter.IntersectFullLoadCurves(engineFLD, gbxFLD); diff --git a/VectoCoreTest/Utils/InputDataHelper.cs b/VectoCoreTest/Utils/InputDataHelper.cs new file mode 100644 index 0000000000000000000000000000000000000000..e3f08b265ce1d2e82711d78489ceccbe44ec506f --- /dev/null +++ b/VectoCoreTest/Utils/InputDataHelper.cs @@ -0,0 +1,20 @@ +using System.IO; + +namespace TUGraz.VectoCore.Tests.Utils +{ + public class InputDataHelper + { + public static MemoryStream InputDataAsStream(string header, string[] entries) + { + var cycleData = new MemoryStream(); + var writer = new StreamWriter(cycleData); + writer.WriteLine(header); + foreach (var entry in entries) { + writer.WriteLine(entry); + } + writer.Flush(); + cycleData.Seek(0, SeekOrigin.Begin); + return cycleData; + } + } +} \ No newline at end of file diff --git a/VectoCoreTest/VectoCoreTest.csproj b/VectoCoreTest/VectoCoreTest.csproj index ebf72e07a5b65c0e31c8b99da8c8130b5165b3c6..10a15f4e2c52b7b4ebd60cd04a027dccb0d35cde 100644 --- a/VectoCoreTest/VectoCoreTest.csproj +++ b/VectoCoreTest/VectoCoreTest.csproj @@ -91,6 +91,7 @@ <Compile Include="Integration\SimulationRuns\FullPowertrain.cs" /> <Compile Include="Integration\Truck40tPowerTrain.cs" /> <Compile Include="Models\SimulationComponent\GearboxPowertrainTest.cs" /> + <Compile Include="Utils\InputDataHelper.cs" /> <Compile Include="Utils\MockSimulationDataFactory.cs" /> <Compile Include="Utils\Port.cs" /> <Compile Include="Models\SimulationComponentData\AuxiliaryTypeHelperTest.cs" />