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

Skip to content
Snippets Groups Projects
Commit 028ca65b authored by Stefanos Doumpoulakis's avatar Stefanos Doumpoulakis
Browse files

a)removed FanDiameter from results, b)updated xsd for report xml

parent a15871c1
No related branches found
No related tags found
No related merge requests found
...@@ -60,7 +60,7 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -60,7 +60,7 @@ namespace TUGraz.VectoCore.OutputData.XML
{ {
internal class XMLVTPReport : DeclarationReport<XMLVTPReport.ResultEntry>, IVTPReport internal class XMLVTPReport : DeclarationReport<XMLVTPReport.ResultEntry>, IVTPReport
{ {
public const string CURRENT_SCHEMA_VERSION = "0.1.1"; public const string CURRENT_SCHEMA_VERSION = "0.11";
private const string VTPReportTartetName = "VTPReportTarget"; private const string VTPReportTartetName = "VTPReportTarget";
...@@ -486,7 +486,7 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -486,7 +486,7 @@ namespace TUGraz.VectoCore.OutputData.XML
GetAxlegearDescription(modelData.AxleGearData), GetAxlegearDescription(modelData.AxleGearData),
GetAirDragDescription(modelData.AirdragData), GetAirDragDescription(modelData.AirdragData),
GetAxleWheelsDescription(modelData.VehicleData), GetAxleWheelsDescription(modelData.VehicleData),
GetAuxiliariesDescription(modelData.Aux, modelData.FanData) GetAuxiliariesDescription(modelData.Aux)
) )
); );
...@@ -758,7 +758,7 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -758,7 +758,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.AxleWheels_Axles_Axle_TwinTyres, axle.TwinTyres)); new XElement(tns + XMLNames.AxleWheels_Axles_Axle_TwinTyres, axle.TwinTyres));
} }
private XElement GetAuxiliariesDescription(IEnumerable<VectoRunData.AuxData> aux, AuxFanData fanData) private XElement GetAuxiliariesDescription(IEnumerable<VectoRunData.AuxData> aux)
{ {
var auxData = aux.ToDictionary(a => a.ID); var auxData = aux.ToDictionary(a => a.ID);
var auxList = new[] { var auxList = new[] {
...@@ -772,12 +772,6 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -772,12 +772,6 @@ namespace TUGraz.VectoCore.OutputData.XML
} }
} }
retVal.Add(new XElement(
tns + "FanDiameter",
new XAttribute(XMLNames.Report_Results_Unit_Attr, fanData.FanDiameter.ConvertToMilliMeter().Units),
fanData.FanDiameter.ConvertToMilliMeter().Value)
);
return retVal; return retVal;
} }
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:VTPReport:v0.1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:VTPReport:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1">
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.1.xsd"/>
<xs:element name="VectoVTPReport">
<xs:complexType>
<xs:sequence>
<xs:element name="Data">
<xs:complexType>
<xs:sequence>
<xs:element name="General">
<xs:complexType>
<xs:sequence>
<xs:element name="Manufacturer" type="vdecdef:ManufacturerType"/>
<xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Vehicle" type="VehicleType"/>
<xs:element name="DataIntegrityCheck" type="DataIntegrityCheckType"/>
<xs:element name="TestConditions"/>
<xs:element name="Results" type="ResultsType"/>
<xs:element name="ApplicationInformation">
<xs:complexType>
<xs:sequence>
<xs:element name="SimulationToolVersion"/>
<xs:element name="Date"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute name="schemaVersion" type="xs:decimal" use="required"/>
</xs:complexType>
</xs:element>
<xs:complexType name="AirDragType">
<xs:sequence>
<xs:element name="Model" type="vdecdef:ModelType" minOccurs="0">
<xs:annotation>
<xs:documentation>P241</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationMethod" type="AirdragCertificationOptionType">
<xs:annotation>
<xs:documentation>VECTO</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
<xs:annotation>
<xs:documentation>P268</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CdxA" type="vdecdef:AirdragCdxAType">
<xs:annotation>
<xs:documentation>P146</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="AngleDriveType">
<xs:sequence>
<xs:element name="Model" type="vdecdef:ModelType">
<xs:annotation>
<xs:documentation>P221</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationMethod" type="vdecdef:AngledriveCertificationOptionType">
<xs:annotation>
<xs:documentation>P258</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
<xs:annotation>
<xs:documentation>P265</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Ratio" type="vdecdef:AngledriveRatioType">
<xs:annotation>
<xs:documentation>P176</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="AuxiliariesType">
<xs:sequence>
<xs:element name="FanTechnology" type="vdecdef:AuxFanTechnologyType">
<xs:annotation>
<xs:documentation>P181</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="SteeringPumpTechnology" type="vdecdef:AuxSPTechnologyType" maxOccurs="4">
<xs:annotation>
<xs:documentation>P182</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ElectricSystemTechnology" type="vdecdef:AuxESTechnologyType">
<xs:annotation>
<xs:documentation>P183</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="PneumaticSystemTechnology" type="vdecdef:AuxPSTechnologyType">
<xs:annotation>
<xs:documentation>P184</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="HVACTechnology" type="vdecdef:AuxHVACTechnologyType">
<xs:annotation>
<xs:documentation>P185</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="FanDiameter" type="vdecdef:AuxFanDiameterType">
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="AxlegearType">
<xs:sequence>
<xs:element name="Model" type="vdecdef:ModelType">
<xs:annotation>
<xs:documentation>P216</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationMethod" type="vdecdef:AxlegearCertificationOptionType">
<xs:annotation>
<xs:documentation>P256</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
<xs:annotation>
<xs:documentation>P264</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="LineType" type="vdecdef:AxlegearLineTypeType">
<xs:annotation>
<xs:documentation>P253</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Ratio" type="vdecdef:AxlegearRatioType">
<xs:annotation>
<xs:documentation>P150</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="AxleType">
<xs:sequence>
<xs:element name="TyreDimension" type="vdecdef:TyreDimensionType">
<xs:annotation>
<xs:documentation>P108</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType">
<xs:annotation>
<xs:documentation>P267</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="TyreRRCDeclared" type="vdecdef:TyreRRCISOType">
<xs:annotation>
<xs:documentation>P046</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="TwinTyres" type="vdecdef:AxleTwinTyresType">
<xs:annotation>
<xs:documentation>P045</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
<xs:attribute name="axleNumber" use="required">
<xs:simpleType>
<xs:restriction base="xs:int">
<xs:minInclusive value="1"/>
<xs:maxInclusive value="4"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:complexType>
<xs:complexType name="AxleWheelsType">
<xs:sequence minOccurs="2" maxOccurs="4">
<xs:element name="Axle" type="AxleType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="CO2ResultType">
<xs:sequence>
<xs:element name="Mission">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:minLength value="1"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Declared">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:double">
<xs:attribute name="unit" type="CO2UnitType" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="Verified">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:double">
<xs:attribute name="unit" type="CO2UnitType" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="DataIntegrityCheckType">
<xs:sequence>
<xs:element name="Components">
<xs:complexType>
<xs:sequence>
<xs:element name="Component" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:complexContent>
<xs:extension base="DataIntegrityResultType">
<xs:attribute name="componentName" type="xs:token" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ManufacturerReport" type="DataIntegrityResultType"/>
<xs:element name="JobData" type="DataIntegrityResultType"/>
</xs:sequence>
<xs:attribute name="status" type="DataIntegrityStatusType" use="required"/>
</xs:complexType>
<xs:complexType name="DataIntegrityResultType">
<xs:choice>
<xs:sequence>
<xs:element name="DigestValueRecomputed" type="xs:token"/>
<xs:element name="DigestValueRead" maxOccurs="unbounded">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:token">
<xs:attribute name="source" type="xs:token" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:sequence>
<xs:element name="Error" type="xs:string"/>
</xs:sequence>
</xs:choice>
<xs:attribute name="status" type="DataIntegrityStatusType" use="required"/>
</xs:complexType>
<xs:complexType name="EngineType">
<xs:sequence>
<xs:element name="Model" type="vdecdef:ModelType">
<xs:annotation>
<xs:documentation>P201</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType">
<xs:annotation>
<xs:documentation>P261</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="RatedPower" type="vdecdef:EngineRatedPower">
<xs:annotation>
<xs:documentation>P250</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Displacement" type="vdecdef:EngineDisplacementType">
<xs:annotation>
<xs:documentation>P061</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="FuelType" type="vdecdef:FuelTypeType" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>P193</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="FuelConsumptionResultType">
<xs:sequence>
<xs:element name="Measured">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:double">
<xs:attribute name="unit" type="FCUnitType" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="MeasuredCorrected">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:double">
<xs:attribute name="unit" type="FCUnitType" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="Simulated">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:double">
<xs:attribute name="unit" type="FCUnitType" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute name="fuelType" use="required">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:minLength value="1"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:complexType>
<xs:complexType name="GearboxType">
<xs:sequence>
<xs:element name="Model" type="vdecdef:ModelType">
<xs:annotation>
<xs:documentation>P206</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationMethod" type="vdecdef:GearboxCertificationOptionType">
<xs:annotation>
<xs:documentation>P254</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
<xs:annotation>
<xs:documentation>P262</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="TransmissionType" type="vdecdef:GearboxTransmissionTypeType">
<xs:annotation>
<xs:documentation>P076</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="GearsCount">
<xs:annotation>
<xs:documentation>P199</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:int">
<xs:minInclusive value="1"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="TransmissionRatioFinalGear" type="vdecdef:GearboxGearRatioType">
<xs:annotation>
<xs:documentation>P078</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ResultsType">
<xs:sequence>
<xs:element name="Status" type="VTPStatusType"/>
<xs:element name="AverageFanPower">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:double">
<xs:attribute name="unit" type="PowerUnitType" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="WorkPosVT">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:double">
<xs:attribute name="unit" type="WorkUnitType" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="TestFuelNCV" minOccurs="0">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:double">
<xs:attribute name="unit" type="NCVUnitType" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="FuelConsumption" type="FuelConsumptionResultType" maxOccurs="unbounded"/>
<xs:element name="CO2" type="CO2ResultType"/>
<xs:element name="C_VTP" type="xs:double"/>
<xs:element name="Warnings" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="Warning" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="RetarderType">
<xs:sequence>
<xs:element name="RetarderType" type="vdecdef:RetarderTypeType">
<xs:annotation>
<xs:documentation>P052</xs:documentation>
</xs:annotation>
</xs:element>
<xs:sequence minOccurs="0">
<xs:element name="Model" type="vdecdef:ModelType">
<xs:annotation>
<xs:documentation>P226</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationMethod" type="vdecdef:RetarderCertificationOptionType">
<xs:annotation>
<xs:documentation>P255</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
<xs:annotation>
<xs:documentation>P266</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:sequence>
</xs:complexType>
<xs:complexType name="TorqueConverterType">
<xs:sequence>
<xs:element name="Model" type="vdecdef:ModelType">
<xs:annotation>
<xs:documentation>P211</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationMethod" type="vdecdef:TorqueConverterCertificationOptionType">
<xs:annotation>
<xs:documentation>P257</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
<xs:annotation>
<xs:documentation>P263</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="VehicleType">
<xs:sequence>
<xs:element name="Model" type="vdecdef:ModelType">
<xs:annotation>
<xs:documentation>P236</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="VIN" type="vdecdef:VINType">
<xs:annotation>
<xs:documentation>P238</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="LegislativeClass" type="vdecdef:LegislativeClassDeclarationType">
<xs:annotation>
<xs:documentation>P251</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="VehicleGroup" type="VehicleGroupType">
<xs:annotation>
<xs:documentation>VECTO</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="AxleConfiguration" type="vdecdef:VehicleAxleConfigurationDeclarationType">
<xs:annotation>
<xs:documentation>P037</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="GrossVehicleMass" type="vdecdef:VehicleGrossVehicleMassType">
<xs:annotation>
<xs:documentation>P041</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CurbMassChassis" type="vdecdef:VehicleCurbMassChassisType">
<xs:annotation>
<xs:documentation>P038</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="RetarderRatio" type="vdecdef:RetarderRatioType" minOccurs="0">
<xs:annotation>
<xs:documentation>P053</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="PTO" type="xs:boolean">
<xs:annotation>
<xs:documentation>P247</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Components">
<xs:complexType>
<xs:sequence>
<xs:element name="Engine" type="EngineType"/>
<xs:element name="Gearbox" type="GearboxType"/>
<xs:element name="TorqueConverter" type="TorqueConverterType" minOccurs="0"/>
<xs:element name="Retarder" type="RetarderType"/>
<xs:element name="AngleDrive" type="AngleDriveType" minOccurs="0"/>
<xs:element name="Axlegear" type="AxlegearType"/>
<xs:element name="AirDrag" type="AirDragType"/>
<xs:element name="AxleWheels" type="AxleWheelsType"/>
<xs:element name="Auxiliaries" type="AuxiliariesType"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:simpleType name="AirdragCertificationOptionType">
<xs:restriction base="xs:string">
<xs:enumeration value="Measured"/>
<xs:enumeration value="Standard values"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="CO2UnitType">
<xs:restriction base="xs:token">
<xs:enumeration value="g/t-km"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="DataIntegrityStatusType">
<xs:restriction base="xs:string">
<xs:enumeration value="success"/>
<xs:enumeration value="failed"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="FCUnitType">
<xs:restriction base="xs:token">
<xs:enumeration value="g/kWh"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="NCVUnitType">
<xs:restriction base="xs:token">
<xs:enumeration value="MJ/kg"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="PowerUnitType">
<xs:restriction base="xs:token">
<xs:enumeration value="kW"/>
</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="VTPStatusType">
<xs:restriction base="xs:token">
<xs:enumeration value="Passed"/>
<xs:enumeration value="Failed"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="WorkUnitType">
<xs:restriction base="xs:token">
<xs:enumeration value="kWh"/>
</xs:restriction>
</xs:simpleType>
</xs:schema>
This diff is collapsed.
...@@ -838,10 +838,7 @@ ...@@ -838,10 +838,7 @@
<EmbeddedResource Include="Resources\XSD\VectoOutputManufacturer.0.7.2.xsd"> <EmbeddedResource Include="Resources\XSD\VectoOutputManufacturer.0.7.2.xsd">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.1.1.xsd"> <EmbeddedResource Include="Resources\XSD\VTPReport.0.11.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources\XSD\VTPReport.0.1.1.xsd">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<None Include="Utils\VectoVersionCore.tt"> <None Include="Utils\VectoVersionCore.tt">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment