Merge branch 'amdm2/develop' of...

Merge branch 'amdm2/develop' of https://code.europa.eu/vecto/tug-itna/mq_vecto-sim into amdm2/develop

# Conflicts:
#	VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs

VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs

@@ -713,17 +713,19 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
 			var genericTechnolgyBenefit = (relatedRun.VectoRunDataGenericBody.BusAuxiliaries.SSMInputsCooling as ISSMDeclarationInputs).Technologies;
 			var specificTechnolgyBenefit = (relatedRun.VectoRunDataSpezificBody.BusAuxiliaries.SSMInputsCooling as ISSMDeclarationInputs).Technologies;
 
-			Assert.AreEqual(0.0, genericTechnolgyBenefit.CValueVariation);
-			Assert.AreEqual(0.02, genericTechnolgyBenefit.HValueVariation);
-			Assert.AreEqual(0.0, genericTechnolgyBenefit.VCValueVariation);
-			Assert.AreEqual(0.02, genericTechnolgyBenefit.VHValueVariation);
-			Assert.AreEqual(0.0, genericTechnolgyBenefit.VVValueVariation);
+			Assert.AreEqual(0.08, genericTechnolgyBenefit.CValueVariation);
+			Assert.AreEqual(0.06, genericTechnolgyBenefit.HValueVariation);
+			Assert.AreEqual(0.08, genericTechnolgyBenefit.VCValueVariation);
+			Assert.AreEqual(0.06, genericTechnolgyBenefit.VHValueVariation);
+			Assert.AreEqual(0.04, genericTechnolgyBenefit.VVValueVariation);
 
 			Assert.AreEqual(0.08, specificTechnolgyBenefit.CValueVariation);
 			Assert.AreEqual(0.08, specificTechnolgyBenefit.HValueVariation);
 			Assert.AreEqual(0.08, specificTechnolgyBenefit.VCValueVariation);
 			Assert.AreEqual(0.08, specificTechnolgyBenefit.VHValueVariation);
 			Assert.AreEqual(0.04, specificTechnolgyBenefit.VVValueVariation);
+
+
 		}
 
 		#endregion
@@ -822,12 +824,12 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
 			switch (currentIndex) {
 				case 0:
 				case 1://Interurban
-					Assert.AreEqual(31381.5, genericValue, 1e-3);
+					Assert.AreEqual(28543.35, genericValue, 1e-3);
 					Assert.AreEqual(28718.1875, specificValue, 1e-3);
 					break;
 				case 2:
 				case 3://Coach
-					Assert.AreEqual(47099.5, genericValue, 1e-3);
+					Assert.AreEqual(42639.55, genericValue, 1e-3);
 					Assert.AreEqual(41271.4375, specificValue, 1e-3);
 					break;
 			}
