moved SI conversions directly to definition

VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs

@@ -174,16 +174,16 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 					"At least one Gear-Entry must be defined in Gearbox!");
 			}
 
-			retVal.Inertia = DeclarationData.Gearbox.Inertia.SI<KilogramSquareMeter>();
+			retVal.Inertia = DeclarationData.Gearbox.Inertia;
 			retVal.TractionInterruption = retVal.Type.TractionInterruption();
 			retVal.SkipGears = retVal.Type.SkipGears();
 			retVal.EarlyShiftUp = retVal.Type.EarlyShiftGears();
 
 			retVal.TorqueReserve = DeclarationData.Gearbox.TorqueReserve;
 			retVal.StartTorqueReserve = DeclarationData.Gearbox.TorqueReserveStart;
-			retVal.ShiftTime = DeclarationData.Gearbox.MinTimeBetweenGearshifts.SI<Second>();
-			retVal.StartSpeed = DeclarationData.Gearbox.StartSpeed.SI<MeterPerSecond>();
-			retVal.StartAcceleration = DeclarationData.Gearbox.StartAcceleration.SI<MeterPerSquareSecond>();
+			retVal.ShiftTime = DeclarationData.Gearbox.MinTimeBetweenGearshifts;
+			retVal.StartSpeed = DeclarationData.Gearbox.StartSpeed;
+			retVal.StartAcceleration = DeclarationData.Gearbox.StartAcceleration;
 
 			retVal.HasTorqueConverter = false;
 

VectoCore/VectoCore/Models/Declaration/DeclarationData.cs

@@ -216,11 +216,11 @@ namespace TUGraz.VectoCore.Models.Declaration
 		{
 			public const double TorqueReserve = 0.2;
 			public const double TorqueReserveStart = 0.2;
-			public const double StartSpeed = 2;
-			public const double StartAcceleration = 0.6;
-			public const double Inertia = 0;
+			public static readonly MeterPerSecond StartSpeed = 2.SI<MeterPerSecond>();
+			public static readonly MeterPerSquareSecond StartAcceleration = 0.6.SI<MeterPerSquareSecond>();
+			public static readonly KilogramSquareMeter Inertia = 0.SI<KilogramSquareMeter>();
 
-			public const double MinTimeBetweenGearshifts = 2;
+			public static readonly Second MinTimeBetweenGearshifts = 2.SI<Second>();
 
 			internal static ShiftPolygon ComputeShiftPolygon(EngineFullLoadCurve fullLoadCurve, PerSecond engineIdleSpeed)
 			{