From cd82d29de9d4e2119068dcd3e3d5e0eeeed9e694 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Mon, 29 Feb 2016 14:34:54 +0100
Subject: [PATCH] updated vsum tests, si class code format
---
.../Declaration/40t_Long_Haul_Truck.vsum | 2 +-
.../EngineOnlyCycles/40t_Long_Haul_Truck.vsum | 2 +-
.../Results/Engineering/24t Coach.vsum | 2 +-
VectoCoreTest/Utils/SITest.cs | 32 +++++--------------
4 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck.vsum b/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck.vsum
index e006c661a8..8dad7cff1a 100644
--- a/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck.vsum
+++ b/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck.vsum
@@ -1,4 +1,4 @@
-Job [-],Input File [-],Cycle [-],time [s],distance [km],speed [km/h],∆altitude [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+Job [-],Input File [-],Cycle [-],time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5188,108.1817,75.06826,0.4176572,1.44111111111111,1.93108893699116,0.62256001614862,2.55282541645898,0.504388880299197,84.2005492982813,-1.38841319755122,16373.51,218.1149,-,-,16610.92,221.2776,699.2371,-,221.2776,-,26.59586,71.9230417326127,-2.65873198913168,121.342347155412,-2.00085768580437,-68.5272798927924,-27.4112346063885,-0.000913775395601988,6.82509400778347E-08,-7.05197461869982,-3.8315282110042,-10.5097224537532,-2.00511476749089,0,14600,0,-4.595578E-10,0.4826669,-0.5824779,0.194878,0.04471858,0.03797225,0.870663,0.04664611
1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5285,108.1821,73.69076,0.405076,1.46805555555556,1.96719449344609,0.634200016450551,2.60055557555623,0.513819435694151,117.069029630527,-3.5248178646913,22546.45,305.9603,-,-,22873.37,310.3967,980.8537,50.82144,310.3967,1.933021,37.3073,105.022315874343,-13.1872949838864,171.863839332594,-5.17462844858153,-67.1631451211485,-58.5049236301995,-0.042272475272831,1.16840367101961E-07,-7.18382533921136,-19.3596816638443,-12.4393761609495,-1.99137201235888,0,14600,19300,-2.706739E-10,0.347071,-0.4362039,0.1876148,0.0717124,0.05733207,0.8251656,0.04578997
1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,5322,108.1813,73.17788,0.4295395,1.47833333333333,1.98096671601137,0.63864001656572,2.6187619249026,0.517416657855113,127.378675165939,-3.93737369995846,24547.73,335.4529,-,-,24903.67,340.3169,1075.401,42.33864,340.3169,1.610373,40.90347,115.230841308054,-17.3626400919527,188.308141453647,-5.82075078643858,-66.5735653450041,-67.8989995111525,-0.0355927723190851,1.25660767985715E-07,-7.23411891301473,-25.6677696026034,-13.09323215276,-1.97993133016707,0,14600,25400,4.479868E-10,0.3184433,-0.4329029,0.1870568,0.08248778,0.05881248,0.8132281,0.04547163
diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck.vsum b/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck.vsum
index 3b7952e182..ee840a00c3 100644
--- a/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck.vsum
+++ b/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100tkm],FC-Final [l/100km],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_FAN [kWh],Eaux_PS [kWh],Eaux_STP [kWh],Eaux_ES [kWh],Eaux_AC [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100tkm],FC-Final [l/100km],PwheelPos [kW],P_brake_loss [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
1,40t_Long_Haul_Truck.vecto,Long_Haul.vdri,Success,5188,108.1817,75.06826,0.4176572,1.44111111111111,1.93108893699116,0.62256001614862,2.55282541645898,0.504388880299197,84.2005492982813,-1.38841319755122,16373.51,218.1149,-,-,16610.92,221.2776,699.2371,-,221.2776,-,26.59586,71.9230417326127,-2.65873198913168,121.342347155412,-2.00085768580437,-68.5272798927924,-27.4112346063885,-0.000913775395601988,6.82509400778347E-08,-7.05197461869982,-3.8315282110042,-10.5097224537532,-2.00511476749089,0,14600,0,-4.595578E-10,0.4826669,-0.5824779,0.194878,0.04471858,0.03797225,0.870663,0.04664611
\ No newline at end of file
diff --git a/VectoCoreTest/TestData/Results/Engineering/24t Coach.vsum b/VectoCoreTest/TestData/Results/Engineering/24t Coach.vsum
index 75b7da2a50..7ff74a603d 100644
--- a/VectoCoreTest/TestData/Results/Engineering/24t Coach.vsum
+++ b/VectoCoreTest/TestData/Results/Engineering/24t Coach.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Eaux_ALT1 [kWh],Eaux_ALT3 [kWh],Eaux_ALT2 [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],altitudeDelta [m],Eaux_ALT1 [kWh],Eaux_ALT3 [kWh],Eaux_ALT2 [kWh],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
1,24t Coach.vecto,Coach.vdri,Success,15279,275.1611,64.83279,0.9548082,2.15551399312913,2.15551399312913,2.15551399312913,71.5356641859138,-2.6406735300967,14081.74,217.2008,-,-,-,-,686.3547,207.9863,217.2008,7.910869,26.10587,57.9167737957934,-9.19399721736506,303.609281415716,-11.2074585739854,-89.141969279321,-91.2083669284317,-0.0565074551141717,9.93856988821386E-06,-32.3559585060014,-39.0208565233669,-34.0154425995942,-6.6027628314715,0,15700,3300,-4.93487E-10,0.4005699,-0.2652605,0.1767927,0.06682374,0.09221808,0.8138621,0.02709601
diff --git a/VectoCoreTest/Utils/SITest.cs b/VectoCoreTest/Utils/SITest.cs
index 2e92e9e0d2..e5c188646d 100644
--- a/VectoCoreTest/Utils/SITest.cs
+++ b/VectoCoreTest/Utils/SITest.cs
@@ -78,9 +78,7 @@ namespace TUGraz.VectoCore.Tests.Utils
var angVeloSum = angularVelocity + angularVelocity2;
Assert.IsInstanceOfType(angVeloSum, typeof(PerSecond));
Assert.AreEqual((400.0 + 600) / 60 * 2 * Math.PI, angVeloSum.Value(), 0.0000001);
- AssertHelper.Exception<VectoException>(() => {
- var x = 500.SI().Watt + 300.SI().Newton;
- });
+ AssertHelper.Exception<VectoException>(() => { var x = 500.SI().Watt + 300.SI().Newton; });
//subtract
var angVeloDiff = angularVelocity - angularVelocity2;
@@ -110,15 +108,11 @@ namespace TUGraz.VectoCore.Tests.Utils
// ConvertTo only allows conversion if the units are correct.
- AssertHelper.Exception<VectoException>(() => {
- var x = 40.SI<Newton>().ConvertTo().Watt;
- });
+ AssertHelper.Exception<VectoException>(() => { var x = 40.SI<Newton>().ConvertTo().Watt; });
var res1 = 40.SI<Newton>().ConvertTo().Newton;
// Cast only allows the cast if the units are correct.
- AssertHelper.Exception<VectoException>(() => {
- var x = 40.SI().Newton.Cast<Watt>();
- });
+ AssertHelper.Exception<VectoException>(() => { var x = 40.SI().Newton.Cast<Watt>(); });
var res2 = 40.SI().Newton.Cast<Newton>();
}
@@ -188,21 +182,13 @@ namespace TUGraz.VectoCore.Tests.Utils
Assert.IsTrue(v1 > v2);
Assert.IsFalse(v1 < v2);
- AssertHelper.Exception<VectoException>(() => {
- var x = v1 < v4;
- },
+ AssertHelper.Exception<VectoException>(() => { var x = v1 < v4; },
"Operator '<' can only operate on SI Objects with the same unit. Got: 600.0000 [Nm] < 100.0000 [W]");
- AssertHelper.Exception<VectoException>(() => {
- var x = v1 > v4;
- },
+ AssertHelper.Exception<VectoException>(() => { var x = v1 > v4; },
"Operator '>' can only operate on SI Objects with the same unit. Got: 600.0000 [Nm] > 100.0000 [W]");
- AssertHelper.Exception<VectoException>(() => {
- var x = v1 <= v4;
- },
+ AssertHelper.Exception<VectoException>(() => { var x = v1 <= v4; },
"Operator '<=' can only operate on SI Objects with the same unit. Got: 600.0000 [Nm] <= 100.0000 [W]");
- AssertHelper.Exception<VectoException>(() => {
- var x = v1 >= v4;
- },
+ AssertHelper.Exception<VectoException>(() => { var x = v1 >= v4; },
"Operator '>=' can only operate on SI Objects with the same unit. Got: 600.0000 [Nm] >= 100.0000 [W]");
SI si = null;
@@ -268,9 +254,7 @@ namespace TUGraz.VectoCore.Tests.Utils
AssertHelper.AreRelativeEqual(3.SI<NewtonMeter>(), 1.SI<NewtonMeter>() + 2.SI().Newton.Meter);
AssertHelper.AreRelativeEqual(-1.SI<NewtonMeter>(), 1.SI<NewtonMeter>() - 2.SI().Newton.Meter);
- AssertHelper.Exception<VectoException>(() => {
- var x = 1.SI().Second - 1.SI<Meter>();
- },
+ AssertHelper.Exception<VectoException>(() => { var x = 1.SI().Second - 1.SI<Meter>(); },
"Operator '-' can only operate on SI Objects with the same unit. Got: 1.0000 [s] - 1.0000 [m]");
}
--
GitLab