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 Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf and b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf differ diff --git a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs index 0207a841b6700f2c79aed690357c75816f7bb159..6613749bc7dfe0b0272904a22a58174581fae35f 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 ad6222992e4131580bbbbc993235fb6510d28b10..d1437ad5536236af134480d21c49b135b59ce9ee 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 361554665e349b055a9126e495b699739954aad8..ffe6039a72e7ec103f3e947c83b0c180b17f833b 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 4c4d6677d6f1c38e8d634c1926abb1ec594f83c1..8befe015091ed8924495e0d6ee2665bc7360b3cf 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; }