Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

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

adapt testcases due to changed gearbox behavior: no not issue null-requests,...

adapt testcases due to changed gearbox behavior: no not issue null-requests, use clutch-closed to check if clutch is open or not
parent d54f0796
Branches
Tags
No related merge requests found
...@@ -339,7 +339,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl ...@@ -339,7 +339,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (GearboxType.AutomaticTransmission()) { if (GearboxType.AutomaticTransmission()) {
disengagedResponse = EngineIdleRequest(absTime, dt); disengagedResponse = EngineIdleRequest(absTime, dt);
} else { } else {
disengagedResponse = NextComponent.Request(absTime, dt, 0.SI<NewtonMeter>(), null); disengagedResponse = NextComponent.Request(absTime, dt, 0.SI<NewtonMeter>(), outAngularVelocity);
} }
if (TorqueConverter != null) { if (TorqueConverter != null) {
TorqueConverter.Locked(CurrentState.InTorque, disengagedResponse.EngineSpeed); TorqueConverter.Locked(CurrentState.InTorque, disengagedResponse.EngineSpeed);
......
...@@ -319,6 +319,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent ...@@ -319,6 +319,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
// actual test... // actual test...
gearbox.Gear = 0; gearbox.Gear = 0;
gearbox.SetClutchClosed = false;
torque = 0.SI<NewtonMeter>(); torque = 0.SI<NewtonMeter>();
response = (ResponseSuccess)gearbox.Request(absTime, dt, torque, angularVelocity); response = (ResponseSuccess)gearbox.Request(absTime, dt, torque, angularVelocity);
...@@ -355,10 +356,12 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent ...@@ -355,10 +356,12 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var engineSpeed = new[] { 560.RPMtoRad(), 560.RPMtoRad(), 560.RPMtoRad(), 560.RPMtoRad() }; var engineSpeed = new[] { 560.RPMtoRad(), 560.RPMtoRad(), 560.RPMtoRad(), 560.RPMtoRad() };
var enginePower = new[] { -8601.6308.SI<Watt>(), 5000.SI<Watt>(), 5000.SI<Watt>(), 5000.SI<Watt>() }; var enginePower = new[] { -8601.6308.SI<Watt>(), 5000.SI<Watt>(), 5000.SI<Watt>(), 5000.SI<Watt>() };
for (var i = 0; i < engineSpeed.Length; i++) { ((MockGearbox)container.Gearbox).SetClutchClosed = false;
for (var i = 0; i < engineSpeed.Length; i++)
{
torque = 0.SI<NewtonMeter>(); torque = 0.SI<NewtonMeter>();
response = (ResponseSuccess)requestPort.Request(absTime, dt, torque, null); response = (ResponseSuccess)requestPort.Request(absTime, dt, torque, 0.SI<PerSecond>());
container.CommitSimulationStep(absTime, dt); container.CommitSimulationStep(absTime, dt);
absTime += dt; absTime += dt;
...@@ -420,11 +423,12 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent ...@@ -420,11 +423,12 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var fld = engine.ModelData.FullLoadCurve; var fld = engine.ModelData.FullLoadCurve;
((MockGearbox)container.Gearbox).SetClutchClosed = false;
var engSpeedResults = new List<dynamic>(); var engSpeedResults = new List<dynamic>();
for (var i = 0; i < 20; i++) { for (var i = 0; i < 20; i++) {
torque = 0.SI<NewtonMeter>(); torque = 0.SI<NewtonMeter>();
response = (ResponseSuccess)requestPort.Request(absTime, dt, torque, null); response = (ResponseSuccess)requestPort.Request(absTime, dt, torque, 0.SI<PerSecond>());
container.CommitSimulationStep(absTime, dt); container.CommitSimulationStep(absTime, dt);
...@@ -476,10 +480,11 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent ...@@ -476,10 +480,11 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
// 5000.SI<Watt>(), 5000.SI<Watt>(), 5000.SI<Watt>(), 5000.SI<Watt>() // 5000.SI<Watt>(), 5000.SI<Watt>(), 5000.SI<Watt>(), 5000.SI<Watt>()
//}; //};
((MockGearbox)container.Gearbox).SetClutchClosed = false;
var engSpeedResults = new List<dynamic>(); var engSpeedResults = new List<dynamic>();
torque = 0.SI<NewtonMeter>(); torque = 0.SI<NewtonMeter>();
for (var i = 0; i < engineSpeed.Length; i++) { for (var i = 0; i < engineSpeed.Length; i++) {
response = (ResponseSuccess)requestPort.Request(absTime, dt, torque, null); response = (ResponseSuccess)requestPort.Request(absTime, dt, torque, 0.SI<PerSecond>());
container.CommitSimulationStep(absTime, dt); container.CommitSimulationStep(absTime, dt);
......
...@@ -44,6 +44,7 @@ namespace TUGraz.VectoCore.Tests.Utils ...@@ -44,6 +44,7 @@ namespace TUGraz.VectoCore.Tests.Utils
public class MockGearbox : VectoSimulationComponent, IGearbox, ITnInPort, ITnOutPort, IClutchInfo public class MockGearbox : VectoSimulationComponent, IGearbox, ITnInPort, ITnOutPort, IClutchInfo
{ {
private ITnOutPort _outPort; private ITnOutPort _outPort;
private bool _clutchClosed = true;
public MockGearbox(IVehicleContainer cockpit) : base(cockpit) {} public MockGearbox(IVehicleContainer cockpit) : base(cockpit) {}
...@@ -102,10 +103,10 @@ namespace TUGraz.VectoCore.Tests.Utils ...@@ -102,10 +103,10 @@ namespace TUGraz.VectoCore.Tests.Utils
bool dryRun = false) bool dryRun = false)
{ {
if (_outPort != null) { if (_outPort != null) {
if (Gear > 0) { //if (Gear > 0) {
return _outPort.Request(absTime, dt, outTorque, outAngularVelocity, dryRun); return _outPort.Request(absTime, dt, outTorque, outAngularVelocity, dryRun);
} //}
return _outPort.Request(absTime, dt, 0.SI<NewtonMeter>(), null, dryRun); //return _outPort.Request(absTime, dt, 0.SI<NewtonMeter>(), null, dryRun);
} }
throw new NotImplementedException(); throw new NotImplementedException();
} }
...@@ -125,9 +126,14 @@ namespace TUGraz.VectoCore.Tests.Utils ...@@ -125,9 +126,14 @@ namespace TUGraz.VectoCore.Tests.Utils
protected override void DoCommitSimulationStep() {} protected override void DoCommitSimulationStep() {}
public bool SetClutchClosed
{
set { _clutchClosed = value; }
}
public bool ClutchClosed(Second absTime) public bool ClutchClosed(Second absTime)
{ {
return true; return _clutchClosed;
} }
public void Connect(IAuxPort aux) public void Connect(IAuxPort aux)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment