diff --git a/VectoCoreTest/Models/Simulation/AuxTests.cs b/VectoCoreTest/Models/Simulation/AuxTests.cs index d9cd836bd5b68fb228ef4cb7cd6beed342cf576e..0e022023bfecdef387921ba4457a994c77815bb8 100644 --- a/VectoCoreTest/Models/Simulation/AuxTests.cs +++ b/VectoCoreTest/Models/Simulation/AuxTests.cs @@ -31,7 +31,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation var container = new VehicleContainer(dataWriter, deco); var data = DrivingCycleDataReader.ReadFromFileDistanceBased(@"TestData\Cycles\LongHaul_short.vdri"); - + var mockcycle = new MockDrivingCycle(container, data); var port = new MockTnOutPort(); var aux = new Auxiliary(container); diff --git a/VectoCoreTest/Utils/MockAuxiliaryDemand.cs b/VectoCoreTest/Utils/MockAuxiliaryDemand.cs index b193adf3c54732c7d6d7683bff23a01d73de9e13..be93826a2034e534091f1c6f552a83cbfa1686b7 100644 --- a/VectoCoreTest/Utils/MockAuxiliaryDemand.cs +++ b/VectoCoreTest/Utils/MockAuxiliaryDemand.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using TUGraz.VectoCore.Models.Simulation; @@ -19,13 +20,13 @@ namespace TUGraz.VectoCore.Tests.Utils if (data != null) { _left = data.Entries.GetEnumerator(); _right = data.Entries.GetEnumerator(); - _left.MoveNext(); - _right.MoveNext(); - _right.MoveNext(); } else { _left = Enumerable.Empty<DrivingCycleData.DrivingCycleEntry>().GetEnumerator(); _right = Enumerable.Empty<DrivingCycleData.DrivingCycleEntry>().GetEnumerator(); } + _left.MoveNext(); + _right.MoveNext(); + _right.MoveNext(); } @@ -39,7 +40,13 @@ namespace TUGraz.VectoCore.Tests.Utils }; } - protected override void DoWriteModalResults(IModalDataWriter writer) {} + protected override void DoWriteModalResults(IModalDataWriter writer) + { + writer[ModalResultField.dist] = 0.SI<Meter>(); + writer[ModalResultField.v_targ] = 0.KMPHtoMeterPerSecond(); + writer[ModalResultField.grad] = 0.SI<Scalar>(); + writer[ModalResultField.altitude] = 0.SI<Meter>(); + } protected override void DoCommitSimulationStep() { @@ -49,7 +56,7 @@ namespace TUGraz.VectoCore.Tests.Utils public Meter CycleStartDistance { - get { return _left.Current.Distance; } + get { return 0.SI<Meter>(); } } public IReadOnlyList<DrivingCycleData.DrivingCycleEntry> LookAhead(Meter lookaheadDistance)