diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 1c9250971b7fb8b20ba53ac0ee927d20cb67dd20..fab6992313e5068e66aa422c1bcaac5a50538fc1 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -664,7 +664,7 @@ Public Class Vehicle
End Get
End Property
- Public ReadOnly Property TankSystem As TankSystem Implements IVehicleDeclarationInputData.TankSystem
+ Public ReadOnly Property TankSystem As TankSystem? Implements IVehicleDeclarationInputData.TankSystem
get
Return DeclarationData.Vehicle.TankSystemDefault
End Get
@@ -729,4 +729,6 @@ Public Class Vehicle
Return DeclarationData.Vehicle.ADAS.PredictiveCruiseControlDefault
End Get
End Property
+
+
End Class
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 3a77f6525ca9e9835699e2013e56194860c22717..3fa00720bdc440f2275751e801d191be41e0abdf 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -142,7 +142,7 @@ namespace TUGraz.VectoCommon.InputData
bool SleeperCab { get; }
- TankSystem TankSystem { get; }
+ TankSystem? TankSystem { get; }
IAdvancedDriverAssistantSystemDeclarationInputData ADAS { get; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index 7d44789df5e40f3e4f546e6856408d52f345ad11..82d5e86a4f71dfcb7e243a19728ab630abdbcfed 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -304,7 +304,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public bool VocationalVehicle { get { return DeclarationData.Vehicle.VocationalVehicleDefault; } }
public bool SleeperCab { get { return DeclarationData.Vehicle.SleeperCabDefault; } }
- public TankSystem TankSystem { get { return DeclarationData.Vehicle.TankSystemDefault; } }
+ public TankSystem? TankSystem { get { return DeclarationData.Vehicle.TankSystemDefault; } }
public IAdvancedDriverAssistantSystemDeclarationInputData ADAS { get { return this; } }
public bool ZeroEmissionVehicle { get { return DeclarationData.Vehicle.ZeroEmissionVehicleDefault; } }
public bool HybridElectricHDV { get { return DeclarationData.Vehicle.HybridElectricHDVDefault; } }
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index 74020e16aad0156f3eea13c49d6b727c5b701bf9..522d802fc27312461cbb39a2b5c5b6b7abb8fff1 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -260,7 +260,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public bool SleeperCab { get { return DeclarationData.Vehicle.SleeperCabDefault; } }
- public TankSystem TankSystem { get { return DeclarationData.Vehicle.TankSystemDefault; } }
+ public TankSystem? TankSystem { get { return DeclarationData.Vehicle.TankSystemDefault; } }
public IAdvancedDriverAssistantSystemDeclarationInputData ADAS { get { return this; } }
public bool ZeroEmissionVehicle { get { return DeclarationData.Vehicle.ZeroEmissionVehicleDefault; } }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs
index 5ed9d542f59c9614d98c317bcfebf3fb1ec4bc61..878db64c77a37c1f90cee008a6ec34b90f6e086e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs
@@ -260,37 +260,27 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
}
public bool VocationalVehicle { get {
- return ElementExists(XMLNames.Vehicle_VocationalVehicle)
- ? XmlConvert.ToBoolean(GetElementValue(XMLNames.Vehicle_VocationalVehicle))
- : DeclarationData.Vehicle.VocationalVehicleDefault;
+ return XmlConvert.ToBoolean(GetElementValue(XMLNames.Vehicle_VocationalVehicle));
} }
public bool SleeperCab { get {
- return ElementExists(XMLNames.Vehicle_SleeperCab)
- ? XmlConvert.ToBoolean(GetElementValue(XMLNames.Vehicle_SleeperCab))
- : DeclarationData.Vehicle.SleeperCabDefault;
+ return XmlConvert.ToBoolean(GetElementValue(XMLNames.Vehicle_SleeperCab));
} }
- public TankSystem TankSystem { get {
+ public TankSystem? TankSystem { get {
return ElementExists(XMLNames.Vehicle_NgTankSystem)
? EnumHelper.ParseEnum<TankSystem>(GetElementValue(XMLNames.Vehicle_NgTankSystem))
- : DeclarationData.Vehicle.TankSystemDefault;
+ : (TankSystem?)null;
} }
public IAdvancedDriverAssistantSystemDeclarationInputData ADAS { get { return this; } }
public bool ZeroEmissionVehicle { get {
- return ElementExists(XMLNames.Vehicle_ZeroEmissionVehicle)
- ? XmlConvert.ToBoolean(GetElementValue(XMLNames.Vehicle_ZeroEmissionVehicle))
- : DeclarationData.Vehicle.ZeroEmissionVehicleDefault;
+ return XmlConvert.ToBoolean(GetElementValue(XMLNames.Vehicle_ZeroEmissionVehicle));
} }
public bool HybridElectricHDV { get {
- return ElementExists(XMLNames.Vehicle_HybridElectricHDV)
- ? XmlConvert.ToBoolean(GetElementValue(XMLNames.Vehicle_HybridElectricHDV))
- : DeclarationData.Vehicle.HybridElectricHDVDefault;
+ return XmlConvert.ToBoolean(GetElementValue(XMLNames.Vehicle_HybridElectricHDV));
} }
public bool DualFuelVehicle { get {
- return ElementExists(XMLNames.Vehicle_DualFuelVehicle)
- ? XmlConvert.ToBoolean(GetElementValue(XMLNames.Vehicle_DualFuelVehicle))
- : DeclarationData.Vehicle.DualFuelVehicleDefault;
+ return XmlConvert.ToBoolean(GetElementValue(XMLNames.Vehicle_DualFuelVehicle));
} }
public Watt MaxNetPower1 { get {
return ElementExists(XMLNames.Vehicle_MaxNetPower1)
@@ -306,28 +296,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
#region Implementation of IAdvancedDriverAssistantSystemDeclarationInputData
public bool EngineStopStart { get {
- return ElementExists(XMLNames.Vehicle_ADAS)
- ? XmlConvert.ToBoolean(GetElementValue(Helper.Query(XMLNames.Vehicle_ADAS, XMLNames.Vehicle_ADAS_EngineStopStart)))
- : DeclarationData.Vehicle.ADAS.EngineStopStartDefault;
+ return XmlConvert.ToBoolean(GetElementValue(Helper.Query(XMLNames.Vehicle_ADAS, XMLNames.Vehicle_ADAS_EngineStopStart)));
} }
public bool EcoRollWitoutEngineStop { get {
- return ElementExists(XMLNames.Vehicle_ADAS)
- ? XmlConvert.ToBoolean(GetElementValue(Helper.Query(XMLNames.Vehicle_ADAS, XMLNames.Vehicle_ADAS_EcoRollWithoutEngineStop)))
- : DeclarationData.Vehicle.ADAS.EcoRollWitoutEngineStop;
+ return XmlConvert.ToBoolean(GetElementValue(Helper.Query(XMLNames.Vehicle_ADAS, XMLNames.Vehicle_ADAS_EcoRollWithoutEngineStop)));
} }
public bool EcoRollWithEngineStop { get {
- return ElementExists(XMLNames.Vehicle_ADAS)
- ? XmlConvert.ToBoolean(GetElementValue(Helper.Query(XMLNames.Vehicle_ADAS, XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart)))
- : DeclarationData.Vehicle.ADAS.EcoRollWithEngineStop;
+ return XmlConvert.ToBoolean(GetElementValue(Helper.Query(XMLNames.Vehicle_ADAS, XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart)));
} }
public PredictiveCruiseControlType PredictiveCruiseControl
{
get {
- return ElementExists(XMLNames.Vehicle_ADAS)
- ? PredictiveCruiseControlTypeHelper.Parse(
- GetElementValue(Helper.Query(XMLNames.Vehicle_ADAS, XMLNames.Vehicle_ADAS_PCC)))
- : DeclarationData.Vehicle.ADAS.PredictiveCruiseControlDefault;
+ return PredictiveCruiseControlTypeHelper.Parse(GetElementValue(Helper.Query(XMLNames.Vehicle_ADAS, XMLNames.Vehicle_ADAS_PCC)));
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs
index 411fd230832c9b9a773ba648231aa29d3b66357f..769b62228da0736052834b937a5e7b9afcae52ec 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs
@@ -293,7 +293,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
public IPTOTransmissionInputData PTOTransmissionInputData { get; private set; }
public bool VocationalVehicle { get { return false; } }
public bool SleeperCab { get { return true; } }
- public TankSystem TankSystem { get; }
+ public TankSystem? TankSystem { get; }
public IAdvancedDriverAssistantSystemDeclarationInputData ADAS { get { return null; } }
public bool ZeroEmissionVehicle { get { return false; } }
public bool HybridElectricHDV { get { return false; } }
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs
index 2213672f450cfb7c119270eb2a332c6005cbbedb..9acbedb193ee41a0478cc73c6b774c431687c9e5 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs
@@ -146,6 +146,15 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Vehicle_PTO,
new XElement(tns + XMLNames.Vehicle_PTO_ShaftsGearWheels, "none"),
new XElement(tns + XMLNames.Vehicle_PTO_OtherElements, "none")),
+ new XElement(tns + XMLNames.Vehicle_ZeroEmissionVehicle, false),
+ new XElement(tns+XMLNames.Vehicle_VocationalVehicle, false),
+ new XElement(tns + XMLNames.Vehicle_SleeperCab, true),
+ new XElement(tns + XMLNames.Vehicle_ADAS,
+ new XElement(tns + XMLNames.Vehicle_ADAS_EngineStopStart, false),
+ new XElement(tns + XMLNames.Vehicle_ADAS_EcoRollWithoutEngineStop, false),
+ new XElement(tns + XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart, false),
+ new XElement(tns + XMLNames.Vehicle_ADAS_PCC, "none")
+ ),
CreateTorqueLimits(vehicle),
new XElement(tns + XMLNames.Vehicle_Components,
CreateEngine(engine),
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
index 09eb143304f6a27edf79d5f3b3051740e0928ca0..2d606e4ac4bc0ed085287651a1200ef215be8156 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
@@ -961,7 +961,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:sequence minOccurs="0">
+ <xs:sequence>
<xs:element name="ZeroEmissionVehicle" type="tns:ZeroEmissionVehicleType">
<xs:annotation>
<xs:documentation>P269 - bool</xs:documentation>
@@ -2547,28 +2547,28 @@ ToDo: -0.00
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="NgTankSystemType">
- <xs:annotation>
-<xs:appinfo>
-<vectoParam:description>
- <vectoParam:parameterId component="Vehicle">275</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
-</vectoParam:description>
-</xs:appinfo>
-</xs:annotation>
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Vehicle">275</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ </xs:annotation>
<xs:restriction base="xs:string">
<xs:enumeration value="Compressed"/>
<xs:enumeration value="Liquefied"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="PredictiveCruiseControlType">
- <xs:annotation>
-<xs:appinfo>
-<vectoParam:description>
- <vectoParam:parameterId component="Vehicle/ADAS">274</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
-</vectoParam:description>
-</xs:appinfo>
-</xs:annotation>
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Vehicle/ADAS">274</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ </xs:annotation>
<xs:restriction base="xs:string">
<xs:enumeration value="none"/>
<xs:enumeration value="1,2"/>
@@ -2576,15 +2576,15 @@ ToDo: -0.00
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="PowerType">
- <xs:annotation>
- <xs:appinfo>
-<vectoParam:description>
- <vectoParam:parameterId component="Vehicle">277</vectoParam:parameterId>
- <vectoParam:parameterId component="Vehicle">278</vectoParam:parameterId>
- <vectoParam:unit>W</vectoParam:unit>
-</vectoParam:description>
-</xs:appinfo>
-</xs:annotation>
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Vehicle">277</vectoParam:parameterId>
+ <vectoParam:parameterId component="Vehicle">278</vectoParam:parameterId>
+ <vectoParam:unit>W</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ </xs:annotation>
<xs:restriction base="xs:int">
<xs:minInclusive value="0"/>
</xs:restriction>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd
index 6f382c8b3800b316a942996d8cfbe1fa0272a394..ce4445daf29f983ec72df2cce34fff9cdcf86552 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd
@@ -736,7 +736,7 @@
</xs:element>
<xs:element name="SleeperCab" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P267 / I.1.1.13</xs:documentation>
+ <xs:documentation>P276 / I.1.1.13</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="PTO" type="xs:boolean">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml
index a80e78a55099dcbe72e36923992e9012e1c64bee..98818d2a51e24b8d7d2c7cf5bb64447802fa6a0c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml
@@ -24,6 +24,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>false</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-gooZah3D">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml
index cf96de01bd7c267570ea988e9ea83e002fd69fb0..28a2b3c3e3bdc345a6e612b96e441d6780ab2eec 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml
@@ -18,6 +18,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>false</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-175kW6.8lEngine">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
index 634a24cbb62a2e16e975759659a5a4970944769e..0737f918d4eb8891d02581b209f89fabb10314af 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
@@ -23,6 +23,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>false</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-GenericEngine">
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/Tractor_4x2_vehicle-class-5_Generic vehicle.xml b/VectoCore/VectoCoreTest/TestData/Jobs/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
index 3356681805bc32dd3dc6b96c2db2d7b4f3c2ef5d..f6ae4770fa30836f0caf5a1f7bd30d976412973f 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
@@ -19,6 +19,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>false</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-GenericEngine">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml
index ce04b525026f38e8b9f9f4587473eb6d1fc231b6..14fa4aaa716a059300457753979ffa92b9420cce 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml
@@ -19,6 +19,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>false</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-350kW_IVT_12l">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml
index e96fe1c8b151dfe2bc26c8140568bf54dc828a0e..56aad96784ed0bd2ff185a79b9132c91784d8efb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml
@@ -24,6 +24,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>false</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-gooZah3D">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_AT.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_AT.xml
index 7f5e85d08ac6ae772f08a6fb0f701c164e88a6c4..702947e038f9b38abeff8186712817288a266d77 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_AT.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_AT.xml
@@ -18,6 +18,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>false</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-Generic220kW7.7lEngine">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml
index c59b865a3367ac5148f33ea799c250ee1bc32251..98ecc6a0e1dc43894389ab5d1f0dba3a1d4f0ade 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml
@@ -24,6 +24,15 @@
<PTOShaftsGearWheels>only the drive shaft of the PTO</PTOShaftsGearWheels>
<PTOOtherElements>multi-disc clutch</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>false</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<TorqueLimits>
<Entry gear="6" maxTorque="1800" />
<Entry gear="1" maxTorque="2500" />
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml
index 1e4fd4c089675d27533a99e67aa190c2303031cd..6cc98897c7daa5b4ea15cad83fa7bfd3237f348e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml
@@ -24,6 +24,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>false</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-gooZah3D">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml
index db13b8c5b1d9c9421796ec0926a2fb9fec1ac936..cd2eb30df69e9b7cb1b40183bfb5317f50538877 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml
@@ -24,6 +24,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>false</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-gooZah3D">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_torqueLimits.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_torqueLimits.xml
index 7461745d95221d9289536c66b4e77ae218498d26..09f860af295d433375a2dc507ca8abcf76ff8b5b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_torqueLimits.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_torqueLimits.xml
@@ -24,10 +24,19 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>false</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<TorqueLimits>
<Entry gear="1" maxTorque="2000"/>
<Entry gear="2" maxTorque="2000"/>
- <Entry gear="11" maxTorque="2000"/>
+ <Entry gear="11" maxTorque="2000"/>
<Entry gear="12" maxTorque="1500"/>
</TorqueLimits>
<Components>
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
index c2c87a855df0a38a88844d59124cb7b4cd7c0c6f..8213b35ad88862be2a7012d094b6772ffb207e18 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
@@ -1011,28 +1011,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(pcc, adas.PredictiveCruiseControl);
}
- [TestCase(SampleVehicleDecl)]
- public void TestDefaultValuesNewParameters(string file)
- {
- var reader = XmlReader.Create(file);
-
- var inputDataProvider = new XMLDeclarationInputDataProvider(reader, true);
- var vehicle = inputDataProvider.JobInputData.Vehicle;
- var adas = vehicle.ADAS;
-
- Assert.IsFalse(vehicle.ExemptedVehicle);
-
- Assert.AreEqual(false, vehicle.ZeroEmissionVehicle);
- Assert.AreEqual(false, vehicle.VocationalVehicle);
- Assert.AreEqual(true, vehicle.SleeperCab);
-
- Assert.AreEqual(TankSystem.Compressed, vehicle.TankSystem);
-
- Assert.AreEqual(false, adas.EngineStopStart);
- Assert.AreEqual(false, adas.EcoRollWitoutEngineStop);
- Assert.AreEqual(false, adas.EcoRollWithEngineStop);
- Assert.AreEqual(PredictiveCruiseControlType.None, adas.PredictiveCruiseControl);
- }
+
[TestCase(SampleVehicleFullDeclUpdated)]
public void TestRigidTruckIsReadAsRigidLorry(string file)