Merge branch...

Merge branch 'feature/CodeEU-48_Consider-JunctionBox-ConnectorsSubsystemsIncluded' into 'amdm2/develop'

Bugfix: sign connector losses

See merge request vecto!22

VectoCore/VectoCore/Models/Connector/Ports/Impl/BatteryResponse.cs

@@ -89,7 +89,7 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
             //      see ElectricSystem implementation...
             // I_est = P_EM / U_Int
             // P_Conn = I_est ^ 2 * R_Conn = (P_EM / U_Int) ^ 2 * R_Conn
-            // P_EM_max = P_Bat_max - P_Chg + P_aux + P_Conn(P_EM)
+            // P_EM_max = P_Bat_max - P_Chg + P_aux - P_Conn(P_EM)
             // P_EM_max + P_Conn = P_Bat_max - P_Chg + P_aux
             // P_EM_max + ((P_EM_max + P_Chg - P_aux) / U_Int) ^ 2 * R_Conn = P_Bat_max - P_Chg + P_aux
             // P_EM_max^2 * R_Conn / U_Int^2 + P_EM_max - (P_Bat_max - P_Chg + P_aux) = 0

VectoCore/VectoCore/Models/SimulationComponent/ElectricSystem.cs

@@ -36,7 +36,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent
 			var chargePower = Charger.Count == 0 ? 0.SI<Watt>() : Charger.Sum(x => x.PowerDemand(absTime, dt, powerDemand, auxDemand, dryRun));
 			var currentEst = powerDemand / Battery.InternalVoltage;
 			var connectorLoss = currentEst * (ModelData?.ConnectionSystemResistance ?? 0.SI<Ohm>() ) * currentEst;
-			var totalPowerDemand = powerDemand + chargePower - auxDemand + connectorLoss;
+			var totalPowerDemand = powerDemand + chargePower - auxDemand - connectorLoss;
 
 			var batResponse = Battery.MainBatteryPort.Request(absTime, dt, totalPowerDemand, dryRun);
 
@@ -156,7 +156,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent
 				ConnectorLoss = connectorLoss;
 			}
 
-			public Watt TotalPowerDemand => ConsumerPower + ChargePower - AuxPower + ConnectorLoss;
+			public Watt TotalPowerDemand => ConsumerPower + ChargePower - AuxPower;
 
 			public State Clone() => (State)MemberwiseClone();
 		}