From 1673b597adb65c4856454fa4401d7a6e82015f67 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 22 Sep 2016 08:32:50 +0200
Subject: [PATCH] re-adding min-speed for coasting
---
.../Reader/DataObjectAdapter/DeclarationDataAdapter.cs | 2 +-
.../Reader/DataObjectAdapter/EngineeringDataAdapter.cs | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
index 62b441e563..783e7af47f 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
@@ -57,7 +57,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var lookAheadData = new DriverData.LACData {
Enabled = DeclarationData.Driver.LookAhead.Enabled,
//Deceleration = DeclarationData.Driver.LookAhead.Deceleration,
- //MinSpeed = DeclarationData.Driver.LookAhead.MinimumSpeed,
+ MinSpeed = DeclarationData.Driver.LookAhead.MinimumSpeed,
LookAheadDecisionFactor = new LACDecisionFactor(),
LookAheadDistanceFactor = DeclarationData.Driver.LookAhead.LookAheadDistanceFactor,
};
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index f68efa901d..dacd50e5cb 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -127,9 +127,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var retVal = SetCommonGearboxData(gearbox);
//var gears = gearbox.Gears;
- if (gearbox.Gears.Count < 1) {
+ if (gearbox.Gears.Count < 2) {
throw new VectoSimulationException(
- "At least one Gear-Entry must be defined in Gearbox!");
+ "At least two Gear-Entries must be defined in Gearbox!");
}
retVal.Inertia = gearbox.Inertia;
@@ -142,7 +142,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
retVal.StartSpeed = gearbox.StartSpeed;
retVal.StartAcceleration = gearbox.StartAcceleration;
- var gearDifferenceRatio = gearbox.Gears[0].Ratio / gearbox.Gears[1].Ratio;
+ var gearDifferenceRatio = gearbox.Type.AutomaticTransmission() && gearbox.Gears.Count > 2 ?
+ gearbox.Gears[0].Ratio / gearbox.Gears[1].Ratio
+ : 1.0;
var gears = new Dictionary<uint, GearData>();
--
GitLab