Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 45a41e6b authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

pass number of gears to sum writer

parent 807bba4a
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -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();
......
......@@ -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);
......
......@@ -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() {}
}
......
......@@ -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);
......
......@@ -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();
......
......@@ -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)
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment