remove alternator ratio from input data, remove manufacturerprimaryvehicle,...

remove alternator ratio from input data, remove manufacturerprimaryvehicle, manuracturercompletedvehicle in xml input data

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

@@ -645,21 +645,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 			SourceType = DataSourceType.XMLEmbedded;
 		}
 
-		#region Overrides of AbstractCommonComponentType
-
-		public override string Manufacturer
-		{
-			get { return GetString(XMLNames.ManufacturerPrimaryVehicle); }
-		}
-
-		public override string ManufacturerAddress
-		{
-			get { return GetString(XMLNames.ManufacturerAddressPrimaryVehicle); }
-		}
-
-		#endregion
-
-
+		
 		#region Overrides of XMLDeclarationVehicleDataProviderV10
 
 		public override IAdvancedDriverAssistantSystemDeclarationInputData ADAS
@@ -798,21 +784,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		}
 
 
-		#region Overrides of AbstractCommonComponentType
-
-		public override string Manufacturer
-		{
-			get { return GetString(XMLNames.ManufacturerCompletedVehicle); }
-		}
-
-		public override string ManufacturerAddress
-		{
-			get { return GetString(XMLNames.ManufacturerAddressCompletedVehicle); }
-		}
-
-		#endregion
-
-
 		#region Overrides of XMLDeclarationVehicleDataProviderV10
 
 		public override string RegisteredClass

VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs

@@ -490,17 +490,8 @@ namespace TUGraz.VectoCore.Tests.FileIO
 
 			Assert.AreEqual(1, busAux.ElectricSupply.Alternators.Count);
 			Assert.AreEqual("standard alternator", busAux.ElectricSupply.Alternators[0].Technology);
-			Assert.AreEqual(1, busAux.ElectricSupply.Alternators[0].Ratio);
 			Assert.AreEqual(false, busAux.ElectricSupply.SmartElectrics);
 
-			//Assert.AreEqual(3, busAux.ElectricSupply.ResultCards.Idle.Count);
-			//Assert.AreEqual(0, busAux.ElectricSupply.ResultCards.Idle[0].Current.Value());
-			//Assert.AreEqual(20, busAux.ElectricSupply.ResultCards.Idle[1].Current.Value());
-			//Assert.AreEqual(50, busAux.ElectricSupply.ResultCards.Idle[2].Current.Value());
-			//Assert.AreEqual(0, busAux.ElectricSupply.ResultCards.Idle[0].SmartCurrent.Value());
-			//Assert.AreEqual(25, busAux.ElectricSupply.ResultCards.Idle[1].SmartCurrent.Value());
-			//Assert.AreEqual(60, busAux.ElectricSupply.ResultCards.Idle[2].SmartCurrent.Value());
-
 			Assert.AreEqual("", busAux.PneumaticSupply.CompressorSize);
 			Assert.AreEqual(1.0, busAux.PneumaticSupply.Ratio);
 

VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs

@@ -95,7 +95,6 @@ namespace TUGraz.VectoCore.Tests.XML
 			var electricSupl = components.BusAuxiliaries.ElectricSupply;
 			Assert.IsNotNull(electricSupl.Alternators);
 			Assert.AreEqual(1, electricSupl.Alternators.Count);
-			Assert.AreEqual(1.000, electricSupl.Alternators.First().Ratio);
 			Assert.AreEqual("default", electricSupl.Alternators.First().Technology);
 
 			var havacAux = components.BusAuxiliaries.HVACAux;

VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs

@@ -264,26 +264,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			
 			Assert.AreEqual(1, auxiliaries.ElectricSupply.Alternators.Count);
 			Assert.AreEqual("default", auxiliaries.ElectricSupply.Alternators[0].Technology);
-			Assert.AreEqual(1.0000, auxiliaries.ElectricSupply.Alternators[0].Ratio);
 			Assert.AreEqual(false, auxiliaries.ElectricSupply.SmartElectrics);
-
-			//Assert.AreEqual(2, auxiliaries.ElectricSupply.ResultCards.Idle.Count);
-			//Assert.AreEqual(0.00, auxiliaries.ElectricSupply.ResultCards.Idle[0].Current.Value());
-			//Assert.AreEqual(0.00, auxiliaries.ElectricSupply.ResultCards.Idle[0].SmartCurrent.Value());
-			//Assert.AreEqual(100.00, auxiliaries.ElectricSupply.ResultCards.Idle[1].Current.Value());
-			//Assert.AreEqual(120.00, auxiliaries.ElectricSupply.ResultCards.Idle[1].SmartCurrent.Value());
-
-			//Assert.AreEqual(2, auxiliaries.ElectricSupply.ResultCards.Traction.Count);
-			//Assert.AreEqual(0.00, auxiliaries.ElectricSupply.ResultCards.Traction[0].Current.Value());
-			//Assert.AreEqual(0.00, auxiliaries.ElectricSupply.ResultCards.Traction[0].SmartCurrent.Value());
-			//Assert.AreEqual(100.00, auxiliaries.ElectricSupply.ResultCards.Traction[1].Current.Value());
-			//Assert.AreEqual(120.00, auxiliaries.ElectricSupply.ResultCards.Traction[1].SmartCurrent.Value());
-
-			//Assert.AreEqual(2, auxiliaries.ElectricSupply.ResultCards.Overrun.Count);
-			//Assert.AreEqual(0.00, auxiliaries.ElectricSupply.ResultCards.Overrun[0].Current.Value());
-			//Assert.AreEqual(0.00, auxiliaries.ElectricSupply.ResultCards.Overrun[0].SmartCurrent.Value());
-			//Assert.AreEqual(100.00, auxiliaries.ElectricSupply.ResultCards.Overrun[1].Current.Value());
-			//Assert.AreEqual(120.00, auxiliaries.ElectricSupply.ResultCards.Overrun[1].SmartCurrent.Value());
 		}
 
 		private void TestPneumaticSystem(IPneumaticSupplyDeclarationData supply,