Merge branch 'develop' into feature/VECTO-1423-simulation-of-p3-p4-with-apt-transmissions

VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs

@@ -62,7 +62,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			IVehicleContainer container, IAuxiliaryConfig auxiliaryConfig, IAuxPort additionalAux = null) : base(container)
 		{
 			container.AddComponent(this);
-			EngineStopStartUtilityFactor = container.RunData?.DriverData?.EngineStopStart?.UtilityFactorStandstill ?? double.NaN;
+			EngineStopStartUtilityFactor = 1; // container.RunData?.DriverData?.EngineStopStart?.UtilityFactorStandstill ?? double.NaN;
 
 			CurrentState = new BusAuxState();
 			PreviousState = new BusAuxState { AngularSpeed = container.EngineInfo.EngineIdleSpeed };

VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs

@@ -55,7 +55,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		public EngineAuxiliary(IVehicleContainer container) : base(container)
 		{
-			EngineStopStartUtilityFactor = container.RunData?.DriverData?.EngineStopStart?.UtilityFactorStandstill ?? double.NaN;
+			EngineStopStartUtilityFactor = 1; // container.RunData?.DriverData?.EngineStopStart?.UtilityFactorStandstill ?? double.NaN;
 		}
 
 		public IAuxPort Port()

VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs

@@ -20,7 +20,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl {
 			container, modelData, pt1Disabled)
 		{
 			CombustionEngineOn = true;
-			EngineStopStartUtilityFactor = container.RunData.DriverData.EngineStopStart.UtilityFactorStandstill;
+			EngineStopStartUtilityFactor = 1; // container.RunData.DriverData.EngineStopStart.UtilityFactorStandstill;
 
 			var engineRampUpEnergy = Formulas.InertiaPower(modelData.IdleSpeed, 0.RPMtoRad(), modelData.Inertia, modelData.EngineStartTime) * modelData.EngineStartTime;
 			var engineDragEnergy = VectoMath.Abs(modelData.FullLoadCurves[0].DragLoadStationaryTorque(modelData.IdleSpeed)) *

VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs

@@ -665,7 +665,7 @@ public class JSONFileWriter : IOutputFileWriter
 			body.Add("Padd", aux.Auxiliaries.ConstantPowerDemand.Value());
 			body.Add("Paux_ICEOff_Driving", aux.Auxiliaries.PowerDemandICEOffDriving.Value());
 			body.Add("Paux_ICEOff_Standstill", aux.Auxiliaries.PowerDemandICEOffStandstill.Value());
-			body.Add("Padd_electric", aux.Auxiliaries.ElectricPowerDemand);
+			body.Add("Padd_electric", aux.Auxiliaries.ElectricPowerDemand.Value());
 		}
 
 		var driver = input.DriverInputData;