Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit b17de93c authored by Stefanos Doumpoulakis's avatar Stefanos Doumpoulakis
Browse files

a)Padd_electric=0 for all test jobs, b)restored GenericVehicles, c)minor fixes

parent 6c12498a
No related branches found
No related tags found
No related merge requests found
Showing
with 105 additions and 111581 deletions
Markus QUARITSCH <markus.quaritsch@tugraz.at>
Markus QUARITSCH <markus.quaritsch@tugraz.at> <Markus.Quaritsch@tugraz.at>
Markus QUARITSCH <markus.quaritsch@tugraz.at> <markusquaritsch@fvkmb037.vkmthd.tugraz.at>
Markus QUARITSCH <markus.quaritsch@tugraz.at> <quaritsch@ivt.tugraz.at> Markus QUARITSCH <markus.quaritsch@tugraz.at> <quaritsch@ivt.tugraz.at>
Stefan MEYER <stefan.meyer@student.tugraz.at> Stefan MEYER <stefan.meyer@student.tugraz.at>
Harald MARTINI <harald.martini@ivt.tugraz.at> <harald.martini@student.tugraz.at> Harald MARTINI <harald.martini@ivt.tugraz.at> <martini@ivt.tugraz.at>
Harald MARTINI <harald.martini@ivt.tugraz.at> <63290044+marha333@users.noreply.github.com>
Harald MARTINI <harald.martini@ivt.tugraz.at> <Martini@ivt.tugraz.at>
Harald MARTINI <harald.martini@ivt.tugraz.at>
Franz KOBER josef<franz.josef.kober@ivt.tugraz.at> Franz KOBER josef<franz.josef.kober@ivt.tugraz.at>
Franz KOBER josef<franz.josef.kober@ivt.tugraz.at> <ko6er.franz@gmail.com> Franz KOBER josef<franz.josef.kober@ivt.tugraz.at> <ko6er.franz@gmail.com>
Michael KRISPER <michael.krisper@tugraz.at> Michael KRISPER <michael.krisper@tugraz.at>
......
...@@ -30,9 +30,15 @@ ...@@ -30,9 +30,15 @@
"UnderSpeed": 5.0 "UnderSpeed": 5.0
}, },
"Cycles": [ "Cycles": [
"MeasuredSpeed_LongHaul.vdri", "LongHaul",
"MeasuredSpeedGear_LongHaul.vdri", "Coach",
"PWheel_LongHaul.vdri" "Construction",
"HeavyUrban",
"Interurban",
"RegionalDelivery",
"Suburban",
"Urban",
"UrbanDelivery"
] ]
} }
} }
\ No newline at end of file
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
"CreatedBy": " ()", "CreatedBy": " ()",
"Date": "2016-10-13T08:55:18.2100810Z", "Date": "2016-10-13T08:55:18.2100810Z",
"AppVersion": "3", "AppVersion": "3",
"FileVersion": 12 "FileVersion": 9
}, },
"Body": { "Body": {
"SavedInDeclMode": false, "SavedInDeclMode": false,
"EngineOnlyMode": false, "EngineOnlyMode": false,
"VehicleFile": "IEPCVehicle_Gbx1Axl.vveh", "VehicleFile": "BatteryElectricVehicle.vveh",
"GearboxFile": "", "GearboxFile": "AMT.vgbx",
"TCU": "../Common/ShiftParameters.vtcu", "TCU": "AMT.vgbx",
"Padd_electric": 3540.0, "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc", "VACC": "Truck.vacc",
"LAC": { "LAC": {
"Enabled": true, "Enabled": true,
...@@ -30,15 +30,9 @@ ...@@ -30,15 +30,9 @@
"UnderSpeed": 5.0 "UnderSpeed": 5.0
}, },
"Cycles": [ "Cycles": [
"LongHaul", "MeasuredSpeed_LongHaul.vdri",
"Coach", "MeasuredSpeedGear_LongHaul.vdri",
"Construction", "PWheel_LongHaul.vdri"
"HeavyUrban",
"Interurban",
"RegionalDelivery",
"Suburban",
"Urban",
"UrbanDelivery"
] ]
} }
} }
\ No newline at end of file
...@@ -38,7 +38,11 @@ ...@@ -38,7 +38,11 @@
"OverSpeed": 5.0 "OverSpeed": 5.0
}, },
"Cycles": [ "Cycles": [
"MeasuredSpeed_UrbanDelivery.vdri" "Interurban.vdri",
"Suburban.vdri",
"LongHaul",
"RegionalDelivery",
"UrbanDelivery"
] ]
} }
} }
\ No newline at end of file
{ {
"Header": { "Header": {
"CreatedBy": "", "CreatedBy": "",
"Date": "2022-04-14T12:03:53.1329969Z", "Date": "2022-01-26T08:54:53.5628568Z",
"AppVersion": "3", "AppVersion": "3",
"FileVersion": 8 "FileVersion": 8
}, },
......
{ {
"Header": { "Header": {
"CreatedBy": "", "CreatedBy": "",
"Date": "2022-04-14T12:20:22.6653658Z", "Date": "2022-01-26T09:00:21.8597275Z",
"AppVersion": "3", "AppVersion": "3",
"FileVersion": 5 "FileVersion": 5
}, },
......
{ {
"Header": { "Header": {
"CreatedBy": "", "CreatedBy": "",
"Date": "2022-04-14T12:04:25.1901921Z", "Date": "2021-03-03T09:06:01.2287610Z",
"AppVersion": "3", "AppVersion": "3",
"FileVersion": 5 "FileVersion": 5
}, },
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
"EngineFile": "Engine_325kW_12.7l_WHR.veng", "EngineFile": "Engine_325kW_12.7l_WHR.veng",
"GearboxFile": "AMT_12.vgbx", "GearboxFile": "AMT_12.vgbx",
"TCU": "ShiftParameters.vtcu", "TCU": "ShiftParameters.vtcu",
"ShiftStrategy": "",
"Padd": 5000.0, "Padd": 5000.0,
"Paux_ICEOff_Driving": 3000.0, "Paux_ICEOff_Driving": 3000.0,
"Paux_ICEOff_Standstill": 2000.0, "Paux_ICEOff_Standstill": 2000.0,
...@@ -19,7 +20,6 @@ ...@@ -19,7 +20,6 @@
"EngineStopStartAtVehicleStopThreshold": 120.0, "EngineStopStartAtVehicleStopThreshold": 120.0,
"EngineStopStartMaxOffTimespan": 120.0, "EngineStopStartMaxOffTimespan": 120.0,
"EngineStopStartUtilityFactor": 0.8, "EngineStopStartUtilityFactor": 0.8,
"EngineStopStartUtilityFactorDriving": 0.8,
"EcoRollMinSpeed": 60.000000000000007, "EcoRollMinSpeed": 60.000000000000007,
"EcoRollActivationDelay": 2.0, "EcoRollActivationDelay": 2.0,
"EcoRollUnderspeedThreshold": 0.0, "EcoRollUnderspeedThreshold": 0.0,
......
...@@ -686,7 +686,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl ...@@ -686,7 +686,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
//return gear; //return gear;
emSpeeds[gear] = Tuple.Create(response.ElectricMotor.AngularVelocity, emSpeeds[gear] = Tuple.Create(response.ElectricMotor.AngularVelocity,
(GearshiftParams.StartSpeed * TransmissionRatio * GearboxModelData.Gears[gear.Gear].Ratio) (GearshiftParams.StartSpeed * TransmissionRatio * GearboxModelData.Gears[gear.Gear].Ratio)
.Cast<PerSecond>(), (response.ElectricMotor.ElectricMotorPowerMech / response.ElectricSystem.RESSPowerDemand).Value()); .Cast<PerSecond>(),
!response.ElectricSystem.RESSPowerDemand.IsEqual(0)
? (response.ElectricMotor.ElectricMotorPowerMech / response.ElectricSystem.RESSPowerDemand).Value()
: 0
);
} }
} }
......
...@@ -32,81 +32,81 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric ...@@ -32,81 +32,81 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
[Category("JRC")] [Category("JRC")]
[Category("Integration")] [Category("Integration")]
[ [
TestCase(E2_JOB, 0, 0, 1.1651, 120.0786, TestName = "E2 BEV TimeRun MeasuredSpeed LongHaul"), TestCase(E2_JOB, 0, 0, 1.3212, 115.8048, TestName = "E2 BEV TimeRun MeasuredSpeed LongHaul"),
TestCase(E2_JOB, 1, 1, 4.409, 117.1787, TestName = "E2 BEV TimeRun MeasuredSpeed RegionalDelivery"), TestCase(E2_JOB, 1, 1, 4.8834, 111.8572, TestName = "E2 BEV TimeRun MeasuredSpeed RegionalDelivery"),
TestCase(E2_JOB, 2, 2, 29.5192, 126.2702, TestName = "E2 BEV TimeRun MeasuredSpeed UrbanDelivery"), TestCase(E2_JOB, 2, 2, 32.1409, 115.5528, TestName = "E2 BEV TimeRun MeasuredSpeed UrbanDelivery"),
TestCase(E2_JOB, 6, 0, 1.1634, 120.0728, TestName = "E2 BEV TimeRun MeasuredSpeedGear LongHaul"), TestCase(E2_JOB, 6, 0, 1.3193, 115.7989, TestName = "E2 BEV TimeRun MeasuredSpeedGear LongHaul"),
TestCase(E2_JOB, 7, 1, 4.4193, 117.1627, TestName = "E2 BEV TimeRun MeasuredSpeedGear RegionalDelivery"), TestCase(E2_JOB, 7, 1, 4.8952, 111.8427, TestName = "E2 BEV TimeRun MeasuredSpeedGear RegionalDelivery"),
TestCase(E2_JOB, 8, 2, 29.585, 126.1664, TestName = "E2 BEV TimeRun MeasuredSpeedGear UrbanDelivery"), TestCase(E2_JOB, 8, 2, 32.2101, 115.4526, TestName = "E2 BEV TimeRun MeasuredSpeedGear UrbanDelivery"),
TestCase(E2_JOB, 9, 0, 1.1957, 120.0453, TestName = "E2 BEV TimeRun PWheel LongHaul"), TestCase(E2_JOB, 9, 0, 1.3537, 115.7734, TestName = "E2 BEV TimeRun PWheel LongHaul"),
TestCase(E2_JOB, 10, 1, 4.6028, 117.123, TestName = "E2 BEV TimeRun PWheel RegionalDelivery"), TestCase(E2_JOB, 10, 1, 5.0829, 111.8072, TestName = "E2 BEV TimeRun PWheel RegionalDelivery"),
TestCase(E2_JOB, 11, 2, 31.7001, 126.8887, TestName = "E2 BEV TimeRun PWheel UrbanDelivery"), TestCase(E2_JOB, 11, 2, 34.3508, 116.2004, TestName = "E2 BEV TimeRun PWheel UrbanDelivery"),
TestCase(E3_JOB, 0, 0, 0.8445, 101.6789, TestName = "E3 BEV TimeRun MeasuredSpeed LongHaul"), TestCase(E3_JOB, 0, 0, 0.9604, 94.7664, TestName = "E3 BEV TimeRun MeasuredSpeed LongHaul"),
TestCase(E3_JOB, 1, 1, 3.6425, 105.0844, TestName = "E3 BEV TimeRun MeasuredSpeed RegionalDelivery"), TestCase(E3_JOB, 1, 1, 4.0407, 97.5422, TestName = "E3 BEV TimeRun MeasuredSpeed RegionalDelivery"),
TestCase(E3_JOB, 2, 2, 30.5744, 131.0605, TestName = "E3 BEV TimeRun MeasuredSpeed UrbanDelivery"), TestCase(E3_JOB, 2, 2, 32.8012, 119.5899, TestName = "E3 BEV TimeRun MeasuredSpeed UrbanDelivery"),
TestCase(E3_JOB, 6, 0, 0.8669, 101.6725, TestName = "E3 BEV TimeRun PWheel LongHaul"), TestCase(E3_JOB, 6, 0, 0.9801, 94.7574, TestName = "E3 BEV TimeRun PWheel LongHaul"),
TestCase(E3_JOB, 7, 1, 3.7693, 105.0839, TestName = "E3 BEV TimeRun PWheel RegionalDelivery"), TestCase(E3_JOB, 7, 1, 4.1574, 97.5316, TestName = "E3 BEV TimeRun PWheel RegionalDelivery"),
TestCase(E3_JOB, 8, 2, 31.9715, 130.8939, TestName = "E3 BEV TimeRun PWheel UrbanDelivery"), TestCase(E3_JOB, 8, 2, 34.082, 119.3069, TestName = "E3 BEV TimeRun PWheel UrbanDelivery"),
TestCase(E4_JOB, 0, 0, 0.9694, 97.3673, TestName = "E4 BEV TimeRun MeasuredSpeed LongHaul"), TestCase(E4_JOB, 0, 0, 1.0882, 90.4571, TestName = "E4 BEV TimeRun MeasuredSpeed LongHaul"),
TestCase(E4_JOB, 1, 1, 4.0547, 100.6667, TestName = "E4 BEV TimeRun MeasuredSpeed RegionalDelivery"), TestCase(E4_JOB, 1, 1, 4.5049, 93.1759, TestName = "E4 BEV TimeRun MeasuredSpeed RegionalDelivery"),
TestCase(E4_JOB, 2, 2, 32.5519, 126.4729, TestName = "E4 BEV TimeRun MeasuredSpeed UrbanDelivery"), TestCase(E4_JOB, 2, 2, 34.794, 115.0165, TestName = "E4 BEV TimeRun MeasuredSpeed UrbanDelivery"),
TestCase(E4_JOB, 6, 0, 0.9925, 97.3627, TestName = "E4 BEV TimeRun PWheel LongHaul"), TestCase(E4_JOB, 6, 0, 1.1099, 90.4511, TestName = "E4 BEV TimeRun PWheel LongHaul"),
TestCase(E4_JOB, 7, 1, 4.1832, 100.6705, TestName = "E4 BEV TimeRun PWheel RegionalDelivery"), TestCase(E4_JOB, 7, 1, 4.6265, 93.1728, TestName = "E4 BEV TimeRun PWheel RegionalDelivery"),
TestCase(E4_JOB, 8, 2, 33.9662, 126.343, TestName = "E4 BEV TimeRun PWheel UrbanDelivery"), TestCase(E4_JOB, 8, 2, 36.1207, 114.7989, TestName = "E4 BEV TimeRun PWheel UrbanDelivery"),
TestCase(IEPC3X_JOB, 0, 0, 1.6143, 94.1388, TestName = "IEPC3X BEV TimeRun MeasuredSpeed LongHaul"), TestCase(IEPC3X_JOB, 0, 0, 1.7705, 89.8657, TestName = "IEPC3X BEV TimeRun MeasuredSpeed LongHaul"),
TestCase(IEPC3X_JOB, 1, 1, 5.3288, 92.2672, TestName = "IEPC3X BEV TimeRun MeasuredSpeed RegionalDelivery"), TestCase(IEPC3X_JOB, 1, 1, 5.8651, 87.0042, TestName = "IEPC3X BEV TimeRun MeasuredSpeed RegionalDelivery"),
TestCase(IEPC3X_JOB, 2, 2, 34.2658, 105.4006, TestName = "IEPC3X BEV TimeRun MeasuredSpeed UrbanDelivery"), TestCase(IEPC3X_JOB, 2, 2, 37.1233, 94.97, TestName = "IEPC3X BEV TimeRun MeasuredSpeed UrbanDelivery"),
TestCase(IEPC3X_JOB, 6, 0, 1.612, 94.1575, TestName = "IEPC3X BEV TimeRun MeasuredSpeedGear LongHaul"), TestCase(IEPC3X_JOB, 6, 0, 1.7682, 89.8845, TestName = "IEPC3X BEV TimeRun MeasuredSpeedGear LongHaul"),
TestCase(IEPC3X_JOB, 7, 1, 5.3216, 92.3144, TestName = "IEPC3X BEV TimeRun MeasuredSpeedGear RegionalDelivery"), TestCase(IEPC3X_JOB, 7, 1, 5.8583, 87.0518, TestName = "IEPC3X BEV TimeRun MeasuredSpeedGear RegionalDelivery"),
TestCase(IEPC3X_JOB, 8, 2, 34.1897, 105.9113, TestName = "IEPC3X BEV TimeRun MeasuredSpeedGear UrbanDelivery"), TestCase(IEPC3X_JOB, 8, 2, 37.0491, 95.4826, TestName = "IEPC3X BEV TimeRun MeasuredSpeedGear UrbanDelivery"),
TestCase(IEPC3X_JOB, 9, 0, 1.6306, 94.1195, TestName = "IEPC3X BEV TimeRun PWheel LongHaul"), TestCase(IEPC3X_JOB, 9, 0, 1.7815, 89.8412, TestName = "IEPC3X BEV TimeRun PWheel LongHaul"),
TestCase(IEPC3X_JOB, 10, 1, 5.4244, 92.2446, TestName = "IEPC3X BEV TimeRun PWheel RegionalDelivery"), TestCase(IEPC3X_JOB, 10, 1, 5.9387, 86.9597, TestName = "IEPC3X BEV TimeRun PWheel RegionalDelivery"),
TestCase(IEPC3X_JOB, 11, 2, 35.3498, 105.3943, TestName = "IEPC3X BEV TimeRun PWheel UrbanDelivery"), TestCase(IEPC3X_JOB, 11, 2, 38.0038, 94.7603, TestName = "IEPC3X BEV TimeRun PWheel UrbanDelivery"),
TestCase(IEPC3X_AXLE_JOB, 0, 0, 1.7091, 90.7572, TestName = "IEPC3X_AXLE BEV TimeRun MeasuredSpeed LongHaul"), TestCase(IEPC3X_AXLE_JOB, 0, 0, 1.8804, 86.4985, TestName = "IEPC3X_AXLE BEV TimeRun MeasuredSpeed LongHaul"),
TestCase(IEPC3X_AXLE_JOB, 1, 1, 5.6007, 89.0999, TestName = "IEPC3X_AXLE BEV TimeRun MeasuredSpeed RegionalDelivery"), TestCase(IEPC3X_AXLE_JOB, 1, 1, 6.1565, 83.853, TestName = "IEPC3X_AXLE BEV TimeRun MeasuredSpeed RegionalDelivery"),
TestCase(IEPC3X_AXLE_JOB, 2, 2, 35.3919, 103.3803, TestName = "IEPC3X_AXLE BEV TimeRun MeasuredSpeed UrbanDelivery"), TestCase(IEPC3X_AXLE_JOB, 2, 2, 38.2845, 92.9826, TestName = "IEPC3X_AXLE BEV TimeRun MeasuredSpeed UrbanDelivery"),
TestCase(IEPC3X_AXLE_JOB, 6, 0, 1.7067, 90.776, TestName = "IEPC3X_AXLE BEV TimeRun MeasuredSpeedGear LongHaul"), TestCase(IEPC3X_AXLE_JOB, 6, 0, 1.8782, 86.5173, TestName = "IEPC3X_AXLE BEV TimeRun MeasuredSpeedGear LongHaul"),
TestCase(IEPC3X_AXLE_JOB, 7, 1, 5.5932, 89.1469, TestName = "IEPC3X_AXLE BEV TimeRun MeasuredSpeedGear RegionalDelivery"), TestCase(IEPC3X_AXLE_JOB, 7, 1, 6.1496, 83.9005, TestName = "IEPC3X_AXLE BEV TimeRun MeasuredSpeedGear RegionalDelivery"),
TestCase(IEPC3X_AXLE_JOB, 8, 2, 35.3138, 103.8925, TestName = "IEPC3X_AXLE BEV TimeRun MeasuredSpeedGear UrbanDelivery"), TestCase(IEPC3X_AXLE_JOB, 8, 2, 38.2085, 93.4968, TestName = "IEPC3X_AXLE BEV TimeRun MeasuredSpeedGear UrbanDelivery"),
TestCase(IEPC3X_AXLE_JOB, 9, 0, 1.7283, 90.738, TestName = "IEPC3X_AXLE BEV TimeRun PWheel LongHaul"), TestCase(IEPC3X_AXLE_JOB, 9, 0, 1.8938, 86.4733, TestName = "IEPC3X_AXLE BEV TimeRun PWheel LongHaul"),
TestCase(IEPC3X_AXLE_JOB, 10, 1, 5.6919, 89.0874, TestName = "IEPC3X_AXLE BEV TimeRun PWheel RegionalDelivery"), TestCase(IEPC3X_AXLE_JOB, 10, 1, 6.2227, 83.8154, TestName = "IEPC3X_AXLE BEV TimeRun PWheel RegionalDelivery"),
TestCase(IEPC3X_AXLE_JOB, 11, 2, 36.4718, 103.3618, TestName = "IEPC3X_AXLE BEV TimeRun PWheel UrbanDelivery"), TestCase(IEPC3X_AXLE_JOB, 11, 2, 39.1598, 92.7594, TestName = "IEPC3X_AXLE BEV TimeRun PWheel UrbanDelivery"),
TestCase(IEPC3X_WHEEL1_JOB, 0, 0, 1.7431, 90.8044, TestName = "IEPC3X_WHEEL1 BEV TimeRun MeasuredSpeed LongHaul"), TestCase(IEPC3X_WHEEL1_JOB, 0, 0, 1.9143, 86.5457, TestName = "IEPC3X_WHEEL1 BEV TimeRun MeasuredSpeed LongHaul"),
TestCase(IEPC3X_WHEEL1_JOB, 1, 1, 5.6987, 89.2263, TestName = "IEPC3X_WHEEL1 BEV TimeRun MeasuredSpeed RegionalDelivery"), TestCase(IEPC3X_WHEEL1_JOB, 1, 1, 6.2554, 83.9808, TestName = "IEPC3X_WHEEL1 BEV TimeRun MeasuredSpeed RegionalDelivery"),
TestCase(IEPC3X_WHEEL1_JOB, 2, 2, 36.0026, 104.1617, TestName = "IEPC3X_WHEEL1 BEV TimeRun MeasuredSpeed UrbanDelivery"), TestCase(IEPC3X_WHEEL1_JOB, 2, 2, 38.904, 93.7733, TestName = "IEPC3X_WHEEL1 BEV TimeRun MeasuredSpeed UrbanDelivery"),
TestCase(IEPC3X_WHEEL1_JOB, 6, 0, 1.7407, 90.8231, TestName = "IEPC3X_WHEEL1 BEV TimeRun MeasuredSpeedGear LongHaul"), TestCase(IEPC3X_WHEEL1_JOB, 6, 0, 1.9121, 86.5647, TestName = "IEPC3X_WHEEL1 BEV TimeRun MeasuredSpeedGear LongHaul"),
TestCase(IEPC3X_WHEEL1_JOB, 7, 1, 5.6917, 89.2737, TestName = "IEPC3X_WHEEL1 BEV TimeRun MeasuredSpeedGear RegionalDelivery"), TestCase(IEPC3X_WHEEL1_JOB, 7, 1, 6.2496, 84.0293, TestName = "IEPC3X_WHEEL1 BEV TimeRun MeasuredSpeedGear RegionalDelivery"),
TestCase(IEPC3X_WHEEL1_JOB, 8, 2, 35.9317, 104.6797, TestName = "IEPC3X_WHEEL1 BEV TimeRun MeasuredSpeedGear UrbanDelivery"), TestCase(IEPC3X_WHEEL1_JOB, 8, 2, 38.839, 94.2973, TestName = "IEPC3X_WHEEL1 BEV TimeRun MeasuredSpeedGear UrbanDelivery"),
TestCase(IEPC3X_WHEEL1_JOB, 9, 0, 1.7585, 90.784, TestName = "IEPC3X_WHEEL1 BEV TimeRun PWheel LongHaul"), TestCase(IEPC3X_WHEEL1_JOB, 9, 0, 1.9246, 86.5202, TestName = "IEPC3X_WHEEL1 BEV TimeRun PWheel LongHaul"),
TestCase(IEPC3X_WHEEL1_JOB, 10, 1, 5.7864, 89.2035, TestName = "IEPC3X_WHEEL1 BEV TimeRun PWheel RegionalDelivery"), TestCase(IEPC3X_WHEEL1_JOB, 10, 1, 6.3208, 83.9357, TestName = "IEPC3X_WHEEL1 BEV TimeRun PWheel RegionalDelivery"),
TestCase(IEPC3X_WHEEL1_JOB, 11, 2, 37.0538, 104.117, TestName = "IEPC3X_WHEEL1 BEV TimeRun PWheel UrbanDelivery"), TestCase(IEPC3X_WHEEL1_JOB, 11, 2, 39.7878, 93.5613, TestName = "IEPC3X_WHEEL1 BEV TimeRun PWheel UrbanDelivery"),
TestCase(IEPC3X_WHEEL2_JOB, 0, 0, 1.7091, 90.7572, TestName = "IEPC3X_WHEEL2 BEV TimeRun MeasuredSpeed LongHaul"), TestCase(IEPC3X_WHEEL2_JOB, 0, 0, 1.8804, 86.4985, TestName = "IEPC3X_WHEEL2 BEV TimeRun MeasuredSpeed LongHaul"),
TestCase(IEPC3X_WHEEL2_JOB, 1, 1, 5.6007, 89.0999, TestName = "IEPC3X_WHEEL2 BEV TimeRun MeasuredSpeed RegionalDelivery"), TestCase(IEPC3X_WHEEL2_JOB, 1, 1, 6.1565, 83.853, TestName = "IEPC3X_WHEEL2 BEV TimeRun MeasuredSpeed RegionalDelivery"),
TestCase(IEPC3X_WHEEL2_JOB, 2, 2, 35.3919, 103.3803, TestName = "IEPC3X_WHEEL2 BEV TimeRun MeasuredSpeed UrbanDelivery"), TestCase(IEPC3X_WHEEL2_JOB, 2, 2, 38.2845, 92.9826, TestName = "IEPC3X_WHEEL2 BEV TimeRun MeasuredSpeed UrbanDelivery"),
TestCase(IEPC3X_WHEEL2_JOB, 6, 0, 1.7067, 90.776, TestName = "IEPC3X_WHEEL2 BEV TimeRun MeasuredSpeedGear LongHaul"), TestCase(IEPC3X_WHEEL2_JOB, 6, 0, 1.8782, 86.5173, TestName = "IEPC3X_WHEEL2 BEV TimeRun MeasuredSpeedGear LongHaul"),
TestCase(IEPC3X_WHEEL2_JOB, 7, 1, 5.5932, 89.1469, TestName = "IEPC3X_WHEEL2 BEV TimeRun MeasuredSpeedGear RegionalDelivery"), TestCase(IEPC3X_WHEEL2_JOB, 7, 1, 6.1496, 83.9005, TestName = "IEPC3X_WHEEL2 BEV TimeRun MeasuredSpeedGear RegionalDelivery"),
TestCase(IEPC3X_WHEEL2_JOB, 8, 2, 35.3138, 103.8925, TestName = "IEPC3X_WHEEL2 BEV TimeRun MeasuredSpeedGear UrbanDelivery"), TestCase(IEPC3X_WHEEL2_JOB, 8, 2, 38.2085, 93.4968, TestName = "IEPC3X_WHEEL2 BEV TimeRun MeasuredSpeedGear UrbanDelivery"),
TestCase(IEPC3X_WHEEL2_JOB, 9, 0, 1.7283, 90.738, TestName = "IEPC3X_WHEEL2 BEV TimeRun PWheel LongHaul"), TestCase(IEPC3X_WHEEL2_JOB, 9, 0, 1.8938, 86.4733, TestName = "IEPC3X_WHEEL2 BEV TimeRun PWheel LongHaul"),
TestCase(IEPC3X_WHEEL2_JOB, 10, 1, 5.6919, 89.0874, TestName = "IEPC3X_WHEEL2 BEV TimeRun PWheel RegionalDelivery"), TestCase(IEPC3X_WHEEL2_JOB, 10, 1, 6.2227, 83.8154, TestName = "IEPC3X_WHEEL2 BEV TimeRun PWheel RegionalDelivery"),
TestCase(IEPC3X_WHEEL2_JOB, 11, 2, 36.4718, 103.3618, TestName = "IEPC3X_WHEEL2 BEV TimeRun PWheel UrbanDelivery") TestCase(IEPC3X_WHEEL2_JOB, 11, 2, 39.1598, 92.7594, TestName = "IEPC3X_WHEEL2 BEV TimeRun PWheel UrbanDelivery")
] ]
public void TestBEVTimeRunCycle(string jobFile, int cycleIdx, int distanceCycleIdx, double charge, double discharge) public void TestBEVTimeRunCycle(string jobFile, int cycleIdx, int distanceCycleIdx, double charge, double discharge)
{ {
......
...@@ -188,8 +188,12 @@ namespace TUGraz.VectoCore.Tests.Integration ...@@ -188,8 +188,12 @@ namespace TUGraz.VectoCore.Tests.Integration
factory.Validate = false; factory.Validate = false;
var sumData = new SummaryDataContainer(fileWriter); var sumData = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumData); var jobContainer = new JobContainer(sumData);
jobContainer.AddRuns(factory); jobContainer.AddRuns(factory);
//var i = 2;
//jobContainer.Runs[i].Run.Run();
//Assert.IsTrue(jobContainer.Runs[i].Run.FinishedWithoutErrors);
jobContainer.Execute(); jobContainer.Execute();
jobContainer.WaitFinished(); jobContainer.WaitFinished();
......
...@@ -30,7 +30,16 @@ ...@@ -30,7 +30,16 @@
"UnderSpeed": 5.0 "UnderSpeed": 5.0
}, },
"Cycles": [ "Cycles": [
"LongHaul" "LongHaul",
"Coach",
"Construction",
"HeavyUrban",
"Interurban",
"MunicipalUtility",
"RegionalDelivery",
"Suburban",
"Urban",
"UrbanDelivery"
] ]
} }
} }
\ No newline at end of file
{
"Header": {
"CreatedBy": " ()",
"Date": "2016-10-13T08:54:28.7387223Z",
"AppVersion": "3",
"FileVersion": 1
},
"Body": {
"SavedInDeclMode": false,
"Model": "Generic IEPC",
"Inertia": 0.5,
"DifferentialIncluded": true,
"DesignTypeWheelMotor": false,
"NrOfDesignTypeWheelMotorMeasured": 1,
"ThermalOverloadRecoveryFactor": 0.9,
"Gears": [
{
"Ratio": 12.276
}
],
"VoltageLevels": [
{
"Voltage": 500,
"ContinuousTorque": 13860.59,
"ContinuousTorqueSpeed": 166.99,
"OverloadTorque": 16517.20,
"OverloadTorqueSpeed": 166.01,
"OverloadTime": 312,
"FullLoadCurve": "IEPC_Gbx1Axl_FLD_min.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx1Axl.viepco"
}
},
{
"Voltage": 900,
"ContinuousTorque": 15015.63,
"ContinuousTorqueSpeed": 168.62,
"OverloadTorque": 17325.73,
"OverloadTorqueSpeed": 170.17,
"OverloadTime": 345,
"FullLoadCurve": "IEPC_Gbx1Axl_FLD_max.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx1Axl.viepco"
}
}
],
"DragCurves": {
"1": "IEPC_Gbx1Axl_drag.viepcd"
}
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment