From 2c28d7df8b1ac98327e70be2527bfbb5349d6488 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Wed, 15 Mar 2023 15:19:10 +0100
Subject: [PATCH] bugfix saving declaration job
---
VECTO/Input Files/VectoJob.vb | 2 +-
.../VectoCore/OutputData/FileIO/JSONFileWriter.cs | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index 4e76eaa564..125c3fcb77 100644
--- a/VECTO/Input Files/VectoJob.vb
+++ b/VECTO/Input Files/VectoJob.vb
@@ -538,7 +538,7 @@ Public Class VectoJob
If (vectoJob.JobType = VectoSimulationJobType.ConventionalVehicle OrElse vectoJob.JobType = VectoSimulationJobType.ParallelHybridVehicle) _
AndAlso gearboxInputData Is Nothing Then _
result.Add(New ValidationResult("Gearbox File is missing or invalid"))
- If (mode = ExecutionMode.Engineering AndAlso vectoJob.JobType = VectoSimulationJobType.ConventionalVehicle OrElse vectoJob.JobType = VectoSimulationJobType.ParallelHybridVehicle) _
+ If (mode = ExecutionMode.Engineering AndAlso (vectoJob.JobType = VectoSimulationJobType.ConventionalVehicle OrElse vectoJob.JobType = VectoSimulationJobType.ParallelHybridVehicle)) _
AndAlso gearshiftInputData Is Nothing Then _
result.Add(New ValidationResult("Gearshift File is missing or invalid"))
diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index 3388740f18..78d2781eef 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
@@ -788,7 +788,11 @@ public class JSONFileWriter : IOutputFileWriter
body.Add("TCU", GetRelativePath(input.DriverInputData.GearshiftInputData.Source, basePath));
}
- body.Add("HybridStrategyParams", GetRelativePath(input.JobInputData.HybridStrategyParameters.Source, basePath));
+
+ if (!job.SavedInDeclarationMode) {
+ body.Add("HybridStrategyParams",
+ GetRelativePath(input.JobInputData.HybridStrategyParameters.Source, basePath));
+ }
var auxList = new List<object>();
if (job.SavedInDeclarationMode && job.Vehicle is IVehicleDeclarationInputData declVehicle) {
@@ -808,9 +812,9 @@ public class JSONFileWriter : IOutputFileWriter
auxList.Add(auxOut);
}
- if (declVehicle.Components.BusAuxiliaries != null) {
- body.Add("BusAux", GetRelativePath(job.Vehicle.Components.AuxiliaryInputData.BusAuxiliariesData.DataSource.SourceFile, basePath));
- }
+ //if (declVehicle.Components.BusAuxiliaries != null) {
+ // body.Add("BusAux", GetRelativePath(job.Vehicle.Components.AuxiliaryInputData.BusAuxiliariesData.DataSource.SourceFile, basePath));
+ //}
body.Add("Aux", auxList);
}
--
GitLab