fixed unit test of completed bus reader

VectoCommon/VectoCommon/InputData/DeclarationInputData.cs

@@ -761,7 +761,7 @@ namespace TUGraz.VectoCommon.InputData
 
 		ICompressorType CompressorType { get; }
 
-		int AuxHeaterPower { get; }
+		Watt AuxHeaterPower { get; }
 
 		bool DoubleGlasing { get; }
 

VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs

@@ -181,7 +181,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		public virtual int SystemConfiguration { get; set; }
 		public virtual ICompressorType CompressorType { get { return null; } }
-		public virtual int  AuxHeaterPower { get; set; }
+		public virtual Watt AuxHeaterPower { get; set; }
 		public virtual bool DoubleGlasing { get { return false; } }
 		public virtual bool HeatPump { get { return false; } }
 		public virtual bool AdjustableCoolantThermostat { get { return Body["Aux"]?["HVAC"]?.GetEx<bool>("AdjustableCoolantThermostat") ?? false; } }

VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs

@@ -61,7 +61,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider {
 			}
 		}
 
-		public IElectricConsumersDeclarationData ElectricConsumers { get; }
+		public IElectricConsumersDeclarationData ElectricConsumers
+		{
+			get { return null; }
+		}
 
 		public IPneumaticSupplyDeclarationData PneumaticSupply
 		{
@@ -85,7 +88,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider {
 					AdBlueDosing = GetBool(XMLNames.Bus_AdBlueDosing) ? ConsumerTechnology.Pneumatically : ConsumerTechnology.Electrically,
 					DoorDriveTechnology = ConsumerTechnologyHelper.Parse(GetString(XMLNames.Bus_DoorDriveTechnology))
 				};
-
 			}
 		}
 
