Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 84b7302b authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

correctly set ovc mode for completed simulation.

ignore ovc mode at first when searching primary result, only consider ovc mode when more than one result is available
parent 9f72f003
Branches
Tags
No related merge requests found
...@@ -153,12 +153,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider ...@@ -153,12 +153,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public IResult GetResult(VehicleClass vehicleClass, MissionType mission, string fuelMode, Kilogram payload, public IResult GetResult(VehicleClass vehicleClass, MissionType mission, string fuelMode, Kilogram payload,
OvcHevMode ovcHevMode) OvcHevMode ovcHevMode)
{ {
return ResultsInputData.Results.FirstOrDefault( var matches = ResultsInputData.Results.Where(
x => x.VehicleGroup == vehicleClass && x => x.VehicleGroup == vehicleClass &&
(x.SimulationParameter.Payload - payload).IsEqual(0, 1) && x.Mission == mission (x.SimulationParameter.Payload - payload).IsEqual(0, 1) && x.Mission == mission
&& x.OvcMode == ovcHevMode ).ToArray();
// && x.SimulationParameter.FuelMode.Equals(fuelMode, StringComparison.InvariantCultureIgnoreCase) if (matches.Length == 1) {
); return matches.First();
}
return matches.First(x => x.OvcMode == ovcHevMode);
} }
public XmlNode ResultsNode => GetNode(XMLNames.Report_Results); public XmlNode ResultsNode => GetNode(XMLNames.Report_Results);
......
...@@ -362,7 +362,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRun ...@@ -362,7 +362,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRun
} }
else else
{ {
foreach (var run in CreateVectoRunData(mission, loading, modeIdx, fuelMode)) { foreach (var run in CreateVectoRunData(mission, loading, modeIdx, fuelMode, OvcHevMode.ChargeSustaining)) {
yield return run; yield return run;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment