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

Skip to content
Snippets Groups Projects
Commit 4099799e authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Pull request #189: Develop 

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '42cb52d9':
  update expected values for pcc tests
  adding missing file
  bugfix engineering factory: handle the case no EM is present ;-)
parents e3f96f2e 42cb52d9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
+ 1
− 1
View file @ 4099799e
......@@ -404,7 +404,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
dao.CreateElectricMachines(vehicle.Components.ElectricMachines,
vehicle.ElectricMotorTorqueLimits, averageVoltage) ??
new List<Tuple<PowertrainPosition, ElectricMotorData>>();
var powertrainPosition = electricMachines.First(e => e.Item1 != PowertrainPosition.GEN).Item1;
var powertrainPosition = electricMachines.FirstOrDefault(e => e.Item1 != PowertrainPosition.GEN)?.Item1 ?? PowertrainPosition.HybridPositionNotSet;
var jobType = electricMachines.Count > 0 && (battery != null || superCap != null)
? VectoSimulationJobType.ParallelHybridVehicle
......
VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
+ 40
− 12
View file @ 4099799e
......@@ -603,13 +603,30 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
public void Class5_P3_PCC123EcoRollEngineStop_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name,
(0, 3559, OutsideSegment, Accelerate), // len: 3559m
(3559, 4563, WithinSegment, Accelerate), // len: 1004m
(5158, 5371, WithinSegment, Accelerate), // len: 213m
(5371, 5698, UseCase2, Coast), // len: 327m
(5698, 6002, WithinSegment, Coast), // len: 304m
(6002, 6101, WithinSegment, Brake), // len: 99m
(6101, 6126, WithinSegment, Coast), // len: 25m
(6126, 6501, OutsideSegment, Coast), // len: 375m
(6501, 1e6, OutsideSegment, Accelerate));
(4563, 4582, WithinSegment, Roll), // len: 19m
(4582, 4700, WithinSegment, Accelerate), // len: 118m
(4700, 4715, WithinSegment, Roll), // len: 15m
(4715, 4774, WithinSegment, Accelerate), // len: 59m
(4774, 4785, WithinSegment, Roll), // len: 11m
(4785, 4826, WithinSegment, Accelerate), // len: 41m
(4826, 4834, WithinSegment, Roll), // len: 8m
(4834, 4873, WithinSegment, Accelerate), // len: 39m
(4873, 4879, WithinSegment, Roll), // len: 6m
(4879, 4923, WithinSegment, Accelerate), // len: 44m
(4923, 4929, WithinSegment, Roll), // len: 6m
(4929, 5005, WithinSegment, Accelerate), // len: 76m
(5005, 5014, WithinSegment, Roll), // len: 9m
(5014, 5056, WithinSegment, Accelerate), // len: 42m
(5056, 5068, WithinSegment, Roll), // len: 12m
(5068, 5100, WithinSegment, Accelerate), // len: 32m
(5100, 5114, WithinSegment, Roll), // len: 14m
(5114, 5151, WithinSegment, Accelerate), // len: 37m
(5151, 5167, WithinSegment, Roll), // len: 16m
(5167, 5371, WithinSegment, Accelerate), // len: 204m
(5371, 5708, UseCase2, Coast), // len: 337m
(5708, 6123, WithinSegment, Coast), // len: 415m
(6123, 6510, OutsideSegment, Coast), // len: 387m
(6510, 1e6, OutsideSegment, Accelerate));
[TestCase]
public void Class5_P3_PCC123EcoRollEngineStop_CrestCoast1_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name,
......@@ -815,11 +832,22 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
public void Class5_P25_PCC123EcoRollEngineStop_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name,
(0, 3559, OutsideSegment, Accelerate), // len: 3559m
(3559, 4519, WithinSegment, Accelerate), // len: 960m
(5057, 5312, WithinSegment, Accelerate), // len: 255m
(5312, 5673, UseCase2, Coast), // len: 361m
(5673, 6123, WithinSegment, Coast), // len: 450m
(6123, 6448, OutsideSegment, Coast), // len: 325m
(6448, 1e6, OutsideSegment, Accelerate));
(4519, 4538, WithinSegment, Roll), // len: 19m
(4538, 4735, WithinSegment, Accelerate), // len: 197m
(4735, 4748, WithinSegment, Roll), // len: 13m
(4748, 4780, WithinSegment, Accelerate), // len: 32m
(4780, 4791, WithinSegment, Roll), // len: 11m
(4791, 4994, WithinSegment, Accelerate), // len: 203m
(4994, 5006, WithinSegment, Roll), // len: 12m
(5006, 5037, WithinSegment, Accelerate), // len: 31m
(5037, 5050, WithinSegment, Roll), // len: 13m
(5050, 5085, WithinSegment, Accelerate), // len: 35m
(5085, 5100, WithinSegment, Roll), // len: 15m
(5100, 5329, WithinSegment, Accelerate), // len: 229m
(5329, 5679, UseCase2, Coast), // len: 350m
(5679, 6117, WithinSegment, Coast), // len: 438m
(6117, 6455, OutsideSegment, Coast), // len: 338m
(6455, 1e6, OutsideSegment, Accelerate));
[TestCase]
......
VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2.RSLT_MANUFACTURER.xml 0 → 100644
+ 273
− 0
View file @ 4099799e
<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet href="https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css"?>
<mrf:VectoOutput xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputManufacturer.xsd">
<mrf:Data xsi:type="VectoOutputDataType" id="RESULT-8a1c4eb391614a73b113">
<Vehicle xsi:type="VehicleTruckType">
<Model>ML2r</Model>
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<VIN>standard values</VIN>
<LegislativeClass>N2</LegislativeClass>
<GrossVehicleMass unit="t">7.0</GrossVehicleMass>
<CurbMassChassis unit="kg">2500</CurbMassChassis>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<HybridElectricHDV>false</HybridElectricHDV>
<DualFuelVehicle>false</DualFuelVehicle>
<AxleConfiguration>4x2</AxleConfiguration>
<VehicleGroup>ML2r</VehicleGroup>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
<PTO>false</PTO>
<ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
<adas:EngineStopStart>false</adas:EngineStopStart>
<adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
<adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
<adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
</ADAS>
<Components xsi:type="ComponentsTruckFWDType">
<Engine>
<Model>130kW engine</Model>
<CertificationNumber>ENG-130kW_IVT_3l</CertificationNumber>
<DigestValue>KftUzK5FhNC46W/dX26TBdIvMQxDF/f6oBOa68fs8A8=</DigestValue>
<RatedPower unit="kW">130</RatedPower>
<IdlingSpeed unit="rpm">800</IdlingSpeed>
<RatedSpeed unit="rpm">3600</RatedSpeed>
<Displacement unit="ltr">3.0</Displacement>
<WHRType>none</WHRType>
<Mode>
<FuelType>Diesel CI</FuelType>
</Mode>
</Engine>
<Gearbox>
<Model>GB_6-gear_MT</Model>
<CertificationMethod>Standard values</CertificationMethod>
<DigestValue>KftUzK5FhNC46W/dX26TBdIvMQxDF/f6oBOa68fs8A8=</DigestValue>
<TransmissionType>SMT</TransmissionType>
<GearsCount>6</GearsCount>
<AxlegearRatio>4.300</AxlegearRatio>
<TransmissionRatioFinalGear>0.791</TransmissionRatioFinalGear>
</Gearbox>
<Retarder>
<RetarderType>None</RetarderType>
</Retarder>
<AirDrag>
<Model>N.A.</Model>
<CertificationMethod>Measured</CertificationMethod>
<CertificationNumber>generic cabin</CertificationNumber>
<DigestValue>KftUzK5FhNC46W/dX26TBdIvMQxDF/f6oBOa68fs8A8=</DigestValue>
<CdxA>5.80</CdxA>
</AirDrag>
<AxleWheels>
<Axle axleNumber="1">
<TyreDimension>215/75 R17.5</TyreDimension>
<TyreCertificationNumber>TYRE-235/65 R16C</TyreCertificationNumber>
<DigestValue>KftUzK5FhNC46W/dX26TBdIvMQxDF/f6oBOa68fs8A8=</DigestValue>
<TyreRRCDeclared>0.0074</TyreRRCDeclared>
<TwinTyres>false</TwinTyres>
</Axle>
<Axle axleNumber="2">
<TyreDimension>215/75 R17.5</TyreDimension>
<TyreCertificationNumber>TYRE-215/75 R17.5</TyreCertificationNumber>
<DigestValue>KftUzK5FhNC46W/dX26TBdIvMQxDF/f6oBOa68fs8A8=</DigestValue>
<TyreRRCDeclared>0.0074</TyreRRCDeclared>
<TwinTyres>true</TwinTyres>
</Axle>
</AxleWheels>
<Auxiliaries>
<FanTechnology>Crankshaft mounted - Bimetallic controlled visco clutch</FanTechnology>
<SteeringPumpTechnology>Fixed displacement</SteeringPumpTechnology>
<ElectricSystemTechnology>Standard technology - LED headlights, all</ElectricSystemTechnology>
<PneumaticSystemTechnology>Vacuum pump</PneumaticSystemTechnology>
<HVACTechnology>Default</HVACTechnology>
</Auxiliaries>
</Components>
<InputDataSignature>
<di:Reference URI="#VEH-class5_Class-5_5t0">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>hBQl3bPXtviHPjVq/jmOM8ai5kkHLooMWoTVJfzkuLQ=</di:DigestValue>
</di:Reference>
</InputDataSignature>
</Vehicle>
<Results>
<Status>success</Status>
<Result status="success" xsi:type="ResultSuccessType">
<Mission>Regional Delivery</Mission>
<Distance unit="km">100.000</Distance>
<SimulationParameters>
<TotalVehicleMass unit="kg">4429</TotalVehicleMass>
<Payload unit="kg">1129</Payload>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<VehiclePerformance>
<AverageSpeed unit="km/h">60.4</AverageSpeed>
<AverageDrivingSpeed unit="km/h">69.0</AverageDrivingSpeed>
<MinSpeed unit="km/h">0.0</MinSpeed>
<MaxSpeed unit="km/h">85.0</MaxSpeed>
<MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
<MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
<FullLoadDrivingtimePercentage>7.16</FullLoadDrivingtimePercentage>
<GearshiftCount>111</GearshiftCount>
<EngineSpeedDriving>
<Min unit="rpm">800.0</Min>
<Average unit="rpm">1936.1</Average>
<Max unit="rpm">3196.3</Max>
</EngineSpeedDriving>
<AverageGearboxEfficiency unit="%">88.74</AverageGearboxEfficiency>
<AverageAxlegearEfficiency unit="%">100.00</AverageAxlegearEfficiency>
</VehiclePerformance>
<Fuel type="Diesel CI">
<FuelConsumption unit="g/km">144.3</FuelConsumption>
<FuelConsumption unit="g/t-km">127.8</FuelConsumption>
<FuelConsumption unit="g/m³-km">6.38</FuelConsumption>
<FuelConsumption unit="MJ/km">6.16</FuelConsumption>
<FuelConsumption unit="MJ/t-km">5.46</FuelConsumption>
<FuelConsumption unit="MJ/m³-km">0.273</FuelConsumption>
<FuelConsumption unit="l/100km">17.3</FuelConsumption>
<FuelConsumption unit="l/t-km">0.153</FuelConsumption>
<FuelConsumption unit="l/m³-km">0.00764</FuelConsumption>
</Fuel>
<CO2 unit="g/km">451.5</CO2>
<CO2 unit="g/t-km">400.0</CO2>
<CO2 unit="g/m³-km">20.0</CO2>
</Result>
<Result status="success" xsi:type="ResultSuccessType">
<Mission>Regional Delivery</Mission>
<Distance unit="km">100.000</Distance>
<SimulationParameters>
<TotalVehicleMass unit="kg">3524</TotalVehicleMass>
<Payload unit="kg">224</Payload>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<VehiclePerformance>
<AverageSpeed unit="km/h">60.4</AverageSpeed>
<AverageDrivingSpeed unit="km/h">69.1</AverageDrivingSpeed>
<MinSpeed unit="km/h">0.0</MinSpeed>
<MaxSpeed unit="km/h">85.0</MaxSpeed>
<MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
<MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
<FullLoadDrivingtimePercentage>3.58</FullLoadDrivingtimePercentage>
<GearshiftCount>100</GearshiftCount>
<EngineSpeedDriving>
<Min unit="rpm">800.0</Min>
<Average unit="rpm">1925.5</Average>
<Max unit="rpm">2876.2</Max>
</EngineSpeedDriving>
<AverageGearboxEfficiency unit="%">88.37</AverageGearboxEfficiency>
<AverageAxlegearEfficiency unit="%">100.00</AverageAxlegearEfficiency>
</VehiclePerformance>
<Fuel type="Diesel CI">
<FuelConsumption unit="g/km">138.9</FuelConsumption>
<FuelConsumption unit="g/t-km">621.1</FuelConsumption>
<FuelConsumption unit="g/m³-km">6.15</FuelConsumption>
<FuelConsumption unit="MJ/km">5.93</FuelConsumption>
<FuelConsumption unit="MJ/t-km">26.5</FuelConsumption>
<FuelConsumption unit="MJ/m³-km">0.262</FuelConsumption>
<FuelConsumption unit="l/100km">16.6</FuelConsumption>
<FuelConsumption unit="l/t-km">0.743</FuelConsumption>
<FuelConsumption unit="l/m³-km">0.00735</FuelConsumption>
</Fuel>
<CO2 unit="g/km">434.7</CO2>
<CO2 unit="g/t-km">1944.2</CO2>
<CO2 unit="g/m³-km">19.2</CO2>
</Result>
<Result status="success" xsi:type="ResultSuccessType">
<Mission>Urban Delivery</Mission>
<Distance unit="km">99.999</Distance>
<SimulationParameters>
<TotalVehicleMass unit="kg">4429</TotalVehicleMass>
<Payload unit="kg">1129</Payload>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<VehiclePerformance>
<AverageSpeed unit="km/h">25.7</AverageSpeed>
<AverageDrivingSpeed unit="km/h">33.7</AverageDrivingSpeed>
<MinSpeed unit="km/h">0.0</MinSpeed>
<MaxSpeed unit="km/h">85.0</MaxSpeed>
<MaxDeceleration unit="m/s²">1.45</MaxDeceleration>
<MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
<FullLoadDrivingtimePercentage>5.23</FullLoadDrivingtimePercentage>
<GearshiftCount>796</GearshiftCount>
<EngineSpeedDriving>
<Min unit="rpm">800.0</Min>
<Average unit="rpm">1709.3</Average>
<Max unit="rpm">3671.2</Max>
</EngineSpeedDriving>
<AverageGearboxEfficiency unit="%">83.39</AverageGearboxEfficiency>
<AverageAxlegearEfficiency unit="%">100.00</AverageAxlegearEfficiency>
</VehiclePerformance>
<Fuel type="Diesel CI">
<FuelConsumption unit="g/km">166.9</FuelConsumption>
<FuelConsumption unit="g/t-km">147.8</FuelConsumption>
<FuelConsumption unit="g/m³-km">7.38</FuelConsumption>
<FuelConsumption unit="MJ/km">7.13</FuelConsumption>
<FuelConsumption unit="MJ/t-km">6.31</FuelConsumption>
<FuelConsumption unit="MJ/m³-km">0.315</FuelConsumption>
<FuelConsumption unit="l/100km">20.0</FuelConsumption>
<FuelConsumption unit="l/t-km">0.177</FuelConsumption>
<FuelConsumption unit="l/m³-km">0.00883</FuelConsumption>
</Fuel>
<CO2 unit="g/km">522.4</CO2>
<CO2 unit="g/t-km">462.7</CO2>
<CO2 unit="g/m³-km">23.1</CO2>
</Result>
<Result status="success" xsi:type="ResultSuccessType">
<Mission>Urban Delivery</Mission>
<Distance unit="km">99.999</Distance>
<SimulationParameters>
<TotalVehicleMass unit="kg">3524</TotalVehicleMass>
<Payload unit="kg">224</Payload>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<VehiclePerformance>
<AverageSpeed unit="km/h">25.7</AverageSpeed>
<AverageDrivingSpeed unit="km/h">33.7</AverageDrivingSpeed>
<MinSpeed unit="km/h">0.0</MinSpeed>
<MaxSpeed unit="km/h">85.0</MaxSpeed>
<MaxDeceleration unit="m/s²">1.41</MaxDeceleration>
<MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
<FullLoadDrivingtimePercentage>3.86</FullLoadDrivingtimePercentage>
<GearshiftCount>747</GearshiftCount>
<EngineSpeedDriving>
<Min unit="rpm">800.0</Min>
<Average unit="rpm">1695.9</Average>
<Max unit="rpm">3677.2</Max>
</EngineSpeedDriving>
<AverageGearboxEfficiency unit="%">81.68</AverageGearboxEfficiency>
<AverageAxlegearEfficiency unit="%">100.00</AverageAxlegearEfficiency>
</VehiclePerformance>
<Fuel type="Diesel CI">
<FuelConsumption unit="g/km">154.0</FuelConsumption>
<FuelConsumption unit="g/t-km">688.9</FuelConsumption>
<FuelConsumption unit="g/m³-km">6.82</FuelConsumption>
<FuelConsumption unit="MJ/km">6.58</FuelConsumption>
<FuelConsumption unit="MJ/t-km">29.4</FuelConsumption>
<FuelConsumption unit="MJ/m³-km">0.291</FuelConsumption>
<FuelConsumption unit="l/100km">18.4</FuelConsumption>
<FuelConsumption unit="l/t-km">0.824</FuelConsumption>
<FuelConsumption unit="l/m³-km">0.00815</FuelConsumption>
</Fuel>
<CO2 unit="g/km">482.1</CO2>
<CO2 unit="g/t-km">2156.4</CO2>
<CO2 unit="g/m³-km">21.3</CO2>
</Result>
</Results>
<ApplicationInformation>
<SimulationToolVersion>0.6.0.1875-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
<Date>2020-02-22T15:44:10.8645043Z</Date>
</ApplicationInformation>
</mrf:Data>
<mrf:Signature>
<di:Reference URI="#RESULT-8a1c4eb391614a73b113">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>Ymq1wujbJTpLLkbvcZZcMb0DkFHpOD6khpNPuRz89RI=</di:DigestValue>
</di:Reference>
</mrf:Signature>
</mrf:VectoOutput>
\ No newline at end of file
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