diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs index 1b31ce3cd451eb20b54f39a07c84766ba5351788..bfb53ef49928d6c77d4b6f264b99c0c17ba7723d 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs @@ -128,11 +128,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl CurrentState.InTorque = torque; }) .Case<ResponseOverload>(r => { - angularVelocity = SearchAlgorithm.Search(angularVelocity, r.Delta, 50.RPMtoRad(), + var torque = SearchAlgorithm.Search(CycleIterator.LeftSample.Torque, r.Delta, 50.SI<NewtonMeter>(), getYValue: result => ((ResponseDryRun)result).DeltaFullLoad, - evaluateFunction: n => NextComponent.Request(absTime, dt, CycleIterator.LeftSample.Torque, n, true), + evaluateFunction: t => NextComponent.Request(absTime, dt, t, angularVelocity, true), criterion: y => ((ResponseDryRun)y).DeltaFullLoad.Value()); - response = NextComponent.Request(absTime, dt, CycleIterator.LeftSample.Torque, angularVelocity); + response = NextComponent.Request(absTime, dt, torque, angularVelocity); CurrentState.InAngularVelocity = angularVelocity; }) .Case<ResponseFailTimeInterval>(r => { dt = r.DeltaT; }) @@ -173,8 +173,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl public CycleData CycleData { - get - { + get { return new CycleData { AbsTime = CycleIterator.LeftSample.Time, AbsDistance = null,