Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of...

Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1731-declaration-mode-xev-primary-bus

Documentation/MultiStepTool/1-introduction/B_new_job.md

@@ -63,7 +63,8 @@ In case a mandatory input field is empty, or the value provided by the user is i
 ### 8 Save and Close
 - **Save as JSON ...**:\
     Saves the input data as completed bus job (JSON v7).
-    Not the created files consist of the paths of the VIF and the completed input, to update edited fields the input has to be saved additionaly.
+    Note: The created file consists of the paths of the VIF and the completed input relative to the created JSON (.vecto) file, to update edited fields the input has to be saved additionaly.
+    This option is only available if a step input was loaded, or the current input was already saved.
 
 - **Save Input As ...**:\
     Saves the input of the current step to a new file.

Documentation/MultiStepTool/build_in_docker.sh

 docker build -t ubuntu_pandoc .
-docker run --rm --volume /mnt/c/Users/Harry/source/repos/hm_vecto-dev/Documentation/MultiStepTool:/documentation --entrypoint /documentation/convert.sh ubuntu_pandoc
+
+SCRIPT=$(readlink -f "$0")
+# Absolute path this script is in, thus /home/user/bin
+SCRIPTPATH=$(dirname "$SCRIPT")
+echo $SCRIPTPATH
+
+docker run --rm --volume $SCRIPTPATH:/documentation --entrypoint /documentation/convert.sh ubuntu_pandoc

Documentation/MultiStepTool/convert.sh

@@ -12,11 +12,14 @@ cd documentation
 declare -a FILES
 mapfile -t FILES < files.txt
 cat files.txt
+
+echo "\n"
 echo "Running pandoc with these input files"
-echo "${FILES[@]}"
+echo "${FILES[@]}\n"
 
-OUTPUTFILE="MultiStepToolHelp.html"
 
+OUTPUTFILE="MultiStepToolHelp.html"
+echo "Start conversion"
 #pandoc --verbose  -f markdown+raw_html %LIST% -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --webtex -c includes/style.css -c includes/print.css -B includes/header.html -A includes/footer.html -o HashingToolHelp.html  -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
 pandoc --verbose -f markdown+raw_html ${FILES[@]} -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --webtex -c includes/style.css -c includes/print.css -B includes/header.html -A includes/footer.html -o $OUTPUTFILE  -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
 

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/GearBoxDataAdapter.cs

@@ -228,7 +228,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
 		}
 
 
-		protected void CheckGearNumbers(IGearboxDeclarationInputData gbxInputData)
+		protected virtual void CheckGearNumbers(IGearboxDeclarationInputData gbxInputData)
 		{
 			if (gbxInputData == null) {
 				return;
@@ -565,6 +565,12 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
 		{
 			return CreateIEPCGearboxData(inputData, runData, shiftPolygonCalculator);
 		}
+
+		protected override void CheckGearNumbers(IGearboxDeclarationInputData gbxInputData)
+		{
+			// TODO?
+		}
+
 		#endregion
 	}
 

VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs

@@ -186,7 +186,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				var estimatedTimeToSpeedChange = distanceToSpeedChange / DataBus.VehicleInfo.VehicleSpeed;
 				if (estimatedTimeToSpeedChange.IsSmaller(Constants.SimulationSettings.LowerBoundTimeInterval / 2) &&
 					DataBus.VehicleInfo.VehicleSpeed.IsSmaller(DataBus.DriverInfo.ApplyOverspeed(Left.VehicleTargetSpeed), 0.1.KMPHtoMeterPerSecond()) &&
-					DataBus.VehicleInfo.VehicleSpeed.IsSmaller(DataBus.DriverInfo.ApplyOverspeed(Right.VehicleTargetSpeed), 0.1.KMPHtoMeterPerSecond())) {
+					DataBus.VehicleInfo.VehicleSpeed.IsSmallerOrEqual( DataBus.DriverInfo.ApplyOverspeed(Right.VehicleTargetSpeed), 0.1.KMPHtoMeterPerSecond())) {
 					CurrentState.Response = DriveDistance(absTime, ds);
 					return CurrentState.Response;
 				}

VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs

@@ -196,21 +196,26 @@ namespace TUGraz.VectoCore.OutputData.XML
 				DeclarationData.FuelData.Lookup(x, specific.VectoRunData.VehicleData.InputData.TankSystem)).ToList(); //specific.FuelData;
             var co2Sum = 0.SI<Kilogram>();
 
