From cd1417a8b26534f94cf94496899143960f881880 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 17 Nov 2017 13:54:47 +0100
Subject: [PATCH] bugfix: correct calculation of acceleration in case
simulation intervals are split up
---
.../SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs | 2 +-
.../Models/Simulation/MeasuredSpeedModeTest.cs | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs
index cf4ae6f835..5e156498f1 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs
@@ -154,7 +154,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
targetSpeed = 0.KMPHtoMeterPerSecond();
}
var deltaV = targetSpeed - DataBus.VehicleSpeed;
- var deltaT = CycleIterator.RightSample.Time - CycleIterator.LeftSample.Time;
+ var deltaT = CycleIterator.RightSample.Time - absTime;
if (DataBus.VehicleSpeed.IsSmaller(0)) {
throw new VectoSimulationException("vehicle velocity is smaller than zero");
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
index 67595e7a88..4aae8a5467 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
@@ -32,6 +32,7 @@
using NUnit.Framework;
using System.Collections.Generic;
using System.Data;
+using System.IO;
using System.Linq;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
@@ -60,6 +61,13 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestFixture]
public class MeasuredSpeedModeTest
{
+
+ [OneTimeSetUp]
+ public void Init()
+ {
+ Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
+ }
+
/// <summary>
/// Test if the cycle file can be read.
/// </summary>
--
GitLab