diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
index ecc5673ce6824eceae68bcd47dc25790466f611a..1f31233a83400754ef1a196b8ce8b42dd903ad13 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
@@ -4,6 +4,7 @@ using System.Linq;
using System.Xml;
using System.Xml.Linq;
using Ninject;
+using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Resources;
@@ -157,6 +158,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
x => x.VehicleGroup == vehicleClass &&
(x.SimulationParameter.Payload - payload).IsEqual(0, 1) && x.Mission == mission
).ToArray();
+ if (!matches.Any()) {
+ throw new VectoException($"No primary result found for {vehicleClass}, {mission}, {payload}");
+ }
if (matches.Length == 1) {
return matches.First();
}
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/FactorMethod/VIF/P31_32_S2_HEV_nonSmartES_elecSP_mechFan.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/FactorMethod/VIF/P31_32_S2_HEV_nonSmartES_elecSP_mechFan.RSLT_VIF.xml
index 8dd163e9ce1e1cefc14158a6408845427eb75d36..80da29fce4ba3db79e995f54c1e270ba9e4f630d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/FactorMethod/VIF/P31_32_S2_HEV_nonSmartES_elecSP_mechFan.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/FactorMethod/VIF/P31_32_S2_HEV_nonSmartES_elecSP_mechFan.RSLT_VIF.xml
@@ -455,25 +455,340 @@
<di:DigestValue>LjjGuDZDOWjRfXcNSmjLiX7wUHns4vXmxOCj5j7/tSA=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
- <Results>
- <Status>success</Status>
- <Result status="success">
- <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
- <Mission>Suburban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">13887</TotalVehicleMass>
- <Payload unit="kg">1124</Payload>
- <PassengerCount>16.52</PassengerCount>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">8.43</EnergyConsumption>
- </Fuel>
- <ElectricEnergyConsumption>
- <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
- </ElectricEnergyConsumption>
- </Result>
- </Results>
- <ApplicationInformation>
+ <Results>
+ <Status>success</Status>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+ <Payload unit="kg">1124</Payload>
+ <PassengerCount>16.52</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">17.5</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+ <Payload unit="kg">5618</Payload>
+ <PassengerCount>82.62</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">13.6</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+ <Payload unit="kg">1124</Payload>
+ <PassengerCount>16.52</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">13.6</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+ <Payload unit="kg">5618</Payload>
+ <PassengerCount>82.62</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">13.6</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+ <Payload unit="kg">1124</Payload>
+ <PassengerCount>16.52</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">10.4</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+ <Payload unit="kg">5618</Payload>
+ <PassengerCount>82.62</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">13.9</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13050</TotalVehicleMass>
+ <Payload unit="kg">1075</Payload>
+ <PassengerCount>15.15</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">13.9</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15495</TotalVehicleMass>
+ <Payload unit="kg">3520</Payload>
+ <PassengerCount>49.57</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">13.9</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+ <Payload unit="kg">1193</Payload>
+ <PassengerCount>17.55</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">18.8</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+ <Payload unit="kg">5967</Payload>
+ <PassengerCount>87.75</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">18.8</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+ <Payload unit="kg">1193</Payload>
+ <PassengerCount>17.55</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">14.6</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+ <Payload unit="kg">5967</Payload>
+ <PassengerCount>87.75</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">14.6</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+ <Payload unit="kg">1193</Payload>
+ <PassengerCount>17.55</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">11.1</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+ <Payload unit="kg">5967</Payload>
+ <PassengerCount>87.75</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">15.2</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">14225</TotalVehicleMass>
+ <Payload unit="kg">1075</Payload>
+ <PassengerCount>15.15</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">15.2</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">16670</TotalVehicleMass>
+ <Payload unit="kg">3520</Payload>
+ <PassengerCount>49.57</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">15.2</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">14245</TotalVehicleMass>
+ <Payload unit="kg">1095</Payload>
+ <PassengerCount>15.42</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">7.04</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15887</TotalVehicleMass>
+ <Payload unit="kg">2737</Payload>
+ <PassengerCount>38.56</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">7.44</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">14663</TotalVehicleMass>
+ <Payload unit="kg">1263</Payload>
+ <PassengerCount>17.79</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">7.44</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">17609</TotalVehicleMass>
+ <Payload unit="kg">4209</Payload>
+ <PassengerCount>59.29</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">7.44</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">14747</TotalVehicleMass>
+ <Payload unit="kg">1347</Payload>
+ <PassengerCount>18.97</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">7.42</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ <Result status="success">
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">16768</TotalVehicleMass>
+ <Payload unit="kg">3368</Payload>
+ <PassengerCount>47.43</PassengerCount>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">7.44</EnergyConsumption>
+ </Fuel>
+ <ElectricEnergyConsumption>
+ <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+ </ElectricEnergyConsumption>
+ </Result>
+ </Results>
+ <ApplicationInformation>
<SimulationToolVersion>0.7.10.3073-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
<Date>2023-06-01T13:33:12.6595824Z</Date>
</ApplicationInformation>