testcases primary bus simulation for FM sanity checks (create VIF)

VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs

@@ -88,8 +88,37 @@ public class PrimaryBusSimulation
 	TestCase(@"PrimaryBus/S-HEV/PrimaryCityBus_IEPC-S_Base.xml", 0, TestName = "2nd Amendment PrimaryBus CityBus S-HEV IEPC Base"),
 
     TestCase(@"PrimaryBus/exempted/exempted_primary_heavyBus.xml", 0, TestName = "2nd Amendment PrimaryBus Exempted"),
-	]
-	public void PrimaryBusSimulationTest(string jobFile, int runIdx)
+
+	TestCase(@"FactorMethod\Conventional\P31_32_nonSmartES_elecFan_elecSteer.xml", 0, TestName = "2nd Amendment PrimaryBus FM Conventional nonSmartES_elFan_elSteer"),
+	TestCase(@"FactorMethod\Conventional\P31_32_nonSmartES_mechFan_mechSteer.xml", 0, TestName = "2nd Amendment PrimaryBus FM Conventional nonSmartES_mechFan_mechSteer"),
+	TestCase(@"FactorMethod\Conventional\P31_32_SmartES_elecFan_elecSteer.xml", 0, TestName = "2nd Amendment PrimaryBus FM Conventional SmartES_elFan_elSteer"),
+	TestCase(@"FactorMethod\Conventional\P31_32_SmartES_mechFan_mechSteer.xml", 0, TestName = "2nd Amendment PrimaryBus FM Conventional SmartES_mechFan_mechSteer"),
+
+
+	TestCase(@"FactorMethod\IEPC\P31_32_IEPC_EDP.xml", 0, TestName = "2nd Amendment PrimaryBus FM IEPC EDP"),
+	TestCase(@"FactorMethod\IEPC\P31_32_IEPC_FESG.xml", 0, TestName = "2nd Amendment PrimaryBus FM IEPC FESG"),
+
+	TestCase(@"FactorMethod\IHPC\P31_32_IHPC_nonSmartES_elec_SP_elec_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM IHPC nonSmartES_elFan_elSteer"),
+	TestCase(@"FactorMethod\IHPC\P31_32_IHPC_nonSmartES_elec_SP_mech_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM IHPC nonSmartES_mechFan_elSteer"),
+	TestCase(@"FactorMethod\IHPC\P31_32_IHPC_nonSmartES_mechAux.xml", 0, TestName = "2nd Amendment PrimaryBus FM IHPC nonSmartES_mechAux"),
+	TestCase(@"FactorMethod\IHPC\P31_32_IHPC_SmartES_elec_SP_elec_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM IHPC SmartES_elFan_ElSteer"),
+
+	TestCase(@"FactorMethod\PEV\P31_32_E2_AMT_EDP.xml", 0, TestName = "2nd Amendment PrimaryBus FM PEV E2 EDP"),
+	TestCase(@"FactorMethod\PEV\P31_32_E2_AMT_FESG.xml", 0, TestName = "2nd Amendment PrimaryBus FM PEV E2 FESG"),
+
+	TestCase(@"FactorMethod\P-HEV\P1-HEV\P31_32_P1_HEV_AT_nonSmart_ES_elec_SP_elec_PS.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P1 nonSmartES_elFan_elPS"),
+	TestCase(@"FactorMethod\P-HEV\P1-HEV\P31_32_P1_HEV_AT_nonSmart_ES_mech_Aux.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P1 nonSmartES_mechAux"),
+	TestCase(@"FactorMethod\P-HEV\P1-HEV\P31_32_P1_HEV_AT_Smart_ES_elec_SP_elec_PS.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P1 SmartES_elPS_elSteer"),
+	
+	TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_nonSmartES_elec_SP_elec_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P2 nonSmartES_elFan_elSteer"),
+	TestCase(@"FactorMethod\P-HEV\P2-HEV\P31_32_P2_HEV_nonSmartES_elec_SP_mech_Fan.xml", 0, TestName = "2nd Amendment PrimaryBus FM P-HEV P2 nonSmartES_mechFan_elSP"),
+	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"),
+
+    ]
+
+
+    public void PrimaryBusSimulationTest(string jobFile, int runIdx)
 	{
 		RunSimulationPrimary(jobFile, runIdx);
 	}
@@ -106,14 +135,23 @@ public class PrimaryBusSimulation
 	TestCase(@"PrimaryCoach_S2_Base_AMT.RSLT_VIF.xml", @"HEV_completedBus_2.xml", 1,                   TestName = "2nd Amendment CompletedBus Coach HEV S2 OVC"),
 	TestCase(@"PrimaryCityBus_IEPC-S_Base.RSLT_VIF.xml", @"HEV_completedBus_2.xml", 1,                 TestName = "2nd Amendment CompletedBus CityBus HEV IEPC-S"),
 	TestCase(@"exempted_primary_heavyBus.RSLT_VIF.xml", @"exempted_completedBus_input_full.xml", 1,    TestName = "2nd Amendment CompletedBus Exempted"),
