diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index 91e58c9eaf4af32aea088dd569b136cb0ecb2ae6..b4efb9ba1eac127daef15e6634458c3695387d76 100644
--- a/VECTO/Input Files/Engine.vb
+++ b/VECTO/Input Files/Engine.vb
@@ -653,7 +653,6 @@ Public Class DummyVehicle
Public Property HybridElectricHDV As Boolean Implements IVehicleDeclarationInputData.HybridElectricHDV
Public Property DualFuelVehicle As Boolean Implements IVehicleDeclarationInputData.DualFuelVehicle
Public Property MaxNetPower1 As Watt Implements IVehicleDeclarationInputData.MaxNetPower1
- Public Property MaxNetPower2 As Watt Implements IVehicleDeclarationInputData.MaxNetPower2
Public ReadOnly Property ExemptedTechnology As String Implements IVehicleDeclarationInputData.ExemptedTechnology
Public ReadOnly Property RegisteredClass As RegistrationClass? Implements IVehicleDeclarationInputData.RegisteredClass
Public ReadOnly Property NumberPassengerSeatsUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsUpperDeck
diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb
index 6dad5ee10526325fd199ad26c1d394699cff30e4..213b4ef7356aa1d3b70e6afc17cab8e798d05659 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -865,7 +865,6 @@ Public Class MockEngineeringVehicle
Public Property HybridElectricHDV As Boolean Implements IVehicleDeclarationInputData.HybridElectricHDV
Public Property DualFuelVehicle As Boolean Implements IVehicleDeclarationInputData.DualFuelVehicle
Public Property MaxNetPower1 As Watt Implements IVehicleDeclarationInputData.MaxNetPower1
- Public Property MaxNetPower2 As Watt Implements IVehicleDeclarationInputData.MaxNetPower2
Public ReadOnly Property ExemptedTechnology As String Implements IVehicleDeclarationInputData.ExemptedTechnology
Public ReadOnly Property RegisteredClass As RegistrationClass? Implements IVehicleDeclarationInputData.RegisteredClass
Public ReadOnly Property NumberPassengerSeatsUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsUpperDeck
diff --git a/VECTO/Input Files/MockVehicleInputData.vb b/VECTO/Input Files/MockVehicleInputData.vb
index cbb94692aaf67350fea24580e208eec3de52b40b..0a2bcc4f477bbc4309cf4f24e9fa95a6aaad83cf 100644
--- a/VECTO/Input Files/MockVehicleInputData.vb
+++ b/VECTO/Input Files/MockVehicleInputData.vb
@@ -39,7 +39,6 @@ Public Class MockVehicleInputData
Public Property HybridElectricHDV As Boolean Implements IVehicleDeclarationInputData.HybridElectricHDV
Public Property DualFuelVehicle As Boolean Implements IVehicleDeclarationInputData.DualFuelVehicle
Public Property MaxNetPower1 As Watt Implements IVehicleDeclarationInputData.MaxNetPower1
- Public Property MaxNetPower2 As Watt Implements IVehicleDeclarationInputData.MaxNetPower2
Public ReadOnly Property ExemptedTechnology As String Implements IVehicleDeclarationInputData.ExemptedTechnology
Public ReadOnly Property RegisteredClass As RegistrationClass? Implements IVehicleDeclarationInputData.RegisteredClass
Public ReadOnly Property NumberPassengerSeatsUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsUpperDeck
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index b8614bdab2bec77fcea4ff968bcfe86686bc2932..71a6b8bafefbafe857628b624a6d35b499980427 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -895,13 +895,7 @@ end Property
End Get
End Property
- Public ReadOnly Property MaxNetPower2 As Watt Implements IVehicleDeclarationInputData.MaxNetPower2
- Get
- Return Nothing
- End Get
- End Property
-
- Public ReadOnly Property ExemptedTechnology As String Implements IVehicleDeclarationInputData.ExemptedTechnology
+ Public ReadOnly Property ExemptedTechnology As String Implements IVehicleDeclarationInputData.ExemptedTechnology
Public ReadOnly Property RegisteredClass As RegistrationClass? Implements IVehicleDeclarationInputData.RegisteredClass
Public ReadOnly Property NumberPassengerSeatsUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsUpperDeck
diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
index 14bf6ca8db1cc140f8d8c9297f6a9c28ae406324..93399103cffc1c172d5607be1bfcae5c0ae6e2b4 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
@@ -274,11 +274,6 @@ namespace VECTO3GUI2020.ViewModel.Implementation.JobEdit.Vehicle
set => throw new NotImplementedException();
}
- public virtual Watt MaxNetPower2
- {
- get => throw new NotImplementedException();
- set => throw new NotImplementedException();
- }
public string ExemptedTechnology { get; }
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
index c1d1e808365ce010e247f3e6c28eb3c1b17dbda8..652da7f5a8d298a861130e34f93f01ddeb1d1515 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
@@ -1082,10 +1082,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
get { throw new NotImplementedException(); }
}
- public Watt MaxNetPower2
- {
- get { throw new NotImplementedException(); }
- }
+
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index a99e21957a411fa6388d8b2e9e7eb4c886d564b8..0616a430fb7b31fdf8a272f0fb873503affbb172 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -161,10 +161,11 @@ namespace TUGraz.VectoCommon.InputData
bool DualFuelVehicle { get; }
+ /// <summary>
+ /// SumNetPower in 2nd amendment
+ /// </summary>
Watt MaxNetPower1 { get; }
- Watt MaxNetPower2 { get; }
-
string ExemptedTechnology { get; }
// --- end
@@ -804,7 +805,27 @@ namespace TUGraz.VectoCommon.InputData
IList<ElectricMachineEntry<IElectricMotorDeclarationInputData>> Entries { get; }
}
- public class ElectricMachineEntry<T> where T : IElectricMotorDeclarationInputData
+ //public interface IElectricMachineEntry<T>
+ //{
+ // T ElectricMachine { get; set; }
+
+ // int Count { get; set; }
+
+ // PowertrainPosition Position { get; set; }
+
+ // double RatioADC { get; set; }
+
+ // double[] RatioPerGear { get; set; }
+
+ // double MechanicalTransmissionEfficiency { get; set; }
+
+ // TableData MechanicalTransmissionLossMap { get; set; }
+
+ // IADCDeclarationInputData ADC { get; set; }
+ //}
+
+
+ public class ElectricMachineEntry<T> where T : class, IElectricMotorDeclarationInputData
{
public T ElectricMachine { get; set; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index 7a8250bf571ee75c1798a92205664d9d61d01d8c..e8f85d9de34307bcd007e6d6bda39b6d6a219c2b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -192,11 +192,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
? GetDouble(XMLNames.Vehicle_MaxNetPower1).SI<Watt>()
: null;
- public virtual Watt MaxNetPower2 =>
- ElementExists(XMLNames.Vehicle_MaxNetPower2)
- ? GetDouble(XMLNames.Vehicle_MaxNetPower2).SI<Watt>()
- : null;
-
public virtual string ExemptedTechnology => null;
public virtual RegistrationClass? RegisteredClass => RegistrationClass.unknown;
@@ -293,8 +288,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override Watt MaxNetPower1 => null;
- public override Watt MaxNetPower2 => null;
-
public override VectoSimulationJobType VehicleType { get => VectoSimulationJobType.ConventionalVehicle; }
public class ADASDefaultValues : IAdvancedDriverAssistantSystemDeclarationInputData
{
@@ -405,8 +398,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override Watt MaxNetPower1 => GetDouble(XMLNames.Vehicle_MaxNetPower1).SI<Watt>();
- public override Watt MaxNetPower2 => GetDouble(XMLNames.Vehicle_MaxNetPower2).SI<Watt>();
-
public override IVehicleComponentsDeclaration Components => null;
#endregion
@@ -579,7 +570,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public bool HybridElectricHDV { get; }
public bool DualFuelVehicle { get; }
public virtual Watt MaxNetPower1 { get; }
- public Watt MaxNetPower2 { get; }
public virtual string ExemptedTechnology { get; }
public RegistrationClass? RegisteredClass { get; }
public VehicleCode? VehicleCode { get; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationExemptedVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationExemptedVehicleDataProvider.cs
index c04f4fd92a9b6f4d3068389b7dd4e24946f3f450..10dbe155000a16cb80aa537ac0a8337781083a98 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationExemptedVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationExemptedVehicleDataProvider.cs
@@ -60,8 +60,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override Watt MaxNetPower1 => GetDouble("SumNetPower").SI<Watt>();
- public override Watt MaxNetPower2 => null;
-
public override string ExemptedTechnology => GetString("Technology");
public override IVehicleComponentsDeclaration Components => null;
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
index d7409a81fd62f75a7d6fcb89d003b402d9e01fb1..46ece69d99243c2a4acc33dcb7ec050bb9577621 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -624,7 +624,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public PerSecond EngineIdleSpeed => _primaryVehicle.Vehicle.EngineIdleSpeed;
public Watt MaxNetPower1 => _primaryVehicle.Vehicle.MaxNetPower1;
- public Watt MaxNetPower2 => _primaryVehicle.Vehicle.MaxNetPower2;
public string ExemptedTechnology => _primaryVehicle.Vehicle.ExemptedTechnology;
public ArchitectureID ArchitectureID => _primaryVehicle.Vehicle.ArchitectureID;
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
index 671ba8ca9a6262376462b4eb9b983a5b26079327..d36e2cc30cf9c708bc076c52a103c44c7189aa1b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
@@ -128,8 +128,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public Watt MaxNetPower1 => null;
- public Watt MaxNetPower2 => null;
-
public string ExemptedTechnology { get; }
public virtual RegistrationClass? RegisteredClass => RegistrationClass.unknown;
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/VehicleDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/VehicleDataAdapter.cs
index 2431752cf71b94c6ae11906f65f74f9053de3472..a6487417bc18a8b53bb0bbd145e3450ee8cc8332 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/VehicleDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/VehicleDataAdapter.cs
@@ -216,7 +216,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
exempted.HybridElectricHDV = data.HybridElectricHDV;
exempted.DualFuelVehicle = data.DualFuelVehicle;
exempted.MaxNetPower1 = data.MaxNetPower1;
- exempted.MaxNetPower2 = data.MaxNetPower2;
return exempted;
}
}
@@ -264,7 +263,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
exempted.HybridElectricHDV = data.HybridElectricHDV;
exempted.DualFuelVehicle = data.DualFuelVehicle;
exempted.MaxNetPower1 = data.MaxNetPower1;
- exempted.MaxNetPower2 = data.MaxNetPower2;
exempted.AxleConfiguration = data.AxleConfiguration;
return exempted;
}
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
index 4d58646be095aabb11b84c849031ac1322fcc22e..29f5cf0807e5554ec03ca7a3cb3e6380dfcc696c 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
@@ -76,7 +76,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
throw new VectoException("Invalid input: at least one option of ZE-HDV, He-HDV, and DualFuelVehicle has to be set for an exempted vehicle!");
}
- if (vehicleData.HybridElectricHDV && (vehicleData.MaxNetPower1 == null || vehicleData.MaxNetPower2 == null)) {
+ if (vehicleData.HybridElectricHDV && vehicleData.MaxNetPower1 == null) {
throw new VectoException("For He-HDV both MaxNetPower1 and MaxNetPower2 have to be provided!");
}
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
index 739517b2cdbcd5a311afb598e71ebbe8a9a6ac2a..cf94949717c9fcb02a4781d8762fc4a0d2dd3f9f 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
@@ -233,7 +233,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
public bool HybridElectricHDV { get; internal set; }
public bool DualFuelVehicle { get; internal set; }
public Watt MaxNetPower1 { get; internal set; }
- public Watt MaxNetPower2 { get; internal set; }
public bool? SleeperCab { get; internal set; }
public ADASData ADAS { get; internal set; }
public bool VocationalVehicle { get; internal set; }
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReport.cs
index de2e6cb785c2eb53e7931a980a987cc474cd6669..05df4bf15856087f625832253910e5197e2ca307 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReport.cs
@@ -121,7 +121,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
return new object[] {
modelData.VehicleData.HybridElectricHDV ? new XElement(tns + XMLNames.Vehicle_MaxNetPower1, XMLHelper.ValueAsUnit(modelData.VehicleData.MaxNetPower1, XMLNames.Unit_W)) : null,
- modelData.VehicleData.HybridElectricHDV ? new XElement(tns + XMLNames.Vehicle_MaxNetPower2, XMLHelper.ValueAsUnit(modelData.VehicleData.MaxNetPower2, XMLNames.Unit_W)) : null
+
};
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedTruck.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedTruck.cs
index 0d4eb6eed259fe03db1322d3403d089f47310dd5..6d1d0c7998733a0791df8313e7243586de38ad24 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedTruck.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedTruck.cs
@@ -55,10 +55,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
if (modelData.VehicleData.MaxNetPower1 != null)
retVal.Add(new XElement(tns + XMLNames.Vehicle_MaxNetPower1,
XMLHelper.ValueAsUnit(modelData.VehicleData.MaxNetPower1, XMLNames.Unit_W)));
- if (modelData.VehicleData.MaxNetPower2 != null) {
- retVal.Add(new XElement(tns + XMLNames.Vehicle_MaxNetPower2,
- XMLHelper.ValueAsUnit(modelData.VehicleData.MaxNetPower2, XMLNames.Unit_W)));
- }
return retVal.ToArray();
}
diff --git a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
index e37abccbfd97abce547b16779989ef06e34fd780..3d5bf400872b8bc3db5a6da8d4ac4b9357e71de2 100644
--- a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
@@ -47,7 +47,6 @@ namespace TUGraz.VectoCore.Tests.Utils
public bool HybridElectricHDV { get; }
public bool DualFuelVehicle { get; }
public Watt MaxNetPower1 { get; }
- public Watt MaxNetPower2 { get; }
public string ExemptedTechnology { get; }
public RegistrationClass? RegisteredClass { get; set; }
public int? NumberPassengerSeatsUpperDeck { get; set; }
@@ -127,7 +126,6 @@ namespace TUGraz.VectoCore.Tests.Utils
public ConsumerTechnology? DoorDriveTechnology { get; }
public VehicleDeclarationType VehicleDeclarationType { get; }
- public Watt MaxNetPower2 { get; }
public string ExemptedTechnology { get; }
public RegistrationClass? RegisteredClass { get; set; }
public int? NumberPassengerSeatsUpperDeck { get; set; }
diff --git a/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs b/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
index ea65332b74110dc9edaad6341af8a4ca9bd59f97..95879d9814625045298cadda24397f92c1e428d1 100644
--- a/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
@@ -282,7 +282,6 @@ namespace TUGraz.VectoCore.Tests.Utils
public bool HybridElectricHDV { get; }
public bool DualFuelVehicle { get; }
public Watt MaxNetPower1 { get; }
- public Watt MaxNetPower2 { get; }
public string ExemptedTechnology { get; }
public RegistrationClass? RegisteredClass { get; }
public int? NumberPassengerSeatsUpperDeck { get; }
diff --git a/VectoCore/VectoCoreTest/Utils/MockVehicleInputData.cs b/VectoCore/VectoCoreTest/Utils/MockVehicleInputData.cs
index d52875e9855a88b0afa439198146f4ab7082bfd4..c00a314265f7d5a5faa2ee4a58eaa8cd5ad7bf90 100644
--- a/VectoCore/VectoCoreTest/Utils/MockVehicleInputData.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockVehicleInputData.cs
@@ -68,7 +68,6 @@ namespace TUGraz.VectoCore.Tests.Utils
public Watt MaxNetPower1 { get; set; }
- public Watt MaxNetPower2 { get; set; }
public string ExemptedTechnology { get; }