From 6207b211ce5fbb6dd325a4ca1b607595baa05934 Mon Sep 17 00:00:00 2001
From: Harald Martini <harald.martini@student.tugraz.at>
Date: Tue, 3 May 2022 16:50:12 +0200
Subject: [PATCH] implemented VehicleType in HeavyLorryVehicleDataProvider
---
.../XMLDeclarationVehicleDataProvider.cs | 2 +-
...eclarationHeavyLorryVehicleDataProvider.cs | 35 +++++++++++++++++--
2 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index e8d02c7212..bb60b5c916 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -714,7 +714,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override VectoSimulationJobType VehicleType
{
- get => throw new NotImplementedException();
+ get => throw new NotImplementedException($"not implemented in {this.GetType()}");
}
#endregion
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs
index 172959b3d5..adb09b293f 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs
@@ -38,6 +38,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
: (TankSystem?)null;
#endregion
+
+
+ public override VectoSimulationJobType VehicleType
+ {
+ get => VectoSimulationJobType.ConventionalVehicle;
+ }
}
// ---------------------------------------------------------------------------------------
@@ -81,6 +87,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
: null;
#endregion
+
+ public override VectoSimulationJobType VehicleType
+ {
+ get => VectoSimulationJobType.ParallelHybridVehicle;
+ }
}
// ---------------------------------------------------------------------------------------
@@ -108,6 +119,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override IList<ITorqueLimitInputData> TorqueLimits => null;
#endregion
+
+ public override VectoSimulationJobType VehicleType
+ {
+ get => VectoSimulationJobType.SerialHybridVehicle;
+ }
}
// ---------------------------------------------------------------------------------------
@@ -141,6 +157,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
#endregion
public override IList<ITorqueLimitInputData> TorqueLimits => null;
+
+ public override VectoSimulationJobType VehicleType
+ {
+ get => VectoSimulationJobType.BatteryElectricVehicle;
+ }
}
// ---------------------------------------------------------------------------------------
@@ -161,12 +182,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override IList<ITorqueLimitInputData> TorqueLimits => null;
-
-
- #endregion
+ #endregion
+
+ public override VectoSimulationJobType VehicleType
+ {
+ get => VectoSimulationJobType.BatteryElectricVehicle;
+ }
}
// ---------------------------------------------------------------------------------------
@@ -205,6 +229,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override TableData BoostingLimitations => null;
#endregion
+
+ public override VectoSimulationJobType VehicleType
+ {
+ get => VectoSimulationJobType.SerialHybridVehicle;
+ }
}
// ---------------------------------------------------------------------------------------
--
GitLab