From 1d491f81ed9c518e6c0955413fecd880bd8fb5b6 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Mon, 6 Mar 2023 12:22:36 +0100
Subject: [PATCH] update rundata for aux test, update expected values
---
.../Integration/ADAS/ADASTestsHEV.cs | 22 +++----------------
.../BusAuxiliaries/BusAdapterTest.cs | 2 +-
.../VectoCoreTest/Reports/SumWriterTest.cs | 14 ++++++++++++
3 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
index b6293e66e3..dff94c49a1 100644
--- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
+++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
@@ -524,25 +524,9 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
[TestCase]
public void Class5_NoADAS_CaseI_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name,
- (537, 4200, OutsideSegment, Accelerate), // len: 3663m
- (4200, 4223, OutsideSegment, Roll), // len: 23m
- (4223, 4586, OutsideSegment, Accelerate), // len: 363m
- (4586, 4605, OutsideSegment, Roll), // len: 19m
- (4605, 4747, OutsideSegment, Accelerate), // len: 142m
- (4747, 4762, OutsideSegment, Roll), // len: 15m
- (4762, 4888, OutsideSegment, Accelerate), // len: 126m
- (4888, 4900, OutsideSegment, Roll), // len: 12m
- (4900, 4981, OutsideSegment, Accelerate), // len: 81m
- (4981, 4994, OutsideSegment, Roll), // len: 13m
- (4994, 5116, OutsideSegment, Accelerate), // len: 122m
- (5116, 5133, OutsideSegment, Roll), // len: 17m
- (5133, 5301, OutsideSegment, Accelerate), // len: 168m
- (5301, 5323, OutsideSegment, Roll), // len: 22m
- (5323, 5392, OutsideSegment, Accelerate), // len: 69m
- (5392, 5475, OutsideSegment, Coast), // len: 83m
- (5475, 6111, OutsideSegment, Brake), // len: 636m
- (6111, 6397, OutsideSegment, Coast), // len: 286m
- (6397, 1e6, OutsideSegment, Accelerate));
+ (35, 420, OutsideSegment, Accelerate), // len: 385m
+ (420, 444, OutsideSegment, Roll), // len: 24m
+ (444, 1e6, OutsideSegment, Accelerate));
[TestCase]
public void Class5_NoADAS_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name,
diff --git a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
index bf60c084d9..9feaf26b61 100644
--- a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
@@ -105,7 +105,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
}
[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, 1256, 48, -28, 5649.8149)] // 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,
diff --git a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
index 09b4c268ea..cc8e696053 100644
--- a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
@@ -99,6 +99,13 @@ namespace TUGraz.VectoCore.Tests.Reports
DriverData = new DriverData() {
EngineStopStart = new DriverData.EngineStopStartData()
},
+ Aux = new List<VectoRunData.AuxData>() {
+ new() {
+ ID = "FAN",
+ PowerDemandMech = 3000.SI<Watt>(),
+ Technology = new List<string>() {"FanTech"}
+ }
+ }
};
var modData = new ModalDataContainer(rundata, writer, null);
modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
@@ -191,6 +198,13 @@ namespace TUGraz.VectoCore.Tests.Reports
DriverData = new DriverData() {
EngineStopStart = new DriverData.EngineStopStartData()
},
+ Aux = new List<VectoRunData.AuxData>() {
+ new() {
+ ID = "FAN",
+ PowerDemandMech = 3000.SI<Watt>(),
+ Technology = new List<string>() {"FanTech"}
+ }
+ }
};
var modData = new ModalDataContainer(rundata, writer, null);
modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
--
GitLab