bugfix testcase PEV E2 Limited ContPwr

VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs

@@ -12,19 +12,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON {
 		public JSONElectricMotorV2(JObject data, string filename, bool tolerateMissing = false) : base(data, filename, tolerateMissing) { }
 
 		public override NewtonMeter ContinuousTorque {
-			get { return Body.GetValueOrDefault<double>("ContinuousTorque")?.SI<NewtonMeter>() ?? 1e12.SI<NewtonMeter>(); }
+			get { return Body.GetEx<double>("ContinuousTorque").SI<NewtonMeter>(); }
 		}
 
 		public override PerSecond ContinuousTorqueSpeed {
-			get { return Body.GetValueOrDefault<double>("ContinuousTorqueSpeed")?.RPMtoRad(); }
+			get { return Body.GetEx<double>("ContinuousTorqueSpeed").RPMtoRad(); }
 		}
 
 		public override NewtonMeter OverloadTorque {
-			get { return Body.GetValueOrDefault<double>("OverloadTorque")?.SI<NewtonMeter>() ?? 1e12.SI<NewtonMeter>(); }
+			get { return Body.GetEx<double>("OverloadTorque").SI<NewtonMeter>(); }
 		}
 
 		public override PerSecond OverloadTestSpeed {
-			get { return Body.GetValueOrDefault<double>("OverloadTorqueSpeed")?.RPMtoRad(); }
+			get { return Body.GetEx<double>("OverloadTorqueSpeed").RPMtoRad(); }
 		}
 	}
 

VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/GenericEMotor_125kW_485Nm_Cont30kW.vem

@@ -3,7 +3,7 @@
     "CreatedBy": " ()",
     "Date": "2016-10-13T08:54:28.7387223Z",
     "AppVersion": "3",
-    "FileVersion": 1
+    "FileVersion": 2
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -12,8 +12,10 @@
     "DragCurve": "GenericDrag_125kW_485Nm.vemd",
     "EfficiencyMap": "GenericMap_125kW_485Nm.vemo",
     "Inertia": 0.225,
-    "ContinuousPower": 30000,
-    "ContinuousPowerSpeed": 2000,
+    "ContinuousTorque": 145,
+    "ContinuousTorqueSpeed": 2000,
+    "OverloadTorque": 485,
+    "OverloadTorqueSpeed": 2000,
     "OverloadTime": 30,
     "ThermalOverloadRecoveryFactor": 0.9
   }