Merge pull request #68 in VECTO/vecto-sim from...

Merge pull request #68 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-115-additional-retarder-type to develop

* commit 'd9907785':
  add new retarder type, update powertrain-builder, input file reader

VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs

@@ -42,7 +42,7 @@ namespace TUGraz.VectoCore.FileIO.Reader.DataObjectAdaper
 				Type =
 					(RetarderData.RetarderType)Enum.Parse(typeof(RetarderData.RetarderType), data.Retarder.TypeStr.ToString(), true),
 			};
-			if (retarder.Type != RetarderData.RetarderType.None) {
+			if (retarder.Type == RetarderData.RetarderType.Primary || retarder.Type == RetarderData.RetarderType.Secondary) {
 				retarder.LossMap = RetarderLossMap.ReadFromFile(Path.Combine(basePath, data.Retarder.File));
 				retarder.Ratio = data.Retarder.Ratio;
 			}

VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs

@@ -64,6 +64,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 				case RetarderData.RetarderType.None:
 					tmp = AddComponent(tmp, GetGearbox(_container, data.GearboxData));
 					break;
+				case RetarderData.RetarderType.LossesIncludedInTransmission:
+					tmp = AddComponent(tmp, GetGearbox(_container, data.GearboxData));
+					break;
 			}
 
 			// gearbox --> clutch

VectoCore/Models/SimulationComponent/Data/RetarderData.cs

@@ -9,7 +9,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
 		{
 			None,
 			Primary,
-			Secondary
+			Secondary,
+			LossesIncludedInTransmission
 		}
 
 		public RetarderLossMap LossMap { get; internal set; }