diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs index 2e65ca2d4fa89b8ca53384b96a69635e1f3ed2a6..e5f0174b317a77ee4cc8801119ab07aece0a1ffa 100644 --- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs +++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs @@ -92,13 +92,6 @@ namespace TUGraz.VectoCommon.InputData /// cf. VECTO Input Parameters.xlsx /// </summary> DataTable CrosswindCorrectionMap { get; } - - // Advanced Auxiliaries - AuxiliaryModel AuxiliaryAssembly { get; } - - string AuxiliaryVersion { get; } - - string AdvancedAuxiliaryFilePath { get; } } @@ -196,6 +189,13 @@ namespace TUGraz.VectoCommon.InputData public interface IAuxiliariesEngineeringInputData : IAuxiliariesDeclarationInputData { new IList<IAuxiliaryEngineeringInputData> Auxiliaries { get; } + + // Advanced Auxiliaries + AuxiliaryModel AuxiliaryAssembly { get; } + + string AuxiliaryVersion { get; } + + string AdvancedAuxiliaryFilePath { get; } } diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs index 2b8aeda12eeacfe162d56278f04a9ab81e6c9145..e8f2d0ed42a169c869e562902ae5f8b97904219d 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs @@ -525,5 +525,32 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON } return retVal; } + + #region AdvancedAuxiliaries + + public AuxiliaryModel AuxiliaryAssembly + { + get + { + return AuxiliaryModelHelper.Parse(Body["AuxiliaryAssembly"] == null ? "" : Body["AuxiliaryAssembly"].ToString()); + } + } + + public string AuxiliaryVersion + { + get { return Body["AuxiliaryVersion"] != null ? Body["AuxiliaryVersion"].Value<string>() : "<CLASSIC>"; } + } + + public string AdvancedAuxiliaryFilePath + { + get + { + return Body["AdvancedAuxiliaryFilePath"] != null + ? Path.Combine(Path.GetFullPath(BasePath), Body["AdvancedAuxiliaryFilePath"].Value<string>()) + : ""; + } + } + + #endregion } } \ No newline at end of file diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs index 77eba9f429662aa11e172bfb3649aa4f7218088b..0f0b929997038c1a6b2df3acb4c8500794235c15 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs @@ -177,25 +177,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON #endregion - #region AdvancedAuxiliaries - - public AuxiliaryModel AuxiliaryAssembly - { - get { return AuxiliaryModelHelper.Parse(Body["AuxiliaryAssembly"] == null ? "" : Body["AuxiliaryAssembly"].ToString()); } - } - - public string AuxiliaryVersion - { - get { return Body["AuxiliaryVersion"] != null ? Body["AuxiliaryVersion"].Value<string>() : "<CLASSIC>"; } - } - - public string AdvancedAuxiliaryFilePath - { - get { return Body["AdvancedAuxiliaryFilePath"] != null ? Body["AdvancedAuxiliaryFilePath"].Value<string>() : ""; } - } - - #endregion - public string Vendor { get { return "N/A"; } diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs index 480caa8f3e9958c37d6f5b3ee0a2c4e8f453b55a..6e139e7693d9e48322d56dddf4cfb2a7bcc588c5 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs @@ -228,12 +228,12 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper return SetCommonRetarderData(retarder, vehicle); } - public AdvancedAuxData CreateAdvancedAuxData(IVehicleEngineeringInputData vehicleInputData) + public AdvancedAuxData CreateAdvancedAuxData(IAuxiliariesEngineeringInputData auxInputData) { return new AdvancedAuxData() { - AdvancedAuxiliaryFilePath = vehicleInputData.AdvancedAuxiliaryFilePath, - AuxiliaryAssembly = vehicleInputData.AuxiliaryAssembly, - AuxiliaryVersion = vehicleInputData.AuxiliaryVersion + AdvancedAuxiliaryFilePath = auxInputData.AdvancedAuxiliaryFilePath, + AuxiliaryAssembly = auxInputData.AuxiliaryAssembly, + AuxiliaryVersion = auxInputData.AuxiliaryVersion }; } } diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs index e6f9433635d71949f6fdee643a6699a597ffb8cc..1ebfef8a5267bf78ca460f4c701f0ab3371a208e 100644 --- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs +++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs @@ -81,7 +81,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl VehicleData = dao.CreateVehicleData(vehicleInputData), DriverData = driver, Aux = dao.CreateAuxiliaryData(InputDataProvider.AuxiliaryInputData()), - AdvancedAux = dao.CreateAdvancedAuxData(InputDataProvider.VehicleInputData), + AdvancedAux = dao.CreateAdvancedAuxData(InputDataProvider.AuxiliaryInputData()), Retarder = dao.CreateRetarderData(InputDataProvider.RetarderInputData, InputDataProvider.VehicleInputData), Cycle = DrivingCycleDataReader.ReadFromDataTable(cycle.CycleData, cycle.Name, crossWindRequired), IsEngineOnly = InputDataProvider.JobInputData().EngineOnlyMode diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs index 2a34598bcad14caa8394e69e217eaf08b24909d6..8093d54182e4db618b5a6917a2cc7c42b7b88071 100644 --- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs +++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs @@ -290,11 +290,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl AddComponent(tmp, engine); // connect aux --> engine - if (data.Aux != null) { - engine.Connect(CreateAuxiliaries(data, container).Port()); + if (data.AdvancedAux != null && data.AdvancedAux.AuxiliaryAssembly == AuxiliaryModel.Advanced) { + engine.Connect(CreateBusAuxiliaries(data, container).Port()); } else { - if (data.AdvancedAux.AuxiliaryAssembly == AuxiliaryModel.Advanced) { - engine.Connect(CreateBusAuxiliaries(data, container).Port()); + if (data.Aux != null) { + engine.Connect(CreateAuxiliaries(data, container).Port()); } }