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

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

adapt expected values for bus auxiliaries due to changes in busaux models

parent 514b0c64
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs
+ 14
− 11
View file @ 1b26afba
......@@ -58,9 +58,9 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
}
[Test]
[TestCase(12000, 1256, 148, 148, 6086.9321)]
[TestCase(12000, 1256, -15, -50, 8954.1396)]
[TestCase(15700, 1319, -35.79263, -144.0441, 9093.9473)]
[TestCase(12000, 1256, 148, 148, 6087.03221)]
[TestCase(12000, 1256, -45, -30, 8954.1396)]
[TestCase(15700, 1319, -45.79263, -24.0441, 9093.9473)]
public void AuxDemandtest(double vehicleWeight, double engineSpeedRpm, double driveLinePower, double internalPower,
double expectedPowerDemand)
{
......@@ -96,23 +96,25 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
for (int i = 0; i < 10; i++) {
var torque = busAux.TorqueDemand(0.SI<Second>(), 1.SI<Second>(), engineDrivelinePower / engineSpeed,
(internalPower * 1000).SI<Watt>() / engineSpeed, engineSpeed);
Assert.AreEqual(6086.9321, (torque * engineSpeed).Value(), 1e-3);
Assert.AreEqual(6087.03221, (torque * engineSpeed).Value(), 1e-3);
busAux.DoWriteModalResults(modalData);
busAux.DoCommitSimulationStep();
}
//Assert.AreEqual(79.303.SI(Unit.SI.Gramm).Value(), ((SI)modalData[ModalResultField.AA_TotalCycleFC_Grams]).Value(), 0.0001);
engineDrivelinePower = -15000.SI<Watt>();
internalPower = -50;
engineDrivelinePower = -45000.SI<Watt>();
internalPower = -20;
for (int i = 0; i < 10; i++) {
var torque = busAux.TorqueDemand(0.SI<Second>(), 1.SI<Second>(), engineDrivelinePower / engineSpeed,
(internalPower * 1000).SI<Watt>() / engineSpeed, engineSpeed);
Assert.AreEqual(8954.1396, (torque * engineSpeed).Value(), 1e-3);
Assert.AreEqual(8954.1429, (torque * engineSpeed).Value(), 1e-3);
busAux.DoWriteModalResults(modalData);
busAux.DoCommitSimulationStep();
}
//Assert.AreEqual(82.5783.SI(Unit.SI.Gramm).Value(), ((SI)modalData[ModalResultField.AA_TotalCycleFC_Grams]).Value(), 0.0001);
//Assert.AreEqual(82.5783.SI(Unit.SI.Gramm).Value(), ((SI)modalData[ModalResultField.AA_TotalCycleFC_Grams]).Value(), 0.0001);
engineDrivelinePower = (driveLinePower * 1000).SI<Watt>();
internalPower = 148;
......@@ -120,11 +122,12 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
for (int i = 0; i < 10; i++) {
var torque = busAux.TorqueDemand(0.SI<Second>(), 1.SI<Second>(), engineDrivelinePower / engineSpeed,
(internalPower * 1000).SI<Watt>() / engineSpeed, engineSpeed);
Assert.AreEqual(6086.9321, (torque * engineSpeed).Value(), 1e-3);
Assert.AreEqual(6087.03221, (torque * engineSpeed).Value(), 1e-3);
busAux.DoWriteModalResults(modalData);
busAux.DoCommitSimulationStep();
}
//Assert.AreEqual(162.4654.SI(Unit.SI.Gramm).Value(), ((SI)modalData[ModalResultField.AA_TotalCycleFC_Grams]).Value(), 0.0001);
//Assert.AreEqual(162.4654.SI(Unit.SI.Gramm).Value(), ((SI)modalData[ModalResultField.AA_TotalCycleFC_Grams]).Value(), 0.0001);
}
public static BusAuxiliariesAdapter CreateBusAuxAdapterForTesting(double vehicleMass, out MockDriver driver)
......@@ -159,7 +162,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
};
var engine = new CombustionEngine(vehicle, modelData);
//new Vehicle(vehicle, new VehicleData());
driver = new MockDriver(vehicle) { VehicleStopped = false, DriverBehavior = DrivingBehavior.Braking };
driver = new MockDriver(vehicle) { VehicleStopped = false, DriverBehavior = DrivingBehavior.Braking, DrivingAction = DrivingAction.Brake };
var gbx = new MockGearbox(vehicle) { Gear = 1 };
var brakes = new MockBrakes(vehicle);
var veh = new MockVehicle(vehicle) { MyVehicleSpeed = 50.KMPHtoMeterPerSecond() };
......
VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
+ 22
− 20
View file @ 1b26afba
......@@ -36,6 +36,7 @@ using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Tests.Utils;
using System.IO;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
{
......@@ -50,12 +51,12 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
[Test]
[TestCase(12000, 1256, 148, 148, 6086.9321)]
[TestCase(12000, 1256, -48, -148, 6086.9321)]
[TestCase(12000, 1256, 48, -148, 6086.9321)]
[TestCase(12000, 800, 148, 148, 6377.0923)]
[TestCase(12000, 800, -48, -148, 6377.0923)]
[TestCase(12000, 800, 48, -148, 6377.0923)]
[TestCase(12000, 1256, 148, 148, 6087.03221)]
[TestCase(12000, 1256, -48, -148, 6087.03221)]
[TestCase(12000, 1256, 48, -148, 6087.03221)]
[TestCase(12000, 800, 148, 148, 6377.2027)]
[TestCase(12000, 800, -48, -148, 6377.2027)]
[TestCase(12000, 800, 48, -148, 6377.2027)]
public void TestNoSmartAuxDuringDrive(double vehicleWeight, double engineSpeedRpm, double driveLinePower,
double internalPower, double expectedPowerDemand)
{
......@@ -75,16 +76,16 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
}
[Test]
[TestCase(12000, 1256, 148, 148, 6086.9321)]
[TestCase(12000, 1256, -28, -27, 6086.9321)]
[TestCase(12000, 1256, -28, -29, 6086.9321)]
[TestCase(12000, 1256, -128, -28, 6086.9321)]
[TestCase(12000, 1256, 28, -28, 6086.9321)]
[TestCase(12000, 800, 148, 148, 6377.0923)]
[TestCase(12000, 800, -14, -13, 6377.0923)]
[TestCase(12000, 800, -14, -15, 6377.0923)]
[TestCase(12000, 800, -35, -14, 6377.0923)]
[TestCase(12000, 800, 35, -14, 6377.0923)]
[TestCase(12000, 1256, 148, 148, 6087.0322)]
[TestCase(12000, 1256, -28, -27, 6087.0322)]
[TestCase(12000, 1256, -28, -29, 6087.0322)]
[TestCase(12000, 1256, -128, -28, 6087.03221)]
[TestCase(12000, 1256, 28, -28, 6087.0322)]
[TestCase(12000, 800, 148, 148, 6377.2027)]
[TestCase(12000, 800, -14, -13, 6377.2027)]
[TestCase(12000, 800, -14, -15, 6377.2027)]
[TestCase(12000, 800, -35, -14, 6377.2027)]
[TestCase(12000, 800, 35, -14, 6377.2027)]
public void TestNoSmartAuxDuringCoasting(double vehicleWeight, double engineSpeedRpm, double driveLinePower,
double internalPower, double expectedPowerDemand)
{
......@@ -107,10 +108,10 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
}
[Test]
[TestCase(12000, 1256, -48, -148, 8954.1396)]
[TestCase(12000, 1256, 48, -148, 8954.1396)]
[TestCase(12000, 800, -48, -148, 8281.5088)]
[TestCase(12000, 800, 48, -148, 8281.5088)]
[TestCase(12000, 1256, -48, -28, 8954.1429)] // smart PS active - power demand below engine drag
[TestCase(12000, 1256, 48, -28, 6087.0322)] // no smart aux active - positive power demand
[TestCase(12000, 800, -48, -28, 8281.5129)] // smart PS active - power demand below engine drag
[TestCase(12000, 800, 48, -28, 6377.2027)] // no smart aux active - positive power demand
public void TestSmartAuxDuringBrake(double vehicleWeight, double engineSpeedRpm, double driveLinePower,
double internalPower, double expectedPowerDemand)
{
......@@ -118,6 +119,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
var busAux = AuxDemandTest.CreateBusAuxAdapterForTesting(vehicleWeight, out driver);
driver.DriverBehavior = DrivingBehavior.Braking;
driver.DrivingAction = DrivingAction.Brake;
var engineDrivelinePower = (driveLinePower * 1000).SI<Watt>();
var engineSpeed = engineSpeedRpm.RPMtoRad();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about