From a2834b91ecd7b34a7a0fe884ff49bf73bb53090f Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 11 Nov 2015 09:17:16 +0100
Subject: [PATCH] make engine-only tests run again
---
.../SimulationComponent/Impl/EngineOnlyDrivingCycle.cs | 10 +++++++---
.../TestData/Results/EngineOnlyCycles/24t Coach.vsum | 8 ++++----
VectoCoreTest/TestData/Results/Integration/job.vsum | 4 ++--
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/VectoCore/Models/SimulationComponent/Impl/EngineOnlyDrivingCycle.cs b/VectoCore/Models/SimulationComponent/Impl/EngineOnlyDrivingCycle.cs
index aa69f91b6b..e21d22d6f5 100644
--- a/VectoCore/Models/SimulationComponent/Impl/EngineOnlyDrivingCycle.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/EngineOnlyDrivingCycle.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
@@ -21,6 +22,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
private IEnumerator<DrivingCycleData.DrivingCycleEntry> RightSample { get; set; }
private IEnumerator<DrivingCycleData.DrivingCycleEntry> LeftSample { get; set; }
+ protected Second AbsTime { get; set; }
+
public EngineOnlyDrivingCycle(IVehicleContainer container, DrivingCycleData cycle) : base(container)
{
@@ -65,7 +68,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (index >= Data.Entries.Count) {
return new ResponseCycleFinished();
}
-
+ AbsTime = absTime;
return NextComponent.Request(absTime, dt, Data.Entries[index].EngineTorque, Data.Entries[index].EngineSpeed);
}
@@ -77,12 +80,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public double Progress
{
- get { throw new NotImplementedException(); }
+ get { return AbsTime.Value() / Data.Entries.Last().Time.Value(); }
}
+
public Meter StartDistance
{
- get { throw new NotImplementedException(); }
+ get { return 0.SI<Meter>(); }
}
#endregion
diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum b/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum
index a2f10c7f2d..9ad88585ec 100644
--- a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum
+++ b/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum
@@ -1,4 +1,4 @@
-Job [-],Input File [-],Cycle [-],time [s],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
-1,24t Coach.vecto,Engine Only1.vdri,3951,29.5999634846317,-1.63579455196953,ERROR,-,-
-1,24t Coach.vecto,Engine Only2.vdri,3951,29.5999634846317,-1.63579455196953,ERROR,-,-
-1,24t Coach.vecto,Engine Only3.vdri,3951,29.5999634846317,-1.63579455196953,ERROR,-,-
+Job [-],Input File [-],Cycle [-],Status,time [s],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
+1,24t Coach.vecto,Engine Only1.vdri,Success,3951,29.5999634846317,-1.63579455196953,ERROR,-,-
+1,24t Coach.vecto,Engine Only2.vdri,Success,3951,29.5999634846317,-1.63579455196953,ERROR,-,-
+1,24t Coach.vecto,Engine Only3.vdri,Success,3951,29.5999634846317,-1.63579455196953,ERROR,-,-
diff --git a/VectoCoreTest/TestData/Results/Integration/job.vsum b/VectoCoreTest/TestData/Results/Integration/job.vsum
index 88388dc426..12c714a912 100644
--- a/VectoCoreTest/TestData/Results/Integration/job.vsum
+++ b/VectoCoreTest/TestData/Results/Integration/job.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],time [s],distance [km],speed [km/h],∆altitude [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
-0-0,job.vecto,1-Gear-Test-dist,8522.5000,16812.0086,4.0893,,15403.1928,-12521.5157,3672.4548,,,,,,,,,,,,Infinity,15403.1928,-12521.5157,,,,20412.4831,0.0000,Infinity,11089490.8510,10157295.6812,,15700.0000,3300.0000,0.0000,,,,0.0000,0.0000,100.0000,0.0117
+Job [-],Input File [-],Cycle [-],Status,time [s],distance [km],speed [km/h],∆altitude [m],Ppos [kW],Pneg [kW],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],CO2 [g/km],CO2 [g/tkm],FC-Final [g/km],FC-Final [l/100tkm],FC-Final [l/100km],PwheelPos [kW],Pbrake [kW],EposICE [kWh],EnegICE [kWh],Eair [kWh],Eroll [kWh],Egrad [kWh],Eacc [kWh],Eaux [kWh],Ebrake [kWh],Etransm [kWh],Eretarder [kWh],Etorqueconv [kWh],Mass [kg],Loading [kg],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],Acc.Noise [m/s^2],pAcc [%],pDec [%],pCruise [%],pStop [%]
+0-0,job.vecto,1-Gear-Test-dist,Success,8522.5000,16812.0086,4.0893,,15403.1928,-12521.5157,3672.4548,,,,,,,,,,,,Infinity,15403.1928,-12521.5157,,,,20412.4831,0.0000,Infinity,11089490.8510,10157295.6812,,15700.0000,3300.0000,0.0000,,,,0.0000,0.0000,100.0000,0.0117
--
GitLab