diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBusSmartES-sample_adasV2.3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml similarity index 99% rename from VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBusSmartES-sample_adasV2.3.xml rename to VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml index 2017925d42e6624cd7df5306d88c9acdc06fe473..2be6328a751fdf5bce6fe2abf017c0e7cf0d3bf3 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBusSmartES-sample_adasV2.3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml @@ -15,7 +15,7 @@ xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt <IdlingSpeed>600</IdlingSpeed> <RetarderType>Transmission Output Retarder</RetarderType> <RetarderRatio>1.000</RetarderRatio> - <AngledriveType>None</AngledriveType> + <AngledriveType>Separate Angledrive</AngledriveType> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> <ADAS xsi:type="v2.3:AdvancedDriverAssistantSystemsType"> <v2.3:EngineStopStart>true</v2.3:EngineStopStart> @@ -194,8 +194,8 @@ xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> - <TransmissionType>AMT</TransmissionType> - <MainCertificationMethod>Standard values</MainCertificationMethod> + <TransmissionType>APT-S</TransmissionType> + <MainCertificationMethod>Option 1</MainCertificationMethod> <Gears xsi:type="GearsDeclarationType"> <Gear number="1"> <Ratio>14.930</Ratio> @@ -2594,7 +2594,7 @@ xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> <Date>2017-02-15T11:00:00Z</Date> <AppVersion>TC CalcApp 123</AppVersion> - <CertificationMethod>Standard values</CertificationMethod> + <CertificationMethod>Measured</CertificationMethod> <Characteristics> <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/> <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/> @@ -2616,7 +2616,7 @@ xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt <Date>2017-01-11T11:00:00Z</Date> <AppVersion>3.0.1</AppVersion> <Ratio>2.345</Ratio> - <CertificationMethod>Standard values</CertificationMethod> + <CertificationMethod>Option 1</CertificationMethod> <TorqueLossMap> <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/> <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/> @@ -2692,7 +2692,7 @@ xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt <AppVersion>3.0.1</AppVersion> <LineType>Single portal axle</LineType> <Ratio>2.590</Ratio> - <CertificationMethod>Standard values</CertificationMethod> + <CertificationMethod>Measured</CertificationMethod> <TorqueLossMap> <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/> <Entry inputSpeed="0.00" inputTorque="-4000.00" torqueLoss="100.00"/> diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp index ffe94008f94ac99846fc2c686276c2416f9efdc3..a18bdad0c3e962a29e4afe556f0a5240f7d01bf0 100644 --- a/VectoCore/VectoXML.spp +++ b/VectoCore/VectoXML.spp @@ -20,7 +20,7 @@ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-medium_lorryFWD-sample.xml" HomeFolder="Yes"/> <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBus-sample.xml" HomeFolder="Yes"/> <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBusSmartES-sample.xml" HomeFolder="Yes"/> - <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBusSmartES-sample_adasV2.3.xml" HomeFolder="Yes"/> + <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml" HomeFolder="Yes"/> </Folder> <Folder FolderName="Examples 1.0"> <File FilePath="VectoCoreTest\TestData\XML\XMLReaderEngineering\engineering_axlegear-sample_ref.xml" HomeFolder="Yes"/>