diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs b/VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs
index 5ad456f3553599b19c21cc77ebc4f968a6593762..4b0b18cf45678675fa27b5de78cfe978ffe82544 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs
@@ -156,7 +156,9 @@ public class PrimaryBusSimulation
TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_nonSmartES_mechAux.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P2 nonSmartES_mechAux"),
TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P2 SmartES_elFan_elSteer"),
- TestCase(@"FactorMethod\S-HEV\S2-HEV\P31_32_S2_HEV_nonSmartES_elecSP_mechFan.xml", 0, TestName = "2nd Amendment PrimaryBus FM S-HEV S2 nonSmartES_elecSP_mechFan"),
+ // Fails on almost every cycle except suburban
+ TestCase(@"FactorMethod\S-HEV\S2-HEV\P31_32_S2_HEV_nonSmartES_elecSP_mechFan.xml", 0, TestName = "2nd Amendment PrimaryBus FM S-HEV S2 nonSmartES_elecSP_mechFan 0"),
+ TestCase(@"FactorMethod\S-HEV\S2-HEV\P31_32_S2_HEV_nonSmartES_elecSP_mechFan.xml", 4, TestName = "2nd Amendment PrimaryBus FM S-HEV S2 nonSmartES_elecSP_mechFan 4"),
]
@@ -309,11 +311,15 @@ public class PrimaryBusSimulation
TestName = "2nd Amendment FactorMethodRunData P-HEV P2 nonSmartES_mechFan_elSP spez_Dim_HVAC"),
TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_nonSmartES_mechAux.xml", @"FactorMethod\P-HEV\P2-HEV\P2_HEV_32e_prim_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_P2_HEV_nonSmartES_mechAux.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData P-HEV P2 nonSmartES_mechAux prim_Dim_HVAC"),
+
TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.xml", @"FactorMethod\P-HEV\P2-HEV\P2_HEV_32e_spez_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.RSLT_VIF.xml", CycleCO, LowL,
TestName = "2nd Amendment FactorMethodRunData P-HEV P2 SmartES_elFan_elSteer spez_Dim_HVAC"),
+ TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.xml", @"FactorMethod\P-HEV\P2-HEV\P2_HEV_32e_spez_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_P2_HEV_SmartES_elec_SP_elec_Fan.RSLT_VIF.xml", CycleCO, LowL,
+ TestName = "2nd Amendment FactorMethodRunData P-HEV P2 SmartES_elFan_elSteer spez_Dim_HVAC"),
-
+ TestCase(@"FactorMethod\S-HEV\S2-HEV\P31_32_S2_HEV_nonSmartES_elecSP_mechFan.xml", @"FactorMethod\S-HEV\S2-HEV\S2_HEV_32e_spec_Dim_HVAC.xml", @"FactorMethod\VIF\P31_32_S2_HEV_nonSmartES_elecSP_mechFan.RSLT_VIF.xml", MissionType.Suburban, LowL,
+ TestName= "2nd Amendment FactorMethodRunData S-HEV S2 nonSmartES_elecSP_mechFan"),
]
public void TestFactorMethodRunData(string primary, string completed, string vifFile, MissionType mission, LoadingType loading)
{
@@ -487,7 +493,7 @@ public class PrimaryBusSimulation
//runsFactory.SerializeVectoRunData = true;
var jobContainer = new JobContainer(new SummaryDataContainer(fileWriter)) { };
//var jobContainer = new JobContainer(new MockSumWriter()) { };
- var runs = runsFactory.SimulationRuns();
+ var runs = runsFactory.SimulationRuns().ToList();
foreach (var vectoRun in runs) {
foreach (var action in runDataModifier) {
action(vectoRun.GetContainer().RunData);
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/FactorMethod/S-HEV/S2-HEV/S2_HEV_32e_spec_Dim_HVAC.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/FactorMethod/S-HEV/S2-HEV/S2_HEV_32e_spec_Dim_HVAC.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9a06296aed0a14efffa4dad1758eaadb551bfc1e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/FactorMethod/S-HEV/S2-HEV/S2_HEV_32e_spec_Dim_HVAC.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="S2_HEV_32e_spez_Dim_HVAC" xsi:type="Vehicle_HEV_CompletedBusDeclarationType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-30T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>11737</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>19000</TechnicalPermissibleMaximumLadenMass>
+ <AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+ <ClassBus>II+III</ClassBus>
+ <NumberPassengerSeatsLowerDeck>49</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>0</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CA</BodyworkCode>
+ <LowEntry>false</LowEntry>
+ <HeightIntegratedBody>3050</HeightIntegratedBody>
+ <VehicleLength>12300</VehicleLength>
+ <VehicleWidth>2450</VehicleWidth>
+ <EntranceHeight>340</EntranceHeight>
+ <DoorDriveTechnology>electric</DoorDriveTechnology>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_xEV_CompletedBusType">
+ <AirDrag>
+ <v2.0:Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+ <v2.0:Model>Generic Model</v2.0:Model>
+ <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+ <v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+ <v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+ <v2.0:CdxA_0>3.44</v2.0:CdxA_0>
+ <v2.0:TransferredCdxA>3.44</v2.0:TransferredCdxA>
+ <v2.0:DeclaredCdxA>3.44</v2.0:DeclaredCdxA>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ <Auxiliaries>
+ <Data xsi:type="AUX_xEV_CompletedBusType">
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>true</Interiorlights>
+ <Dayrunninglights>true</Dayrunninglights>
+ <Positionlights>true</Positionlights>
+ <Brakelights>true</Brakelights>
+ <Headlights>true</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>6</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>not applicable</Cooling>
+ <Heating>not applicable</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 3-stage</Cooling>
+ <Heating>non R-744 3-stage</Heating>
+ </HeatPumpTypePassengerCompartment>
+ <AuxiliaryHeaterPower>20000</AuxiliaryHeaterPower>
+ <DoubleGlazing>true</DoubleGlazing>
+ <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+ <WaterElectricHeater>true</WaterElectricHeater>
+ <AirElectricHeater>true</AirElectricHeater>
+ <OtherHeatingTechnology>false</OtherHeatingTechnology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>