From 45a41e6b5348b18e0f82115341faef9b3f1cba07 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 27 Feb 2017 17:05:39 +0100
Subject: [PATCH] pass number of gears to sum writer
---
.../VectoCore/Models/Simulation/Impl/SimulatorFactory.cs | 4 ++--
.../VectoCore/Models/Simulation/Impl/VehicleContainer.cs | 2 +-
VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs | 2 +-
VectoCore/VectoCoreTest/Models/Simulation/MockSumWriter.cs | 2 +-
.../VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs | 4 ++--
VectoCore/VectoCoreTest/Reports/SumWriterTest.cs | 4 ++--
VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
index b4f253b610..ed34d5b546 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
@@ -146,9 +146,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
WriteModalResults = _mode != ExecutionMode.Declaration || WriteModalResults
};
var current = i++;
- var builder = new PowertrainBuilder(modContainer, (writer, mass, loading, volume) =>
+ var builder = new PowertrainBuilder(modContainer, (writer, mass, loading, volume, gearCount) =>
SumData.Write(modContainer, d.JobName, string.Format("{0}-{1}", JobNumber, current),
- d.Cycle.Name + Constants.FileExtensions.CycleFile, mass, loading, volume));
+ d.Cycle.Name + Constants.FileExtensions.CycleFile, mass, loading, volume, gearCount));
VectoRun run;
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs b/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
index f360fa7d66..9414aac206 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
@@ -326,7 +326,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
Log.Info("VehicleContainer finishing simulation.");
ModData.Finish(RunStatus);
- WriteSumData(ModData, VehicleMass, VehicleLoading, Vehicle != null ? Vehicle.CargoVolume : 0.SI<CubicMeter>());
+ WriteSumData(ModData, VehicleMass, VehicleLoading, Vehicle != null ? Vehicle.CargoVolume : 0.SI<CubicMeter>(), Gearbox.NumGears);
ModData.FinishSimulation();
DrivingCycle.FinishSimulation();
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
index 66b6db8ae2..11b9352741 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
@@ -71,7 +71,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var sumWriter = new SummaryDataContainer(fileWriter);
var container = new VehicleContainer(ExecutionMode.Declaration, modData,
- (writer, mass, loading, volume) => sumWriter.Write(modData, "", "", "", null, null, null));
+ (writer, mass, loading, volume, gearCount) => sumWriter.Write(modData, "", "", "", null, null, null, gearCount));
var data = DrivingCycleDataReader.ReadFromFile(@"TestData\Cycles\LongHaul_short.vdri", CycleType.DistanceBased, false);
new MockDrivingCycle(container, data);
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/MockSumWriter.cs b/VectoCore/VectoCoreTest/Models/Simulation/MockSumWriter.cs
index 5306c49efb..8c0a9eaebe 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/MockSumWriter.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/MockSumWriter.cs
@@ -37,7 +37,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
public class MockSumWriter : SummaryDataContainer
{
public override void Write(IModalDataContainer modData, string jobFileName, string jobName,
- string cycleFileName, Kilogram vehicleMass, Kilogram vehicleLoading, CubicMeter cargoVolume) {}
+ string cycleFileName, Kilogram vehicleMass, Kilogram vehicleLoading, CubicMeter cargoVolume, uint gearCount) {}
public override void Finish() {}
}
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
index 13259dc8c7..05d62d49e0 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
@@ -155,9 +155,9 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var sumWriter =
new SummaryDataContainer(
new FileOutputWriter(string.Format("AT_Vehicle_Drive-TC_{0}-{1}", cycleName, gbxType == GearboxType.ATSerial ? "ser" : "ps")));
- ((VehicleContainer)run.GetContainer()).WriteSumData = (writer, mass, loading, volume) =>
+ ((VehicleContainer)run.GetContainer()).WriteSumData = (writer, mass, loading, volume, gearCount) =>
sumWriter.Write(run.GetContainer().ModalData, cycleName, string.Format("{0}-{1}", 0, 0),
- cycleName + Constants.FileExtensions.CycleFile, mass, loading, 0.SI<CubicMeter>());
+ cycleName + Constants.FileExtensions.CycleFile, mass, loading, 0.SI<CubicMeter>(), gearCount);
run.Run();
sumWriter.Finish();
Assert.IsTrue(run.FinishedWithoutErrors);
diff --git a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
index fbff2ce3f8..1af73eadff 100644
--- a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
@@ -76,7 +76,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData.CommitSimulationStep();
}
- sumWriter.Write(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>(), 0.SI<CubicMeter>());
+ sumWriter.Write(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>(), 0.SI<CubicMeter>(), 0);
modData.Finish(VectoRun.Status.Success);
sumWriter.Finish();
@@ -131,7 +131,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData.CommitSimulationStep();
}
- sumWriter.Write(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>(), 0.SI<CubicMeter>());
+ sumWriter.Write(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>(), 0.SI<CubicMeter>(), 0);
modData.Finish(VectoRun.Status.Success);
sumWriter.Finish();
diff --git a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
index 30ea0c475f..054e95e082 100644
--- a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
@@ -121,7 +121,7 @@ namespace TUGraz.VectoCore.Tests.Utils
public Kilogram VehicleMass { get; set; }
public Kilogram VehicleLoading { get; set; }
public Kilogram TotalMass { get; set; }
- public CubicMeter CargoVolume { get; set; }
+ public CubicMeter CargoVolume { get; set; }
public Newton AirDragResistance(MeterPerSecond previousVelocity, MeterPerSecond nextVelocity)
{
--
GitLab