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

Skip to content
Snippets Groups Projects
Commit ba141190 authored by Glenn Zarb's avatar Glenn Zarb Committed by Kostis ANAGNOSTOPOULOS
Browse files

JRC: Add RICARDO Decleration files. 

- sed-ed conflicting VECTO.vbproj.
- Orig-commit-message:

 git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C2019
parent 1900697f
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Declaration/MissionCycles/lst.txt 0 → 100644
+ 20
− 0
View file @ ba141190
Volume in drive C has no label.
Volume Serial Number is 742F-DD50
Directory of C:\Users\tb28\Source\Workspaces\VECTO\VECTO\bin\Debug\Declaration\MissionCycles
05/01/2015 11:25 <DIR> .
05/01/2015 11:25 <DIR> ..
20/06/2014 13:56 540,751 Citybus_Heavy_Urban.vdri
20/06/2014 13:56 411,271 Citybus_Suburban.vdri
20/06/2014 13:56 706,067 Citybus_Urban.vdri
20/06/2014 13:56 8,585,112 Coach.vdri
20/06/2014 13:56 378,587 Construction.vdri
20/06/2014 13:56 2,332,261 Interurban_Bus.vdri
20/06/2014 13:56 3,238,451 Long_Haul.vdri
05/01/2015 11:25 0 lst.txt
20/06/2014 13:56 167,266 Municipal_Utility.vdri
20/06/2014 13:56 767,429 Regional_Delivery.vdri
20/06/2014 13:56 828,985 Urban_Delivery.vdri
11 File(s) 17,956,180 bytes
2 Dir(s) 234,794,237,952 bytes free
Declaration/Reports/repAAUX.pdf 0 → 100644
+ 0
− 0
View file @ ba141190
File added
Declaration/SegmentTable_bad.csv 0 → 100644
+ 26
− 0
View file @ ba141190
Valid,tVehCat,tAxleConf,GVW_Min,GVW_Max,HDV_Class,VACC,VCDV,Rigid/Truck Axles - Long haul,Rigid/Truck Axles - Other,Trailer Axles - Long haul,Trailer Axles - Other,LongHaul,RegionalDelivery,UrbanDelivery,MunicipalUtility,Construction,HeavyUrban,Urban,Suburban,Interurban,Coach,MassExtra - LongHaul,MassExtra - RegionalDelivery,MassExtra - UrbanDelivery,MassExtra - MunicipalUtility,MassExtra - Construction,MassExtra - HeavyUrban,MassExtra - Urban,MassExtra - Suburban,MassExtra - Interurban,MassExtra - Coach,RefLoad - LongHaul,RefLoad - RegionalDelivery,RefLoad - UrbanDelivery,RefLoad - MunicipalUtility,RefLoad - Construction,RefLoad - HeavyUrban,RefLoad - Urban,RefLoad - Suburban,RefLoad - Interurban,RefLoad - Coach,WHTCWF - LongHaul,WHTCWF - RegionalDelivery,WHTCWF - UrbanDelivery,WHTCWF - MunicipalUtility,WHTCWF - Construction,WHTCWF - HeavyUrban,WHTCWF - Urban,WHTCWF - Suburban,WHTCWF - Interurban,WHTCWF - Coach
0,RigidTruck,4x2,0,7.5,0,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,1,1,0,0,0,0,0,0,0,-,???,???,-,-,-,-,-,-,-,-,???,???,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
1,RigidTruck,4x2,7.5,10,1,Truck.vacc,Truck.vcdv,-,45/55,0/0,0/0,0,1,1,0,0,0,0,0,0,0,-,1600,1600,-,-,-,-,-,-,-,-,f,f,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
1,RigidTruck,4x2,10,12,2,Truck.vacc,Truck.vcdv,40/60,45/55,0/0,0/0,1,1,1,0,0,0,0,0,0,0,1900,1900,1900,-,-,-,-,-,-,-,f,f,f,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
1,RigidTruck,4x2,12,16,3,Truck.vacc,Truck.vcdv,-,40/60,0/0,0/0,0,1,1,0,0,0,0,0,0,0,-,2000,2000,-,-,-,-,-,-,-,-,f,f,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
1,RigidTruck,4x2,16,99,4,Truck.vacc,Truck.vcdv,20/30,45/55,50/2,0/0,1,1,0,1,0,0,0,0,0,0,7500,2100,-,2100,-,-,-,-,-,-,14000,4400,-,4400,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
1,Tractor,4x2,16,99,5,Truck.vacc,Truck.vcdv,20/25,25/25,55/3,50/3,1,1,0,0,0,0,0,0,0,0,7500,7500,-,-,-,-,-,-,-,-,19300,12900,-,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,RigidTruck,4x4,7.5,16,6,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,1,1,0,0,0,0,0,-,-,-,???,???,-,-,-,-,-,-,-,-,???,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,RigidTruck,4x4,16,99,7,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,B5,-,-,-,-,-,-,-,-,-,4300,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,Tractor,4x4,16,99,8,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
1,RigidTruck,6x2,0,99,9,Truck.vacc,Truck.vcdv,20/30/15,35/40/25,35/2,0/0,1,1,0,1,0,0,0,0,0,0,7600,2200,-,2200,-,-,-,-,-,-,17900,7100,-,7100,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
1,Tractor,6x2,0,99,10,Truck.vacc,Truck.vcdv,15/10/20,20/10/20,55/2,50/2,1,1,0,0,0,0,0,0,0,0,7500,7500,-,-,-,-,-,-,-,-,19000,12700,-,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,RigidTruck,6x4,0,99,11,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,B7,-,-,-,-,-,-,-,-,-,7600,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,Tractor,6x4,0,99,12,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,ST2,-,-,-,-,-,-,-,-,-,12100,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,RigidTruck,6x6,0,99,13,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,0,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,Tractor,6x6,0,99,14,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,0,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,RigidTruck,8x2,0,99,15,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,1,0,0,0,0,0,0,0,0,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,RigidTruck,8x4,0,99,16,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,B9,-,-,-,-,-,-,-,-,-,11600,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,RigidTruck,8x6,0,99,17,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,RigidTruck,8x8,0,99,17,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,CityBus,4x2,0,18,B1,N/A,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,0,1,1,1,0,0,-,-,-,-,-,???,???,???,-,-,-,-,-,-,-,???,???,???,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,InterurbanBus,4x2,0,18,B2,N/A,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,0,0,0,0,1,0,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,Coach,4x2,0,18,B3,N/A,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,0,0,0,0,0,1,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,CityBus,6x2,18,99,B4,N/A,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,0,1,1,1,0,0,-,-,-,-,-,???,???,???,-,-,-,-,-,-,-,???,???,???,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,InterurbanBus,6x2,18,99,B5,N/A,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,0,0,0,0,1,0,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
0,Coach,6x2,18,99,B6,N/A,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,0,0,0,0,0,1,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
Declaration/VCDV/Truck.vcdv 0 → 100644
+ 22
− 0
View file @ ba141190
v_veh [km/h],cdx_rel [-]
0,1.09879105165478
5,1.09879105165478
10,1.09879105165478
15,1.09879105165478
20,1.09879105165478
25,1.09879105165478
30,1.09879105165478
35,1.09879105165478
40,1.09879105165478
45,1.09879105165478
50,1.09879105165478
55,1.09879105165478
60,1.09879105165478
65,1.08880328691127
70,1.08053379303156
75,1.07361197884146
80,1.06774118921044
85,1.0627044915251
90,1.05833988168619
95,1.05452412535638
100,1.05116194011008
VECTO/VECTO.vbproj
+ 407
− 284
View file @ ba141190
This diff is collapsed.
VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
+ 1
− 1
View file @ ba141190
......@@ -41,7 +41,7 @@ M10Mock.Setup( Function(x) x.AverageLoadsFuelConsumptionInterpolatedForPneumatic
'Assert
Assert.AreEqual( target.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand, OUT1 )
Assert.AreEqual( target.BaseFuelConsumptionWithAverageAuxiliaryLoads, OUT2 )
Assert.AreEqual( target.BaseFuelConsumptionWithTrueAuxiliaryLoads, OUT2 )
End Sub
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
+ 1
− 1
View file @ ba141190
......@@ -40,7 +40,7 @@ Dim M12 As New Mock(Of IM12)
Dim Signals As New Mock(Of ISignals)
m12.Setup ( Function(x) x.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand) .Returns( IP1 )
m12.Setup ( Function(x) x.BaseFuelConsumptionWithAverageAuxiliaryLoads) .Returns( IP2 )
m12.Setup ( Function(x) x.BaseFuelConsumptionWithTrueAuxiliaryLoads) .Returns( IP2 )
m10.Setup ( Function(x) x.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand) .Returns( IP3 )
Signals.Setup ( Function(x) x.SmartPneumatics) .Returns( IP4 )
Signals.Setup ( Function(x) x.SmartElectrics) .Returns( IP5 )
......
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