-			var fuel = specific.FuelData.First();
-			var fuelFactor = CalculateFactor(combinedResults, r => r.FuelConsumptionFinal(fuel.FuelType).TotalFuelConsumptionCorrected);
+			if (primary.EnergyConsumption != null && primary.EnergyConsumption.Any()) {
+				var fuel = specific.FuelData.First();
+				var fuelFactor = CalculateFactor(combinedResults,
+					r => r.FuelConsumptionFinal(fuel.FuelType).TotalFuelConsumptionCorrected);
 
-            foreach (var entry in primary.EnergyConsumption)//generic.FuelData.Select(f => f.FuelType))
-            {
-				var energyDemand = fuelFactor * (entry.Value * specific.Distance);
-                var fuelConsumption = new CompletedBusFuelConsumption()
-                {
-                    Fuel = DeclarationData.FuelData.Lookup(entry.Key, specific.VectoRunData.VehicleData.InputData.TankSystem), // specific.FuelData.Single(f => f.FuelType == fuel),
-                    EnergyDemand = energyDemand,
-                };
-                co2Sum += fuelConsumption.TotalFuelConsumptionCorrected * fuelConsumption.Fuel.CO2PerFuelWeight;
-                result.CorrectedFinalFuelConsumption.Add(entry.Key, fuelConsumption);
-            }
-            result.CO2Total = co2Sum;
+				foreach (var entry in primary.EnergyConsumption) //generic.FuelData.Select(f => f.FuelType))
+				{
+					var energyDemand = fuelFactor * (entry.Value * specific.Distance);
+					var fuelConsumption = new CompletedBusFuelConsumption() {
+						Fuel = DeclarationData.FuelData.Lookup(entry.Key,
+							specific.VectoRunData.VehicleData.InputData
+								.TankSystem), // specific.FuelData.Single(f => f.FuelType == fuel),
+						EnergyDemand = energyDemand,
+					};
+					co2Sum += fuelConsumption.TotalFuelConsumptionCorrected * fuelConsumption.Fuel.CO2PerFuelWeight;
+					result.CorrectedFinalFuelConsumption.Add(entry.Key, fuelConsumption);
+				}
+			}
+
+			result.CO2Total = co2Sum;
 
 
             result.ElectricEnergyConsumption = null;

VectoCore/VectoCore/Resources/Declaration/GenericBusData/EfficiencyMap_IEPC_ASM_normalized.vmap

@@ -312,5 +312,4 @@
    4.000 ,0.600      ,2.865
    4.000 ,0.800      ,3.908
    4.000 ,1.000      ,5.009
-   4.000 ,1.100      ,5.582
-         ,           ,
\ No newline at end of file
+   4.000 ,1.100      ,5.582
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PEV_primaryBus_AMT_E2.RSLT_VIF.xml

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
   <PrimaryVehicle>
     <Data id="VIF_P-c15b1005764d4741ae98" xsi:type="PrimaryVehicleDataType">
@@ -429,7 +429,6 @@
                 <CompressorDrive>electrically</CompressorDrive>
                 <SmartRegenerationSystem>false</SmartRegenerationSystem>
                 <AirsuspensionControl>electronically</AirsuspensionControl>
-                <PneumaticSCRReagentDosing>false</PneumaticSCRReagentDosing>
               </PneumaticSystem>
               <HVAC>
                 <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCityBus_IEPC_Base.RSLT_VIF.xml

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
   <PrimaryVehicle>
     <Data id="VIF_P-eed1f0ed412b4130bda1" xsi:type="PrimaryVehicleDataType">
@@ -306,7 +306,6 @@
                 <CompressorDrive>electrically</CompressorDrive>
                 <SmartRegenerationSystem>false</SmartRegenerationSystem>
                 <AirsuspensionControl>electronically</AirsuspensionControl>
-                <PneumaticSCRReagentDosing>false</PneumaticSCRReagentDosing>
               </PneumaticSystem>
               <HVAC>
                 <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_E2_Base_AMT.RSLT_VIF.xml

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
   <PrimaryVehicle>
     <Data id="VIF_P-f6219114ce4248989b7f" xsi:type="PrimaryVehicleDataType">
@@ -272,7 +272,6 @@
                 <CompressorDrive>electrically</CompressorDrive>
                 <SmartRegenerationSystem>false</SmartRegenerationSystem>
                 <AirsuspensionControl>electronically</AirsuspensionControl>
-                <PneumaticSCRReagentDosing>false</PneumaticSCRReagentDosing>
               </PneumaticSystem>
               <HVAC>
                 <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>

VectoCore/VectoCoreTest/TestData/XML/XMLVIFBusReport/IEPC_completedBus_2.VIF_Report_2.xml

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
   <PrimaryVehicle>
     <Data id="VIF_P-7198abf5d8364942a4ef" xsi:type="PrimaryVehicleDataType">
@@ -234,7 +234,6 @@
                 <CompressorDrive>electrically</CompressorDrive>
                 <SmartRegenerationSystem>false</SmartRegenerationSystem>
                 <AirsuspensionControl>electronically</AirsuspensionControl>
-                <PneumaticSCRReagentDosing>false</PneumaticSCRReagentDosing>
               </PneumaticSystem>
               <HVAC>
                 <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>