From 0b774576ab9abcbdd9eb3b5d6e1b866f5ad446a2 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Tue, 10 May 2016 12:40:03 +0200
Subject: [PATCH] reverted distance check
---
.../Impl/DistanceBasedDrivingCycle.cs | 11 -----------
.../Models/SimulationComponent/Impl/Vehicle.cs | 11 ++++++++++-
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
index 318d48794a..f0db6c2284 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
@@ -298,17 +298,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected override void DoWriteModalResults(IModalDataContainer container)
{
- // sanity check: is the vehicle in step with the cycle?
- if (container[ModalResultField.dist] == DBNull.Value) {
- Log.Warn("Distance field is not set!");
- } else {
- var distance = (SI)container[ModalResultField.dist];
- if (!distance.IsEqual(CurrentState.Distance)) {
- Log.Warn("Vehicle Distance diverges from Cycle by {0} [m]. Distance: {1}",
- (distance - CurrentState.Distance).Value(), distance);
- }
- }
-
container[ModalResultField.dist] = CurrentState.Distance; // (CurrentState.Distance + PreviousState.Distance) / 2.0;
container[ModalResultField.simulationDistance] = CurrentState.SimulationDistance;
container[ModalResultField.v_targ] = CurrentState.VehicleTargetSpeed;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
index 6e0a47dbc8..f1f79f63bb 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
@@ -174,7 +174,16 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
container[ModalResultField.P_slope] = CurrentState.SlopeResistance * averageVelocity;
container[ModalResultField.P_trac] = CurrentState.VehicleTractionForce * averageVelocity;
- container[ModalResultField.dist] = CurrentState.Distance;
+ // sanity check: is the vehicle in step with the cycle?
+ if (container[ModalResultField.dist] == DBNull.Value) {
+ Log.Warn("Distance field is not set!");
+ } else {
+ var distance = (SI)container[ModalResultField.dist];
+ if (!distance.IsEqual(CurrentState.Distance)) {
+ Log.Warn("Vehicle Distance diverges from Cycle by {0} [m]. Distance: {1}",
+ (distance - CurrentState.Distance).Value(), distance);
+ }
+ }
}
protected override void DoCommitSimulationStep()
--
GitLab