From e16191ec2ae32c1b5d1f3d1e2f2da0343bcf6b48 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 25 Feb 2020 09:05:38 +0100
Subject: [PATCH] adapt expected values (adaptations in shift strategy)
---
.../Integration/Declaration/NaturalGasVehicles.cs | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
index 904760fd28..53c035d500 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
@@ -46,6 +46,7 @@ using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.FileIO.XML;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.OutputData;
+using TUGraz.VectoCore.OutputData.FileIO;
using TUGraz.VectoCore.Tests.Models.Simulation;
using TUGraz.VectoCore.Utils;
@@ -69,10 +70,10 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
[
- TestCase(Class5NG, 2, TankSystem.Liquefied, 253.8, 703.1, TestName = "Class5 LNG 2"),
- TestCase(Class5NG, 2, TankSystem.Compressed, 259.6, 698.4 , TestName = "Class5 CNG 2"),
- TestCase(Class5NG, 6, TankSystem.Liquefied, 252.9, 700.5, TestName = "Class5 LNG 6"),
- TestCase(Class5NG, 6, TankSystem.Compressed, 258.7, 695.8, TestName = "Class5 CNG 6"),
+ TestCase(Class5NG, 2, TankSystem.Liquefied, 253.8, 703.2, TestName = "Class5 LNG 2"),
+ TestCase(Class5NG, 2, TankSystem.Compressed, 259.7, 698.6 , TestName = "Class5 CNG 2"),
+ TestCase(Class5NG, 6, TankSystem.Liquefied, 253.1, 701.4, TestName = "Class5 LNG 6"),
+ TestCase(Class5NG, 6, TankSystem.Compressed, 259.0, 696.8, TestName = "Class5 CNG 6"),
]
public void NaturalGasTankSystemTest(string filename, int runIdx, TankSystem tankSystem, double expectedFc, double expectedCo2)
{
@@ -95,7 +96,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
tankSystemNode.SetValue(tankSystem.ToString());
var modified = XmlReader.Create(new StringReader(nav.OuterXml));
- var writer = new MockDeclarationWriter(filename);
+ var writer = new FileOutputWriter(filename); // new MockDeclarationWriter(filename);
var inputData = xmlInputReader.CreateDeclaration(modified);
var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
WriteModalResults = true,
@@ -107,7 +108,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
jobContainer.Execute();
jobContainer.WaitFinished();
- var manufacturerReport = writer.GetReport(ReportType.DeclarationReportManufacturerXML);
+ var manufacturerReport = XDocument.Load(XmlReader.Create(writer.XMLFullReportName)); // writer.GetReport(ReportType.DeclarationReportManufacturerXML);
var fuelTypeResultNodes = manufacturerReport.XPathSelectElements("//*[local-name()='Results']//*[local-name()='FuelType']");
foreach (var node in fuelTypeResultNodes) {
--
GitLab