-	TestCase(@"PrimaryCityBus_IHPC.RSLT_VIF.xml", @"HEV_completedBus_2.xml", -1, TestName="2nd Amendment Completed Bus IHPC")
-	]
+	TestCase(@"PrimaryCityBus_IHPC.RSLT_VIF.xml", @"HEV_completedBus_2.xml", -1, TestName="2nd Amendment Completed Bus IHPC"),
+
+	TestCase(@"FactorMethod\VIF\P31_32_nonSmartES_elecFan_elecSteer.RSLT_VIF.xml", @"FactorMethod\Conventional\Conventional_32e_prim_Dim_HVAC.xml", 0,
+		TestName = "2nd Amendment CompletedBus Conventional nonSmartES_elFan_elSteer 32e_prim_Dim_HVAC"),
+	TestCase(@"FactorMethod\VIF\P31_32_nonSmartES_mechFan_mechSteer.RSLT_VIF.xml", @"FactorMethod\Conventional\Conventional_32e_spez_Dim_HVAC.xml",  0,
+		TestName = "2nd Amendment CompletedBus Conventional nonSmartES_mechFan_mechSteer 32e_spez_Dim_HVAC.xml"),
+	TestCase(@"FactorMethod\VIF\P31_32_SmartES_elecFan_elecSteer.RSLT_VIF.xml", @"FactorMethod\Conventional\Conventional_32e_prim_Dim_HVAC.xml",0,
+		TestName = "2nd Amendment CompletedBus Conventional SmartES_elFan_elSteer 32e_prim_Dim_HVAC"),
+	TestCase(@"FactorMethod\VIF\P31_32_SmartES_mechFan_mechSteer.RSLT_VIF.xml", @"FactorMethod\Conventional\Conventional_32e_spez_Dim_HVAC.xml",  0,
+		TestName = "2nd Amendment CompletedBus Conventional SmartES_mechFan_mechSteer 32e_spez_Dim_HVAC"),
+    ]
     public void CompletedBusSimulationTest(string vifFile, string completed, int runIdx, bool full_sim = false)
 	{
 		if (full_sim) {
 			Kernel.Rebind<IDeclarationCycleFactory>().To<DeclarationCycleFactory>().InSingletonScope();
         }
-		var completedJob = GenerateJsonJobCompletedBus(Path.Combine(BASE_DIR_VIF, vifFile), Path.Combine(BASE_DIR_COMPLETED, completed));
+		var completedJob = GenerateJsonJobCompletedBus(Path.Combine(BASE_DIR, vifFile), Path.Combine(BASE_DIR, completed));
 
 		Kernel.Rebind<IMissionFilter>().To<TestMissionFilter>().InSingletonScope();
 		var missionFilter = Kernel.Get<IMissionFilter>() as TestMissionFilter;
@@ -154,7 +192,10 @@ public class PrimaryBusSimulation
 		TestCase(@"PrimaryBus/P-HEV/PrimaryCoach_P2_HEV_AMT_OVC.xml", @"HEV_completedBus_2.xml", 0, TestName = "2nd Amendment SingleBus Coach P-HEV P2 AMT OVC"),
 		TestCase(@"PrimaryBus/P-HEV/PrimaryCityBus_P1_HEV_Base_AT.xml", @"HEV_completedBus_2.xml", 0, TestName = "2nd Amendment SingleBus CityBus P-HEV P1 Base AT"),
 
-		TestCase(@"PrimaryBus/S-HEV/PrimaryCoach_S2_Base_AMT.xml", @"HEV_completedBus_2.xml", 0, TestName = "2nd Amendment SingleBus Coach S-HEV S2 Base"),
+		TestCase(@"PrimaryBus/P-HEV/PrimaryCityBus_IHPC.xml", @"HEV_completedBus_2.xml", 0, TestName = "2nd Amendment SingleBus CityBus IHPC"),
+
+
+        TestCase(@"PrimaryBus/S-HEV/PrimaryCoach_S2_Base_AMT.xml", @"HEV_completedBus_2.xml", 0, TestName = "2nd Amendment SingleBus Coach S-HEV S2 Base"),
 		TestCase(@"PrimaryBus/S-HEV/PrimaryCityBus_IEPC-S_Base.xml", @"HEV_completedBus_2.xml", 0, TestName = "2nd Amendment SingleBus CityBus S-HEV IEPC Base"),
 
 		//TestCase(@"PrimaryBus/exempted/exempted_primary_heavyBus.xml", @"exempted_completedBus_input_full.xml", 0, TestName = "2nd Amendment SingleBus Exempted"), // exempted single run not supported!
@@ -239,7 +280,7 @@ public class PrimaryBusSimulation
 			Directory.CreateDirectory(outputPath);
 		}
 
-		var singleJob = GenerateJsonJobSingleBus(Path.Combine(BASE_DIR, primary), Path.Combine(BASE_DIR_COMPLETED, completed));
+		var singleJob = GenerateJsonJobSingleBus(Path.Combine(BASE_DIR, primary), Path.Combine(BASE_DIR, completed));
 		var dataProviderSingle = JSONInputDataFactory.ReadJsonJob(singleJob);
 		var fileWriterSingle = new FileOutputWriter(singleJob);
 		var simFactorySingle = Kernel.Get<ISimulatorFactoryFactory>();
@@ -257,7 +298,7 @@ public class PrimaryBusSimulation
 		SerializeRunData(runsFactoryPrim, outputPath);
 
 
-		var completedJob = GenerateJsonJobCompletedBus(Path.Combine(BASE_DIR_VIF, vifFile), Path.Combine(BASE_DIR_COMPLETED, completed), false);
+		var completedJob = GenerateJsonJobCompletedBus(Path.Combine(BASE_DIR, vifFile), Path.Combine(BASE_DIR, completed), false);
 
 		var dataProviderComleted = JSONInputDataFactory.ReadJsonJob(completedJob);
 		var fileWriterCompleted = new FileOutputWriter(singleJob);
@@ -362,7 +403,7 @@ public class PrimaryBusSimulation
 		var runsFactory = simFactory.Factory(ExecutionMode.Declaration, dataProvider, fileWriter, null, null);
 		
 		//runsFactory.WriteModalResults = true;
-		runsFactory.SerializeVectoRunData = true;
+		//runsFactory.SerializeVectoRunData = true;
 		var jobContainer = new JobContainer(new SummaryDataContainer(fileWriter)) { };
         //var jobContainer = new JobContainer(new MockSumWriter()) { };