Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit b2b1e1c6 authored by Michael KRISPER's avatar Michael KRISPER
Browse files

adjusted tests to new cross wind values (with vehicle height)

parent 8f1009ee
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv
+ 28
− 28
View file @ b2b1e1c6
Valid,Vehicle Category,Axle Conf.,GVW_Min,GVW_Max,HDV class,Height,DesignSpeed,Body,Trailer,EMS ,.vacc file,Cross Wind Correction - Long haul,Cross Wind Correction - EMS,Cross Wind Correction - Other,Truck Axles - Long haul,Truck Axles - Other,Trailer Axles - Long haul,Trailer Axles - Other,Truck Axles - Long haul EMS,Truck Axles - Other EMS,Trailer Axles - Long haul EMS,Trailer Axles - Other EMS,Long haul,Long haul EMS,Regional delivery,Regional delivery EMS,Urban delivery,Municipal utility,Construction,Heavy Urban,Urban,Suburban,Interurban,Coach,CdxA_Construction
## 0 ,RigidTruck ,4x2 ,0 ,7.5 ,0 ,3.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- , ,pc(R) , ,pc(R) ,- ,- ,- ,- ,- ,- ,- , ,
1 ,RigidTruck ,4x2 ,7.5 ,10 ,1 ,3.0 ,85 ,B1 , , ,Truck.vacc, , ,RigidSolo , ,45/55 , , , , , , ,- ,- ,pc(R) ,- ,pc(R) ,- ,- ,- ,- ,- ,- ,- ,
1 ,Tractor ,4x2 ,7.5 ,10 ,1 ,3.0 ,85 ,B1 , , ,Truck.vacc, , ,RigidSolo , ,45/55 , , , , , , ,- ,- ,pc(R) ,- ,pc(R) ,- ,- ,- ,- ,- ,- ,- ,
1 ,RigidTruck ,4x2 ,10 ,12 ,2 ,3.0 ,85 ,B2 ,T1 , ,Truck.vacc,RigidTrailer , ,RigidSolo ,22.5/32.5 ,45/55 ,45 , , , , , ,pc(R) ,- ,pc(R) ,- ,pc(R) ,- ,- ,- ,- ,- ,- ,- ,
1 ,Tractor ,4x2 ,10 ,12 ,2 ,3.0 ,85 ,B2 ,T1 , ,Truck.vacc,RigidTrailer , ,RigidSolo ,22.5/32.5 ,45/55 ,45 , , , , , ,pc(R) ,- ,pc(R) ,- ,pc(R) ,- ,- ,- ,- ,- ,- ,- ,
1 ,RigidTruck ,4x2 ,12 ,16 ,3 ,3.0 ,85 ,B3 , , ,Truck.vacc, , ,RigidSolo , ,40/60 , , , , , , ,- ,- ,pc(R) ,- ,pc(R) ,- ,- ,- ,- ,- ,- ,- ,
1 ,Tractor ,4x2 ,12 ,16 ,3 ,3.0 ,85 ,B3 , , ,Truck.vacc, , ,RigidSolo , ,40/60 , , , , , , ,- ,- ,pc(R) ,- ,pc(R) ,- ,- ,- ,- ,- ,- ,- ,
1 ,RigidTruck ,4x2 ,16 ,99 ,4 ,3.0 ,85 ,B4 ,T2 , ,Truck.vacc,RigidTrailer , ,RigidSolo ,20/30 ,45/55 ,50 , , , , , ,14000 ,- ,4400 ,- ,- ,4400 ,- ,- ,- ,- ,- ,- ,
1 ,Tractor ,4x2 ,16 ,99 ,5 ,3.0 ,85 , ,ST1 ,ST1+T2,Truck.vacc,TractorSemitrailer ,RigidTrailer ,TractorSemitrailer ,20/25 ,25/25 ,55 ,50 ,15/20 ,17.5/25 ,40/25 ,35/22.5 ,19300 ,26500 ,12900 ,17500 ,- ,- ,- ,- ,- ,- ,- ,- ,
0 ,RigidTruck ,4x4 ,7.5 ,16 ,6 ,3.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,??? ,??? ,- ,- ,- ,- ,- ,
0 ,RigidTruck ,4x4 ,16 ,99 ,7 ,3.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
0 ,Tractor ,4x4 ,16 ,99 ,8 ,3.0 ,85 , , , ,Truck.vacc, , ,TractorSemitrailer , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
1 ,RigidTruck ,6x2 ,0 ,99 ,9 ,3.0 ,85 ,B5 ,T2 ,D+ST1 ,Truck.vacc,RigidTrailer ,RigidTrailer ,RigidSolo ,20/30/15 ,35/40/25 ,35 , ,15/20/10 ,17.5/20/10 ,22.5/32.5 ,22.5/30 ,19300 ,26500 ,7100 ,17500 ,- ,7100 ,- ,- ,- ,- ,- ,- ,
1 ,Tractor ,6x2 ,0 ,99 ,10 ,3.0 ,85 , ,ST1 ,ST1+T2,Truck.vacc,TractorSemitrailer ,RigidTrailer ,TractorSemitrailer ,15/10/20 ,20/10/20 ,55 ,50 ,12.5/15/10 ,15/15/10 ,37.5/25 ,35/25 ,19300 ,26500 ,12900 ,17500 ,- ,- ,- ,- ,- ,- ,- ,- ,
1 ,RigidTruck ,6x4 ,0 ,99 ,11 ,3.0 ,85 ,B5 ,T2 ,D+ST1 ,Truck.vacc,RigidTrailer ,RigidTrailer ,RigidSolo ,20/22.5/22.5 ,35/35/30 ,35 , ,15/20/10 ,17.5/20/10 ,22.5/32.5 ,22.5/30 ,19300 ,26500 ,7100 ,17500 ,- ,7100 ,7100 ,- ,- ,- ,- ,- ,8.5
1 ,Tractor ,6x4 ,0 ,99 ,12 ,3.0 ,85 , ,ST1 ,ST1+T2,Truck.vacc,TractorSemitrailer ,RigidTrailer ,TractorSemitrailer ,15/15/15 ,20/15/15 ,55 ,50 ,12.5/15/10 ,15/15/10 ,37.5/25 ,35/25 ,19300 ,26500 ,12900 ,17500 ,- ,- ,12900 ,- ,- ,- ,- ,- ,8.8
0 ,RigidTruck ,6x6 ,0 ,99 ,13 ,3.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
0 ,Tractor ,6x6 ,0 ,99 ,14 ,3.0 ,85 , , , ,Truck.vacc, , ,TractorSemitrailer , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
0 ,RigidTruck ,8x2 ,0 ,99 ,15 ,3.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,??? ,- ,- ,- ,- ,- ,- ,- ,- ,- ,
1 ,RigidTruck ,8x4 ,0 ,99 ,16 ,3.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , ,25/25/25/25 , , , , , , ,- ,- ,- ,- ,- ,- ,12900 ,- ,- ,- ,- ,- ,
0 ,RigidTruck ,8x6 ,0 ,99 ,17 ,3.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,9.0
0 ,RigidTruck ,8x8 ,0 ,99 ,17 ,3.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
0 ,CityBus ,4x2 ,0 ,18 ,B1 ,3.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,??? ,??? ,??? ,- ,- ,
0 ,InterurbanBus ,4x2 ,0 ,18 ,B2 ,3.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,- ,
0 ,Coach ,4x2 ,0 ,18 ,B3 ,3.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,
0 ,CityBus ,6x2 ,18 ,99 ,B4 ,3.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,??? ,??? ,??? ,- ,- ,
0 ,InterurbanBus ,6x2 ,18 ,99 ,B5 ,3.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,- ,
0 ,Coach ,6x2 ,18 ,99 ,B6 ,3.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,
\ No newline at end of file
## 0 ,RigidTruck ,4x2 ,0 ,7.5 ,0 ,4.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- , ,pc(R) , ,pc(R) ,- ,- ,- ,- ,- ,- ,- , ,
1 ,RigidTruck ,4x2 ,7.5 ,10 ,1 ,4.0 ,85 ,B1 , , ,Truck.vacc, , ,RigidSolo , ,45/55 , , , , , , ,- ,- ,pc(R) ,- ,pc(R) ,- ,- ,- ,- ,- ,- ,- ,
1 ,Tractor ,4x2 ,7.5 ,10 ,1 ,4.0 ,85 ,B1 , , ,Truck.vacc, , ,RigidSolo , ,45/55 , , , , , , ,- ,- ,pc(R) ,- ,pc(R) ,- ,- ,- ,- ,- ,- ,- ,
1 ,RigidTruck ,4x2 ,10 ,12 ,2 ,4.0 ,85 ,B2 ,T1 , ,Truck.vacc,RigidTrailer , ,RigidSolo ,22.5/32.5 ,45/55 ,45 , , , , , ,pc(R) ,- ,pc(R) ,- ,pc(R) ,- ,- ,- ,- ,- ,- ,- ,
1 ,Tractor ,4x2 ,10 ,12 ,2 ,4.0 ,85 ,B2 ,T1 , ,Truck.vacc,RigidTrailer , ,RigidSolo ,22.5/32.5 ,45/55 ,45 , , , , , ,pc(R) ,- ,pc(R) ,- ,pc(R) ,- ,- ,- ,- ,- ,- ,- ,
1 ,RigidTruck ,4x2 ,12 ,16 ,3 ,4.0 ,85 ,B3 , , ,Truck.vacc, , ,RigidSolo , ,40/60 , , , , , , ,- ,- ,pc(R) ,- ,pc(R) ,- ,- ,- ,- ,- ,- ,- ,
1 ,Tractor ,4x2 ,12 ,16 ,3 ,4.0 ,85 ,B3 , , ,Truck.vacc, , ,RigidSolo , ,40/60 , , , , , , ,- ,- ,pc(R) ,- ,pc(R) ,- ,- ,- ,- ,- ,- ,- ,
1 ,RigidTruck ,4x2 ,16 ,99 ,4 ,4.0 ,85 ,B4 ,T2 , ,Truck.vacc,RigidTrailer , ,RigidSolo ,20/30 ,45/55 ,50 , , , , , ,14000 ,- ,4400 ,- ,- ,4400 ,- ,- ,- ,- ,- ,- ,
1 ,Tractor ,4x2 ,16 ,99 ,5 ,4.0 ,85 , ,ST1 ,ST1+T2,Truck.vacc,TractorSemitrailer ,RigidTrailer ,TractorSemitrailer ,20/25 ,25/25 ,55 ,50 ,15/20 ,17.5/25 ,40/25 ,35/22.5 ,19300 ,26500 ,12900 ,17500 ,- ,- ,- ,- ,- ,- ,- ,- ,
0 ,RigidTruck ,4x4 ,7.5 ,16 ,6 ,4.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,??? ,??? ,- ,- ,- ,- ,- ,
0 ,RigidTruck ,4x4 ,16 ,99 ,7 ,4.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
0 ,Tractor ,4x4 ,16 ,99 ,8 ,4.0 ,85 , , , ,Truck.vacc, , ,TractorSemitrailer , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
1 ,RigidTruck ,6x2 ,0 ,99 ,9 ,4.0 ,85 ,B5 ,T2 ,D+ST1 ,Truck.vacc,RigidTrailer ,RigidTrailer ,RigidSolo ,20/30/15 ,35/40/25 ,35 , ,15/20/10 ,17.5/20/10 ,22.5/32.5 ,22.5/30 ,19300 ,26500 ,7100 ,17500 ,- ,7100 ,- ,- ,- ,- ,- ,- ,
1 ,Tractor ,6x2 ,0 ,99 ,10 ,4.0 ,85 , ,ST1 ,ST1+T2,Truck.vacc,TractorSemitrailer ,RigidTrailer ,TractorSemitrailer ,15/10/20 ,20/10/20 ,55 ,50 ,12.5/15/10 ,15/15/10 ,37.5/25 ,35/25 ,19300 ,26500 ,12900 ,17500 ,- ,- ,- ,- ,- ,- ,- ,- ,
1 ,RigidTruck ,6x4 ,0 ,99 ,11 ,4.0 ,85 ,B5 ,T2 ,D+ST1 ,Truck.vacc,RigidTrailer ,RigidTrailer ,RigidSolo ,20/22.5/22.5 ,35/35/30 ,35 , ,15/20/10 ,17.5/20/10 ,22.5/32.5 ,22.5/30 ,19300 ,26500 ,7100 ,17500 ,- ,7100 ,7100 ,- ,- ,- ,- ,- ,8.5
1 ,Tractor ,6x4 ,0 ,99 ,12 ,4.0 ,85 , ,ST1 ,ST1+T2,Truck.vacc,TractorSemitrailer ,RigidTrailer ,TractorSemitrailer ,15/15/15 ,20/15/15 ,55 ,50 ,12.5/15/10 ,15/15/10 ,37.5/25 ,35/25 ,19300 ,26500 ,12900 ,17500 ,- ,- ,12900 ,- ,- ,- ,- ,- ,8.8
0 ,RigidTruck ,6x6 ,0 ,99 ,13 ,4.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
0 ,Tractor ,6x6 ,0 ,99 ,14 ,4.0 ,85 , , , ,Truck.vacc, , ,TractorSemitrailer , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
0 ,RigidTruck ,8x2 ,0 ,99 ,15 ,4.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,??? ,- ,- ,- ,- ,- ,- ,- ,- ,- ,
1 ,RigidTruck ,8x4 ,0 ,99 ,16 ,4.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , ,25/25/25/25 , , , , , , ,- ,- ,- ,- ,- ,- ,12900 ,- ,- ,- ,- ,- ,
0 ,RigidTruck ,8x6 ,0 ,99 ,17 ,4.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,9.0
0 ,RigidTruck ,8x8 ,0 ,99 ,17 ,4.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
0 ,CityBus ,4x2 ,0 ,18 ,B1 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,??? ,??? ,??? ,- ,- ,
0 ,InterurbanBus ,4x2 ,0 ,18 ,B2 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,- ,
0 ,Coach ,4x2 ,0 ,18 ,B3 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,
0 ,CityBus ,6x2 ,18 ,99 ,B4 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,??? ,??? ,??? ,- ,- ,
0 ,InterurbanBus ,6x2 ,18 ,99 ,B5 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,- ,
0 ,Coach ,6x2 ,18 ,99 ,B6 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,
\ No newline at end of file
VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
+ 1
− 1
View file @ b2b1e1c6
......@@ -78,7 +78,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
requestPort.Request(absTime, dt, accell, gradient);
Assert.AreEqual(-2340.2558, mockPort.Force.Value(), 0.0001);
Assert.AreEqual(-2332.5362, mockPort.Force.Value(), 0.0001);
Assert.AreEqual(16.954303841, mockPort.Velocity.Value(), 0.0001);
}
......
VectoCore/VectoCoreTest/Reports/ModDataTest.cs
+ 9
− 11
View file @ b2b1e1c6
......@@ -314,25 +314,23 @@ namespace TUGraz.VectoCore.Tests.Reports
Assert.AreEqual(pEngOut.Value(), (pClutchOut + pClutchLoss).Value(), 1E-3,
"time: {0} distance: {1}", time, distance);
// P_eng_fcmap = P_eng_out + P_AUX + P_eng_inertia ( + P_PTO_Transm + P_PTO_Consumer )
Assert.AreEqual(pEngFcmap.Value(), (pEngOut + pAux + pEngInertia + pPTOtransm + pPTOconsumer).Value(), 1E-3,
Assert.IsTrue(pLossGbx.IsGreaterOrEqual(pShiftLoss + pGbxInertia), "time: {0} distance: {1}", time,
distance);
Assert.AreEqual(pGbxIn.Value(), (pRetIn + pLossGbx + pGbxInertia).Value(), gear != 0 ? 1E-3 : 0.5,
"time: {0} distance: {1}", time,
distance);
// P_eng_fcmap = P_eng_out + P_AUX + P_eng_inertia ( + P_PTO_Transm + P_PTO_Consumer )
Assert.AreEqual(pEngFcmap.Value(), (pEngOut + pAux + pEngInertia + pPTOtransm + pPTOconsumer).Value(), 0.5,
"time: {0} distance: {1}", time, distance);
// P_eng_fcmap = sum(Losses Powertrain)
var pLossTot = pClutchLoss + pLossGbx + pLossRet + pGbxInertia + pLossAngle + pLossAxle + pBrakeLoss +
pWheelInertia + pAir + pRoll + pGrad + pVehInertia + pPTOconsumer + pPTOtransm;
var pEngFcmapCalc = (pLossTot + pEngInertia + pAux).Value();
Assert.AreEqual(pEngFcmap.Value(), pEngFcmapCalc, 0.5, "time: {0} distance: {1}", time, distance);
Assert.AreEqual(pEngFcmap.Value(), pEngFcmapCalc, 1E-2, "time: {0} distance: {1}", time, distance);
Assert.IsTrue(pLossGbx.IsGreaterOrEqual(pShiftLoss + pGbxInertia), "time: {0} distance: {1}", time,
distance);
Assert.AreEqual(pGbxIn.Value(), (pRetIn + pLossGbx + pGbxInertia).Value(), gear != 0 ? 1E-3 : 0.5,
"time: {0} distance: {1}", time,
distance);
Assert.AreEqual(pEngFcmap.Value(),
(pTrac + pWheelInertia + pBrakeLoss + pLossAxle + pLossRet + pLossGbx + pGbxInertia + pEngInertia + pAux +
pClutchLoss + pPTOtransm + pPTOconsumer).Value(), 0.5, "time: {0} distance: {1}", time, distance);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about