Merge branch 'feature/VECTO-112-simple-shifting-strategy' into...

Merge branch 'feature/VECTO-112-simple-shifting-strategy' into feature/VECTO-113-commandline-interface Conflicts: VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs VectoCore/Models/SimulationComponent/Impl/Driver.cs VectoCore/Utils/DelauneyMap.cs VectoCore/VectoCore.csproj VectoCoreTest/app.config

Merge branch 'feature/VECTO-112-simple-shifting-strategy' into...
9616090e · Michael KRISPER · 3f978526 · c335aaf5 · 9616090e · 3f978526
Commit 9616090e authored 9 years ago by Michael KRISPER
--- a/VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs
+++ b/VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs
--- a/VectoCore/Models/SimulationComponent/Data/GearFullLoadCurve.cs
+++ b/VectoCore/Models/SimulationComponent/Data/GearFullLoadCurve.cs
--- a/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs
+++ b/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs
--- a/VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs
+++ b/VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs
--- a/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
+++ b/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
--- a/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
+++ b/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
--- a/VectoCore/Models/SimulationComponent/Data/GearboxType.cs
+++ b/VectoCore/Models/SimulationComponent/Data/GearboxType.cs
--- a/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
+++ b/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
@@ -10,7 +10,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
 	{
 		public string BasePath { get; internal set; }

-
 		public VehicleCategory VehicleCategory { get; internal set; }

 		public VehicleClass VehicleClass { get; internal set; }

--- a/VectoCore/Models/SimulationComponent/IBreaks.cs
+++ b/VectoCore/Models/SimulationComponent/IBreaks.cs
--- a/VectoCore/Models/SimulationComponent/IClutch.cs
+++ b/VectoCore/Models/SimulationComponent/IClutch.cs
--- a/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs
--- a/VectoCore/Models/SimulationComponent/Impl/Breaks.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/Breaks.cs
--- a/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
--- a/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
--- a/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
--- a/VectoCore/Models/SimulationComponent/Impl/Driver.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/Driver.cs
--- a/VectoCore/Models/SimulationComponent/Impl/EngineOnlyCombustionEngine.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/EngineOnlyCombustionEngine.cs
--- a/VectoCore/Models/SimulationComponent/Impl/EngineOnlyGearbox.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/EngineOnlyGearbox.cs
--- a/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
--- a/VectoCore/Models/SimulationComponent/Impl/Retarder.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/Retarder.cs