From 7d420dc7ddb90511d6a39f55dbf74cd1762c2849 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at>
Date: Wed, 31 May 2023 19:15:01 +0200
Subject: [PATCH] ignore CompletedBusCycle section when FULL_SIMULATIONS is set
---
.../VectoCore/Models/Simulation/Impl/VectoRun.cs | 2 +-
.../Declaration/PrimaryBus/PrimaryBusSimulation.cs | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
index 1b2a3ad178..56a9cb96ef 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
@@ -233,7 +233,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
{
try {
return action();
- } catch (VectoException e) {
+ } catch (Exception e) {
LogManager.GetLogger(typeof(VectoRun).FullName).Info(e);
return null;
}
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs b/VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs
index 34867796ed..d264265f9d 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs
@@ -209,12 +209,14 @@ public class PrimaryBusSimulation
public void CompletedBusCycleSection(string vifFile, string completed, double start,
double? distance = null)
{
- Kernel.Rebind<IDeclarationCycleFactory>().To<TestDeclarationCycleFactoryStartPoint>().InSingletonScope();
- var cycleFactory = Kernel.Get<IDeclarationCycleFactory>() as TestDeclarationCycleFactoryStartPoint;
+#if FULL_SIMULATIONS
+ Assert.Ignore();
+#endif
+ var cycleFactory = StartPointCycleFactory();
var missionFilter = TestMissionFilter();
missionFilter?.SetMissions((MissionType.Interurban, LoadingType.ReferenceLoad));
- cycleFactory!.SetStartPoint(MissionType.Interurban, start.SI<Meter>(), true, distance?.SI<Meter>());
+ cycleFactory?.SetStartPoint(MissionType.Interurban, start.SI<Meter>(), true, distance?.SI<Meter>());
var completedJob = GenerateJsonJobCompletedBus(Path.Combine(BASE_DIR_VIF, vifFile),
Path.Combine(BASE_DIR_COMPLETED, completed));
@@ -470,6 +472,10 @@ public class PrimaryBusSimulation
}
public void RunSimulationPrimary(string jobFile, int runIdx, out string vifFile, params Action<VectoRunData>[] runDataModifier)
{
+#if FULL_SIMULATIONS
+ runIdx = -1;
+#endif
+
var filePath = Path.Combine(BASE_DIR, jobFile);
var dataProvider = _xmlReader.CreateDeclaration(filePath);
var fileWriter = new FileOutputWriter(filePath);
@@ -630,7 +636,7 @@ public class PrimaryBusSimulation
{
#if FULL_SIMULATIONS
- Assert.Ignore();
+ Assert.Ignore($"");
#endif
var missionFilter = TestMissionFilter();
--
GitLab