additional consolidated multistage xml test files added

VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml

@@ -659,6 +659,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:Date>2018-02-15T11:00:00Z</v2.8:Date>
 				<v2.8:Model>Intermediate Model 1</v2.8:Model>
 				<v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
+				<v2.8:NumberPassengersLowerDeck>10</v2.8:NumberPassengersLowerDeck>			
+				<v2.8:NumberPassengersUpperDeck>30</v2.8:NumberPassengersUpperDeck>	
 				<v2.8:LowEntry>true</v2.8:LowEntry>
 				<v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
 				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
@@ -682,7 +684,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="3">	
+	<ManufacturingStage stageCount="3">
 		<Data xsi:type="vif:BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -716,10 +718,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 							<v2.8:ElectricSystem>
 								<v2.8:LEDLights>
 									<v2.8:Interiorlights>true</v2.8:Interiorlights>	
-									<v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>
-									<v2.8:Positionlights>false</v2.8:Positionlights>
-									<v2.8:Brakelights>false</v2.8:Brakelights>
-									<v2.8:Headlights>true</v2.8:Headlights>														
+									<v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>													
 								</v2.8:LEDLights>
 							</v2.8:ElectricSystem>
 							<v2.8:HVAC>
@@ -731,10 +730,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 								<v2.8:AuxiliaryHeaterPower>50</v2.8:AuxiliaryHeaterPower>
 								<v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
 								<v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
-								<v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>
-								<v2.8:WaterElectricHeater>false</v2.8:WaterElectricHeater>
-								<v2.8:AirElectricHeater>false</v2.8:AirElectricHeater>
-								<v2.8:OtherHeatingTechnology>true</v2.8:OtherHeatingTechnology>
+								<v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>	
 							</v2.8:HVAC>
 						</v2.8:Data>
 					</v2.8:Auxiliaries>
@@ -786,6 +782,24 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<v2.3:PredictiveCruiseControl>1,2</v2.3:PredictiveCruiseControl>
 					<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
 				</v2.8:ADAS>				
+				<v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
+					<v2.8:Auxiliaries>
+						<v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType">
+							<v2.8:ElectricSystem>
+								<v2.8:LEDLights>
+									<v2.8:Positionlights>false</v2.8:Positionlights>
+									<v2.8:Brakelights>false</v2.8:Brakelights>
+									<v2.8:Headlights>true</v2.8:Headlights>									
+								</v2.8:LEDLights>
+							</v2.8:ElectricSystem>
+							<v2.8:HVAC>
+								<v2.8:WaterElectricHeater>false</v2.8:WaterElectricHeater>
+								<v2.8:AirElectricHeater>false</v2.8:AirElectricHeater>
+								<v2.8:OtherHeatingTechnology>true</v2.8:OtherHeatingTechnology>							
+							</v2.8:HVAC>
+						</v2.8:Data>
+					</v2.8:Auxiliaries>
+				</v2.8:Components>
 			</Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>

VectoCore/VectoXML.spp

@@ -71,6 +71,8 @@
 		</Folder>
 		<Folder FolderName="Schema Multistage 0.1">
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_multiple_stages.xml" HomeFolder="Yes"/>
+			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_one_stage.xml" HomeFolder="Yes"/>
+			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_consolidated_two_stages.xml" HomeFolder="Yes"/>
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_only.xml" HomeFolder="Yes"/>
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_3.xml" HomeFolder="Yes"/>
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_full.xml" HomeFolder="Yes"/>