Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit d2842d32 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Pull request #187: fix testcases battery electric E2

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '24064ded':
  use better name for variable
  bugfix: do not reset idle controller on dry-runs
  Revert "Driver ApplyLimit DriverAcceleration switched"
  fix testcases battery electric E2
parents 8aa76069 24064ded
No related branches found
No related tags found
No related merge requests found
......@@ -107,7 +107,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return HandleClutchOpen(absTime, dt, outTorque, outAngularVelocity, false);
}
if (IdleController != null) {
if (IdleController != null && !dryRun) {
IdleController.Reset();
}
......
......@@ -480,10 +480,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
searchedOperatingPoint.SimulationInterval,
searchedOperatingPoint.Acceleration, rollAction ? "ROLL" : "COAST");
var applyLimit = rollAction || tcOperatingPointSet;
var ignoreDriverLimits = rollAction || tcOperatingPointSet;
var limitedOperatingPoint = LimitAccelerationByDriverModel(searchedOperatingPoint,
applyLimit ? LimitationMode.LimitDecelerationDriver : LimitationMode.NoLimitation);
ignoreDriverLimits ? LimitationMode.NoLimitation : LimitationMode.LimitDecelerationDriver);
// compute speed at the end of the simulation interval. if it exceeds the limit -> return
var v2 = DataBus.VehicleInfo.VehicleSpeed +
......
......@@ -970,6 +970,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
}
powertrain
.AddComponent(new AxleGear(container, runData.AxleGearData))
.AddComponent(runData.AngledriveData != null ? new Angledrive(container, runData.AngledriveData) : null)
.AddComponent(runData.Retarder.Type == RetarderType.TransmissionOutputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null)
.AddComponent(new PEVGearbox(container, strategy))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment