From cd1f75b5018ef75841b19fba03aa4ffd3b9d4d70 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at>
Date: Thu, 9 Feb 2023 12:01:45 +0100
Subject: [PATCH] set ovcmode in Result Initialize method
---
.../Release Notes Vecto3.x.pdf | Bin 934655 -> 934655 bytes
.../OVCHevIterativeRunStrategy.cs | 2 +-
.../VectoCore/OutputData/DeclarationReport.cs | 2 +-
.../Common/AbstractResultsWriter.cs | 2 +-
.../OutputData/XML/XMLDeclarationReport.cs | 1 +
5 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf
index 6035cba5be7acab16916ad9ded6854320f69212d..ce1a6006fb36848915a5cba025409f536f697167 100644
GIT binary patch
delta 425
zcmez0YWcs_vY~~sg{g(Pg{6hHg{_6Xg<}h+e3GWQp^<@!fu**Ap}K*Ax~77@Z+?nP
zVo9ooi<Oaqk+Ff10aQi1M-pedM-o@NM-q3tM-tC=k0jp3>$uEA42`S|Osotnr+*dT
zGeG9+3-a}=xEPuk8@n2t>6*A0yXcyjnpo;OIa)aBnz=eU8XCD+ni*M`PJblGr$v;?
z?FK@8`#7A8&5T`5j9m<kT})g|EKN*7CL$YXXG2KEb^~d?EoxLSXu6scUo17uIqJk`
F1pp;QXk`EZ
delta 425
zcmez0YWcs_vY~~sg{g(Pg{6hHg{_6Xg<}h+e3GV_p`o#XiMh6cp}K*Ax~77@Z+?nP
zVo9ooi<Oaqk+Ff10aQi1M-pedM-o@NM-q3tM-tC=k0jp3>$uE93=OS}4XjMer+*dT
zGeG9+3-a}=n3!6)xH!AI=$bhhnCP0gIvVO)xSAR2x*C`|J36_!IXO8QOn)TEr$v;?
z?FK@8`#79jU0j?kTue+2Ow61d4NY7@CL$YXXG2KEb^~d?EoxLSXu6scUo17uIqJk`
F1pwftYiR%g
diff --git a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs
index 0207a841b6..6613749bc7 100644
--- a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs
+++ b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs
@@ -12,7 +12,7 @@ namespace TUGraz.VectoCore.Models.Declaration.IterativeRunStrategies
public override bool RunAgain(int iteration, IModalDataContainer modData, VectoRunData runData)
{
- return Enabled && iteration < 2;
+ return Enabled && (iteration < 2);
}
public override void UpdateRunData(int iteration, IModalDataContainer modData, VectoRunData runData)
diff --git a/VectoCore/VectoCore/OutputData/DeclarationReport.cs b/VectoCore/VectoCore/OutputData/DeclarationReport.cs
index ad6222992e..d1437ad553 100644
--- a/VectoCore/VectoCore/OutputData/DeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/DeclarationReport.cs
@@ -276,7 +276,7 @@ namespace TUGraz.VectoCore.OutputData
/// <param name="entry"></param>
/// <param name="runData"></param>
/// <param name="modData">The mod data.</param>
- //[MethodImpl(MethodImplOptions.Synchronized)]
+ //[MethodImpl(MethodImplOptions.Synchronized)] //Results are already locked
protected abstract void DoStoreResult(T entry, VectoRunData runData, IModalDataContainer modData);
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/AbstractResultsWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/AbstractResultsWriter.cs
index 361554665e..ffe6039a72 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/AbstractResultsWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/AbstractResultsWriter.cs
@@ -57,7 +57,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
}
var retVal = new List<IOVCResultEntry>(results.Count / 2);
- var cdEntries = results.Where(x => x.OVCMode == VectoRunData.OvcHevMode.ChargeSustaining)
+ var cdEntries = results.Where(x => x.OVCMode == VectoRunData.OvcHevMode.ChargeDepleting)
.OrderBy(x => x.VehicleClass)
.ThenBy(x => x.FuelMode)
.ThenBy(x => x.Mission)
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
index 4c4d6677d6..8befe01509 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
@@ -88,6 +88,7 @@ namespace TUGraz.VectoCore.OutputData.XML
PassengerCount = runData.VehicleData.PassengerCount;
MaxChargingPower = runData.MaxChargingPower;
BatteryData = runData.BatteryData;
+ OVCMode = runData.OVCMode;
}
public MissionType Mission { get; set; }
--
GitLab