From b691a39a04fa321a3b19af509f78b89059a9add8 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 19 Sep 2022 15:51:58 +0200
Subject: [PATCH] updating mockup classes
---
.../VectoMockup/MockupModalDataContainer.cs | 18 ++++++++++++++----
.../MockupSimulatorFactories.cs | 2 +-
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/VectoMockup/VectoMockup/MockupModalDataContainer.cs b/VectoMockup/VectoMockup/MockupModalDataContainer.cs
index c5ddedd060..01bcdb7aff 100644
--- a/VectoMockup/VectoMockup/MockupModalDataContainer.cs
+++ b/VectoMockup/VectoMockup/MockupModalDataContainer.cs
@@ -6,6 +6,7 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
+using TUGraz.VectoCore.Models.SimulationComponent;
using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoMockup
@@ -185,10 +186,10 @@ namespace TUGraz.VectoMockup
_modalDataContainerImplementation.CalculateAggregateValues();
}
- public void AddElectricMotor(PowertrainPosition pos)
- {
- _modalDataContainerImplementation.AddElectricMotor(pos);
- }
+ //public void AddElectricMotor(PowertrainPosition pos)
+ //{
+ // _modalDataContainerImplementation.AddElectricMotor(pos);
+ //}
public KilogramPerWattSecond VehicleLineSlope(IFuelProperties fuel)
{
@@ -278,6 +279,15 @@ namespace TUGraz.VectoMockup
}
public ICorrectedModalData CorrectedModalData => _modalDataContainerImplementation.CorrectedModalData;
+ public void RegisterComponent(VectoSimulationComponent component)
+ {
+ throw new NotImplementedException();
+ }
+
+ public bool ContainsColumn(string modalResultField)
+ {
+ throw new NotImplementedException();
+ }
#endregion
}
diff --git a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs b/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
index 90fb473ab9..67d747fd31 100644
--- a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
+++ b/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
@@ -77,7 +77,7 @@ namespace TUGraz.VectoMockup.Simulation.SimulatorFactory
});
}
- protected override IVectoRun GetNonExemptedRun(VectoRunData data, int current, VectoRunData d, ref bool warning1Hz)
+ protected override IVectoRun GetNonExemptedRun(VectoRunData data, int current, VectoRunData d, ref bool warning1Hz, ref bool firstRun)
{
var addReportResult = PrepareReport(data);
return new MockupRun(new VehicleContainer(ExecutionMode.Declaration,
--
GitLab