updated auxiliarydataadapter

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/AuxiliaryDataAdapter.cs

@@ -101,6 +101,8 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
 			AuxiliaryType.PneumaticSystem,
 			AuxiliaryType.SteeringPump
 		};
+
+		protected override string errorStringVehicleType => "battery electric";
 	}
 
 	public class HeavyLorryAuxiliaryDataAdapter : AuxiliaryDataAdapter
@@ -112,6 +114,8 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
 			AuxiliaryType.Fan,
 			AuxiliaryType.SteeringPump
 		};
+		protected virtual string errorStringVehicleType => "conventional/hybrid";
+
 		#region Overrides of AuxiliaryDataAdapter
 
 		public override AuxiliaryConfig CreateBusAuxiliariesData(Mission mission, IVehicleDeclarationInputData primaryVehicle, VectoRunData runData)
@@ -128,12 +132,13 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
 		{
 			var retVal = new List<VectoRunData.AuxData>();
 
-			if (!new HashSet<AuxiliaryType>(auxInputData.Auxiliaries.Select(aux => aux.Type)).SetEquals(AuxiliaryTypes))
-			{
-				Log.Error(
-					"In Declaration Mode exactly 4 Auxiliaries must be defined for battery electric vehicles: Steering pump, HVAC, Electric System, Pneumatic System.");
+			if (!new HashSet<AuxiliaryType>(auxInputData.Auxiliaries.Select(aux => aux.Type)).SetEquals(AuxiliaryTypes)) {
+				var error = string.Format(
+					"In Declaration Mode exactly {0} Auxiliaries must be defined for {2} vehicles: {1}",
+					AuxiliaryTypes.Count, string.Join(", ", AuxiliaryTypes.Select(aux => aux.ToString())), errorStringVehicleType);
+				Log.Error(error);
 				throw new VectoException(
-					"In Declaration Mode exactly 4 Auxiliaries must be defined for battery electric vehicles: Steering pump, HVAC, Electric System, Pneumatic System.");
+					error);
 			}
 
 			var alternatorEfficiency = DeclarationData.AlternatorEfficiency;
@@ -209,7 +214,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
 			aux.ID = Constants.Auxiliaries.IDs.ElectricSystem;
 			aux.PowerDemandElectric = aux.PowerDemandMech * alternatorEfficiency;
 			aux.ConnectToREESS = vectoSimulationJobType.IsOneOf(VectoSimulationJobType.BatteryElectricVehicle,
-				VectoSimulationJobType.ParallelHybridVehicle);
+				VectoSimulationJobType.SerialHybridVehicle, VectoSimulationJobType.IEPC_E, VectoSimulationJobType.IEPC_S);
 			auxDataList.Add(aux);
 		}
 
@@ -356,8 +361,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
 		#endregion
 	}
 
-
-
 	public class PrimaryBusAuxiliaryDataAdapter : AuxiliaryDataAdapter, IPrimaryBusAuxiliaryDataAdapter
 	{
 		public ElectricsUserInputsConfig GetDefaultElectricalUserConfig()