@@ -955,6 +957,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
 
             for (int i = 0; i < runs.Count; i++)
 			{
+				
 				var relatedRun = new RelatedRun
 				{
 					VectoRunDataSpezificBody = runs[i],

VectoCore/VectoCoreTest/Integration/Multistage/MultistageMultipleRunsTest.cs

@@ -188,6 +188,12 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
 
 			var fileOutputWriter = new FileOutputWriter(_outputDirectory);
 			var tempFileOutputWriter = new TempFileOutputWriter(fileOutputWriter);
+			var input = JSONInputDataFactory.ReadJsonJob(InterimDiesel) as JSONInputDataV10_PrimaryAndStageInputBus;
+			Assert.IsTrue(File.Exists(input.PrimaryVehicleInputDataPath));
+			Assert.IsTrue(File.Exists(input.StageInputDataPath));
+
+
+
             StartSimulation(InterimDiesel, tempFileOutputWriter, fileOutputWriter);
 
 

VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs

@@ -354,7 +354,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 		TestCase(VehicleClass.Class6, MissionType.LongHaul, "Standard technology - Flux-Compensator")]
 		//Medium Lorry
 		//[TestCase(VehicleClass.Class55, MissionType.LongHaul, "Standard technology"),
-		//TestCase(VehicleClass.Class55, MissionType.UrbanDelivery, "Standard technology - Flux-Compensator"),
+		[TestCase(VehicleClass.Class55, MissionType.UrbanDelivery, "Standard technology - Flux-Compensator")]
 		//TestCase(VehicleClass.Class55, MissionType.LongHaul, "Standard technology - LED headlights, all")]
 
 		public void AuxElectricSystem_NotExistingError(VehicleClass hdvClass, MissionType mission, string technology)

VectoCore/VectoCoreTest/Models/SimulationComponent/BatteryTest.cs

@@ -23,6 +23,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 	{
 		public const string componentFile = @"TestData/Hybrids/Battery/GenericBattery.vbat";
 
+
         [OneTimeSetUp]
 		public void RunBeforeAnyTests()
 		{
@@ -127,9 +128,11 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			double maxPowerDischarge, double battLoss)
 		{
 
-			var inputData = JSONInputDataFactory.ReadREESSData(componentFile, false);
-			Assert.NotNull(inputData);
+			var inputData = JSONInputDataFactory.ReadREESSData(componentFile, false) as JSONBatteryV1;
 
+			Assert.NotNull(inputData);
+			Assert.IsTrue(inputData.ConnectorsSubsystemsIncluded);
+			Assert.IsTrue(inputData.ConnectorsSubsystemsIncluded);
 			var dao = new EngineeringDataAdapter();
 			var tmp = new MockBatteryInputData()
 			{

VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs

@@ -87,6 +87,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 		public void ElectricMotorOnlyRequestTest(double speed, double torque, double expectedBatteryPower)
 		{
 			var container = new MockVehicleContainer();
+			container.Gear = new GearshiftPosition(0);
 
 			var inputData = JSONInputDataFactory.ReadElectricMotorData(MotorFile, false);
 			var dao = new EngineeringDataAdapter();
@@ -134,7 +135,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 		public void ElectricMotorOnlyRequestTestMechLoss(double speed, double torque, double expectedBatteryPower)
 		{
 			var container = new MockVehicleContainer();
-
+			container.Gear = new GearshiftPosition(0);
             var inputData = JSONInputDataFactory.ReadElectricMotorData(MotorFile, false);
 			var dao = new EngineeringDataAdapter();
 			var electricMachine = new MockElectricMachinesInputData() {
@@ -338,7 +339,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 		public void ElectricMotorOnlyWithBatteryRequestTest(double initialSoc, double speed, double torque, double expectedBatteryPower, double expectedBatteryLoss)
 		{
 			var container = new MockVehicleContainer();
-
+			container.Gear = new GearshiftPosition(0);
             var inputData = JSONInputDataFactory.ReadElectricMotorData(MotorFile, false);
 			var batInput = JSONInputDataFactory.ReadREESSData(BatFile, false);
 			var dao = new EngineeringDataAdapter();

VectoCore/VectoCoreTest/Reports/ModDataPostprocessingTest.cs

@@ -2639,6 +2639,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 
 				modData[ModalResultField.P_reess_int] = P_bat;
 				modData[ModalResultField.P_reess_terminal] = P_bat * (P_bat < 0 ? batEff : 1/batEff);
+				modData[ModalResultField.P_terminal_ES] = P_bat * (P_bat < 0 ? batEff : 1 / batEff);
 				modData[ModalResultField.REESSStateOfCharge] = soc.SI();
 
 
@@ -2690,6 +2691,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 
 				modData[ModalResultField.P_reess_int] = P_bat;
 				modData[ModalResultField.P_reess_terminal] = P_bat * (P_bat < 0 ? batEff : 1 / batEff);
+				modData[ModalResultField.P_terminal_ES] = P_bat * (P_bat < 0 ? batEff : 1 / batEff);
                 modData[ModalResultField.REESSStateOfCharge] = soc.SI();
 
 				// WHR

VectoCore/VectoCoreTest/TestData/Hybrids/Battery/GenericBattery.vbat

@@ -13,6 +13,8 @@
     "Capacity": 7.5,
     "InternalResistanceCurve": "GenericBattery.vbatr",
     "MaxCurrentMap": "MaxCurrent.vimax",
-    "SoCCurve": "GenericBattery.vbatv"
+    "SoCCurve": "GenericBattery.vbatv",
+    "JunctionboxIncluded": true,
+    "ConnectorsSubsystemsIncluded": true
   }
 }

VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto

@@ -6,10 +6,10 @@
     "FileVersion": 10
   },
   "Body": {
-    "PrimaryVehicle": "vecto_vehicle-primary_heavyBus-sample.xml",
-    "InterimStep": "vecto_vehicle-stage_input_full-sample.xml",
+    "PrimaryVehicle": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//vecto_vehicle-primary_heavyBus-sample.xml",
+    "InterimStep": "..//..//XML//XMLReaderDeclaration//SchemaVersion2.4//vecto_vehicle-stage_input_full-sample-final.xml",
     "Completed": false,
-    "RunSimulation": true
+    "RunSimulation": false
   }
 }
 

VectoCore/VectoCoreTest/VectoCoreTest.csproj

@@ -43,6 +43,9 @@
   </ItemGroup>
 
 	<ItemGroup>
+		<None Update="TestData\Hybrids\Battery\GenericBattery_JB_Connector_included.vbat">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 		<None Update="TestData\Integration\Buses\FactorMethod\CompletedBus_41-32b.vecto">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>