@@ -233,9 +235,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider {
 			{
 				var hvac = new HVACBusAuxiliariesDeclarationData
 				{
-					SystemConfiguration = XmlConvert.ToInt32(GetString(XMLNames.Bus_SystemConfiguration)),
-					CompressorType = new CompressorType( GetString(XMLNames.Bus_DriverAC), GetString(XMLNames.Bus_PassengerAC)),
-					AuxHeaterPower = XmlConvert.ToInt32(GetString(XMLNames.Bus_AuxiliaryHeaterPower)),
+					SystemConfiguration = GetString(XMLNames.Bus_SystemConfiguration).ToInt(),
+					CompressorType = new CompressorType(GetString(XMLNames.Bus_DriverAC), GetString(XMLNames.Bus_PassengerAC)),
+					AuxHeaterPower = GetString(XMLNames.Bus_AuxiliaryHeaterPower).ToDouble().SI<Watt>(),
 					DoubleGlasing = GetBool(XMLNames.Bus_DoubleGlasing),
 					HeatPump = GetBool(XMLNames.Bus_HeatPump),
 					AdjustableAuxiliaryHeater = GetBool(XMLNames.Bus_AdjustableAuxiliaryHeater),

VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs

@@ -31,6 +31,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Runtime.InteropServices;
 using System.Windows.Forms.VisualStyles;
 using System.Xml;
 using System.Xml.Linq;
@@ -705,6 +706,18 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		//VehicleWidth
 		public override Meter Width { get { return GetDouble(XMLNames.Bus_VehicleWidth).SI<Meter>(); } }
 
+		public override XmlElement PTONode
+		{
+			get
+			{
+				if (ExemptedVehicle)
+				{
+					return null;
+				}
+				return _ptoNode ?? (_ptoNode = GetNode(XMLNames.Vehicle_PTO, required: false) as XmlElement);
+			}
+		}
+		
 		#endregion
 
 		public bool LowEntry { get { return GetBool(XMLNames.Bus_LowEntry); } }

VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs

@@ -71,11 +71,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
 		protected override IVehicleDeclarationInputData VehicleCreator(string version, XmlNode vehicleNode, string sourceFile)
 		{
 			var vehicle = Factory.CreateVehicleData(version, JobData, vehicleNode, sourceFile);
+
 			vehicle.ComponentReader = GetReader(vehicle, vehicle.ComponentNode, Factory.CreateComponentReader);
 			vehicle.ADASReader = vehicle.ADASNode == null ? null : GetReader(vehicle, vehicle.ADASNode, Factory.CreateADASReader); //null;
-
-			if(!version.EndsWith(XMLDeclarationCompletedBusDataProviderV26.XSD_TYPE))
-				vehicle.PTOReader = GetReader(vehicle, vehicle.PTONode, Factory.CreatePTOReader);
+			vehicle.PTOReader = vehicle.PTONode == null ? null : GetReader(vehicle, vehicle.PTONode, Factory.CreatePTOReader);
 
 			return vehicle;
 		}

VectoCore/VectoCore/InputData/Impl/InputData.cs

@@ -252,7 +252,7 @@ namespace TUGraz.VectoCore.InputData.Impl
 
 		public bool AdjustableCoolantThermostat { get; internal set; }
 
-		public int AuxHeaterPower { get; internal set; }
+		public Watt AuxHeaterPower { get; internal set; }
 
 		public ICompressorType CompressorType { get; internal set; }
 		

VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-completed_heavyBus.xml

@@ -47,7 +47,7 @@
 			<Auxiliaries>
 				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
 					<ElectricSystem>
-						<AlternatorTechnology ratio="1.000">Sample Alternator Technology 1</AlternatorTechnology>
+						<AlternatorTechnology ratio="1.000">default</AlternatorTechnology>
 						<LEDLights>
 							<Dayrunninglights>false</Dayrunninglights>
 							<Headlights>false</Headlights>
@@ -59,8 +59,8 @@
 					<HVAC>
 						<SystemConfiguration>7</SystemConfiguration>
 						<CompressorType>
-							<DriverAC>sample tech 2</DriverAC>
-							<PassengerAC>sample tech 1</PassengerAC>
+							<DriverAC>2-stage</DriverAC>
+							<PassengerAC>3-stage</PassengerAC>
 						</CompressorType>
 						<AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
 						<DoubleGlasing>true</DoubleGlasing>

VectoCore/VectoCoreTest/VectoCoreTest.csproj

@@ -3586,9 +3586,12 @@
     <Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\example_heavyBus_PIF.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-completed_heavyBus.xml" />
+    <Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-completed_heavyBus.xml">
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBus.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="TestData\XML\XMLReaderDeclaration\Tractor_4x2_vehicle-class-5_5_t_0.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs

@@ -99,14 +99,14 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.IsNotNull(electricSupl.Alternators);
 			Assert.AreEqual(1, electricSupl.Alternators.Count);
 			Assert.AreEqual(1.000, electricSupl.Alternators.First().Ratio);
-			Assert.AreEqual("Sample Alternator Technology 1", electricSupl.Alternators.First().Technology);
+			Assert.AreEqual("default", electricSupl.Alternators.First().Technology);
 
 			var havacAux = components.BusAuxiliaries.HVACAux;
 			Assert.IsNotNull(havacAux);
 			Assert.AreEqual(7, havacAux.SystemConfiguration);
-			Assert.AreEqual("sample tech 2", havacAux.CompressorType.DriverAC);
-			Assert.AreEqual("sample tech 1", havacAux.CompressorType.PassengerAC);
-			Assert.AreEqual(0, havacAux.AuxHeaterPower);
+			Assert.AreEqual("2-stage", havacAux.CompressorType.DriverAC);
+			Assert.AreEqual("3-stage", havacAux.CompressorType.PassengerAC);
+			Assert.AreEqual(0.SI<Watt>(), havacAux.AuxHeaterPower);
 			Assert.IsTrue(havacAux.DoubleGlasing);
 			Assert.IsFalse(havacAux.HeatPump);
 			Assert.IsTrue(havacAux.AdjustableAuxiliaryHeater);