From d94fede3b9ddaf0a118ad2c321c53f9eef092e40 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Wed, 7 Apr 2021 11:41:07 +0200
Subject: [PATCH] added new VectoSimulationJobType and added
VectoSimulationJobtype propertie ad declaration data reader
---
VectoCommon/VectoCommon/InputData/EngineeringInputData.cs | 1 +
VectoCommon/VectoCommon/InputData/IInputDataProvider.cs | 2 ++
.../DataProvider/XMLDeclarationMultistageInputData.cs | 7 ++++++-
.../XML/Declaration/IXMLDeclarationInputDataReader.cs | 3 ++-
.../Reader/Impl/XMLDeclarationMultistageInputReader.cs | 5 +++++
5 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
index 27392fbf11..ddac7f345a 100644
--- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
@@ -57,6 +57,7 @@ namespace TUGraz.VectoCommon.InputData
{
ConventionalVehicle,
ParallelHybridVehicle,
+ SerialHybridVehicle,
BatteryElectricVehicle,
EngineOnlySimulation,
}
diff --git a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
index 802f0b1b96..6a9f408e7e 100644
--- a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
+++ b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
@@ -102,6 +102,8 @@ namespace TUGraz.VectoCommon.InputData
IManufacturingStageInputData ConsolidateManufacturingStage { get; }
+ VectoSimulationJobType JobType { get; }
+
bool InputComplete { get; }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
index 5919110af9..ab4f253c75 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
@@ -105,11 +105,16 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get { return _concolidateManfacturingStage ?? (_concolidateManfacturingStage = Reader.ConsolidateManufacturingStage); }
}
+ public VectoSimulationJobType JobType
+ {
+ get { return VectoSimulationJobType.ConventionalVehicle; }
+ }
+
public bool InputComplete
{
get { return Reader.InputComplete; }
}
-
+
public IXMLMultistageJobReader Reader { protected get; set; }
public IXMLMultistageInputDataProvider InputData { get; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/IXMLDeclarationInputDataReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/IXMLDeclarationInputDataReader.cs
index aa47260eab..94479a656c 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/IXMLDeclarationInputDataReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/IXMLDeclarationInputDataReader.cs
@@ -31,8 +31,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
IManufacturingStageInputData ConsolidateManufacturingStage { get; }
- bool InputComplete { get; }
+ VectoSimulationJobType JobType { get; }
+ bool InputComplete { get; }
}
public interface IXMLMultistageReader
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 baef09e2f0..b3ce6d2747 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -139,6 +139,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
}
}
+ public VectoSimulationJobType JobType
+ {
+ get { return InputData.JobType; }
+ }
+
public bool InputComplete
{
get
--
GitLab