diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs index 1fa6d3dde5cb8ded64aa99cc586ee65f2da92797..ea7c167071310d7dd08774bce492cdc34052c6c1 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs +++ b/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 diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs index ec25b63c89073a70dcb54342a6512eab4d6de20d..190bc0df3e6d2a99e06b1ffb08e8ee4685b004ac 100644 --- a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs +++ b/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); diff --git a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs index 51bb70a95b6237cd6986a0bb2d036f9a4bd85331..11b0fc7b0eb05666e1aa9fd74f78adad271ac731 100644 --- a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs +++ b/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; diff --git a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs index e5b5e04331c94d1783cdfc3c33511415e5ac6799..e5f1508b2a332d4cf7a65f38246170e6977b05e0 100644 --- a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs +++ b/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,