From 2b663266d423c8268111e5c37af5ed64c3267046 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Tue, 28 Feb 2023 19:23:10 +0100
Subject: [PATCH] update expected values for bus aux testcases (due to
refactoring of bus aux model)
---
.../BusAuxiliaries/AuxDemandTest.cs | 6 +--
.../BusAuxiliaries/BusAdapterTest.cs | 40 +++++++++----------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs
index 9fe4448468..3aa8a6a422 100644
--- a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs
@@ -60,9 +60,9 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
}
- [TestCase(12000, 1256, 148, 148, 6087.03221)]
- [TestCase(12000, 1256, -45, -30, 8954.1396)]
- [TestCase(15700, 1319, -45.79263, -24.0441, 9093.9473)]
+ [TestCase(12000, 1256, 148, 148, 5649.8149)]
+ [TestCase(12000, 1256, -45, -30, 8516.9257)]
+ [TestCase(15700, 1319, -45.79263, -24.0441, 8656.7333)]
public void AuxDemandtest(double vehicleWeight, double engineSpeedRpm, double driveLinePower, double internalPower,
double expectedPowerDemand)
{
diff --git a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
index 1c24ec3f1c..bf60c084d9 100644
--- a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
@@ -51,12 +51,12 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
}
- [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)]
+ [TestCase(12000, 1256, 148, 148, 5649.8149)]
+ [TestCase(12000, 1256, -48, -148, 5649.8149)]
+ [TestCase(12000, 1256, 48, -148, 5649.8149)]
+ [TestCase(12000, 800, 148, 148, 5939.985)]
+ [TestCase(12000, 800, -48, -148, 5939.985)]
+ [TestCase(12000, 800, 48, -148, 5939.985)]
public void TestNoSmartAuxDuringDrive(double vehicleWeight, double engineSpeedRpm, double driveLinePower,
double internalPower, double expectedPowerDemand)
{
@@ -74,16 +74,16 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
Assert.AreEqual(expectedPowerDemand, (torque * engineSpeed).Value(), 1e-2);
}
- [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)]
+ [TestCase(12000, 1256, 148, 148, 5649.814)]
+ [TestCase(12000, 1256, -28, -27, 5649.814)]
+ [TestCase(12000, 1256, -28, -29, 5649.814)]
+ [TestCase(12000, 1256, -128, -28, 5649.814)]
+ [TestCase(12000, 1256, 28, -28, 5649.814)]
+ [TestCase(12000, 800, 148, 148, 5939.9854)]
+ [TestCase(12000, 800, -14, -13, 5939.9854)]
+ [TestCase(12000, 800, -14, -15, 5939.9854)]
+ [TestCase(12000, 800, -35, -14, 5939.9854)]
+ [TestCase(12000, 800, 35, -14, 5939.9854)]
public void TestNoSmartAuxDuringCoasting(double vehicleWeight, double engineSpeedRpm, double driveLinePower,
double internalPower, double expectedPowerDemand)
{
@@ -104,10 +104,10 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
Assert.AreEqual(expectedPowerDemand, (torque * engineSpeed).Value(), 1e-2);
}
- [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
+ [TestCase(12000, 1256, -48, -28, 8516.9257)] // smart PS active - power demand below engine drag
+ [TestCase(12000, 1256, 48, -28, 6087.0321)] // no smart aux active - positive power demand
+ [TestCase(12000, 800, -48, -28, 7844.2956)] // smart PS active - power demand below engine drag
+ [TestCase(12000, 800, 48, -28, 5939.985)] // no smart aux active - positive power demand
public void TestSmartAuxDuringBrake(double vehicleWeight, double engineSpeedRpm, double driveLinePower,
double internalPower, double expectedPowerDemand)
{
--
GitLab