handle engine retarder in factory and when building powertrain

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs

@@ -55,7 +55,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 				Manufacturer = data.Manufacturer,
 				ModelName = data.Model,
 				Date = data.Date,
-				//CertificationNumber = data.CertificationNumber,
+				//CertificationNumber = data.CertificationNumber,
 				DigestValueInput = data.DigestValue,
 				VehicleCategory = data.VehicleCategory,
 				AxleConfiguration = data.AxleConfiguration,
@@ -95,12 +95,13 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 						break;
 					case RetarderType.None:
 					case RetarderType.LossesIncludedInTransmission:
+					case RetarderType.EngineRetarder:
 						retarder.Ratio = 1;
 						break;
 					default:
 						// ReSharper disable once NotResolvedInText
 						// ReSharper disable once LocalizableElement
-						throw new ArgumentOutOfRangeException("retarder.Type", "RetarderType unknown");
+						throw new ArgumentOutOfRangeException("retarder", retarder.Type, "RetarderType unknown");
 				}
 
 				if (!retarder.Type.IsDedicatedComponent()) {
@@ -337,4 +338,4 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 			return flc;
 		}
 	}
-}
\ No newline at end of file
+}

VectoCore/VectoCore/Utils/ProviderExtensions.cs

@@ -120,12 +120,14 @@ namespace TUGraz.VectoCore.Utils
 				case RetarderType.TransmissionInputRetarder:
 					return prev.AddComponent(gearbox).AddComponent(new Retarder(container, data.LossMap, data.Ratio));
 				case RetarderType.None:
-					return prev.AddComponent(new DummyRetarder(container)).AddComponent(gearbox);
 				case RetarderType.LossesIncludedInTransmission:
+				case RetarderType.EngineRetarder:
 					return prev.AddComponent(new DummyRetarder(container)).AddComponent(gearbox);
 				default:
-					throw new ArgumentOutOfRangeException(data.Type.ToString());
+					// ReSharper disable once NotResolvedInText
+					// ReSharper disable once LocalizableElement
+					throw new ArgumentOutOfRangeException("retarderdata.Type", data.Type.ToString(), "Retardertype unknown");
 			}
 		}
 	}
-}
\ No newline at end of file
+}

VectoCore/VectoCoreTest/Models/Simulation/DeclarationSimulationFactoryTest.cs

-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Xml;
 using NUnit.Framework;
@@ -44,7 +43,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 
 			var inputDataProvider = new XMLDeclarationInputDataProvider(modified, true);
 
-			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputDataProvider, null) {Validate = false};
+			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputDataProvider, null) { Validate = false };
 
 			var runs = factory.SimulationRuns().ToArray();
 			Assert.AreEqual(8, runs.Length);