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

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

customer and manufacturer report for fwd medium lorry, legislative class

parent 12719f0f
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 393 additions and 276 deletions
VectoCommon/VectoCommon/Models/AxleConfiguration.cs
+ 14
− 14
View file @ 48e13d88
......@@ -93,18 +93,16 @@ namespace TUGraz.VectoCommon.Models
{
switch (self) {
case AxleConfiguration.AxleConfig_4x2:
case AxleConfiguration.AxleConfig_4x4:
return 2;
case AxleConfiguration.AxleConfig_4x4: return 2;
case AxleConfiguration.AxleConfig_6x2:
case AxleConfiguration.AxleConfig_6x4:
case AxleConfiguration.AxleConfig_6x6:
return 3;
case AxleConfiguration.AxleConfig_6x6: return 3;
case AxleConfiguration.AxleConfig_8x2:
case AxleConfiguration.AxleConfig_8x4:
case AxleConfiguration.AxleConfig_8x6:
case AxleConfiguration.AxleConfig_8x8:
return 4;
case AxleConfiguration.AxleConfig_8x8: return 4;
}
return 0;
}
......@@ -114,19 +112,21 @@ namespace TUGraz.VectoCommon.Models
case AxleConfiguration.AxleConfig_4x2:
case AxleConfiguration.AxleConfig_4x2F:
case AxleConfiguration.AxleConfig_6x2:
case AxleConfiguration.AxleConfig_8x2:
return 1;
case AxleConfiguration.AxleConfig_8x2: return 1;
case AxleConfiguration.AxleConfig_4x4:
case AxleConfiguration.AxleConfig_6x4:
case AxleConfiguration.AxleConfig_8x4:
return 2;
case AxleConfiguration.AxleConfig_8x4: return 2;
case AxleConfiguration.AxleConfig_6x6:
case AxleConfiguration.AxleConfig_8x6:
return 3;
case AxleConfiguration.AxleConfig_8x8:
return 4;
case AxleConfiguration.AxleConfig_8x6: return 3;
case AxleConfiguration.AxleConfig_8x8: return 4;
}
return 0;
}
public static bool AxlegearIncludedInGearbox(this AxleConfiguration self)
{
return self == AxleConfiguration.AxleConfig_4x2F;
}
}
}
\ No newline at end of file
VectoCommon/VectoCommon/Models/LegislativeClass.cs
+ 2
− 1
View file @ 48e13d88
......@@ -35,7 +35,8 @@ namespace TUGraz.VectoCommon.Models
{
Unknown,
N2,
N3
N3,
M3
}
public static class LegislativeClassHelper
......
VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+ 9
− 0
View file @ 48e13d88
......@@ -672,6 +672,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get { return null; }
}
#region Overrides of XMLDeclarationVehicleDataProviderV10
public override LegislativeClass LegislativeClass
{
get { return LegislativeClass.M3; }
}
#endregion
public override IPTOTransmissionInputData PTOTransmissionInputData
{
get { return null; }
......
VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs
+ 1
− 0
View file @ 48e13d88
......@@ -114,6 +114,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
protected virtual VehicleData CreateNonExemptedVehicleData(IVehicleDeclarationInputData data, Mission mission, Kilogram loading)
{
var retVal = SetCommonVehicleData(data);
retVal.LegislativeClass = data.LegislativeClass;
retVal.AxleConfiguration = data.AxleConfiguration;
retVal.AirDensity = DeclarationData.AirDensity;
retVal.VIN = data.VIN;
......
VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
+ 2
− 0
View file @ 48e13d88
......@@ -183,6 +183,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
runData.Mission = mission;
runData.Loading = loading.Key;
runData.VehicleData.VehicleClass = Segment.VehicleClass;
runData.VehicleData.LegislativeClass = JobInputData.Vehicle.LegislativeClass;
yield return runData;
// simulate the Measured cycle
......@@ -204,6 +205,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
MissionType = MissionType.VerificationTest
};
vtpRunData.VehicleData.VehicleClass = Segment.VehicleClass;
vtpRunData.VehicleData.LegislativeClass = JobInputData.Vehicle.LegislativeClass;
//var ncvStd = DeclarationData.FuelData.Lookup(JobInputData.Vehicle.Components.EngineInputData.FuelType).LowerHeatingValueVecto;
//var ncvCorrection = ncvStd / JobInputData.NetCalorificValueTestFuel;
......
VectoCore/VectoCore/OutputData/XML/AbstractXMLManufacturerReport.cs
+ 15
− 0
View file @ 48e13d88
......@@ -328,6 +328,21 @@ namespace TUGraz.VectoCore.OutputData.XML
);
}
protected virtual XElement GetGearboxDescription(GearboxData gearboxData, AxleGearData axlegearData)
{
return new XElement(
tns + XMLNames.Component_Gearbox,
GetCommonDescription(gearboxData),
new XElement(tns + XMLNames.Gearbox_TransmissionType, gearboxData.Type.ToXMLFormat()),
new XElement(tns + XMLNames.Report_GetGearbox_GearsCount, gearboxData.Gears.Count),
new XElement(tns + XMLNames.Gearbox_AxlegearRatio, axlegearData.AxleGear.Ratio.ToXMLFormat(3)),
new XElement(
tns + XMLNames.Report_Gearbox_TransmissionRatioFinalGear,
gearboxData.Gears[gearboxData.Gears.Keys.Max()].Ratio.ToXMLFormat(3))
);
}
protected virtual XElement GetTorqueConverterDescription(TorqueConverterData torqueConverterData)
{
if (torqueConverterData == null) {
......
VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
+ 14
− 0
View file @ 48e13d88
......@@ -77,6 +77,20 @@ namespace TUGraz.VectoCore.OutputData.XML
protected override XElement VehicleComponents(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
if (modelData.VehicleData.AxleConfiguration.AxlegearIncludedInGearbox()) {
return new XElement(
tns + XMLNames.Vehicle_Components,
new XAttribute(xsi + "type", "ComponentsTruckFWDType"),
GetEngineDescription(modelData.EngineData, fuelModes),
GetGearboxDescription(modelData.GearboxData, modelData.AxleGearData),
GetTorqueConverterDescription(modelData.GearboxData.TorqueConverterData),
GetRetarderDescription(modelData.Retarder),
GetAngledriveDescription(modelData.AngledriveData),
GetAirDragDescription(modelData.AirdragData),
GetAxleWheelsDescription(modelData.VehicleData),
GetAuxiliariesDescription(modelData)
);
}
return new XElement(
tns + XMLNames.Vehicle_Components,
new XAttribute(xsi + "type", "ComponentsTruckType"),
......
VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.8.xsd
+ 37
− 38
View file @ 48e13d88
......@@ -18,6 +18,30 @@
<xs:attribute name="schemaVersion" type="xs:decimal" use="required"/>
</xs:complexType>
</xs:element>
<xs:complexType name="ADASType">
<xs:sequence>
<xs:element name="EngineStopStart" type="xs:boolean">
<xs:annotation>
<xs:documentation>P271 / II.1.2.11</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="EcoRollWithoutEngineStop" type="xs:boolean">
<xs:annotation>
<xs:documentation>P272 / II.1.2.12</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="EcoRollWithEngineStop" type="xs:boolean">
<xs:annotation>
<xs:documentation>P273 / II.1.2.13</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="PredictiveCruiseControl" type="xs:boolean">
<xs:annotation>
<xs:documentation>P274 / II.1.2.14</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="CO2Type">
<xs:simpleContent>
<xs:extension base="xs:double">
......@@ -251,7 +275,7 @@
</xs:element>
<xs:choice>
<xs:sequence>
<xs:element name="AxleConfiguration" type="vdecdef:VehicleAxleConfigurationDeclarationType">
<xs:element name="AxleConfiguration" type="xs:string">
<xs:annotation>
<xs:documentation>P037 / II.1.1.3</xs:documentation>
</xs:annotation>
......@@ -403,6 +427,11 @@
<xs:enumeration value="g/m³-km"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="DisplacementType">
<xs:restriction base="xs:string">
<xs:enumeration value="ltr"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="DistanceUnitType">
<xs:restriction base="xs:token">
<xs:enumeration value="km"/>
......@@ -438,50 +467,20 @@
<xs:enumeration value="Construction"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="SpeedUnitType">
<xs:restriction base="xs:token">
<xs:enumeration value="km/h"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="VehicleGroupType">
<xs:restriction base="xs:int">
<xs:minInclusive value="1"/>
<xs:maxInclusive value="16"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="PowerUnitType">
<xs:restriction base="xs:string">
<xs:enumeration value="kW"/>
<xs:enumeration value="W"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="DisplacementType">
<xs:simpleType name="SpeedUnitType">
<xs:restriction base="xs:token">
<xs:enumeration value="km/h"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="VehicleGroupType">
<xs:restriction base="xs:string">
<xs:enumeration value="ltr"/>
<xs:minLength value="1"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="ADASType">
<xs:sequence>
<xs:element name="EngineStopStart" type="xs:boolean">
<xs:annotation>
<xs:documentation>P271 / II.1.2.11</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="EcoRollWithoutEngineStop" type="xs:boolean">
<xs:annotation>
<xs:documentation>P272 / II.1.2.12</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="EcoRollWithEngineStop" type="xs:boolean">
<xs:annotation>
<xs:documentation>P273 / II.1.2.13</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="PredictiveCruiseControl" type="xs:boolean">
<xs:annotation>
<xs:documentation>P274 / II.1.2.14</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:schema>
VectoCore/VectoCoreTest/VectoCoreTest.csproj
+ 15
− 0
View file @ 48e13d88
......@@ -2446,6 +2446,12 @@
<None Include="TestData\Integration\VTPMode\GenericVehicle\VTP_rural_2Hz.vdri">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Integration\VTPMode\MediumLorry\VTP Testzyklus.vdri">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Integration\VTPMode\MediumLorry\VTP_MediumLorry.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Jobs\12t Delivery Truck Engineering Efficiency.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
......@@ -3381,6 +3387,9 @@
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="TestData\Integration\Buses\vecto_vehicle-primary_heavyBus.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
......@@ -3468,6 +3477,12 @@
<Content Include="TestData\Integration\VTPMode\GenericVehicle\Tractor_4x2_vehicle-class-5_Generic vehicle.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="TestData\Integration\VTPMode\MediumLorry\vecto_vehicle-medium_lorry_4x2F.RSLT_MANUFACTURER.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="TestData\Integration\VTPMode\MediumLorry\vecto_vehicle-medium_lorry_4x2F.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="TestData\Jobs\Tractor_4x2_vehicle-class-5_Generic vehicle.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
......
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