diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs index 27392fbf11334dcdec327cbb6e5b9c7cde59ccb4..ddac7f345a0af256a4e44ec7534632eede683618 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 802f0b1b96a828a6ed304415ccf710c3680e1b70..6a9f408e7e48a536a400d4f7219296cd971a36d9 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 5919110af9784ca99b5dd0369b43f72371453730..ab4f253c758f708a2f434a3567de81fd1dca9d3c 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 aa47260eabc8ae332807c37d450302f74e310a55..94479a656cf8a8edaba0ae2eae0dec4afdd30ea6 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 baef09e2f0582803a35ce6f6adad8bfd12b70681..b3ce6d274747e600464488f807bbde76d7f07859 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