From e13195680d52b064dfdc8e9a28d7b5c9739c5179 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Mon, 23 May 2016 13:47:36 +0200
Subject: [PATCH] unified comparison tests
---
.../Integration/BusAuxiliaries/AAuxTests.cs | 6 +-
.../DriverStrategy/DriverStrategyTestCoach.cs | 467 -----------------
.../DriverStrategy/DriverStrategyTestTruck.cs | 469 ------------------
.../DriverStrategy/SimpleCycles.cs | 408 +++++++++++++++
...cle_Drive_50_Dec_Increasing_Slope_v22.vmod | 82 +++
...ycle_Drive_50_Dec_Increasing_Slope_v3.vmod | 174 +++++++
VectoCore/VectoCoreTest/VectoCoreTest.csproj | 9 +-
7 files changed, 674 insertions(+), 941 deletions(-)
delete mode 100644 VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
delete mode 100644 VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
create mode 100644 VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
create mode 100644 VectoCore/VectoCoreTest/TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v22.vmod
create mode 100644 VectoCore/VectoCoreTest/TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod
diff --git a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs
index bd85252d52..799de98ff3 100644
--- a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs
@@ -104,7 +104,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
TestCase(20, 85, -15), TestCase(20, 85, -20), TestCase(20, 85, -25),
TestCase(20, 22, 5),
]
- public void Coach_Accelerate(double v1, double v2, double slope)
+ public void Coach_Accelerate_AAux(double v1, double v2, double slope)
{
var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
@@ -136,7 +136,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
TestCase(80, 0, 5), TestCase(80, 0, 15), TestCase(80, 0, 25),
TestCase(22, 20, -5),
]
- public void Coach_Decelerate(double v1, double v2, double slope)
+ public void Coach_Decelerate_AAux(double v1, double v2, double slope)
{
var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
@@ -190,7 +190,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
TestCase(85, 85, -1), TestCase(85, 85, -5), TestCase(85, 85, -10),
TestCase(85, 85, -15), TestCase(85, 85, -20), TestCase(85, 85, -25),
]
- public void Coach_Drive(double v1, double v2, double slope)
+ public void Coach_Drive_AAux(double v1, double v2, double slope)
{
var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
diff --git a/VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs b/VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
deleted file mode 100644
index 4181219cc3..0000000000
--- a/VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
-* This file is part of VECTO.
-*
-* Copyright © 2012-2016 European Union
-*
-* Developed by Graz University of Technology,
-* Institute of Internal Combustion Engines and Thermodynamics,
-* Institute of Technical Informatics
-*
-* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
-* by the European Commission - subsequent versions of the EUPL (the "Licence");
-* You may not use VECTO except in compliance with the Licence.
-* You may obtain a copy of the Licence at:
-*
-* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
-*
-* Unless required by applicable law or agreed to in writing, VECTO
-* distributed under the Licence is distributed on an "AS IS" basis,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the Licence for the specific language governing permissions and
-* limitations under the Licence.
-*
-* Authors:
-* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
-* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
-* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
-* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
-* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
-* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
-*/
-
-using System;
-using System.Globalization;
-using NUnit.Framework;
-using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.Models.Simulation.Data;
-using TUGraz.VectoCore.Tests.Utils;
-
-namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
-{
- [TestFixture]
- public class DriverStrategyTestCoach
- {
- [TestFixtureSetUp]
- public void Init()
- {
- //LogManager.DisableLogging();
-#if TRACE
- GraphWriter.Enable();
-#else
- GraphWriter.Disable();
-#endif
- GraphWriter.Xfields = new[] { ModalResultField.time, ModalResultField.dist };
-
- GraphWriter.Yfields = new[] {
- ModalResultField.v_act, ModalResultField.acc, ModalResultField.n_eng_avg, ModalResultField.Gear,
- ModalResultField.P_eng_out, ModalResultField.T_eng_fcmap, ModalResultField.FCMap
- };
- GraphWriter.Series1Label = "Vecto 3";
- GraphWriter.Series2Label = "Vecto 2.2";
- }
-
- [TestCase, Category("ComparisonV2")]
- public void TestGraph()
- {
- var imgV3 = @"TestData\Results\Integration\24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod";
- var imgv22 = @"TestData\Results\Integration\24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod";
-
- GraphWriter.Write(imgV3, imgv22);
- }
-
- [TestCase, Category("ComparisonV2")]
- public void TestSingleGraph()
- {
- var imgV3 = @"..\..\..\VectoCoreTest\bin\Debug\Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod";
-
- GraphWriter.Write(imgV3);
- }
-
- [Category("ComparisonV2"),
- TestCase(0, 20, -5), TestCase(0, 20, 0),
- TestCase(0, 40, 25), TestCase(0, 40, 20), TestCase(0, 40, 15),
- TestCase(0, 40, 10), TestCase(0, 40, 5), TestCase(0, 40, 1),
- TestCase(0, 40, 0),
- TestCase(0, 40, -1), TestCase(0, 40, -5), TestCase(0, 40, -10),
- TestCase(0, 40, -15), TestCase(0, 40, -20), TestCase(0, 40, -25),
- TestCase(0, 60, 25), TestCase(0, 60, 20), TestCase(0, 60, 15),
- TestCase(0, 60, 10), TestCase(0, 60, 5), TestCase(0, 60, 1),
- TestCase(0, 60, 0),
- TestCase(0, 60, -1), TestCase(0, 60, -5), TestCase(0, 60, -10),
- TestCase(0, 60, -15), TestCase(0, 60, -20), TestCase(0, 60, -25),
- TestCase(0, 85, 25), TestCase(0, 85, 20), TestCase(0, 85, 15),
- TestCase(0, 85, 10), TestCase(0, 85, 5), TestCase(0, 85, 1),
- TestCase(0, 85, 0), TestCase(0, 85, 2),
- TestCase(0, 85, -1), TestCase(0, 85, -5), TestCase(0, 85, -10),
- TestCase(0, 85, -15), TestCase(0, 85, -20), TestCase(0, 85, -25),
- TestCase(20, 40, 25), TestCase(20, 40, 20), TestCase(20, 40, 15),
- TestCase(20, 40, 10), TestCase(20, 40, 5), TestCase(20, 40, 1),
- TestCase(20, 40, 0),
- TestCase(20, 40, -1), TestCase(20, 40, -5), TestCase(20, 40, -10),
- TestCase(20, 40, -15), TestCase(20, 40, -20), TestCase(20, 40, -25),
- TestCase(20, 60, 25), TestCase(20, 60, 20), TestCase(20, 60, 15),
- TestCase(20, 60, 10), TestCase(20, 60, 5), TestCase(20, 60, 1),
- TestCase(20, 60, 0),
- TestCase(20, 60, -1), TestCase(20, 60, -5), TestCase(20, 60, -10),
- TestCase(20, 60, -15), TestCase(20, 60, -20), TestCase(20, 60, -25),
- TestCase(20, 85, 25), TestCase(20, 85, 20), TestCase(20, 85, 15),
- TestCase(20, 85, 10), TestCase(20, 85, 5), TestCase(20, 85, 1),
- TestCase(20, 85, 0),
- TestCase(20, 85, -1), TestCase(20, 85, -5), TestCase(20, 85, -10),
- TestCase(20, 85, -15), TestCase(20, 85, -20), TestCase(20, 85, -25),
- TestCase(20, 22, 5),
- ]
- public void Coach_Accelerate(double v1, double v2, double slope)
- {
- var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
- v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
-
- var slopeStr = GetSlopeString(slope);
- var modFileName = string.Format(CultureInfo.InvariantCulture, @"Coach_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
-
- Coach_Special(cycle, modFileName,
- string.Format(CultureInfo.InvariantCulture, "24t Coach_Cycle_Accelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
- }
-
- [Category("ComparisonV2"),
- TestCase(40, 0, 25), TestCase(40, 0, 20), TestCase(40, 0, 15),
- TestCase(40, 0, 10), TestCase(40, 0, 5), TestCase(40, 0, 1),
- TestCase(40, 0, 0),
- TestCase(40, 0, -1), TestCase(40, 0, -5), TestCase(40, 0, -10),
- TestCase(40, 0, -15), TestCase(40, 0, -20), TestCase(40, 0, -25),
- TestCase(60, 0, 25), TestCase(60, 0, 20), TestCase(60, 0, 15),
- TestCase(60, 0, 10), TestCase(60, 0, 5), TestCase(60, 0, 1),
- TestCase(60, 0, 0),
- TestCase(60, 0, -1), TestCase(60, 0, -5), TestCase(60, 0, -10),
- TestCase(60, 0, -15), TestCase(60, 0, -20), TestCase(60, 0, -25),
- TestCase(85, 0, 25), TestCase(85, 0, 20), TestCase(85, 0, 15),
- TestCase(85, 0, 10), TestCase(85, 0, 5), TestCase(85, 0, 1),
- TestCase(85, 0, 0),
- TestCase(85, 0, -1), TestCase(85, 0, -5), TestCase(85, 0, -10),
- TestCase(85, 0, -15), TestCase(85, 0, -20), TestCase(85, 0, -25),
- TestCase(40, 20, 25), TestCase(40, 20, 20), TestCase(40, 20, 15),
- TestCase(40, 20, 10), TestCase(40, 20, 5), TestCase(40, 20, 1),
- TestCase(40, 20, 0),
- TestCase(40, 20, -1), TestCase(40, 20, -5), TestCase(40, 20, -10),
- TestCase(40, 20, -15), TestCase(40, 20, -20), TestCase(40, 20, -25),
- TestCase(45, 0, -5),
- TestCase(45, 0, 0),
- TestCase(45, 0, 5),
- TestCase(60, 20, 25), TestCase(60, 20, 20), TestCase(60, 20, 15),
- TestCase(60, 20, 10), TestCase(60, 20, 5), TestCase(60, 20, 1),
- TestCase(60, 20, 0),
- TestCase(60, 20, -1), TestCase(60, 20, -5), TestCase(60, 20, -10),
- TestCase(60, 20, -15), TestCase(60, 20, -20), TestCase(60, 20, -25),
- TestCase(85, 20, 25), TestCase(85, 20, 20), TestCase(85, 20, 15),
- TestCase(85, 20, 10), TestCase(85, 20, 5), TestCase(85, 20, 1),
- TestCase(85, 20, 0),
- TestCase(85, 20, -1), TestCase(85, 20, -5), TestCase(85, 20, -10),
- TestCase(85, 20, -15), TestCase(85, 20, -20), TestCase(85, 20, -25),
- TestCase(22, 20, -5),
- ]
- public void Coach_Decelerate(double v1, double v2, double slope)
- {
- var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
- v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
-
- var slopeStr = GetSlopeString(slope);
- var modFileName = string.Format(CultureInfo.InvariantCulture, @"Coach_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
-
- Coach_Special(cycle, modFileName,
- string.Format(CultureInfo.InvariantCulture, "24t Coach_Cycle_Decelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
- }
-
- [Category("ComparisonV2"),
- TestCase(10, 10, 25), TestCase(10, 10, 20), TestCase(10, 10, 15),
- TestCase(10, 10, 10), TestCase(10, 10, 5), TestCase(10, 10, 1),
- TestCase(10, 10, 0),
- TestCase(10, 10, -1), TestCase(10, 10, -5), TestCase(10, 10, -10),
- TestCase(10, 10, -15), TestCase(10, 10, -20), TestCase(10, 10, -25),
- TestCase(20, 20, 25), TestCase(20, 20, 20), TestCase(20, 20, 15),
- TestCase(20, 20, 10), TestCase(20, 20, 5), TestCase(20, 20, 1),
- TestCase(20, 20, 0),
- TestCase(20, 20, -1), TestCase(20, 20, -5), TestCase(20, 20, -10),
- TestCase(20, 20, -15), TestCase(20, 20, -20), TestCase(20, 20, -25),
- TestCase(30, 30, 25), TestCase(30, 30, 20), TestCase(30, 30, 15),
- TestCase(30, 30, 10), TestCase(30, 30, 5), TestCase(30, 30, 1),
- TestCase(30, 30, 0),
- TestCase(30, 30, -1), TestCase(30, 30, -5), TestCase(30, 30, -10),
- TestCase(30, 30, -15), TestCase(30, 30, -20), TestCase(30, 30, -25),
- TestCase(40, 40, 25), TestCase(40, 40, 20), TestCase(40, 40, 15),
- TestCase(40, 40, 10), TestCase(40, 40, 5), TestCase(40, 40, 1),
- TestCase(40, 40, 0),
- TestCase(40, 40, -1), TestCase(40, 40, -5), TestCase(40, 40, -10),
- TestCase(40, 40, -15), TestCase(40, 40, -20), TestCase(40, 40, -25),
- TestCase(50, 50, 25), TestCase(50, 50, 20), TestCase(50, 50, 15),
- TestCase(50, 50, 10), TestCase(50, 50, 5), TestCase(50, 50, 1),
- TestCase(50, 50, 0),
- TestCase(50, 50, -1), TestCase(50, 50, -5), TestCase(50, 50, -10),
- TestCase(50, 50, -15), TestCase(50, 50, -20), TestCase(50, 50, -25),
- TestCase(60, 60, 25), TestCase(60, 60, 20), TestCase(60, 60, 15),
- TestCase(60, 60, 10), TestCase(60, 60, 5), TestCase(60, 60, 1),
- TestCase(60, 60, 0),
- TestCase(60, 60, -1), TestCase(60, 60, -5), TestCase(60, 60, -10),
- TestCase(60, 60, -15), TestCase(60, 60, -20), TestCase(60, 60, -25),
- TestCase(80, 80, 25), TestCase(80, 80, 20), TestCase(80, 80, 15),
- TestCase(80, 80, 10), TestCase(80, 80, 5), TestCase(80, 80, 1),
- TestCase(80, 80, 0),
- TestCase(80, 80, -1), TestCase(80, 80, -5), TestCase(80, 80, -10),
- TestCase(80, 80, -15), TestCase(80, 80, -20), TestCase(80, 80, -25),
- TestCase(85, 85, 25), TestCase(85, 85, 20), TestCase(85, 85, 15),
- TestCase(85, 85, 10), TestCase(85, 85, 5), TestCase(85, 85, 1),
- TestCase(85, 85, 0),
- TestCase(85, 85, -1), TestCase(85, 85, -5), TestCase(85, 85, -10),
- TestCase(85, 85, -15), TestCase(85, 85, -20), TestCase(85, 85, -25),
- ]
- public void Coach_Drive(double v1, double v2, double slope)
- {
- var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
- v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
-
- var slopeStr = GetSlopeString(slope);
- var modFileName = string.Format(CultureInfo.InvariantCulture, @"Coach_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
-
- Coach_Special(cycle, modFileName,
- string.Format(CultureInfo.InvariantCulture, "24t Coach_Cycle_Drive_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
- }
-
- [Category("ComparisonV2"),
- TestCase(0, 40, 25), TestCase(0, 40, 20), TestCase(0, 40, 15),
- TestCase(0, 40, 10), TestCase(0, 40, 5), TestCase(0, 40, 1),
- TestCase(0, 40, 0), TestCase(0, 40, -3),
- TestCase(0, 40, -1), TestCase(0, 40, -5), TestCase(0, 40, -10),
- TestCase(0, 40, -15), TestCase(0, 40, -20), TestCase(0, 40, -25),
- TestCase(0, 60, 25), TestCase(0, 60, 20), TestCase(0, 60, 15),
- TestCase(0, 60, 10), TestCase(0, 60, 5), TestCase(0, 60, 1),
- TestCase(0, 60, 0), TestCase(0, 60, -3),
- TestCase(0, 60, -1), TestCase(0, 60, -5), TestCase(0, 60, -10),
- TestCase(0, 60, -15), TestCase(0, 60, -20), TestCase(0, 60, -25),
- TestCase(0, 85, 25), TestCase(0, 85, 20), TestCase(0, 85, 15),
- TestCase(0, 85, 10), TestCase(0, 85, 5), TestCase(0, 85, 1),
- TestCase(0, 85, 0), TestCase(0, 85, -3),
- TestCase(0, 85, -1), TestCase(0, 85, -5), TestCase(0, 85, -10),
- TestCase(0, 85, -15), TestCase(0, 85, -20), TestCase(0, 85, -25),
- TestCase(20, 40, 25), TestCase(20, 40, 20), TestCase(20, 40, 15),
- TestCase(20, 40, 10), TestCase(20, 40, 5), TestCase(20, 40, 1),
- TestCase(20, 40, 0),
- TestCase(20, 40, -1), TestCase(20, 40, -5), TestCase(20, 40, -10),
- TestCase(20, 40, -15), TestCase(20, 40, -20), TestCase(20, 40, -25),
- TestCase(20, 60, 25), TestCase(20, 60, 20), TestCase(20, 60, 15),
- TestCase(20, 60, 10), TestCase(20, 60, 5), TestCase(20, 60, 1),
- TestCase(20, 60, 0),
- TestCase(20, 60, -1), TestCase(20, 60, -5), TestCase(20, 60, -10),
- TestCase(20, 60, -15), TestCase(20, 60, -20), TestCase(20, 60, -25),
- TestCase(20, 85, 25), TestCase(20, 85, 20), TestCase(20, 85, 15),
- TestCase(20, 85, 10), TestCase(20, 85, 5), TestCase(20, 85, 1),
- TestCase(20, 85, 0),
- TestCase(20, 85, -1), TestCase(20, 85, -5), TestCase(20, 85, -10),
- TestCase(20, 85, -15), TestCase(20, 85, -20), TestCase(20, 85, -25),
- TestCase(20, 22, 5),
- ]
- public void Coach_Accelerate_Overspeed(double v1, double v2, double slope)
- {
- var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
- v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
-
- var slopeStr = GetSlopeString(slope);
- var modFileName = string.Format(CultureInfo.InvariantCulture, @"Coach_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
-
- Coach_Special_Overspeed(cycle, modFileName,
- string.Format(CultureInfo.InvariantCulture, "24t Coach_Cycle_Accelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
- }
-
- [Category("ComparisonV2"),
- TestCase(40, 0, 25), TestCase(40, 0, 20), TestCase(40, 0, 15),
- TestCase(40, 0, 10), TestCase(40, 0, 5), TestCase(40, 0, 1),
- TestCase(40, 0, 0),
- TestCase(40, 0, -1), TestCase(40, 0, -5), TestCase(40, 0, -10),
- TestCase(40, 0, -15), TestCase(40, 0, -20), TestCase(40, 0, -25),
- TestCase(60, 0, 25), TestCase(60, 0, 20), TestCase(60, 0, 15),
- TestCase(60, 0, 10), TestCase(60, 0, 5), TestCase(60, 0, 1),
- TestCase(60, 0, 0),
- TestCase(60, 0, -1), TestCase(60, 0, -5), TestCase(60, 0, -10),
- TestCase(60, 0, -15), TestCase(60, 0, -20), TestCase(60, 0, -25),
- TestCase(85, 0, 25), TestCase(85, 0, 20), TestCase(85, 0, 15),
- TestCase(85, 0, 10), TestCase(85, 0, 5), TestCase(85, 0, 1),
- TestCase(85, 0, 0),
- TestCase(85, 0, -1), TestCase(85, 0, -5), TestCase(85, 0, -10),
- TestCase(85, 0, -15), TestCase(85, 0, -20), TestCase(85, 0, -25),
- TestCase(40, 20, 25), TestCase(40, 20, 20), TestCase(40, 20, 15),
- TestCase(40, 20, 10), TestCase(40, 20, 5), TestCase(40, 20, 1),
- TestCase(40, 20, 0),
- TestCase(40, 20, -1), TestCase(40, 20, -5), TestCase(40, 20, -10),
- TestCase(40, 20, -15), TestCase(40, 20, -20), TestCase(40, 20, -25),
- TestCase(60, 20, 25), TestCase(60, 20, 20), TestCase(60, 20, 15),
- TestCase(60, 20, 10), TestCase(60, 20, 5), TestCase(60, 20, 1),
- TestCase(60, 20, 0),
- TestCase(60, 20, -1), TestCase(60, 20, -5), TestCase(60, 20, -10),
- TestCase(60, 20, -15), TestCase(60, 20, -20), TestCase(60, 20, -25),
- TestCase(85, 20, 25), TestCase(85, 20, 20), TestCase(85, 20, 15),
- TestCase(85, 20, 10), TestCase(85, 20, 5), TestCase(85, 20, 1),
- TestCase(85, 20, 0),
- TestCase(85, 20, -1), TestCase(85, 20, -5), TestCase(85, 20, -10),
- TestCase(85, 20, -15), TestCase(85, 20, -20), TestCase(85, 20, -25),
- TestCase(22, 20, -5),
- ]
- public void Coach_Decelerate_Overspeed(double v1, double v2, double slope)
- {
- var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
- v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
-
- var slopeStr = GetSlopeString(slope);
- var modFileName = string.Format(CultureInfo.InvariantCulture, @"Coach_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
-
- Coach_Special_Overspeed(cycle, modFileName,
- string.Format(CultureInfo.InvariantCulture, "24t Coach_Cycle_Decelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
- }
-
- private static string GetSlopeString(double slope)
- {
- var slopeStr = slope > 0
- ? Math.Abs(slope).ToString("uphill_#")
- : slope < 0
- ? Math.Abs(slope).ToString("downhill_#")
- : "level";
- return slopeStr;
- }
-
- [Category("ComparisonV2"),
- TestCase(10, 10, 25), TestCase(10, 10, 20), TestCase(10, 10, 15),
- TestCase(10, 10, 10), TestCase(10, 10, 5), TestCase(10, 10, 1),
- TestCase(10, 10, 0),
- TestCase(10, 10, -1), TestCase(10, 10, -5), TestCase(10, 10, -10),
- TestCase(10, 10, -15), TestCase(10, 10, -20), TestCase(10, 10, -25),
- TestCase(20, 20, 25), TestCase(20, 20, 20), TestCase(20, 20, 15),
- TestCase(20, 20, 10), TestCase(20, 20, 5), TestCase(20, 20, 1),
- TestCase(20, 20, 0),
- TestCase(20, 20, -1), TestCase(20, 20, -5), TestCase(20, 20, -10),
- TestCase(20, 20, -15), TestCase(20, 20, -20), TestCase(20, 20, -25),
- TestCase(30, 30, 25), TestCase(30, 30, 20), TestCase(30, 30, 15),
- TestCase(30, 30, 10), TestCase(30, 30, 5), TestCase(30, 30, 1),
- TestCase(30, 30, 0),
- TestCase(30, 30, -1), TestCase(30, 30, -5), TestCase(30, 30, -10),
- TestCase(30, 30, -15), TestCase(30, 30, -20), TestCase(30, 30, -25),
- TestCase(40, 40, 25), TestCase(40, 40, 20), TestCase(40, 40, 15),
- TestCase(40, 40, 10), TestCase(40, 40, 5), TestCase(40, 40, 1),
- TestCase(40, 40, 0),
- TestCase(40, 40, -1), TestCase(40, 40, -5), TestCase(40, 40, -10),
- TestCase(40, 40, -15), TestCase(40, 40, -20), TestCase(40, 40, -25),
- TestCase(50, 50, 25), TestCase(50, 50, 20), TestCase(50, 50, 15),
- TestCase(50, 50, 10), TestCase(50, 50, 5), TestCase(50, 50, 1),
- TestCase(50, 50, 0),
- TestCase(50, 50, -1), TestCase(50, 50, -5), TestCase(50, 50, -10),
- TestCase(50, 50, -15), TestCase(50, 50, -20), TestCase(50, 50, -25),
- TestCase(60, 60, 25), TestCase(60, 60, 20), TestCase(60, 60, 15),
- TestCase(60, 60, 10), TestCase(60, 60, 5), TestCase(60, 60, 1),
- TestCase(60, 60, 0),
- TestCase(60, 60, -1), TestCase(60, 60, -5), TestCase(60, 60, -10),
- TestCase(60, 60, -15), TestCase(60, 60, -20), TestCase(60, 60, -25),
- TestCase(80, 80, 25), TestCase(80, 80, 20), TestCase(80, 80, 15),
- TestCase(80, 80, 10), TestCase(80, 80, 5), TestCase(80, 80, 1),
- TestCase(80, 80, 0),
- TestCase(80, 80, -1), TestCase(80, 80, -5), TestCase(80, 80, -10),
- TestCase(80, 80, -15), TestCase(80, 80, -20), TestCase(80, 80, -25),
- TestCase(85, 85, 25), TestCase(85, 85, 20), TestCase(85, 85, 15),
- TestCase(85, 85, 10), TestCase(85, 85, 5), TestCase(85, 85, 1),
- TestCase(85, 85, 0),
- TestCase(85, 85, -1), TestCase(85, 85, -5), TestCase(85, 85, -10),
- TestCase(85, 85, -15), TestCase(85, 85, -20), TestCase(85, 85, -25),
- ]
- public void Coach_Drive_Overspeed(double v1, double v2, double slope)
- {
- var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
- v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
-
- var slopeStr = GetSlopeString(slope);
- var modFileName = string.Format(CultureInfo.InvariantCulture, @"Coach_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
-
- Coach_Special_Overspeed(cycle, modFileName,
- string.Format(CultureInfo.InvariantCulture, "24t Coach_Cycle_Drive_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
- }
-
- [Category("ComparisonV2"),
- TestCase(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope,
- "Coach_DriverStrategy_Drive_80_slope_inc.vmod", "24t Coach_Cycle_Drive_80_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope,
- "Coach_DriverStrategy_Drive_50_slope_inc.vmod", "24t Coach_Cycle_Drive_50_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope,
- "Coach_DriverStrategy_Drive_30_slope_inc.vmod", "24t Coach_Cycle_Drive_30_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope,
- "Coach_DriverStrategy_Drive_80_slope_dec.vmod", "24t Coach_Cycle_Drive_80_Decreasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope,
- "Coach_DriverStrategy_Drive_50_slope_dec.vmod", "24t Coach_Cycle_Drive_50_Decreasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope,
- "Coach_DriverStrategy_Drive_30_slope_dec.vmod", "24t Coach_Cycle_Drive_30_Decreasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_80_Dec_Increasing_Slope,
- "Coach_DriverStrategy_Drive_80_slope_dec-inc.vmod", "24t Coach_Cycle_Drive_80_Dec_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_50_Dec_Increasing_Slope,
- "Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod", "24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_30_Dec_Increasing_Slope,
- "Coach_DriverStrategy_Drive_30_slope_dec-inc.vmod", "24t Coach_Cycle_Drive_30_Dec_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level,
- "Coach_DriverStrategy_DecelerateWhileBrake_80_0_level.vmod", "24t Coach_Cycle_DecelerateWhileBrake_80_0_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level,
- "Coach_DriverStrategy_AccelerateWhileBrake_80_0_level.vmod", "24t Coach_Cycle_AccelerateWhileBrake_80_0_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level,
- "Coach_DriverStrategy_AccelerateAtBrake_80_0_level.vmod", "24t Coach_Cycle_AccelerateAtBrake_80_0_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level,
- "Coach_DriverStrategy_AccelerateBeforeBrake_80_0_level.vmod", "24t Coach_Cycle_AccelerateBeforeBrake_80_0_level.vmod"
- ),
- TestCase(SimpleDrivingCycles.CycleDrive_stop_85_stop_85_level,
- "Coach_DriverStrategy_Drive_stop_85_stop_85_level.vmod", "24t Coach_Cycle_Drive_stop_85_stop_85_level.vmod"),
- ]
- public void Coach_Special(string cycleData, string modFileName, string compareFileName)
- {
- var cycle = SimpleDrivingCycles.CreateCycleData(cycleData);
- var run = CoachPowerTrain.CreateEngineeringRun(cycle, modFileName);
-
- run.Run();
- Assert.IsTrue(run.FinishedWithoutErrors);
-
- GraphWriter.Write(modFileName, @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\" + compareFileName);
- }
-
- [Category("ComparisonV2"),
- TestCase(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope,
- "Coach_DriverStrategy_Drive_80_slope_inc.vmod", "24t Coach_Cycle_Drive_80_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope,
- "Coach_DriverStrategy_Drive_50_slope_inc.vmod", "24t Coach_Cycle_Drive_50_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope,
- "Coach_DriverStrategy_Drive_30_slope_inc.vmod", "24t Coach_Cycle_Drive_30_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope,
- "Coach_DriverStrategy_Drive_80_slope_dec.vmod", "24t Coach_Cycle_Drive_80_Decreasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope,
- "Coach_DriverStrategy_Drive_50_slope_dec.vmod", "24t Coach_Cycle_Drive_50_Decreasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope,
- "Coach_DriverStrategy_Drive_30_slope_dec.vmod", "24t Coach_Cycle_Drive_30_Decreasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_80_Dec_Increasing_Slope,
- "Coach_DriverStrategy_Drive_80_slope_dec-inc.vmod", "24t Coach_Cycle_Drive_80_Dec_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_50_Dec_Increasing_Slope,
- "Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod", "24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_30_Dec_Increasing_Slope,
- "Coach_DriverStrategy_Drive_30_slope_dec-inc.vmod", "24t Coach_Cycle_Drive_30_Dec_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level,
- "Coach_DriverStrategy_DecelerateWhileBrake_80_0_level.vmod", "24t Coach_Cycle_DecelerateWhileBrake_80_0_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level,
- "Coach_DriverStrategy_AccelerateWhileBrake_80_0_level.vmod", "24t Coach_Cycle_AccelerateWhileBrake_80_0_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level,
- "Coach_DriverStrategy_AccelerateAtBrake_80_0_level.vmod", "24t Coach_Cycle_AccelerateAtBrake_80_0_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level,
- "Coach_DriverStrategy_AccelerateBeforeBrake_80_0_level.vmod", "24t Coach_Cycle_AccelerateBeforeBrake_80_0_level.vmod"
- ),
- TestCase(SimpleDrivingCycles.CycleDrive_stop_85_stop_85_level,
- "Coach_DriverStrategy_Drive_stop_85_stop_85_level.vmod", "24t Coach_Cycle_Drive_stop_85_stop_85_level.vmod"),
- ]
- public void Coach_Special_Overspeed(string cycleData, string modFileName, string compareFileName)
- {
- var cycle = SimpleDrivingCycles.CreateCycleData(cycleData);
- var run = CoachPowerTrain.CreateEngineeringRun(cycle, modFileName, true);
-
- run.Run();
- Assert.IsTrue(run.FinishedWithoutErrors);
-
- GraphWriter.Write(modFileName,
- @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach_Overspeed\" + compareFileName);
- }
- }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs b/VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
deleted file mode 100644
index 487bdd2867..0000000000
--- a/VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
-* This file is part of VECTO.
-*
-* Copyright © 2012-2016 European Union
-*
-* Developed by Graz University of Technology,
-* Institute of Internal Combustion Engines and Thermodynamics,
-* Institute of Technical Informatics
-*
-* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
-* by the European Commission - subsequent versions of the EUPL (the "Licence");
-* You may not use VECTO except in compliance with the Licence.
-* You may obtain a copy of the Licence at:
-*
-* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
-*
-* Unless required by applicable law or agreed to in writing, VECTO
-* distributed under the Licence is distributed on an "AS IS" basis,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the Licence for the specific language governing permissions and
-* limitations under the Licence.
-*
-* Authors:
-* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
-* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
-* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
-* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
-* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
-* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
-*/
-
-using System;
-using System.Globalization;
-using NUnit.Framework;
-using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.Models.Simulation.Data;
-using TUGraz.VectoCore.Tests.Utils;
-
-namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
-{
- [TestFixture]
- public class DriverStrategyTestTruck
- {
- [TestFixtureSetUp]
- public void Init()
- {
- //LogManager.DisableLogging();
-#if TRACE
- GraphWriter.Enable();
-#else
- GraphWriter.Disable();
-#endif
- GraphWriter.Xfields = new[] { ModalResultField.time, ModalResultField.dist };
-
- GraphWriter.Yfields = new[] {
- ModalResultField.v_act, ModalResultField.acc, ModalResultField.n_eng_avg, ModalResultField.Gear,
- ModalResultField.P_eng_out, ModalResultField.T_eng_fcmap, ModalResultField.FCMap
- };
- GraphWriter.Series1Label = "Vecto 3";
- GraphWriter.Series2Label = "Vecto 2.2";
- }
-
- [TestCase, Category("ComparisonV2")]
- public void TestGraph()
- {
- var imgV3 = @"TestData\Results\Integration\24t Truck_Cycle_Drive_50_Dec_Increasing_Slope.vmod";
- var imgv22 = @"TestData\Results\Integration\24t Truck_Cycle_Drive_50_Dec_Increasing_Slope.vmod";
-
- GraphWriter.Write(imgV3, imgv22);
- }
-
- [TestCase, Category("ComparisonV2")]
- public void TestSingleGraph()
- {
- var imgV3 = @"..\..\..\VectoCoreTest\bin\Debug\Truck_DriverStrategy_Drive_50_slope_dec-inc.vmod";
-
- GraphWriter.Write(imgV3);
- }
-
- [Category("ComparisonV2"),
- TestCase(0, 20, -5), TestCase(0, 20, 0),
- TestCase(0, 40, 25), TestCase(0, 40, 20), TestCase(0, 40, 15),
- TestCase(0, 40, 10), TestCase(0, 40, 5), TestCase(0, 40, 1),
- TestCase(0, 40, 0),
- TestCase(0, 40, -1), TestCase(0, 40, -5), TestCase(0, 40, -10),
- TestCase(0, 40, -15), TestCase(0, 40, -20), TestCase(0, 40, -25),
- TestCase(0, 60, 25), TestCase(0, 60, 20), TestCase(0, 60, 15),
- TestCase(0, 60, 10), TestCase(0, 60, 5), TestCase(0, 60, 1),
- TestCase(0, 60, 0),
- TestCase(0, 60, -1), TestCase(0, 60, -5), TestCase(0, 60, -10),
- TestCase(0, 60, -15), TestCase(0, 60, -20), TestCase(0, 60, -25),
- TestCase(0, 85, 25), TestCase(0, 85, 20), TestCase(0, 85, 15),
- TestCase(0, 85, 10), TestCase(0, 85, 5), TestCase(0, 85, 1),
- TestCase(0, 85, 0), TestCase(0, 85, 2),
- TestCase(0, 85, -1), TestCase(0, 85, -5), TestCase(0, 85, -10),
- TestCase(0, 85, -15), TestCase(0, 85, -20), TestCase(0, 85, -25),
- TestCase(20, 40, 25), TestCase(20, 40, 20), TestCase(20, 40, 15),
- TestCase(20, 40, 10), TestCase(20, 40, 5), TestCase(20, 40, 1),
- TestCase(20, 40, 0),
- TestCase(20, 40, -1), TestCase(20, 40, -5), TestCase(20, 40, -10),
- TestCase(20, 40, -15), TestCase(20, 40, -20), TestCase(20, 40, -25),
- TestCase(20, 60, 25), TestCase(20, 60, 20), TestCase(20, 60, 15),
- TestCase(20, 60, 10), TestCase(20, 60, 5), TestCase(20, 60, 1),
- TestCase(20, 60, 0),
- TestCase(20, 60, -1), TestCase(20, 60, -5), TestCase(20, 60, -10),
- TestCase(20, 60, -15), TestCase(20, 60, -20), TestCase(20, 60, -25),
- TestCase(20, 85, 25), TestCase(20, 85, 20), TestCase(20, 85, 15),
- TestCase(20, 85, 10), TestCase(20, 85, 5), TestCase(20, 85, 1),
- TestCase(20, 85, 0),
- TestCase(20, 85, -1), TestCase(20, 85, -5), TestCase(20, 85, -10),
- TestCase(20, 85, -15), TestCase(20, 85, -20), TestCase(20, 85, -25),
- TestCase(20, 22, 5),
- ]
- public void Truck_Accelerate(double v1, double v2, double slope)
- {
- var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
- v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
-
- var slopeStr = slope > 0 ? "uhpill" : slope < 0 ? "downhill" : "level";
- var modFileName = string.Format(CultureInfo.InvariantCulture, @"Truck_{0}_{1}_{3}_{2}.vmod", v1, v2, Math.Abs(slope),
- slopeStr);
-
- Truck_Special(cycle, modFileName,
- string.Format(CultureInfo.InvariantCulture, "24t Truck_Cycle_Accelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
- }
-
- [Category("ComparisonV2"),
- TestCase(40, 0, 25), TestCase(40, 0, 20), TestCase(40, 0, 15),
- TestCase(40, 0, 10), TestCase(40, 0, 5), TestCase(40, 0, 1),
- TestCase(40, 0, 0),
- TestCase(40, 0, -1), TestCase(40, 0, -5), TestCase(40, 0, -10),
- TestCase(40, 0, -15), TestCase(40, 0, -20), TestCase(40, 0, -25),
- TestCase(60, 0, 25), TestCase(60, 0, 20), TestCase(60, 0, 15),
- TestCase(60, 0, 10), TestCase(60, 0, 5), TestCase(60, 0, 1),
- TestCase(60, 0, 0),
- TestCase(60, 0, -1), TestCase(60, 0, -5), TestCase(60, 0, -10),
- TestCase(60, 0, -15), TestCase(60, 0, -20), TestCase(60, 0, -25),
- TestCase(85, 0, 25), TestCase(85, 0, 20), TestCase(85, 0, 15),
- TestCase(85, 0, 10), TestCase(85, 0, 5), TestCase(85, 0, 1),
- TestCase(85, 0, 0),
- TestCase(85, 0, -1), TestCase(85, 0, -5), TestCase(85, 0, -10),
- TestCase(85, 0, -15), TestCase(85, 0, -20), TestCase(85, 0, -25),
- TestCase(40, 20, 25), TestCase(40, 20, 20), TestCase(40, 20, 15),
- TestCase(40, 20, 10), TestCase(40, 20, 5), TestCase(40, 20, 1),
- TestCase(40, 20, 0),
- TestCase(40, 20, -1), TestCase(40, 20, -5), TestCase(40, 20, -10),
- TestCase(40, 20, -15), TestCase(40, 20, -20), TestCase(40, 20, -25),
- TestCase(45, 0, -5),
- TestCase(45, 0, 0),
- TestCase(45, 0, 5),
- TestCase(60, 20, 25), TestCase(60, 20, 20), TestCase(60, 20, 15),
- TestCase(60, 20, 10), TestCase(60, 20, 5), TestCase(60, 20, 1),
- TestCase(60, 20, 0),
- TestCase(60, 20, -1), TestCase(60, 20, -5), TestCase(60, 20, -10),
- TestCase(60, 20, -15), TestCase(60, 20, -20), TestCase(60, 20, -25),
- TestCase(85, 20, 25), TestCase(85, 20, 20), TestCase(85, 20, 15),
- TestCase(85, 20, 10), TestCase(85, 20, 5), TestCase(85, 20, 1),
- TestCase(85, 20, 0),
- TestCase(85, 20, -1), TestCase(85, 20, -5), TestCase(85, 20, -10),
- TestCase(85, 20, -15), TestCase(85, 20, -20), TestCase(85, 20, -25),
- TestCase(22, 20, -5),
- ]
- public void Truck_Decelerate(double v1, double v2, double slope)
- {
- var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
- v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
-
- var slopeStr = slope > 0 ? "uhpill" : slope < 0 ? "downhill" : "level";
- var modFileName = string.Format(CultureInfo.InvariantCulture, @"Truck_{0}_{1}_{3}_{2}.vmod", v1, v2, Math.Abs(slope),
- slopeStr);
-
- Truck_Special(cycle, modFileName,
- string.Format(CultureInfo.InvariantCulture, "24t Truck_Cycle_Decelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
- }
-
- [Category("ComparisonV2"),
- TestCase(10, 10, 25), TestCase(10, 10, 20), TestCase(10, 10, 15),
- TestCase(10, 10, 10), TestCase(10, 10, 5), TestCase(10, 10, 1),
- TestCase(10, 10, 0),
- TestCase(10, 10, -1), TestCase(10, 10, -5), TestCase(10, 10, -10),
- TestCase(10, 10, -15), TestCase(10, 10, -20), TestCase(10, 10, -25),
- TestCase(20, 20, 25), TestCase(20, 20, 20), TestCase(20, 20, 15),
- TestCase(20, 20, 10), TestCase(20, 20, 5), TestCase(20, 20, 1),
- TestCase(20, 20, 0),
- TestCase(20, 20, -1), TestCase(20, 20, -5), TestCase(20, 20, -10),
- TestCase(20, 20, -15), TestCase(20, 20, -20), TestCase(20, 20, -25),
- TestCase(30, 30, 25), TestCase(30, 30, 20), TestCase(30, 30, 15),
- TestCase(30, 30, 10), TestCase(30, 30, 5), TestCase(30, 30, 1),
- TestCase(30, 30, 0),
- TestCase(30, 30, -1), TestCase(30, 30, -5), TestCase(30, 30, -10),
- TestCase(30, 30, -15), TestCase(30, 30, -20), TestCase(30, 30, -25),
- TestCase(40, 40, 25), TestCase(40, 40, 20), TestCase(40, 40, 15),
- TestCase(40, 40, 10), TestCase(40, 40, 5), TestCase(40, 40, 1),
- TestCase(40, 40, 0),
- TestCase(40, 40, -1), TestCase(40, 40, -5), TestCase(40, 40, -10),
- TestCase(40, 40, -15), TestCase(40, 40, -20), TestCase(40, 40, -25),
- TestCase(50, 50, 25), TestCase(50, 50, 20), TestCase(50, 50, 15),
- TestCase(50, 50, 10), TestCase(50, 50, 5), TestCase(50, 50, 1),
- TestCase(50, 50, 0),
- TestCase(50, 50, -1), TestCase(50, 50, -5), TestCase(50, 50, -10),
- TestCase(50, 50, -15), TestCase(50, 50, -20), TestCase(50, 50, -25),
- TestCase(60, 60, 25), TestCase(60, 60, 20), TestCase(60, 60, 15),
- TestCase(60, 60, 10), TestCase(60, 60, 5), TestCase(60, 60, 1),
- TestCase(60, 60, 0),
- TestCase(60, 60, -1), TestCase(60, 60, -5), TestCase(60, 60, -10),
- TestCase(60, 60, -15), TestCase(60, 60, -20), TestCase(60, 60, -25),
- TestCase(80, 80, 25), TestCase(80, 80, 20), TestCase(80, 80, 15),
- TestCase(80, 80, 10), TestCase(80, 80, 5), TestCase(80, 80, 1),
- TestCase(80, 80, 0),
- TestCase(80, 80, -1), TestCase(80, 80, -5), TestCase(80, 80, -10),
- TestCase(80, 80, -15), TestCase(80, 80, -20), TestCase(80, 80, -25),
- TestCase(85, 85, 25), TestCase(85, 85, 20), TestCase(85, 85, 15),
- TestCase(85, 85, 10), TestCase(85, 85, 5), TestCase(85, 85, 1),
- TestCase(85, 85, 0),
- TestCase(85, 85, -1), TestCase(85, 85, -5), TestCase(85, 85, -10),
- TestCase(85, 85, -15), TestCase(85, 85, -20), TestCase(85, 85, -25),
- ]
- public void Truck_Drive(double v1, double v2, double slope)
- {
- var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
- v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
-
- var slopeStr = slope > 0 ? "uhpill" : slope < 0 ? "downhill" : "level";
- var modFileName = string.Format(CultureInfo.InvariantCulture, @"Truck_{0}_{1}_{3}_{2}.vmod", v1, v2, Math.Abs(slope),
- slopeStr);
-
- Truck_Special(cycle, modFileName,
- string.Format(CultureInfo.InvariantCulture, "24t Truck_Cycle_Drive_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
- }
-
- [Category("ComparisonV2"),
- TestCase(0, 40, 25), TestCase(0, 40, 20), TestCase(0, 40, 15),
- TestCase(0, 40, 10), TestCase(0, 40, 5), TestCase(0, 40, 1),
- TestCase(0, 40, 0), TestCase(0, 40, -3),
- TestCase(0, 40, -1), TestCase(0, 40, -5), TestCase(0, 40, -10),
- TestCase(0, 40, -15), TestCase(0, 40, -20), TestCase(0, 40, -25),
- TestCase(0, 60, 25), TestCase(0, 60, 20), TestCase(0, 60, 15),
- TestCase(0, 60, 10), TestCase(0, 60, 5), TestCase(0, 60, 1),
- TestCase(0, 60, 0), TestCase(0, 60, -3),
- TestCase(0, 60, -1), TestCase(0, 60, -5), TestCase(0, 60, -10),
- TestCase(0, 60, -15), TestCase(0, 60, -20), TestCase(0, 60, -25),
- TestCase(0, 85, 25), TestCase(0, 85, 20), TestCase(0, 85, 15),
- TestCase(0, 85, 10), TestCase(0, 85, 5), TestCase(0, 85, 1),
- TestCase(0, 85, 0), TestCase(0, 85, -3),
- TestCase(0, 85, -1), TestCase(0, 85, -5), TestCase(0, 85, -10),
- TestCase(0, 85, -15), TestCase(0, 85, -20), TestCase(0, 85, -25),
- TestCase(20, 40, 25), TestCase(20, 40, 20), TestCase(20, 40, 15),
- TestCase(20, 40, 10), TestCase(20, 40, 5), TestCase(20, 40, 1),
- TestCase(20, 40, 0),
- TestCase(20, 40, -1), TestCase(20, 40, -5), TestCase(20, 40, -10),
- TestCase(20, 40, -15), TestCase(20, 40, -20), TestCase(20, 40, -25),
- TestCase(20, 60, 25), TestCase(20, 60, 20), TestCase(20, 60, 15),
- TestCase(20, 60, 10), TestCase(20, 60, 5), TestCase(20, 60, 1),
- TestCase(20, 60, 0),
- TestCase(20, 60, -1), TestCase(20, 60, -5), TestCase(20, 60, -10),
- TestCase(20, 60, -15), TestCase(20, 60, -20), TestCase(20, 60, -25),
- TestCase(20, 85, 25), TestCase(20, 85, 20), TestCase(20, 85, 15),
- TestCase(20, 85, 10), TestCase(20, 85, 5), TestCase(20, 85, 1),
- TestCase(20, 85, 0),
- TestCase(20, 85, -1), TestCase(20, 85, -5), TestCase(20, 85, -10),
- TestCase(20, 85, -15), TestCase(20, 85, -20), TestCase(20, 85, -25),
- TestCase(20, 22, 5),
- ]
- public void Truck_Accelerate_Overspeed(double v1, double v2, double slope)
- {
- var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
- v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
-
- var slopeStr = slope > 0 ? "uhpill" : slope < 0 ? "downhill" : "level";
- var modFileName = string.Format(CultureInfo.InvariantCulture, @"Truck_{0}_{1}_{3}_{2}.vmod", v1, v2, Math.Abs(slope),
- slopeStr);
-
- Truck_Special_Overspeed(cycle, modFileName,
- string.Format(CultureInfo.InvariantCulture, "24t Truck_Cycle_Accelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
- }
-
- [Category("ComparisonV2"),
- TestCase(40, 0, 25), TestCase(40, 0, 20), TestCase(40, 0, 15),
- TestCase(40, 0, 10), TestCase(40, 0, 5), TestCase(40, 0, 1),
- TestCase(40, 0, 0),
- TestCase(40, 0, -1), TestCase(40, 0, -5), TestCase(40, 0, -10),
- TestCase(40, 0, -15), TestCase(40, 0, -20), TestCase(40, 0, -25),
- TestCase(60, 0, 25), TestCase(60, 0, 20), TestCase(60, 0, 15),
- TestCase(60, 0, 10), TestCase(60, 0, 5), TestCase(60, 0, 1),
- TestCase(60, 0, 0),
- TestCase(60, 0, -1), TestCase(60, 0, -5), TestCase(60, 0, -10),
- TestCase(60, 0, -15), TestCase(60, 0, -20), TestCase(60, 0, -25),
- TestCase(85, 0, 25), TestCase(85, 0, 20), TestCase(85, 0, 15),
- TestCase(85, 0, 10), TestCase(85, 0, 5), TestCase(85, 0, 1),
- TestCase(85, 0, 0),
- TestCase(85, 0, -1), TestCase(85, 0, -5), TestCase(85, 0, -10),
- TestCase(85, 0, -15), TestCase(85, 0, -20), TestCase(85, 0, -25),
- TestCase(40, 20, 25), TestCase(40, 20, 20), TestCase(40, 20, 15),
- TestCase(40, 20, 10), TestCase(40, 20, 5), TestCase(40, 20, 1),
- TestCase(40, 20, 0),
- TestCase(40, 20, -1), TestCase(40, 20, -5), TestCase(40, 20, -10),
- TestCase(40, 20, -15), TestCase(40, 20, -20), TestCase(40, 20, -25),
- TestCase(60, 20, 25), TestCase(60, 20, 20), TestCase(60, 20, 15),
- TestCase(60, 20, 10), TestCase(60, 20, 5), TestCase(60, 20, 1),
- TestCase(60, 20, 0),
- TestCase(60, 20, -1), TestCase(60, 20, -5), TestCase(60, 20, -10),
- TestCase(60, 20, -15), TestCase(60, 20, -20), TestCase(60, 20, -25),
- TestCase(85, 20, 25), TestCase(85, 20, 20), TestCase(85, 20, 15),
- TestCase(85, 20, 10), TestCase(85, 20, 5), TestCase(85, 20, 1),
- TestCase(85, 20, 0),
- TestCase(85, 20, -1), TestCase(85, 20, -5), TestCase(85, 20, -10),
- TestCase(85, 20, -15), TestCase(85, 20, -20), TestCase(85, 20, -25),
- TestCase(22, 20, -5),
- ]
- public void Truck_Decelerate_Overspeed(double v1, double v2, double slope)
- {
- var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
- v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
-
- var slopeStr = slope > 0 ? "uhpill" : slope < 0 ? "downhill" : "level";
- var modFileName = string.Format(CultureInfo.InvariantCulture, @"Truck_{0}_{1}_{3}_{2}.vmod", v1, v2, Math.Abs(slope),
- slopeStr);
-
- Truck_Special_Overspeed(cycle, modFileName,
- string.Format(CultureInfo.InvariantCulture, "24t Truck_Cycle_Decelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
- }
-
- [Category("ComparisonV2"),
- TestCase(10, 10, 25), TestCase(10, 10, 20), TestCase(10, 10, 15),
- TestCase(10, 10, 10), TestCase(10, 10, 5), TestCase(10, 10, 1),
- TestCase(10, 10, 0),
- TestCase(10, 10, -1), TestCase(10, 10, -5), TestCase(10, 10, -10),
- TestCase(10, 10, -15), TestCase(10, 10, -20), TestCase(10, 10, -25),
- TestCase(20, 20, 25), TestCase(20, 20, 20), TestCase(20, 20, 15),
- TestCase(20, 20, 10), TestCase(20, 20, 5), TestCase(20, 20, 1),
- TestCase(20, 20, 0),
- TestCase(20, 20, -1), TestCase(20, 20, -5), TestCase(20, 20, -10),
- TestCase(20, 20, -15), TestCase(20, 20, -20), TestCase(20, 20, -25),
- TestCase(30, 30, 25), TestCase(30, 30, 20), TestCase(30, 30, 15),
- TestCase(30, 30, 10), TestCase(30, 30, 5), TestCase(30, 30, 1),
- TestCase(30, 30, 0),
- TestCase(30, 30, -1), TestCase(30, 30, -5), TestCase(30, 30, -10),
- TestCase(30, 30, -15), TestCase(30, 30, -20), TestCase(30, 30, -25),
- TestCase(40, 40, 25), TestCase(40, 40, 20), TestCase(40, 40, 15),
- TestCase(40, 40, 10), TestCase(40, 40, 5), TestCase(40, 40, 1),
- TestCase(40, 40, 0),
- TestCase(40, 40, -1), TestCase(40, 40, -5), TestCase(40, 40, -10),
- TestCase(40, 40, -15), TestCase(40, 40, -20), TestCase(40, 40, -25),
- TestCase(50, 50, 25), TestCase(50, 50, 20), TestCase(50, 50, 15),
- TestCase(50, 50, 10), TestCase(50, 50, 5), TestCase(50, 50, 1),
- TestCase(50, 50, 0),
- TestCase(50, 50, -1), TestCase(50, 50, -5), TestCase(50, 50, -10),
- TestCase(50, 50, -15), TestCase(50, 50, -20), TestCase(50, 50, -25),
- TestCase(60, 60, 25), TestCase(60, 60, 20), TestCase(60, 60, 15),
- TestCase(60, 60, 10), TestCase(60, 60, 5), TestCase(60, 60, 1),
- TestCase(60, 60, 0),
- TestCase(60, 60, -1), TestCase(60, 60, -5), TestCase(60, 60, -10),
- TestCase(60, 60, -15), TestCase(60, 60, -20), TestCase(60, 60, -25),
- TestCase(80, 80, 25), TestCase(80, 80, 20), TestCase(80, 80, 15),
- TestCase(80, 80, 10), TestCase(80, 80, 5), TestCase(80, 80, 1),
- TestCase(80, 80, 0),
- TestCase(80, 80, -1), TestCase(80, 80, -5), TestCase(80, 80, -10),
- TestCase(80, 80, -15), TestCase(80, 80, -20), TestCase(80, 80, -25),
- TestCase(85, 85, 25), TestCase(85, 85, 20), TestCase(85, 85, 15),
- TestCase(85, 85, 10), TestCase(85, 85, 5), TestCase(85, 85, 1),
- TestCase(85, 85, 0),
- TestCase(85, 85, -1), TestCase(85, 85, -5), TestCase(85, 85, -10),
- TestCase(85, 85, -15), TestCase(85, 85, -20), TestCase(85, 85, -25),
- ]
- public void Truck_Drive_Overspeed(double v1, double v2, double slope)
- {
- var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
- v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
-
- var slopeStr = slope > 0 ? "uhpill" : slope < 0 ? "downhill" : "level";
- var modFileName = string.Format(CultureInfo.InvariantCulture, @"Truck_{0}_{1}_{3}_{2}.vmod", v1, v2, Math.Abs(slope),
- slopeStr);
-
- Truck_Special_Overspeed(cycle, modFileName,
- string.Format(CultureInfo.InvariantCulture, "24t Truck_Cycle_Drive_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
- }
-
- [Category("ComparisonV2"),
- TestCase(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope,
- "Truck_DriverStrategy_Drive_80_slope_inc.vmod", "24t Truck_Cycle_Drive_80_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope,
- "Truck_DriverStrategy_Drive_50_slope_inc.vmod", "24t Truck_Cycle_Drive_50_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope,
- "Truck_DriverStrategy_Drive_30_slope_inc.vmod", "24t Truck_Cycle_Drive_30_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope,
- "Truck_DriverStrategy_Drive_80_slope_dec.vmod", "24t Truck_Cycle_Drive_80_Decreasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope,
- "Truck_DriverStrategy_Drive_50_slope_dec.vmod", "24t Truck_Cycle_Drive_50_Decreasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope,
- "Truck_DriverStrategy_Drive_30_slope_dec.vmod", "24t Truck_Cycle_Drive_30_Decreasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_80_Dec_Increasing_Slope,
- "Truck_DriverStrategy_Drive_80_slope_dec-inc.vmod", "24t Truck_Cycle_Drive_80_Dec_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_50_Dec_Increasing_Slope,
- "Truck_DriverStrategy_Drive_50_slope_dec-inc.vmod", "24t Truck_Cycle_Drive_50_Dec_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_30_Dec_Increasing_Slope,
- "Truck_DriverStrategy_Drive_30_slope_dec-inc.vmod", "24t Truck_Cycle_Drive_30_Dec_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level,
- "Truck_DriverStrategy_DecelerateWhileBrake_80_0_level.vmod", "24t Truck_Cycle_DecelerateWhileBrake_80_0_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level,
- "Truck_DriverStrategy_AccelerateWhileBrake_80_0_level.vmod", "24t Truck_Cycle_AccelerateWhileBrake_80_0_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level,
- "Truck_DriverStrategy_AccelerateAtBrake_80_0_level.vmod", "24t Truck_Cycle_AccelerateAtBrake_80_0_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level,
- "Truck_DriverStrategy_AccelerateBeforeBrake_80_0_level.vmod", "24t Truck_Cycle_AccelerateBeforeBrake_80_0_level.vmod"
- ),
- TestCase(SimpleDrivingCycles.CycleDrive_stop_85_stop_85_level,
- "Truck_DriverStrategy_Drive_stop_85_stop_85_level.vmod", "24t Truck_Cycle_Drive_stop_85_stop_85_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_SlopeChangeBeforeStop, "Truck_DriverStrategy_SlopeChangeBeforeStop.vmod", null
- ),
- TestCase(SimpleDrivingCycles.CycleDriver_FrequentSlopChange, "Truck_DriverStrategy_SlopeChangeBeforeStop.vmod", null),
- ]
- public void Truck_Special(string cycleData, string modFileName, string compareFileName = null)
- {
- var cycle = SimpleDrivingCycles.CreateCycleData(cycleData);
- var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, modFileName);
-
- run.Run();
- Assert.IsTrue(run.FinishedWithoutErrors);
-
- GraphWriter.Write(modFileName,
- compareFileName != null ? @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Truck\" + compareFileName : null);
- }
-
- [Category("ComparisonV2"),
- TestCase(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope,
- "Truck_DriverStrategy_Drive_80_slope_inc.vmod", "24t Truck_Cycle_Drive_80_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope,
- "Truck_DriverStrategy_Drive_50_slope_inc.vmod", "24t Truck_Cycle_Drive_50_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope,
- "Truck_DriverStrategy_Drive_30_slope_inc.vmod", "24t Truck_Cycle_Drive_30_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope,
- "Truck_DriverStrategy_Drive_80_slope_dec.vmod", "24t Truck_Cycle_Drive_80_Decreasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope,
- "Truck_DriverStrategy_Drive_50_slope_dec.vmod", "24t Truck_Cycle_Drive_50_Decreasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope,
- "Truck_DriverStrategy_Drive_30_slope_dec.vmod", "24t Truck_Cycle_Drive_30_Decreasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_80_Dec_Increasing_Slope,
- "Truck_DriverStrategy_Drive_80_slope_dec-inc.vmod", "24t Truck_Cycle_Drive_80_Dec_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_50_Dec_Increasing_Slope,
- "Truck_DriverStrategy_Drive_50_slope_dec-inc.vmod", "24t Truck_Cycle_Drive_50_Dec_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_30_Dec_Increasing_Slope,
- "Truck_DriverStrategy_Drive_30_slope_dec-inc.vmod", "24t Truck_Cycle_Drive_30_Dec_Increasing_Slope.vmod"),
- TestCase(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level,
- "Truck_DriverStrategy_DecelerateWhileBrake_80_0_level.vmod", "24t Truck_Cycle_DecelerateWhileBrake_80_0_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level,
- "Truck_DriverStrategy_AccelerateWhileBrake_80_0_level.vmod", "24t Truck_Cycle_AccelerateWhileBrake_80_0_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level,
- "Truck_DriverStrategy_AccelerateAtBrake_80_0_level.vmod", "24t Truck_Cycle_AccelerateAtBrake_80_0_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level,
- "Truck_DriverStrategy_AccelerateBeforeBrake_80_0_level.vmod", "24t Truck_Cycle_AccelerateBeforeBrake_80_0_level.vmod"
- ),
- TestCase(SimpleDrivingCycles.CycleDrive_stop_85_stop_85_level,
- "Truck_DriverStrategy_Drive_stop_85_stop_85_level.vmod", "24t Truck_Cycle_Drive_stop_85_stop_85_level.vmod"),
- ]
- public void Truck_Special_Overspeed(string cycleData, string modFileName, string compareFileName = null)
- {
- var cycle = SimpleDrivingCycles.CreateCycleData(cycleData);
- var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, modFileName, true);
-
- run.Run();
- Assert.IsTrue(run.FinishedWithoutErrors);
-
- GraphWriter.Write(modFileName,
- compareFileName != null
- ? @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Truck_Overspeed\" + compareFileName
- : null);
- }
- }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs b/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
new file mode 100644
index 0000000000..d7407d62c2
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
@@ -0,0 +1,408 @@
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+* Institute of Internal Combustion Engines and Thermodynamics,
+* Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
+
+using System;
+using System.Globalization;
+using NUnit.Framework;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.Tests.Utils;
+
+namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
+{
+ [TestFixture]
+ public class SimpleCycles
+ {
+ [TestFixtureSetUp]
+ public void Init()
+ {
+ //LogManager.DisableLogging();
+#if TRACE
+ GraphWriter.Enable();
+#else
+ GraphWriter.Disable();
+#endif
+ GraphWriter.Xfields = new[] { ModalResultField.time, ModalResultField.dist };
+
+ GraphWriter.Yfields = new[] {
+ ModalResultField.v_act, ModalResultField.acc, ModalResultField.n_eng_avg, ModalResultField.Gear,
+ ModalResultField.P_eng_out, ModalResultField.T_eng_fcmap, ModalResultField.FCMap
+ };
+ GraphWriter.Series1Label = "Vecto 3";
+ GraphWriter.Series2Label = "Vecto 2.2";
+ }
+
+ private static string GetSlopeString(double slope)
+ {
+ var slopeStr = slope > 0
+ ? Math.Abs(slope).ToString("uphill_#")
+ : slope < 0
+ ? Math.Abs(slope).ToString("downhill_#")
+ : "level";
+ return slopeStr;
+ }
+
+ [TestCase, Category("ComparisonV2")]
+ public void TestGraph()
+ {
+ var imgV3 = @"TestData\Results\Integration\40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod";
+ var imgv22 = @"TestData\Results\Integration\40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v22.vmod";
+
+ GraphWriter.Write(imgV3, imgv22);
+ }
+
+ [TestCase, Category("ComparisonV2")]
+ public void TestSingleGraph()
+ {
+ var imgV3 = @"TestData\Results\Integration\40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod";
+
+ GraphWriter.Write(imgV3);
+ }
+
+ [Category("ComparisonV2"),
+ TestCase(0, 20, -5),
+ TestCase(0, 20, 0),
+ TestCase(0, 85, -15),
+ TestCase(0, 85, -25),
+ TestCase(0, 85, -5),
+ TestCase(0, 85, 0),
+ TestCase(0, 85, 1),
+ TestCase(0, 85, 10),
+ TestCase(0, 85, 2),
+ TestCase(0, 85, 25),
+ TestCase(0, 85, 5),
+ TestCase(20, 22, 5),
+ TestCase(20, 60, -15),
+ TestCase(20, 60, -25),
+ TestCase(20, 60, -5),
+ TestCase(20, 60, 0),
+ TestCase(20, 60, 15),
+ TestCase(20, 60, 25),
+ TestCase(20, 60, 5),
+ ]
+ public void Truck_Accelerate(double v1, double v2, double slope)
+ {
+ var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
+ v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
+
+ Truck_Special(cycle,
+ string.Format(CultureInfo.InvariantCulture, "40t_Long_Haul_Truck_Cycle_Accelerate_{0}_{1}_{2}.vmod",
+ v1, v2, GetSlopeString(slope)));
+ }
+
+ [Category("ComparisonV2"),
+ TestCase(22, 20, -5),
+ TestCase(45, 0, -5),
+ TestCase(45, 0, 0),
+ TestCase(45, 0, 5),
+ TestCase(60, 20, -15),
+ TestCase(60, 20, -25),
+ TestCase(60, 20, -5),
+ TestCase(60, 20, 0),
+ TestCase(60, 20, 15),
+ TestCase(60, 20, 5),
+ TestCase(80, 0, -15),
+ TestCase(80, 0, -25),
+ TestCase(80, 0, -5),
+ TestCase(80, 0, 0),
+ TestCase(80, 0, 20),
+ TestCase(80, 0, 15),
+ TestCase(80, 0, 3),
+ TestCase(80, 0, 5),
+ ]
+ public void Truck_Decelerate(double v1, double v2, double slope)
+ {
+ var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
+ v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
+
+ Truck_Special(cycle,
+ string.Format(CultureInfo.InvariantCulture, "40t_Long_Haul_Truck_Cycle_Decelerate_{0}_{1}_{2}.vmod",
+ v1, v2, GetSlopeString(slope)));
+ }
+
+ [Category("ComparisonV2"),
+ TestCase(10, 10, -15),
+ TestCase(10, 10, -25),
+ TestCase(10, 10, -5),
+ TestCase(10, 10, 0),
+ TestCase(10, 10, 15),
+ TestCase(10, 10, 25),
+ TestCase(10, 10, 5),
+ TestCase(20, 20, -15),
+ TestCase(30, 30, -15),
+ TestCase(50, 50, -15),
+ TestCase(80, 80, -15),
+ TestCase(80, 80, -5),
+ TestCase(80, 80, 0),
+ TestCase(80, 80, 15),
+ TestCase(80, 80, 5),
+ ]
+ public void Truck_Drive(double v1, double v2, double slope)
+ {
+ var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
+ v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
+
+ Truck_Special(cycle, string.Format(CultureInfo.InvariantCulture, "40t_Long_Haul_Truck_Cycle_Drive_{0}_{1}_{2}.vmod",
+ v1, v2, GetSlopeString(slope)));
+ }
+
+ [Category("ComparisonV2"),
+ TestCase(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope,
+ "40t_Long_Haul_Truck_Cycle_Drive_80_Increasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope,
+ "40t_Long_Haul_Truck_Cycle_Drive_50_Increasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope,
+ "40t_Long_Haul_Truck_Cycle_Drive_30_Increasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope,
+ "40t_Long_Haul_Truck_Cycle_Drive_80_Decreasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope,
+ "40t_Long_Haul_Truck_Cycle_Drive_50_Decreasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope,
+ "40t_Long_Haul_Truck_Cycle_Drive_30_Decreasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_80_Dec_Increasing_Slope,
+ "40t_Long_Haul_Truck_Cycle_Drive_80_Dec_Increasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_50_Dec_Increasing_Slope,
+ "40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_30_Dec_Increasing_Slope,
+ "40t_Long_Haul_Truck_Cycle_Drive_30_Dec_Increasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level,
+ "40t_Long_Haul_Truck_Cycle_DecelerateWhileBrake_80_0_level.vmod"),
+ TestCase(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level,
+ "40t_Long_Haul_Truck_Cycle_AccelerateWhileBrake_80_0_level.vmod"),
+ TestCase(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level,
+ "40t_Long_Haul_Truck_Cycle_AccelerateAtBrake_80_0_level.vmod"),
+ TestCase(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level,
+ "40t_Long_Haul_Truck_Cycle_AccelerateBeforeBrake_80_0_level.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_stop_85_stop_85_level, "24t Truck_Cycle_Drive_stop_85_stop_85_level.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_SlopeChangeBeforeStop, "Truck_DriverStrategy_SlopeChangeBeforeStop.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDriver_FrequentSlopChange, "Truck_DriverStrategy_SlopeChangeBeforeStop.vmod"),
+ ]
+ public void Truck_Special(string cycleData, string modFileName)
+ {
+ var cycle = SimpleDrivingCycles.CreateCycleData(cycleData);
+ var run = Truck40tPowerTrain.CreateEngineeringRun(cycle, modFileName);
+
+ run.Run();
+ Assert.IsTrue(run.FinishedWithoutErrors);
+
+ GraphWriter.Write(modFileName, @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\" + modFileName);
+ }
+
+ [Category("ComparisonV2"),
+ TestCase(0, 40, -1),
+ TestCase(0, 40, -3),
+ TestCase(0, 40, -5),
+ TestCase(0, 60, -1),
+ TestCase(0, 60, -3),
+ TestCase(0, 60, -5),
+ TestCase(0, 85, -1),
+ TestCase(0, 85, -3),
+ TestCase(0, 85, -5),
+ ]
+ public void Truck_Accelerate_Overspeed(double v1, double v2, double slope)
+ {
+ var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
+ v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
+
+ var slopeStr = slope > 0 ? "uhpill" : slope < 0 ? "downhill" : "level";
+ string modFileName = string.Format(CultureInfo.InvariantCulture,
+ "40t_Long_Haul_Truck_Cycle_Accelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
+
+ var cycleData = SimpleDrivingCycles.CreateCycleData(cycle);
+ var run = Truck40tPowerTrain.CreateEngineeringRun(cycleData, modFileName, true);
+
+ run.Run();
+ Assert.IsTrue(run.FinishedWithoutErrors);
+
+ GraphWriter.Write(modFileName,
+ @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck_Overspeed\" + modFileName);
+ }
+
+ [Category("ComparisonV2"),
+ TestCase(0, 20, -5),
+ TestCase(0, 20, 0),
+ TestCase(0, 85, -15),
+ TestCase(0, 85, -25),
+ TestCase(0, 85, -5),
+ TestCase(0, 85, 0),
+ TestCase(0, 85, 1),
+ TestCase(0, 85, 10),
+ TestCase(0, 85, 2),
+ TestCase(0, 85, 25),
+ TestCase(0, 85, 5),
+ TestCase(20, 22, 5),
+ TestCase(20, 60, -15),
+ TestCase(20, 60, -25),
+ TestCase(20, 60, -5),
+ TestCase(20, 60, 0),
+ TestCase(20, 60, 15),
+ TestCase(20, 60, 25),
+ TestCase(20, 60, 5),
+ ]
+ public void Coach_Accelerate(double v1, double v2, double slope)
+ {
+ var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
+ v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
+
+ Coach_Special(cycle,
+ string.Format(CultureInfo.InvariantCulture, "24t Coach_Cycle_Accelerate_{0}_{1}_{2}.vmod",
+ v1, v2, GetSlopeString(slope)));
+ }
+
+ [Category("ComparisonV2"),
+ TestCase(22, 20, -5),
+ TestCase(45, 0, -5),
+ TestCase(45, 0, 0),
+ TestCase(45, 0, 5),
+ TestCase(60, 20, -15),
+ TestCase(60, 20, -25),
+ TestCase(60, 20, -5),
+ TestCase(60, 20, 0),
+ TestCase(60, 20, 15),
+ TestCase(60, 20, 5),
+ TestCase(80, 0, -15),
+ TestCase(80, 0, -25),
+ TestCase(80, 0, -5),
+ TestCase(80, 0, 0),
+ TestCase(80, 0, 20),
+ TestCase(80, 0, 15),
+ TestCase(80, 0, 3),
+ TestCase(80, 0, 5),
+ ]
+ public void Coach_Decelerate(double v1, double v2, double slope)
+ {
+ var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
+ v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
+
+ Coach_Special(cycle,
+ string.Format(CultureInfo.InvariantCulture, "24t Coach_Cycle_Decelerate_{0}_{1}_{2}.vmod",
+ v1, v2, GetSlopeString(slope)));
+ }
+
+ [Category("ComparisonV2"),
+ TestCase(10, 10, -15),
+ TestCase(10, 10, -25),
+ TestCase(10, 10, -5),
+ TestCase(10, 10, 0),
+ TestCase(10, 10, 15),
+ TestCase(10, 10, 25),
+ TestCase(10, 10, 5),
+ TestCase(20, 20, -15),
+ TestCase(30, 30, -15),
+ TestCase(50, 50, -15),
+ TestCase(80, 80, -15),
+ TestCase(80, 80, -5),
+ TestCase(80, 80, 0),
+ TestCase(80, 80, 15),
+ TestCase(80, 80, 5),
+ ]
+ public void Coach_Drive(double v1, double v2, double slope)
+ {
+ var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
+ v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
+
+ Coach_Special(cycle, string.Format(CultureInfo.InvariantCulture, "24t Coach_Cycle_Drive_{0}_{1}_{2}.vmod",
+ v1, v2, GetSlopeString(slope)));
+ }
+
+ [Category("ComparisonV2"),
+ TestCase(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope,
+ "24t Coach_Cycle_Drive_80_Increasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope,
+ "24t Coach_Cycle_Drive_50_Increasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope,
+ "24t Coach_Cycle_Drive_30_Increasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope,
+ "24t Coach_Cycle_Drive_80_Decreasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope,
+ "24t Coach_Cycle_Drive_50_Decreasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope,
+ "24t Coach_Cycle_Drive_30_Decreasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_80_Dec_Increasing_Slope,
+ "24t Coach_Cycle_Drive_80_Dec_Increasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_50_Dec_Increasing_Slope,
+ "24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_30_Dec_Increasing_Slope,
+ "24t Coach_Cycle_Drive_30_Dec_Increasing_Slope.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level,
+ "24t Coach_Cycle_DecelerateWhileBrake_80_0_level.vmod"),
+ TestCase(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level,
+ "24t Coach_Cycle_AccelerateWhileBrake_80_0_level.vmod"),
+ TestCase(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level,
+ "24t Coach_Cycle_AccelerateAtBrake_80_0_level.vmod"),
+ TestCase(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level,
+ "24t Coach_Cycle_AccelerateBeforeBrake_80_0_level.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_stop_85_stop_85_level, "24t Coach_Cycle_Drive_stop_85_stop_85_level.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDrive_SlopeChangeBeforeStop, "24t Coach_DriverStrategy_SlopeChangeBeforeStop.vmod"),
+ TestCase(SimpleDrivingCycles.CycleDriver_FrequentSlopChange, "24t Coach_DriverStrategy_SlopeChangeBeforeStop.vmod"),
+ ]
+ public void Coach_Special(string cycleData, string modFileName)
+ {
+ var cycle = SimpleDrivingCycles.CreateCycleData(cycleData);
+ var run = CoachPowerTrain.CreateEngineeringRun(cycle, modFileName);
+
+ run.Run();
+ Assert.IsTrue(run.FinishedWithoutErrors);
+
+ GraphWriter.Write(modFileName, @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\" + modFileName);
+ }
+
+ [Category("ComparisonV2"),
+ TestCase(0, 40, -1),
+ TestCase(0, 40, -3),
+ TestCase(0, 40, -5),
+ TestCase(0, 60, -1),
+ TestCase(0, 60, -3),
+ TestCase(0, 60, -5),
+ TestCase(0, 85, -1),
+ TestCase(0, 85, -3),
+ TestCase(0, 85, -5),
+ ]
+ public void Coach_Accelerate_Overspeed(double v1, double v2, double slope)
+ {
+ var cycle = string.Format(CultureInfo.InvariantCulture, "0, {0}, {1}, {2}\n1000, {3}, {4}, {5}", v1, slope,
+ v1.IsEqual(0) ? 2 : 0, v2, slope, v2.IsEqual(0) ? 2 : 0);
+
+ var slopeStr = slope > 0 ? "uhpill" : slope < 0 ? "downhill" : "level";
+ string modFileName = string.Format(CultureInfo.InvariantCulture,
+ "24t Coach_Cycle_Accelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr);
+
+ var cycleData = SimpleDrivingCycles.CreateCycleData(cycle);
+ var run = CoachPowerTrain.CreateEngineeringRun(cycleData, modFileName, true);
+
+ run.Run();
+ Assert.IsTrue(run.FinishedWithoutErrors);
+
+ GraphWriter.Write(modFileName,
+ @"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach_Overspeed\" + modFileName);
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v22.vmod b/VectoCore/VectoCoreTest/TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v22.vmod
new file mode 100644
index 0000000000..e99b27d25b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v22.vmod
@@ -0,0 +1,82 @@
+time [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s²],grad [%],n [1/min],Tq_eng [Nm],Tq_clutch [Nm],Tq_full [Nm],Tq_drag [Nm],Pe_eng [kW],Pe_full [kW],Pe_drag [kW],Pe_clutch [kW],Pa Eng [kW],Paux [kW],Gear [-],Ploss GB [kW],Ploss Diff [kW],Ploss Retarder [kW],Pa GB [kW],Pa Veh [kW],Proll [kW],Pair [kW],Pgrad [kW],Pwheel [kW],Pbrake [kW],FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
+1.5,13.8888893127441,50.0000015258789,50.0000015258789,0,0,703.5271,574.6046,574.6046,1545.476,-148.5176,42.33295,113.8602,-10.94177,42.33295,0,0,12,1.481709,3.559695,0,0,0,27.26789,10.02365,0,37.29154,0,8728.773,-,-
+2.5,27.7777786254883,50.0000015258789,50.0000015258789,0,0,703.5271,574.6046,574.6046,1545.476,-148.5176,42.33295,113.8602,-10.94177,42.33295,0,0,12,1.481709,3.559695,0,0,0,27.26789,10.02365,0,37.29154,0,8728.773,-,-
+3.5,41.6666679382324,50.0000015258789,50.0000015258789,0,0,703.5271,574.6046,574.6046,1545.476,-148.5176,42.33295,113.8602,-10.94177,42.33295,0,0,12,1.481709,3.559695,0,0,0,27.26789,10.02365,0,37.29154,0,8728.773,-,-
+4.5,55.5555572509766,50.0000015258789,50.0000015258789,0,-0.25,703.5271,412.2343,412.2343,1545.476,-148.5176,30.37062,113.8602,-10.94177,30.37062,0,0,12,1.242465,3.383848,0,0,0,27.2678,10.02365,-11.54715,25.7443,0,6445.588,-,-
+5.5,69.4444465637207,50.0000015258789,50.0000015258789,0,-0.25,703.5271,412.2343,412.2343,1545.476,-148.5176,30.37062,113.8602,-10.94177,30.37062,0,0,12,1.242465,3.383848,0,0,0,27.2678,10.02365,-11.54715,25.7443,0,6445.588,-,-
+6.5,83.3333358764648,50.0000015258789,50.0000015258789,0,-0.25,703.5271,412.2343,412.2343,1545.476,-148.5176,30.37062,113.8602,-10.94177,30.37062,0,0,12,1.242465,3.383848,0,0,0,27.2678,10.02365,-11.54715,25.7443,0,6445.588,-,-
+7.5,97.222225189209,50.0000015258789,50.0000015258789,0,-0.25,703.5271,412.2343,412.2343,1545.476,-148.5176,30.37062,113.8602,-10.94177,30.37062,0,0,12,1.242465,3.383848,0,0,0,27.2678,10.02365,-11.54715,25.7443,0,6445.588,-,-
+8.5,111.111114501953,50.0000015258789,50.0000015258789,0,-0.5,703.5271,249.8648,249.8648,1545.476,-148.5176,18.40833,113.8602,-10.94177,18.40833,0,0,12,1.003218,3.208004,0,0,0,27.26754,10.02365,-23.09409,14.19711,0,4371.919,-,-
+9.5,125.000003814697,50.0000015258789,50.0000015258789,0,-0.5,703.5271,249.8648,249.8648,1545.476,-148.5176,18.40833,113.8602,-10.94177,18.40833,0,0,12,1.003218,3.208004,0,0,0,27.26754,10.02365,-23.09409,14.19711,0,4371.919,-,-
+10.5,138.888893127441,50.0000015258789,50.0000015258789,0,-0.5,703.5271,249.8648,249.8648,1545.476,-148.5176,18.40833,113.8602,-10.94177,18.40833,0,0,12,1.003218,3.208004,0,0,0,27.26754,10.02365,-23.09409,14.19711,0,4371.919,-,-
+11.5,152.777782440186,50.0000015258789,50.0000015258789,0,-0.75,703.5271,87.49889,87.49889,1545.476,-148.5176,6.446321,113.8602,-10.94177,6.446321,0,0,12,0.763978,3.032163,0,0,0,27.26712,10.02365,-34.64059,2.650181,0,2507.209,-,-
+12.5,166.66667175293,50.0000015258789,50.0000015258789,0,-0.75,703.5271,87.49889,87.49889,1545.476,-148.5176,6.446321,113.8602,-10.94177,6.446321,0,0,12,0.763978,3.032163,0,0,0,27.26712,10.02365,-34.64059,2.650181,0,2507.209,-,-
+13.5,180.555561065674,50.0000015258789,50.0000015258789,0,-0.75,703.5271,87.49889,87.49889,1545.476,-148.5176,6.446321,113.8602,-10.94177,6.446321,0,0,12,0.763978,3.032163,0,0,0,27.26712,10.02365,-34.64059,2.650181,0,2507.209,-,-
+14.5,194.444450378418,50.0000015258789,50.0000015258789,0,-0.75,703.5271,87.49889,87.49889,1545.476,-148.5176,6.446321,113.8602,-10.94177,6.446321,0,0,12,0.763978,3.032163,0,0,0,27.26712,10.02365,-34.64059,2.650181,0,2507.209,-,-
+15.5,208.333339691162,50.0000015258789,50.0000015258789,0,-1,703.5271,-68.75233,-68.75233,1545.476,-148.5176,-5.065204,113.8602,-10.94177,-5.065204,0,0,12,0.7962137,3.034849,0,0,0,27.26652,10.02365,-46.18644,-8.896267,0,998.639,-,-
+16.5,222.222229003906,50.0000015258789,50.0000015258789,0,-1,703.5271,-68.75233,-68.75233,1545.476,-148.5176,-5.065204,113.8602,-10.94177,-5.065204,0,0,12,0.7962137,3.034849,0,0,0,27.26652,10.02365,-46.18644,-8.896267,0,998.639,-,-
+17.5,236.11111831665,50.0000015258789,50.0000015258789,0,-1,703.5271,-68.75233,-68.75233,1545.476,-148.5176,-5.065204,113.8602,-10.94177,-5.065204,0,0,12,0.7962137,3.034849,0,0,0,27.26652,10.02365,-46.18644,-8.896267,0,998.639,-,-
+18.5,250.000007629395,50.0000015258789,50.0000015258789,0,-1.25,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26575,10.02365,-57.73143,-20.44202,-5.521395,0,-,-
+19.5,263.888896942139,50.0000015258789,50.0000015258789,0,-1.25,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26575,10.02365,-57.73143,-20.44202,-5.521395,0,-,-
+20.5,277.777786254883,50.0000015258789,50.0000015258789,0,-1.25,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26575,10.02365,-57.73143,-20.44202,-5.521395,0,-,-
+21.5,291.666675567627,50.0000015258789,50.0000015258789,0,-1.25,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26575,10.02365,-57.73143,-20.44202,-5.521395,0,-,-
+22.5,305.555564880371,50.0000015258789,50.0000015258789,0,-1.5,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26482,10.02365,-69.27534,-31.98686,-17.06624,0,-,-
+23.5,319.444454193115,50.0000015258789,50.0000015258789,0,-1.5,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26482,10.02365,-69.27534,-31.98686,-17.06624,0,-,-
+24.5,333.333343505859,50.0000015258789,50.0000015258789,0,-1.5,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26482,10.02365,-69.27534,-31.98686,-17.06624,0,-,-
+25.5,347.222232818604,50.0000015258789,50.0000015258789,0,-1.5,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26482,10.02365,-69.27534,-31.98686,-17.06624,0,-,-
+26.5,361.111122131348,50.0000015258789,50.0000015258789,0,-1.75,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26371,10.02365,-80.81794,-43.53057,-28.60995,0,-,-
+27.5,375.000011444092,50.0000015258789,50.0000015258789,0,-1.75,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26371,10.02365,-80.81794,-43.53057,-28.60995,0,-,-
+28.5,388.888900756836,50.0000015258789,50.0000015258789,0,-1.75,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26371,10.02365,-80.81794,-43.53057,-28.60995,0,-,-
+29.5,402.77779006958,50.0000015258789,50.0000015258789,0,-2,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26243,10.02365,-92.35903,-55.07294,-40.15232,0,-,-
+30.5,416.666679382324,50.0000015258789,50.0000015258789,0,-2,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26243,10.02365,-92.35903,-55.07294,-40.15232,0,-,-
+31.5,430.555568695068,50.0000015258789,50.0000015258789,0,-2,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26243,10.02365,-92.35903,-55.07294,-40.15232,0,-,-
+32.5,444.444458007813,50.0000015258789,50.0000015258789,0,-2,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26243,10.02365,-92.35903,-55.07294,-40.15232,0,-,-
+33.5,458.333347320557,50.0000015258789,50.0000015258789,0,-2.25,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26098,10.02365,-103.8984,-66.61375,-51.69313,0,-,-
+34.5,472.222236633301,50.0000015258789,50.0000015258789,0,-2.25,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26098,10.02365,-103.8984,-66.61375,-51.69313,0,-,-
+35.5,486.111125946045,50.0000015258789,50.0000015258789,0,-2.25,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.26098,10.02365,-103.8984,-66.61375,-51.69313,0,-,-
+36.5,500.000015258789,50.0000015258789,50.0000015258789,0,-2.5,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.25937,10.02365,-115.4358,-78.15279,-63.23217,0,-,-
+37.5,513.888904571533,50.0000015258789,50.0000015258789,0,-2.5,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.25937,10.02365,-115.4358,-78.15279,-63.23217,0,-,-
+38.5,527.777793884277,50.0000015258789,50.0000015258789,0,-2.5,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.25937,10.02365,-115.4358,-78.15279,-63.23217,0,-,-
+39.5,541.666683197021,50.0000015258789,50.0000015258789,0,-2.5,703.5271,-148.5176,-148.5176,1545.476,-148.5176,-10.94177,113.8602,-10.94177,-10.94177,0,0,12,0.8549789,3.123879,0,0,0,27.25937,10.02365,-115.4358,-78.15279,-63.23217,0,-,-
+40.5,555.555572509766,50.0000015258789,50.0000015258789,0,0,703.5271,574.6046,574.6046,1545.476,-148.5176,42.33295,113.8602,-10.94177,42.33295,0,0,12,1.481709,3.559695,0,0,0,27.26789,10.02365,0,37.29154,0,8728.773,-,-
+41.5,569.44446182251,50.0000015258789,50.0000015258789,0,0,703.5271,574.6046,574.6046,1545.476,-148.5176,42.33295,113.8602,-10.94177,42.33295,0,0,12,1.481709,3.559695,0,0,0,27.26789,10.02365,0,37.29154,0,8728.773,-,-
+42.5,583.333351135254,50.0000015258789,50.0000015258789,0,0,703.5271,574.6046,574.6046,1545.476,-148.5176,42.33295,113.8602,-10.94177,42.33295,0,0,12,1.481709,3.559695,0,0,0,27.26789,10.02365,0,37.29154,0,8728.773,-,-
+43.5,597.222240447998,50.0000015258789,50.0000015258789,0,0,703.5271,574.6046,574.6046,1545.476,-148.5176,42.33295,113.8602,-10.94177,42.33295,0,0,12,1.481709,3.559695,0,0,0,27.26789,10.02365,0,37.29154,0,8728.773,-,-
+44.5,611.111129760742,50.0000015258789,50.0000015258789,0,0,703.5271,574.6046,574.6046,1545.476,-148.5176,42.33295,113.8602,-10.94177,42.33295,0,0,12,1.481709,3.559695,0,0,0,27.26789,10.02365,0,37.29154,0,8728.773,-,-
+45.5,625.000019073486,50.0000015258789,50.0000015258789,0,0,703.5271,574.6046,574.6046,1545.476,-148.5176,42.33295,113.8602,-10.94177,42.33295,0,0,12,1.481709,3.559695,0,0,0,27.26789,10.02365,0,37.29154,0,8728.773,-,-
+46.5,638.88890838623,50.0000015258789,50.0000015258789,0,0,703.5271,574.6046,574.6046,1545.476,-148.5176,42.33295,113.8602,-10.94177,42.33295,0,0,12,1.481709,3.559695,0,0,0,27.26789,10.02365,0,37.29154,0,8728.773,-,-
+47.5,652.777797698975,50.0000015258789,50.0000015258789,0,0.25,703.5271,736.9724,736.9724,1545.476,-148.5176,54.2951,113.8602,-10.94177,54.2951,0,0,12,1.720953,3.735538,0,0,0,27.2678,10.02365,11.54715,48.83861,0,10650.25,-,-
+48.5,666.666687011719,50.0000015258789,50.0000015258789,0,0.25,703.5271,736.9724,736.9724,1545.476,-148.5176,54.2951,113.8602,-10.94177,54.2951,0,0,12,1.720953,3.735538,0,0,0,27.2678,10.02365,11.54715,48.83861,0,10650.25,-,-
+49.5,680.555576324463,50.0000015258789,50.0000015258789,0,0.25,703.5271,736.9724,736.9724,1545.476,-148.5176,54.2951,113.8602,-10.94177,54.2951,0,0,12,1.720953,3.735538,0,0,0,27.2678,10.02365,11.54715,48.83861,0,10650.25,-,-
+50.5,694.444465637207,50.0000015258789,50.0000015258789,0,0.25,703.5271,736.9724,736.9724,1545.476,-148.5176,54.2951,113.8602,-10.94177,54.2951,0,0,12,1.720953,3.735538,0,0,0,27.2678,10.02365,11.54715,48.83861,0,10650.25,-,-
+51.5,708.333354949951,50.0000015258789,50.0000015258789,0,0.5,703.5271,899.3346,899.3346,1545.476,-148.5176,66.25684,113.8602,-10.94177,66.25684,0,0,12,1.960187,3.911375,0,0,0,27.26754,10.02365,23.09409,60.38528,0,12638.31,-,-
+52.5,722.222244262695,50.0000015258789,50.0000015258789,0,0.5,703.5271,899.3346,899.3346,1545.476,-148.5176,66.25684,113.8602,-10.94177,66.25684,0,0,12,1.960187,3.911375,0,0,0,27.26754,10.02365,23.09409,60.38528,0,12638.31,-,-
+53.5,736.111133575439,50.0000015258789,50.0000015258789,0,0.5,703.5271,899.3346,899.3346,1545.476,-148.5176,66.25684,113.8602,-10.94177,66.25684,0,0,12,1.960187,3.911375,0,0,0,27.26754,10.02365,23.09409,60.38528,0,12638.31,-,-
+54.5,750.000022888184,50.0000015258789,50.0000015258789,0,0.75,703.5271,1061.689,1061.689,1545.476,-148.5176,78.21798,113.8602,-10.94177,78.21798,0,0,12,2.199407,4.087205,0,0,0,27.26712,10.02365,34.64059,71.93137,0,14769.54,-,-
+55.5,763.888912200928,50.0000015258789,50.0000015258789,0,0.75,703.5271,1061.689,1061.689,1545.476,-148.5176,78.21798,113.8602,-10.94177,78.21798,0,0,12,2.199407,4.087205,0,0,0,27.26712,10.02365,34.64059,71.93137,0,14769.54,-,-
+56.5,777.777801513672,50.0000015258789,50.0000015258789,0,0.75,703.5271,1061.689,1061.689,1545.476,-148.5176,78.21798,113.8602,-10.94177,78.21798,0,0,12,2.199407,4.087205,0,0,0,27.26712,10.02365,34.64059,71.93137,0,14769.54,-,-
+57.5,791.666690826416,50.0000015258789,50.0000015258789,0,0.75,703.5271,1061.689,1061.689,1545.476,-148.5176,78.21798,113.8602,-10.94177,78.21798,0,0,12,2.199407,4.087205,0,0,0,27.26712,10.02365,34.64059,71.93137,0,14769.54,-,-
+58.5,805.469250679016,49.6892154693604,50.0000015258789,-0.1726589,1,703.5271,0,0,1545.476,-148.5176,0,113.8602,-10.94177,0,0,0,0,0,0,0,0,-82.83349,27.09704,9.837902,45.89936,0.0008163452,0,1676.407,-,-
+59.5,819.271810531616,49.6892154693604,50.0000015258789,0.1726589,1,1118.647,1684.025,1501.894,2300,-171.2714,197.2741,269.4322,-20.06349,175.9384,21.33567,0,10,4.774593,5.496061,0,0,82.83349,27.09704,9.837902,45.89936,165.6678,0,36115.91,-,-
+60.5,833.074370384216,49.6892154693604,50.0000015258789,-0.1726589,1,1118.647,0,0,2300,-171.2714,0,269.4322,-20.06349,0,0,0,0,0,0,0,0,-82.83349,27.09704,9.837902,45.89936,0.0008163452,0,3127.209,-,-
+61.5,846.83468914032,49.5371475219727,50.0000015258789,0.08817673,1,697.0145,1524.13,1819.959,1528.902,-148.4851,111.248,111.5964,-10.8381,132.841,-21.59294,0,12,3.28359,4.863007,0,0,42.17351,27.01411,9.747855,45.75889,124.6944,0,21815.97,-,-
+62.5,860.540952682495,49.3425487518311,50.0000015258789,-0.1962872,1.25,697.0145,0,0,1528.902,-148.4851,0,111.5964,-10.8381,0,0,0,0,0,0,0,0,-93.5122,26.90724,9.633427,56.97232,0.0007820129,0,1662.73,-,-
+63.5,874.289457321167,49.4946166992188,50.0000015258789,0.2807693,1.25,1114.266,2244.004,2061.316,2300,-170.8552,261.843,268.377,-19.93635,240.526,21.31702,0,10,6.058848,6.434152,0,0,134.1722,26.99016,9.722769,57.1479,228.033,0,49698.16,-,-
+64.5,888.080078125,49.6462348937988,50.0000015258789,-0.196537,1.25,1114.266,0,0,2300,-170.8552,0,268.377,-19.93635,0,0,0,0,0,0,0,0,-94.2075,27.07284,9.812395,57.32296,0.0006980896,0,3117.527,-,-
+65.5,901.791964530945,49.3627910614014,50.0000015258789,0.03906822,1.5,694.5612,1515.85,1810.255,1522.658,-148.4728,110.2543,110.7495,-10.79906,131.6676,-21.41331,0,12,3.257006,4.835536,0,0,18.61994,26.91735,9.645288,68.39247,123.575,0,21612.66,-,-
+66.5,915.413411140442,49.0372077941895,50.0000015258789,-0.2199478,1.5,694.5612,0,0,1522.658,-148.4728,0,110.7495,-10.79906,0,0,0,0,0,0,0,0,-104.1358,26.73981,9.455691,67.94138,0.001037598,0,1657.579,-,-
+67.5,929.108731269836,49.3031524658203,50.0000015258789,0.3676958,1.5,1422.13,2270.994,1979.314,2275.546,-206.5408,338.208,338.886,-30.75912,294.7695,43.43851,0,9,7.720613,7.211584,0,0,175.0323,26.88483,9.610371,68.30984,279.8373,0,64463.67,-,-
+68.5,942.877708435059,49.5683177947998,50.0000015258789,-0.2203827,1.5,1422.13,0,0,2275.546,-206.5408,0,338.886,-30.75912,0,0,0,0,0,0,0,0,-105.4718,27.02942,9.766268,68.67723,0.001098633,0,4405.918,-,-
+69.5,956.566633224487,49.2801292419434,50.0000015258789,0.06027889,1.75,693.3981,1517.21,2116.061,1519.698,-148.467,110.1684,110.3491,-10.78056,153.6524,-43.48404,0,12,3.695235,5.153858,0,0,28.68084,26.87118,9.596913,79.65437,144.8033,0,21610.96,-,-
+70.5,970.163805961609,48.9498218536377,50.0000015258789,-0.243784,1.75,693.3981,0,0,1519.698,-148.467,0,110.3491,-10.78056,0,0,0,0,0,0,0,0,-115.2155,26.69107,9.40523,79.12048,0.001243591,0,1655.136,-,-
+71.5,983.812630653381,49.1357688903809,50.0000015258789,0.3470869,1.75,1417.302,2280.134,1989.759,2280.881,-205.7683,338.4164,338.5273,-30.54004,295.3191,43.09736,0,9,7.721787,7.209942,0,0,164.661,26.79247,9.512821,79.42103,280.3873,0,64537.7,-,-
+72.5,997.512954711914,49.3211666107178,50.0000015258789,-0.2440872,1.75,1417.302,0,0,2280.881,-205.7683,0,338.5273,-30.54004,0,0,0,0,0,0,0,0,-116.234,26.89356,9.620909,79.7207,0.001159668,0,4384.119,-,-
+73.5,1011.1774263382,49.1920978546143,50.0000015258789,0.1723824,2,885.9641,2004.921,2376.981,2009.779,-153.728,186.0125,186.4631,-14.26257,220.5315,-34.519,0,11,5.296019,6.127843,0,0,81.87342,26.82192,9.545575,90.86669,209.1076,0,36480.18,-,-
+74.5,1024.79421615601,49.0204433441162,50.0000015258789,-0.267746,2,885.9641,0,0,2009.779,-153.728,0,186.4631,-14.26257,0,0,0,0,0,0,0,0,-126.7229,26.72833,9.445996,90.54961,0.001060486,0,2302.803,-,-
+75.5,1038.44685840607,49.1495121002197,50.0000015258789,0.3394508,2,1417.698,2276.393,2043.667,2280.443,-205.8318,337.9556,338.5569,-30.558,303.4049,34.55069,0,9,7.8843,7.329609,0,0,161.0835,26.7987,9.520805,90.78802,288.191,0,64432.77,-,-
+76.5,1052.12331485748,49.2352432250977,50.0000015258789,-0.2918224,2.25,1417.698,0,0,2280.443,-205.8318,0,338.5569,-30.558,0,0,0,0,0,0,0,0,-138.7234,26.84402,9.570714,102.3092,0.0006256104,0,4385.909,-,-
+77.5,1065.7275686264,48.9753135681152,50.0000015258789,0.1474161,2.25,882.0598,1994.213,2370.371,1999.842,-153.5133,184.2036,184.7236,-14.17988,218.949,-34.7454,0,11,5.25863,6.091876,0,0,69.7071,26.7023,9.419931,101.7691,207.5985,0,36109.17,-,-
+78.5,1079.25983047485,48.7161426544189,50.0000015258789,-0.291399,2.25,882.0598,0,0,1999.842,-153.5133,0,184.7236,-14.17988,0,0,0,0,0,0,0,0,-137.0616,26.561,9.271174,101.2306,0.001152039,0,2283.555,-,-
+79.5,1092.80715751648,48.7703773498535,50.0000015258789,0.3215294,2.25,1406.763,2292.329,2062.387,2292.527,-204.082,337.6964,337.7256,-30.06451,303.8222,33.87416,0,9,7.870494,7.313714,0,0,151.402,26.59057,9.302173,101.3433,288.638,0,64442.91,-,-
+80.5,1106.60564804077,49.6745658874512,50.0000015258789,0.1807976,2.5,1432.844,1692.012,1678.09,2263.708,-208.255,253.8813,339.6626,-31.24804,251.7924,2.088932,0,9,6.882956,6.601394,0,0,86.71246,27.08194,9.829203,114.6845,238.3081,0,47150.45,-,-
+81.5,1120.3365983963,49.4314212799072,50.0000015258789,-0.3158779,2.5,1432.844,0,0,2263.708,-208.255,0,339.6626,-31.24804,0,0,0,0,0,0,0,0,-150.7569,26.94938,9.685574,114.1231,0.001182556,0,4454.289,-,-
diff --git a/VectoCore/VectoCoreTest/TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod b/VectoCore/VectoCoreTest/TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod
new file mode 100644
index 0000000000..78ac2e7b80
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Results/Integration/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod
@@ -0,0 +1,174 @@
+time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],Gear [-],n_eng_avg [1/min],T_eng_fcmap [Nm],Tq_full [Nm],Tq_drag [Nm],P_eng_fcmap [kW],P_eng_full [kW],P_eng_drag [kW],P_eng_inertia [kW],P_eng_out [kW],P_clutch_loss [kW],P_clutch_out [kW],P_aux [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],FC-Map [g/h],FC-AUXc [g/h],FC-WHTCc [g/h]
+0.2500,0.5000,6.9444,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1360.4331,-148.5176,41.6818,100.2274,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+0.7500,0.5000,13.8889,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+1.2500,0.5000,20.8333,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+1.7500,0.5000,27.7778,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+2.2500,0.5000,34.7222,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+2.7500,0.5000,41.6667,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+3.2500,0.5000,48.6111,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+3.7500,0.5000,55.5556,50.0000,50.0000,0.0000,-0.2000,12,703.5271,437.8721,1119.6962,-148.5176,32.2594,82.4916,-10.9418,0.0000,32.2594,0.0000,32.2594,0.0000,32.2594,0.7963,0.0000,31.4631,0.0000,31.4631,3.4189,28.0442,0.0000,28.0442,0.0000,28.0442,-9.2346,10.0237,27.2551,0.0000,6779.2638,6779.2638,6779.2638
+4.2500,0.5000,62.5000,50.0000,50.0000,0.0000,-0.2500,12,703.5271,405.8985,1064.1136,-148.5176,29.9038,78.3966,-10.9418,0.0000,29.9038,0.0000,29.9038,0.0000,29.9038,0.7846,0.0000,29.1193,0.0000,29.1193,3.3837,25.7355,0.0000,25.7355,0.0000,25.7355,-11.5432,10.0237,27.2551,0.0000,6363.1274,6363.1274,6363.1274
+4.7500,0.5000,69.4444,50.0000,50.0000,0.0000,-0.2500,12,703.5271,405.8985,1050.2179,-148.5176,29.9038,77.3729,-10.9418,0.0000,29.9038,0.0000,29.9038,0.0000,29.9038,0.7846,0.0000,29.1193,0.0000,29.1193,3.3837,25.7355,0.0000,25.7355,0.0000,25.7355,-11.5432,10.0237,27.2551,0.0000,6363.1274,6363.1274,6363.1274
+5.2500,0.5000,76.3889,50.0000,50.0000,0.0000,-0.2500,12,703.5271,405.8985,1050.2179,-148.5176,29.9038,77.3729,-10.9418,0.0000,29.9038,0.0000,29.9038,0.0000,29.9038,0.7846,0.0000,29.1193,0.0000,29.1193,3.3837,25.7355,0.0000,25.7355,0.0000,25.7355,-11.5432,10.0237,27.2551,0.0000,6363.1274,6363.1274,6363.1274
+5.7500,0.5000,83.3333,50.0000,50.0000,0.0000,-0.2500,12,703.5271,405.8985,1050.2179,-148.5176,29.9038,77.3729,-10.9418,0.0000,29.9038,0.0000,29.9038,0.0000,29.9038,0.7846,0.0000,29.1193,0.0000,29.1193,3.3837,25.7355,0.0000,25.7355,0.0000,25.7355,-11.5432,10.0237,27.2551,0.0000,6363.1274,6363.1274,6363.1274
+6.2500,0.5000,90.2778,50.0000,50.0000,0.0000,-0.2500,12,703.5271,405.8985,1050.2179,-148.5176,29.9038,77.3729,-10.9418,0.0000,29.9038,0.0000,29.9038,0.0000,29.9038,0.7846,0.0000,29.1193,0.0000,29.1193,3.3837,25.7355,0.0000,25.7355,0.0000,25.7355,-11.5432,10.0237,27.2551,0.0000,6363.1274,6363.1274,6363.1274
+6.7500,0.5000,97.2222,50.0000,50.0000,0.0000,-0.2500,12,703.5271,405.8985,1050.2179,-148.5176,29.9038,77.3729,-10.9418,0.0000,29.9038,0.0000,29.9038,0.0000,29.9038,0.7846,0.0000,29.1193,0.0000,29.1193,3.3837,25.7355,0.0000,25.7355,0.0000,25.7355,-11.5432,10.0237,27.2551,0.0000,6363.1274,6363.1274,6363.1274
+7.2500,0.5000,104.1667,50.0000,50.0000,0.0000,-0.4000,12,703.5271,309.9779,1050.2179,-148.5176,22.8371,77.3729,-10.9418,0.0000,22.8371,0.0000,22.8371,0.0000,22.8371,0.7492,0.0000,22.0878,0.0000,22.0878,3.2782,18.8096,0.0000,18.8096,0.0000,18.8096,-18.4690,10.0237,27.2550,0.0000,5055.3067,5055.3067,5055.3067
+7.7500,0.5000,111.1111,50.0000,50.0000,0.0000,-0.5000,12,703.5271,246.0313,1008.5310,-148.5176,18.1259,74.3017,-10.9418,0.0000,18.1259,0.0000,18.1259,0.0000,18.1259,0.7257,0.0000,17.4002,0.0000,17.4002,3.2079,14.1923,0.0000,14.1923,0.0000,14.1923,-23.0862,10.0237,27.2548,0.0000,4330.9008,4330.9008,4330.9008
+8.2500,0.5000,118.0556,50.0000,50.0000,0.0000,-0.5000,12,703.5271,246.0313,980.7399,-148.5176,18.1259,72.2542,-10.9418,0.0000,18.1259,0.0000,18.1259,0.0000,18.1259,0.7257,0.0000,17.4002,0.0000,17.4002,3.2079,14.1923,0.0000,14.1923,0.0000,14.1923,-23.0862,10.0237,27.2548,0.0000,4330.9008,4330.9008,4330.9008
+8.7500,0.5000,125.0000,50.0000,50.0000,0.0000,-0.5000,12,703.5271,246.0313,980.7399,-148.5176,18.1259,72.2542,-10.9418,0.0000,18.1259,0.0000,18.1259,0.0000,18.1259,0.7257,0.0000,17.4002,0.0000,17.4002,3.2079,14.1923,0.0000,14.1923,0.0000,14.1923,-23.0862,10.0237,27.2548,0.0000,4330.9008,4330.9008,4330.9008
+9.2500,0.5000,131.9444,50.0000,50.0000,0.0000,-0.5000,12,703.5271,246.0313,980.7399,-148.5176,18.1259,72.2542,-10.9418,0.0000,18.1259,0.0000,18.1259,0.0000,18.1259,0.7257,0.0000,17.4002,0.0000,17.4002,3.2079,14.1923,0.0000,14.1923,0.0000,14.1923,-23.0862,10.0237,27.2548,0.0000,4330.9008,4330.9008,4330.9008
+9.7500,0.5000,138.8889,50.0000,50.0000,0.0000,-0.5000,12,703.5271,246.0313,980.7399,-148.5176,18.1259,72.2542,-10.9418,0.0000,18.1259,0.0000,18.1259,0.0000,18.1259,0.7257,0.0000,17.4002,0.0000,17.4002,3.2079,14.1923,0.0000,14.1923,0.0000,14.1923,-23.0862,10.0237,27.2548,0.0000,4330.9008,4330.9008,4330.9008
+10.2500,0.5000,145.8333,50.0000,50.0000,0.0000,-0.5000,12,703.5271,246.0313,980.7399,-148.5176,18.1259,72.2542,-10.9418,0.0000,18.1259,0.0000,18.1259,0.0000,18.1259,0.7257,0.0000,17.4002,0.0000,17.4002,3.2079,14.1923,0.0000,14.1923,0.0000,14.1923,-23.0862,10.0237,27.2548,0.0000,4330.9008,4330.9008,4330.9008
+10.7500,0.5000,152.7778,50.0000,50.0000,0.0000,-0.6000,12,703.5271,182.0853,980.7399,-148.5176,13.4148,72.2542,-10.9418,0.0000,13.4148,0.0000,13.4148,0.0000,13.4148,0.7021,0.0000,12.7127,0.0000,12.7127,3.1376,9.5751,0.0000,9.5751,0.0000,9.5751,-27.7033,10.0237,27.2547,0.0000,3622.7623,3622.7623,3622.7623
+11.2500,0.5000,159.7222,50.0000,50.0000,0.0000,-0.7500,12,703.5271,86.1678,952.9491,-148.5176,6.3483,70.2068,-10.9418,0.0000,6.3483,0.0000,6.3483,0.0000,6.3483,0.6668,0.0000,5.6815,0.0000,5.6815,3.0321,2.6493,0.0000,2.6493,0.0000,2.6493,-34.6288,10.0237,27.2544,0.0000,2494.5701,2494.5701,2494.5701
+11.7500,0.5000,166.6667,50.0000,50.0000,0.0000,-0.7500,12,703.5271,86.1678,939.2673,-148.5176,6.3483,69.1988,-10.9418,0.0000,6.3483,0.0000,6.3483,0.0000,6.3483,0.6668,0.0000,5.6815,0.0000,5.6815,3.0321,2.6493,0.0000,2.6493,0.0000,2.6493,-34.6288,10.0237,27.2544,0.0000,2494.5701,2494.5701,2494.5701
+12.2500,0.5000,173.6111,50.0000,50.0000,0.0000,-0.7500,12,703.5271,86.1678,939.2673,-148.5176,6.3483,69.1988,-10.9418,0.0000,6.3483,0.0000,6.3483,0.0000,6.3483,0.6668,0.0000,5.6815,0.0000,5.6815,3.0321,2.6493,0.0000,2.6493,0.0000,2.6493,-34.6288,10.0237,27.2544,0.0000,2494.5701,2494.5701,2494.5701
+12.7500,0.5000,180.5556,50.0000,50.0000,0.0000,-0.7500,12,703.5271,86.1678,939.2673,-148.5176,6.3483,69.1988,-10.9418,0.0000,6.3483,0.0000,6.3483,0.0000,6.3483,0.6668,0.0000,5.6815,0.0000,5.6815,3.0321,2.6493,0.0000,2.6493,0.0000,2.6493,-34.6288,10.0237,27.2544,0.0000,2494.5701,2494.5701,2494.5701
+13.2500,0.5000,187.5000,50.0000,50.0000,0.0000,-0.7500,12,703.5271,86.1678,939.2673,-148.5176,6.3483,69.1988,-10.9418,0.0000,6.3483,0.0000,6.3483,0.0000,6.3483,0.6668,0.0000,5.6815,0.0000,5.6815,3.0321,2.6493,0.0000,2.6493,0.0000,2.6493,-34.6288,10.0237,27.2544,0.0000,2494.5701,2494.5701,2494.5701
+13.7500,0.5000,194.4444,50.0000,50.0000,0.0000,-0.7500,12,703.5271,86.1678,939.2673,-148.5176,6.3483,69.1988,-10.9418,0.0000,6.3483,0.0000,6.3483,0.0000,6.3483,0.6668,0.0000,5.6815,0.0000,5.6815,3.0321,2.6493,0.0000,2.6493,0.0000,2.6493,-34.6288,10.0237,27.2544,0.0000,2494.5701,2494.5701,2494.5701
+14.2500,0.5000,201.3889,50.0000,50.0000,0.0000,-0.8000,12,703.5271,54.1958,939.2673,-148.5176,3.9928,69.1988,-10.9418,0.0000,3.9928,0.0000,3.9928,0.0000,3.9928,0.6550,0.0000,3.3378,0.0000,3.3378,2.9970,0.3408,0.0000,0.3408,0.0000,0.3408,-36.9372,10.0237,27.2543,0.0000,2190.9960,2190.9960,2190.9960
+14.7500,0.5000,208.3333,50.0000,50.0000,0.0000,-1.0000,12,703.5271,-70.3479,939.2673,-148.5176,-5.1828,69.1988,-10.9418,0.0000,-5.1828,0.0000,-5.1828,0.0000,-5.1828,0.6756,0.0000,-5.8584,0.0000,-5.8584,3.0348,-8.8932,0.0000,-8.8932,0.0000,-8.8932,-46.1707,10.0237,27.2538,0.0000,982.9098,982.9098,982.9098
+15.2500,0.5000,215.2778,50.0000,50.0000,0.0000,-1.0000,12,703.5271,-70.3479,939.2673,-148.5176,-5.1828,69.1988,-10.9418,0.0000,-5.1828,0.0000,-5.1828,0.0000,-5.1828,0.6756,0.0000,-5.8584,0.0000,-5.8584,3.0348,-8.8932,0.0000,-8.8932,0.0000,-8.8932,-46.1707,10.0237,27.2538,0.0000,982.9098,982.9098,982.9098
+15.7500,0.5000,222.2222,50.0000,50.0000,0.0000,-1.0000,12,703.5271,-70.3479,939.2673,-148.5176,-5.1828,69.1988,-10.9418,0.0000,-5.1828,0.0000,-5.1828,0.0000,-5.1828,0.6756,0.0000,-5.8584,0.0000,-5.8584,3.0348,-8.8932,0.0000,-8.8932,0.0000,-8.8932,-46.1707,10.0237,27.2538,0.0000,982.9098,982.9098,982.9098
+16.2500,0.5000,229.1667,50.0000,50.0000,0.0000,-1.0000,12,703.5271,-70.3479,939.2673,-148.5176,-5.1828,69.1988,-10.9418,0.0000,-5.1828,0.0000,-5.1828,0.0000,-5.1828,0.6756,0.0000,-5.8584,0.0000,-5.8584,3.0348,-8.8932,0.0000,-8.8932,0.0000,-8.8932,-46.1707,10.0237,27.2538,0.0000,982.9098,982.9098,982.9098
+16.7500,0.5000,236.1111,50.0000,50.0000,0.0000,-1.0000,12,703.5271,-70.3479,939.2673,-148.5176,-5.1828,69.1988,-10.9418,0.0000,-5.1828,0.0000,-5.1828,0.0000,-5.1828,0.6756,0.0000,-5.8584,0.0000,-5.8584,3.0348,-8.8932,0.0000,-8.8932,0.0000,-8.8932,-46.1707,10.0237,27.2538,0.0000,982.9098,982.9098,982.9098
+17.2500,0.5000,243.0556,50.0000,50.0000,0.0000,-1.0000,12,703.5271,-70.3479,939.2673,-148.5176,-5.1828,69.1988,-10.9418,0.0000,-5.1828,0.0000,-5.1828,0.0000,-5.1828,0.6756,0.0000,-5.8584,0.0000,-5.8584,3.0348,-8.8932,0.0000,-8.8932,0.0000,-8.8932,-46.1707,10.0237,27.2538,0.0000,982.9098,982.9098,982.9098
+17.7500,0.5000,250.0000,50.0000,50.0000,0.0000,-1.0000,12,703.5271,-70.3479,939.2673,-148.5176,-5.1828,69.1988,-10.9418,0.0000,-5.1828,0.0000,-5.1828,0.0000,-5.1828,0.6756,0.0000,-5.8584,0.0000,-5.8584,3.0348,-8.8932,0.0000,-8.8932,0.0000,-8.8932,-46.1707,10.0237,27.2538,0.0000,982.9098,982.9098,982.9098
+18.2500,0.5000,256.9444,50.0000,50.0000,0.0000,-1.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,5.6818,-20.4350,0.0000,-20.4350,-57.7117,10.0237,27.2531,0.0000,0.0000,0.0000,0.0000
+18.7500,0.5000,263.8889,50.0000,50.0000,0.0000,-1.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,5.6818,-20.4350,0.0000,-20.4350,-57.7117,10.0237,27.2531,0.0000,0.0000,0.0000,0.0000
+19.2500,0.5000,270.8333,50.0000,50.0000,0.0000,-1.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,5.6818,-20.4350,0.0000,-20.4350,-57.7117,10.0237,27.2531,0.0000,0.0000,0.0000,0.0000
+19.7500,0.5000,277.7778,50.0000,50.0000,0.0000,-1.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,5.6818,-20.4350,0.0000,-20.4350,-57.7117,10.0237,27.2531,0.0000,0.0000,0.0000,0.0000
+20.2500,0.5000,284.7222,50.0000,50.0000,0.0000,-1.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,5.6818,-20.4350,0.0000,-20.4350,-57.7117,10.0237,27.2531,0.0000,0.0000,0.0000,0.0000
+20.7500,0.5000,291.6667,50.0000,50.0000,0.0000,-1.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,5.6818,-20.4350,0.0000,-20.4350,-57.7117,10.0237,27.2531,0.0000,0.0000,0.0000,0.0000
+21.2500,0.5000,298.6111,50.0000,50.0000,0.0000,-1.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,5.6818,-20.4350,0.0000,-20.4350,-57.7117,10.0237,27.2531,0.0000,0.0000,0.0000,0.0000
+21.7500,0.5000,305.5556,50.0000,50.0000,0.0000,-1.4500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,14.9146,-29.6678,0.0000,-29.6678,-66.9438,10.0237,27.2523,0.0000,0.0000,0.0000,0.0000
+22.2500,0.5000,312.5000,50.0000,50.0000,0.0000,-1.5000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,17.2227,-31.9759,0.0000,-31.9759,-69.2517,10.0237,27.2521,0.0000,0.0000,0.0000,0.0000
+22.7500,0.5000,319.4444,50.0000,50.0000,0.0000,-1.5000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,17.2227,-31.9759,0.0000,-31.9759,-69.2517,10.0237,27.2521,0.0000,0.0000,0.0000,0.0000
+23.2500,0.5000,326.3889,50.0000,50.0000,0.0000,-1.5000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,17.2227,-31.9759,0.0000,-31.9759,-69.2517,10.0237,27.2521,0.0000,0.0000,0.0000,0.0000
+23.7500,0.5000,333.3333,50.0000,50.0000,0.0000,-1.5000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,17.2227,-31.9759,0.0000,-31.9759,-69.2517,10.0237,27.2521,0.0000,0.0000,0.0000,0.0000
+24.2500,0.5000,340.2778,50.0000,50.0000,0.0000,-1.5000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,17.2227,-31.9759,0.0000,-31.9759,-69.2517,10.0237,27.2521,0.0000,0.0000,0.0000,0.0000
+24.7500,0.5000,347.2222,50.0000,50.0000,0.0000,-1.5000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,17.2227,-31.9759,0.0000,-31.9759,-69.2517,10.0237,27.2521,0.0000,0.0000,0.0000,0.0000
+25.2500,0.5000,354.1667,50.0000,50.0000,0.0000,-1.6500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,24.1467,-38.8999,0.0000,-38.8999,-76.1750,10.0237,27.2515,0.0000,0.0000,0.0000,0.0000
+25.7500,0.5000,361.1111,50.0000,50.0000,0.0000,-1.7500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,28.7625,-43.5157,0.0000,-43.5157,-80.7903,10.0237,27.2510,0.0000,0.0000,0.0000,0.0000
+26.2500,0.5000,368.0556,50.0000,50.0000,0.0000,-1.7500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,28.7625,-43.5157,0.0000,-43.5157,-80.7903,10.0237,27.2510,0.0000,0.0000,0.0000,0.0000
+26.7500,0.5000,375.0000,50.0000,50.0000,0.0000,-1.7500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,28.7625,-43.5157,0.0000,-43.5157,-80.7903,10.0237,27.2510,0.0000,0.0000,0.0000,0.0000
+27.2500,0.5000,381.9444,50.0000,50.0000,0.0000,-1.7500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,28.7625,-43.5157,0.0000,-43.5157,-80.7903,10.0237,27.2510,0.0000,0.0000,0.0000,0.0000
+27.7500,0.5000,388.8889,50.0000,50.0000,0.0000,-1.7500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,28.7625,-43.5157,0.0000,-43.5157,-80.7903,10.0237,27.2510,0.0000,0.0000,0.0000,0.0000
+28.2500,0.5000,395.8333,50.0000,50.0000,0.0000,-1.7500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,28.7625,-43.5157,0.0000,-43.5157,-80.7903,10.0237,27.2510,0.0000,0.0000,0.0000,0.0000
+28.7500,0.5000,402.7778,50.0000,50.0000,0.0000,-1.8500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,33.3780,-48.1312,0.0000,-48.1312,-85.4054,10.0237,27.2505,0.0000,0.0000,0.0000,0.0000
+29.2500,0.5000,409.7222,50.0000,50.0000,0.0000,-2.0000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,40.3009,-55.0541,0.0000,-55.0541,-92.3275,10.0237,27.2497,0.0000,0.0000,0.0000,0.0000
+29.7500,0.5000,416.6667,50.0000,50.0000,0.0000,-2.0000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,40.3009,-55.0541,0.0000,-55.0541,-92.3275,10.0237,27.2497,0.0000,0.0000,0.0000,0.0000
+30.2500,0.5000,423.6111,50.0000,50.0000,0.0000,-2.0000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,40.3009,-55.0541,0.0000,-55.0541,-92.3275,10.0237,27.2497,0.0000,0.0000,0.0000,0.0000
+30.7500,0.5000,430.5556,50.0000,50.0000,0.0000,-2.0000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,40.3009,-55.0541,0.0000,-55.0541,-92.3275,10.0237,27.2497,0.0000,0.0000,0.0000,0.0000
+31.2500,0.5000,437.5000,50.0000,50.0000,0.0000,-2.0000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,40.3009,-55.0541,0.0000,-55.0541,-92.3275,10.0237,27.2497,0.0000,0.0000,0.0000,0.0000
+31.7500,0.5000,444.4444,50.0000,50.0000,0.0000,-2.0000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,40.3009,-55.0541,0.0000,-55.0541,-92.3275,10.0237,27.2497,0.0000,0.0000,0.0000,0.0000
+32.2500,0.5000,451.3889,50.0000,50.0000,0.0000,-2.0500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,42.6084,-57.3616,0.0000,-57.3616,-94.6347,10.0237,27.2495,0.0000,0.0000,0.0000,0.0000
+32.7500,0.5000,458.3333,50.0000,50.0000,0.0000,-2.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,51.8378,-66.5910,0.0000,-66.5910,-103.8629,10.0237,27.2483,0.0000,0.0000,0.0000,0.0000
+33.2500,0.5000,465.2778,50.0000,50.0000,0.0000,-2.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,51.8378,-66.5910,0.0000,-66.5910,-103.8629,10.0237,27.2483,0.0000,0.0000,0.0000,0.0000
+33.7500,0.5000,472.2222,50.0000,50.0000,0.0000,-2.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,51.8378,-66.5910,0.0000,-66.5910,-103.8629,10.0237,27.2483,0.0000,0.0000,0.0000,0.0000
+34.2500,0.5000,479.1667,50.0000,50.0000,0.0000,-2.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,51.8378,-66.5910,0.0000,-66.5910,-103.8629,10.0237,27.2483,0.0000,0.0000,0.0000,0.0000
+34.7500,0.5000,486.1111,50.0000,50.0000,0.0000,-2.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,51.8378,-66.5910,0.0000,-66.5910,-103.8629,10.0237,27.2483,0.0000,0.0000,0.0000,0.0000
+35.2500,0.5000,493.0556,50.0000,50.0000,0.0000,-2.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,51.8378,-66.5910,0.0000,-66.5910,-103.8629,10.0237,27.2483,0.0000,0.0000,0.0000,0.0000
+35.7500,0.5000,500.0000,50.0000,50.0000,0.0000,-2.2500,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,51.8378,-66.5910,0.0000,-66.5910,-103.8629,10.0237,27.2483,0.0000,0.0000,0.0000,0.0000
+36.2500,0.5000,506.9444,50.0000,50.0000,0.0000,-2.5000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,63.3729,-78.1261,0.0000,-78.1261,-115.3964,10.0237,27.2467,0.0000,0.0000,0.0000,0.0000
+36.7500,0.5000,513.8889,50.0000,50.0000,0.0000,-2.5000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,63.3729,-78.1261,0.0000,-78.1261,-115.3964,10.0237,27.2467,0.0000,0.0000,0.0000,0.0000
+37.2500,0.5000,520.8333,50.0000,50.0000,0.0000,-2.5000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,63.3729,-78.1261,0.0000,-78.1261,-115.3964,10.0237,27.2467,0.0000,0.0000,0.0000,0.0000
+37.7500,0.5000,527.7778,50.0000,50.0000,0.0000,-2.5000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,63.3729,-78.1261,0.0000,-78.1261,-115.3964,10.0237,27.2467,0.0000,0.0000,0.0000,0.0000
+38.2500,0.5000,534.7222,50.0000,50.0000,0.0000,-2.5000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,63.3729,-78.1261,0.0000,-78.1261,-115.3964,10.0237,27.2467,0.0000,0.0000,0.0000,0.0000
+38.7500,0.5000,541.6667,50.0000,50.0000,0.0000,-2.5000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,63.3729,-78.1261,0.0000,-78.1261,-115.3964,10.0237,27.2467,0.0000,0.0000,0.0000,0.0000
+39.2500,0.5000,548.6111,50.0000,50.0000,0.0000,-2.5000,12,703.5271,-148.5176,939.2673,-148.5176,-10.9418,69.1988,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.0000,-10.9418,0.6900,0.0000,-11.6318,0.0000,-11.6318,3.1214,-14.7532,63.3729,-78.1261,0.0000,-78.1261,-115.3964,10.0237,27.2467,0.0000,0.0000,0.0000,0.0000
+39.7500,0.5000,555.5556,50.0000,50.0000,0.0000,-0.5000,12,703.5271,246.0313,939.2673,-148.5176,18.1259,69.1988,-10.9418,0.0000,18.1259,0.0000,18.1259,0.0000,18.1259,0.7257,0.0000,17.4002,0.0000,17.4002,3.2079,14.1923,0.0000,14.1923,0.0000,14.1923,-23.0862,10.0237,27.2548,0.0000,4330.9008,4330.9008,4330.9008
+40.2500,0.5000,562.5000,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,980.7399,-148.5176,41.6818,72.2542,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+40.7500,0.5000,569.4444,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+41.2500,0.5000,576.3889,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+41.7500,0.5000,583.3333,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+42.2500,0.5000,590.2778,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+42.7500,0.5000,597.2222,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+43.2500,0.5000,604.1667,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+43.7500,0.5000,611.1111,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+44.2500,0.5000,618.0556,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+44.7500,0.5000,625.0000,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+45.2500,0.5000,631.9444,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+45.7500,0.5000,638.8889,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+46.2500,0.5000,645.8333,50.0000,50.0000,0.0000,0.0000,12,703.5271,565.7663,1119.6962,-148.5176,41.6818,82.4916,-10.9418,0.0000,41.6818,0.0000,41.6818,0.0000,41.6818,0.8435,0.0000,40.8383,0.0000,40.8383,3.5595,37.2788,0.0000,37.2788,0.0000,37.2788,0.0000,10.0237,27.2552,0.0000,8594.5197,8594.5197,8594.5197
+46.7500,0.5000,652.7778,50.0000,50.0000,0.0000,0.1000,12,703.5271,629.7129,1119.6962,-148.5176,46.3930,82.4916,-10.9418,0.0000,46.3930,0.0000,46.3930,0.0000,46.3930,0.8670,0.0000,45.5259,0.0000,45.5259,3.6298,41.8961,0.0000,41.8961,0.0000,41.8961,4.6173,10.0237,27.2552,0.0000,9398.7340,9398.7340,9398.7340
+47.2500,0.5000,659.7222,50.0000,50.0000,0.0000,0.2500,12,703.5271,725.6317,1147.4873,-148.5176,53.4596,84.5390,-10.9418,0.0000,53.4596,0.0000,53.4596,0.0000,53.4596,0.9023,0.0000,52.5572,0.0000,52.5572,3.7353,48.8220,0.0000,48.8220,0.0000,48.8220,11.5432,10.0237,27.2551,0.0000,10478.6118,10478.6118,10478.6118
+47.7500,0.5000,666.6667,50.0000,50.0000,0.0000,0.2500,12,703.5271,725.6317,1189.1734,-148.5176,53.4596,87.6102,-10.9418,0.0000,53.4596,0.0000,53.4596,0.0000,53.4596,0.9023,0.0000,52.5572,0.0000,52.5572,3.7353,48.8220,0.0000,48.8220,0.0000,48.8220,11.5432,10.0237,27.2551,0.0000,10478.6118,10478.6118,10478.6118
+48.2500,0.5000,673.6111,50.0000,50.0000,0.0000,0.2500,12,703.5271,725.6317,1189.1734,-148.5176,53.4596,87.6102,-10.9418,0.0000,53.4596,0.0000,53.4596,0.0000,53.4596,0.9023,0.0000,52.5572,0.0000,52.5572,3.7353,48.8220,0.0000,48.8220,0.0000,48.8220,11.5432,10.0237,27.2551,0.0000,10478.6118,10478.6118,10478.6118
+48.7500,0.5000,680.5556,50.0000,50.0000,0.0000,0.2500,12,703.5271,725.6317,1189.1734,-148.5176,53.4596,87.6102,-10.9418,0.0000,53.4596,0.0000,53.4596,0.0000,53.4596,0.9023,0.0000,52.5572,0.0000,52.5572,3.7353,48.8220,0.0000,48.8220,0.0000,48.8220,11.5432,10.0237,27.2551,0.0000,10478.6118,10478.6118,10478.6118
+49.2500,0.5000,687.5000,50.0000,50.0000,0.0000,0.2500,12,703.5271,725.6317,1189.1734,-148.5176,53.4596,87.6102,-10.9418,0.0000,53.4596,0.0000,53.4596,0.0000,53.4596,0.9023,0.0000,52.5572,0.0000,52.5572,3.7353,48.8220,0.0000,48.8220,0.0000,48.8220,11.5432,10.0237,27.2551,0.0000,10478.6118,10478.6118,10478.6118
+49.7500,0.5000,694.4444,50.0000,50.0000,0.0000,0.2500,12,703.5271,725.6317,1189.1734,-148.5176,53.4596,87.6102,-10.9418,0.0000,53.4596,0.0000,53.4596,0.0000,53.4596,0.9023,0.0000,52.5572,0.0000,52.5572,3.7353,48.8220,0.0000,48.8220,0.0000,48.8220,11.5432,10.0237,27.2551,0.0000,10478.6118,10478.6118,10478.6118
+50.2500,0.5000,701.3889,50.0000,50.0000,0.0000,0.3000,12,703.5271,757.6042,1189.1734,-148.5176,55.8151,87.6102,-10.9418,0.0000,55.8151,0.0000,55.8151,0.0000,55.8151,0.9141,0.0000,54.9010,0.0000,54.9010,3.7704,51.1305,0.0000,51.1305,0.0000,51.1305,13.8518,10.0237,27.2551,0.0000,10962.5162,10962.5162,10962.5162
+50.7500,0.5000,708.3333,50.0000,50.0000,0.0000,0.5000,12,703.5271,885.4918,1203.0686,-148.5176,65.2370,88.6339,-10.9418,0.0000,65.2370,0.0000,65.2370,0.0000,65.2370,0.9612,0.0000,64.2758,0.0000,64.2758,3.9111,60.3647,0.0000,60.3647,0.0000,60.3647,23.0862,10.0237,27.2548,0.0000,12483.4590,12483.4590,12483.4590
+51.2500,0.5000,715.2778,50.0000,50.0000,0.0000,0.5000,12,703.5271,885.4918,1258.6483,-148.5176,65.2370,92.7286,-10.9418,0.0000,65.2370,0.0000,65.2370,0.0000,65.2370,0.9612,0.0000,64.2758,0.0000,64.2758,3.9111,60.3647,0.0000,60.3647,0.0000,60.3647,23.0862,10.0237,27.2548,0.0000,12483.4590,12483.4590,12483.4590
+51.7500,0.5000,722.2222,50.0000,50.0000,0.0000,0.5000,12,703.5271,885.4918,1258.6483,-148.5176,65.2370,92.7286,-10.9418,0.0000,65.2370,0.0000,65.2370,0.0000,65.2370,0.9612,0.0000,64.2758,0.0000,64.2758,3.9111,60.3647,0.0000,60.3647,0.0000,60.3647,23.0862,10.0237,27.2548,0.0000,12483.4590,12483.4590,12483.4590
+52.2500,0.5000,729.1667,50.0000,50.0000,0.0000,0.5000,12,703.5271,885.4918,1258.6483,-148.5176,65.2370,92.7286,-10.9418,0.0000,65.2370,0.0000,65.2370,0.0000,65.2370,0.9612,0.0000,64.2758,0.0000,64.2758,3.9111,60.3647,0.0000,60.3647,0.0000,60.3647,23.0862,10.0237,27.2548,0.0000,12483.4590,12483.4590,12483.4590
+52.7500,0.5000,736.1111,50.0000,50.0000,0.0000,0.5000,12,703.5271,885.4918,1258.6483,-148.5176,65.2370,92.7286,-10.9418,0.0000,65.2370,0.0000,65.2370,0.0000,65.2370,0.9612,0.0000,64.2758,0.0000,64.2758,3.9111,60.3647,0.0000,60.3647,0.0000,60.3647,23.0862,10.0237,27.2548,0.0000,12483.4590,12483.4590,12483.4590
+53.2500,0.5000,743.0556,50.0000,50.0000,0.0000,0.5000,12,703.5271,885.4918,1258.6483,-148.5176,65.2370,92.7286,-10.9418,0.0000,65.2370,0.0000,65.2370,0.0000,65.2370,0.9612,0.0000,64.2758,0.0000,64.2758,3.9111,60.3647,0.0000,60.3647,0.0000,60.3647,23.0862,10.0237,27.2548,0.0000,12483.4590,12483.4590,12483.4590
+53.7500,0.5000,750.0000,50.0000,50.0000,0.0000,0.5000,12,703.5271,885.4918,1258.6483,-148.5176,65.2370,92.7286,-10.9418,0.0000,65.2370,0.0000,65.2370,0.0000,65.2370,0.9612,0.0000,64.2758,0.0000,64.2758,3.9111,60.3647,0.0000,60.3647,0.0000,60.3647,23.0862,10.0237,27.2548,0.0000,12483.4590,12483.4590,12483.4590
+54.2500,0.5000,756.9444,50.0000,50.0000,0.0000,0.7500,12,703.5271,1045.3435,1258.6483,-148.5176,77.0138,92.7286,-10.9418,0.0000,77.0138,0.0000,77.0138,0.0000,77.0138,1.0201,0.0000,75.9937,0.0000,75.9937,4.0868,71.9068,0.0000,71.9068,0.0000,71.9068,34.6288,10.0237,27.2544,0.0000,14595.4625,14595.4625,14595.4625
+54.7500,0.5000,763.8889,50.0000,50.0000,0.0000,0.7500,12,703.5271,1045.3435,1328.1196,-148.5176,77.0138,97.8468,-10.9418,0.0000,77.0138,0.0000,77.0138,0.0000,77.0138,1.0201,0.0000,75.9937,0.0000,75.9937,4.0868,71.9068,0.0000,71.9068,0.0000,71.9068,34.6288,10.0237,27.2544,0.0000,14595.4625,14595.4625,14595.4625
+55.2500,0.5000,770.8333,50.0000,50.0000,0.0000,0.7500,12,703.5271,1045.3435,1328.1196,-148.5176,77.0138,97.8468,-10.9418,0.0000,77.0138,0.0000,77.0138,0.0000,77.0138,1.0201,0.0000,75.9937,0.0000,75.9937,4.0868,71.9068,0.0000,71.9068,0.0000,71.9068,34.6288,10.0237,27.2544,0.0000,14595.4625,14595.4625,14595.4625
+55.7500,0.5000,777.7778,50.0000,50.0000,0.0000,0.7500,12,703.5271,1045.3435,1328.1196,-148.5176,77.0138,97.8468,-10.9418,0.0000,77.0138,0.0000,77.0138,0.0000,77.0138,1.0201,0.0000,75.9937,0.0000,75.9937,4.0868,71.9068,0.0000,71.9068,0.0000,71.9068,34.6288,10.0237,27.2544,0.0000,14595.4625,14595.4625,14595.4625
+56.2500,0.5000,784.7222,50.0000,50.0000,0.0000,0.7500,12,703.5271,1045.3435,1328.1196,-148.5176,77.0138,97.8468,-10.9418,0.0000,77.0138,0.0000,77.0138,0.0000,77.0138,1.0201,0.0000,75.9937,0.0000,75.9937,4.0868,71.9068,0.0000,71.9068,0.0000,71.9068,34.6288,10.0237,27.2544,0.0000,14595.4625,14595.4625,14595.4625
+56.7500,0.5000,791.6667,50.0000,50.0000,0.0000,0.7500,12,703.5271,1045.3435,1328.1196,-148.5176,77.0138,97.8468,-10.9418,0.0000,77.0138,0.0000,77.0138,0.0000,77.0138,1.0201,0.0000,75.9937,0.0000,75.9937,4.0868,71.9068,0.0000,71.9068,0.0000,71.9068,34.6288,10.0237,27.2544,0.0000,14595.4625,14595.4625,14595.4625
+57.2500,0.5000,798.6111,50.0000,50.0000,0.0000,0.7500,12,703.5271,1045.3435,1328.1196,-148.5176,77.0138,97.8468,-10.9418,0.0000,77.0138,0.0000,77.0138,0.0000,77.0138,1.0201,0.0000,75.9937,0.0000,75.9937,4.0868,71.9068,0.0000,71.9068,0.0000,71.9068,34.6288,10.0237,27.2544,0.0000,14595.4625,14595.4625,14595.4625
+57.7508,0.5016,805.5556,49.8429,50.0000,-0.1741,0.9500,0,703.5271,0.0000,1328.1196,-148.5176,0.0000,97.8468,-10.9418,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,2.9377,-2.9377,0.0000,-2.9377,-2.0681,-0.8696,43.7245,9.9295,27.1683,-81.6919,1676.4069,1676.4069,1676.4069
+58.2524,0.5016,812.4563,49.5245,50.0000,-0.1786,1.0000,0,703.5271,0.0000,939.2673,-148.5176,0.0000,69.1988,-10.9418,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,2.9189,-2.9189,0.0000,-2.9189,-2.1082,-0.8107,45.7316,9.7405,26.9946,-83.2774,1676.4069,1676.4069,1676.4069
+58.7531,0.4998,819.3124,49.3838,50.0000,0.0228,1.0000,11,796.6563,1277.9676,1277.9676,-148.9833,106.6153,106.6153,-12.4290,16.7578,89.8575,0.0000,89.8575,0.0000,100.3201,2.8969,0.0000,97.4233,0.0000,97.4233,4.3720,93.0513,0.0000,93.0513,0.2685,92.7828,45.6016,9.6576,26.9179,10.6057,20393.7819,20393.7819,20393.7819
+59.2524,0.4988,826.1741,49.5203,50.0000,0.1292,1.0000,11,891.8751,1646.5058,1646.5058,-154.0531,153.7786,153.7786,-14.3881,0.4217,153.3569,0.0000,153.3569,0.0000,153.3569,3.9612,0.0000,149.3956,0.0000,149.3956,5.1596,144.2361,0.0000,144.2361,1.5253,142.7107,45.7277,9.7380,26.9923,60.2527,28926.3792,28926.3792,28926.3792
+59.7511,0.4985,833.0680,49.7897,50.0000,0.1710,1.0000,11,896.7275,1870.7031,1870.7031,-154.3200,175.6685,175.6685,-14.4914,0.5611,175.1074,0.0000,175.1074,0.0000,175.1074,4.4034,0.0000,170.7040,0.0000,170.7040,5.4951,165.2089,0.0000,165.2089,2.0295,163.1795,45.9765,9.8978,27.1392,80.1660,33506.4184,33506.4184,33506.4184
+60.2501,0.4997,840.0045,49.9716,50.0000,0.0316,1.0000,11,900.0026,1127.5162,1967.7685,-154.5001,106.2662,185.4583,-14.5613,0.1041,106.1621,0.0000,106.1621,0.0000,106.1621,3.0293,0.0000,103.1327,0.0000,103.1327,4.4922,98.6405,0.0000,98.6405,0.3766,98.2639,46.1444,10.0066,27.2383,14.8746,20055.9273,20055.9273,20055.9273
+60.7500,0.5000,846.9490,50.0000,50.0000,0.0000,1.0000,11,900.5147,958.9025,1646.8182,-154.5283,90.4261,155.2977,-14.5723,0.0000,90.4261,0.0000,90.4261,0.0000,90.4261,2.7154,0.0000,87.7107,0.0000,87.7107,4.2626,83.4481,0.0000,83.4481,0.0000,83.4481,46.1707,10.0237,27.2538,0.0000,17148.2101,17148.2101,17148.2101
+61.2500,0.5000,853.8934,50.0000,50.0000,0.0000,1.1402,11,900.5147,1029.9811,1574.0073,-154.5283,97.1289,148.4315,-14.5723,0.0000,97.1289,0.0000,97.1289,0.0000,97.1289,2.8494,0.0000,94.2795,0.0000,94.2795,4.3611,89.9184,0.0000,89.9184,0.0000,89.9184,52.6413,10.0237,27.2534,0.0000,18432.7009,18432.7009,18432.7009
+61.7500,0.5000,860.8379,50.0000,50.0000,0.0000,1.2500,11,900.5147,1085.6778,1604.8979,-154.5283,102.3812,151.3446,-14.5723,0.0000,102.3812,0.0000,102.3812,0.0000,102.3812,2.9545,0.0000,99.4268,0.0000,99.4268,4.4383,94.9884,0.0000,94.9884,0.0000,94.9884,57.7117,10.0237,27.2531,0.0000,19330.5314,19330.5314,19330.5314
+62.2500,0.5000,867.7823,50.0000,50.0000,0.0000,1.2500,11,900.5147,1085.6778,1629.1036,-154.5283,102.3812,153.6272,-14.5723,0.0000,102.3812,0.0000,102.3812,0.0000,102.3812,2.9545,0.0000,99.4268,0.0000,99.4268,4.4383,94.9884,0.0000,94.9884,0.0000,94.9884,57.7117,10.0237,27.2531,0.0000,19330.5314,19330.5314,19330.5314
+62.7500,0.5000,874.7268,50.0000,50.0000,0.0000,1.2500,11,900.5147,1085.6778,1629.1036,-154.5283,102.3812,153.6272,-14.5723,0.0000,102.3812,0.0000,102.3812,0.0000,102.3812,2.9545,0.0000,99.4268,0.0000,99.4268,4.4383,94.9884,0.0000,94.9884,0.0000,94.9884,57.7117,10.0237,27.2531,0.0000,19330.5314,19330.5314,19330.5314
+63.2500,0.5000,881.6712,50.0000,50.0000,0.0000,1.2500,11,900.5147,1085.6778,1629.1036,-154.5283,102.3812,153.6272,-14.5723,0.0000,102.3812,0.0000,102.3812,0.0000,102.3812,2.9545,0.0000,99.4268,0.0000,99.4268,4.4383,94.9884,0.0000,94.9884,0.0000,94.9884,57.7117,10.0237,27.2531,0.0000,19330.5314,19330.5314,19330.5314
+63.7500,0.5000,888.6157,50.0000,50.0000,0.0000,1.2500,11,900.5147,1085.6778,1629.1036,-154.5283,102.3812,153.6272,-14.5723,0.0000,102.3812,0.0000,102.3812,0.0000,102.3812,2.9545,0.0000,99.4268,0.0000,99.4268,4.4383,94.9884,0.0000,94.9884,0.0000,94.9884,57.7117,10.0237,27.2531,0.0000,19330.5314,19330.5314,19330.5314
+64.2500,0.5000,895.5601,50.0000,50.0000,0.0000,1.2500,11,900.5147,1085.6778,1629.1036,-154.5283,102.3812,153.6272,-14.5723,0.0000,102.3812,0.0000,102.3812,0.0000,102.3812,2.9545,0.0000,99.4268,0.0000,99.4268,4.4383,94.9884,0.0000,94.9884,0.0000,94.9884,57.7117,10.0237,27.2531,0.0000,19330.5314,19330.5314,19330.5314
+64.7500,0.5000,902.5045,50.0000,50.0000,0.0000,1.3402,11,900.5147,1131.3965,1629.1036,-154.5283,106.6926,153.6272,-14.5723,0.0000,106.6926,0.0000,106.6926,0.0000,106.6926,3.0407,0.0000,103.6519,0.0000,103.6519,4.5017,99.1502,0.0000,99.1502,0.0000,99.1502,61.8738,10.0237,27.2527,0.0000,20138.0412,20138.0412,20138.0412
+65.2500,0.5000,909.4490,50.0000,50.0000,0.0000,1.5000,11,900.5147,1212.4393,1648.9729,-154.5283,114.3351,155.5009,-14.5723,0.0000,114.3351,0.0000,114.3351,0.0000,114.3351,3.1936,0.0000,111.1415,0.0000,111.1415,4.6140,106.5274,0.0000,106.5274,0.0000,106.5274,69.2517,10.0237,27.2521,0.0000,21593.7632,21593.7632,21593.7632
+65.7500,0.5000,916.3934,50.0000,50.0000,0.0000,1.5000,11,900.5147,1212.4393,1684.1939,-154.5283,114.3351,158.8223,-14.5723,0.0000,114.3351,0.0000,114.3351,0.0000,114.3351,3.1936,0.0000,111.1415,0.0000,111.1415,4.6140,106.5274,0.0000,106.5274,0.0000,106.5274,69.2517,10.0237,27.2521,0.0000,21593.7632,21593.7632,21593.7632
+66.2500,0.5000,923.3379,50.0000,50.0000,0.0000,1.5000,11,900.5147,1212.4393,1684.1939,-154.5283,114.3351,158.8223,-14.5723,0.0000,114.3351,0.0000,114.3351,0.0000,114.3351,3.1936,0.0000,111.1415,0.0000,111.1415,4.6140,106.5274,0.0000,106.5274,0.0000,106.5274,69.2517,10.0237,27.2521,0.0000,21593.7632,21593.7632,21593.7632
+66.7500,0.5000,930.2823,50.0000,50.0000,0.0000,1.5000,11,900.5147,1212.4393,1684.1939,-154.5283,114.3351,158.8223,-14.5723,0.0000,114.3351,0.0000,114.3351,0.0000,114.3351,3.1936,0.0000,111.1415,0.0000,111.1415,4.6140,106.5274,0.0000,106.5274,0.0000,106.5274,69.2517,10.0237,27.2521,0.0000,21593.7632,21593.7632,21593.7632
+67.2500,0.5000,937.2268,50.0000,50.0000,0.0000,1.5000,11,900.5147,1212.4393,1684.1939,-154.5283,114.3351,158.8223,-14.5723,0.0000,114.3351,0.0000,114.3351,0.0000,114.3351,3.1936,0.0000,111.1415,0.0000,111.1415,4.6140,106.5274,0.0000,106.5274,0.0000,106.5274,69.2517,10.0237,27.2521,0.0000,21593.7632,21593.7632,21593.7632
+67.7500,0.5000,944.1712,50.0000,50.0000,0.0000,1.5000,11,900.5147,1212.4393,1684.1939,-154.5283,114.3351,158.8223,-14.5723,0.0000,114.3351,0.0000,114.3351,0.0000,114.3351,3.1936,0.0000,111.1415,0.0000,111.1415,4.6140,106.5274,0.0000,106.5274,0.0000,106.5274,69.2517,10.0237,27.2521,0.0000,21593.7632,21593.7632,21593.7632
+68.2500,0.5000,951.1157,50.0000,50.0000,0.0000,1.5402,11,900.5147,1232.8026,1684.1939,-154.5283,116.2554,158.8223,-14.5723,0.0000,116.2554,0.0000,116.2554,0.0000,116.2554,3.2320,0.0000,113.0234,0.0000,113.0234,4.6423,108.3811,0.0000,108.3811,0.0000,108.3811,71.1055,10.0237,27.2520,0.0000,21918.2520,21918.2520,21918.2520
+68.7500,0.5000,958.0601,50.0000,50.0000,0.0000,1.7500,11,900.5147,1339.1847,1693.0438,-154.5283,126.2874,159.6569,-14.5723,0.0000,126.2874,0.0000,126.2874,0.0000,126.2874,3.4326,0.0000,122.8548,0.0000,122.8548,4.7897,118.0650,0.0000,118.0650,0.0000,118.0650,80.7903,10.0237,27.2510,0.0000,23709.7219,23709.7219,23709.7219
+69.2500,0.5000,965.0045,50.0000,50.0000,0.0000,1.7500,11,900.5147,1339.1847,1739.2772,-154.5283,126.2874,164.0168,-14.5723,0.0000,126.2874,0.0000,126.2874,0.0000,126.2874,3.4326,0.0000,122.8548,0.0000,122.8548,4.7897,118.0650,0.0000,118.0650,0.0000,118.0650,80.7903,10.0237,27.2510,0.0000,23709.7219,23709.7219,23709.7219
+69.7500,0.5000,971.9490,50.0000,50.0000,0.0000,1.7500,11,900.5147,1339.1847,1739.2772,-154.5283,126.2874,164.0168,-14.5723,0.0000,126.2874,0.0000,126.2874,0.0000,126.2874,3.4326,0.0000,122.8548,0.0000,122.8548,4.7897,118.0650,0.0000,118.0650,0.0000,118.0650,80.7903,10.0237,27.2510,0.0000,23709.7219,23709.7219,23709.7219
+70.2500,0.5000,978.8934,50.0000,50.0000,0.0000,1.7500,11,900.5147,1339.1847,1739.2772,-154.5283,126.2874,164.0168,-14.5723,0.0000,126.2874,0.0000,126.2874,0.0000,126.2874,3.4326,0.0000,122.8548,0.0000,122.8548,4.7897,118.0650,0.0000,118.0650,0.0000,118.0650,80.7903,10.0237,27.2510,0.0000,23709.7219,23709.7219,23709.7219
+70.7500,0.5000,985.8379,50.0000,50.0000,0.0000,1.7500,11,900.5147,1339.1847,1739.2772,-154.5283,126.2874,164.0168,-14.5723,0.0000,126.2874,0.0000,126.2874,0.0000,126.2874,3.4326,0.0000,122.8548,0.0000,122.8548,4.7897,118.0650,0.0000,118.0650,0.0000,118.0650,80.7903,10.0237,27.2510,0.0000,23709.7219,23709.7219,23709.7219
+71.2500,0.5000,992.7823,50.0000,50.0000,0.0000,1.7500,11,900.5147,1339.1847,1739.2772,-154.5283,126.2874,164.0168,-14.5723,0.0000,126.2874,0.0000,126.2874,0.0000,126.2874,3.4326,0.0000,122.8548,0.0000,122.8548,4.7897,118.0650,0.0000,118.0650,0.0000,118.0650,80.7903,10.0237,27.2510,0.0000,23709.7219,23709.7219,23709.7219
+71.7500,0.5000,999.7268,50.0000,50.0000,0.0000,1.7500,11,900.5147,1339.1847,1739.2772,-154.5283,126.2874,164.0168,-14.5723,0.0000,126.2874,0.0000,126.2874,0.0000,126.2874,3.4326,0.0000,122.8548,0.0000,122.8548,4.7897,118.0650,0.0000,118.0650,0.0000,118.0650,80.7903,10.0237,27.2510,0.0000,23709.7219,23709.7219,23709.7219
+72.2500,0.5000,1006.6712,50.0000,50.0000,0.0000,1.9902,11,900.5147,1460.9258,1739.2772,-154.5283,137.7677,164.0168,-14.5723,0.0000,137.7677,0.0000,137.7677,0.0000,137.7677,3.6622,0.0000,134.1055,0.0000,134.1055,4.9585,129.1470,0.0000,129.1470,0.0000,129.1470,91.8736,10.0237,27.2498,0.0000,25757.5409,25757.5409,25757.5409
+72.7500,0.5000,1013.6157,50.0000,50.0000,0.0000,2.0000,11,900.5147,1465.9116,1792.1857,-154.5283,138.2379,169.0061,-14.5723,0.0000,138.2379,0.0000,138.2379,0.0000,138.2379,3.6716,0.0000,134.5663,0.0000,134.5663,4.9654,129.6009,0.0000,129.6009,0.0000,129.6009,92.3275,10.0237,27.2497,0.0000,25833.7495,25833.7495,25833.7495
+73.2500,0.5000,1020.5601,50.0000,50.0000,0.0000,2.0000,11,900.5147,1465.9116,1794.3525,-154.5283,138.2379,169.2105,-14.5723,0.0000,138.2379,0.0000,138.2379,0.0000,138.2379,3.6716,0.0000,134.5663,0.0000,134.5663,4.9654,129.6009,0.0000,129.6009,0.0000,129.6009,92.3275,10.0237,27.2497,0.0000,25833.7495,25833.7495,25833.7495
+73.7500,0.5000,1027.5045,50.0000,50.0000,0.0000,2.0000,11,900.5147,1465.9116,1794.3525,-154.5283,138.2379,169.2105,-14.5723,0.0000,138.2379,0.0000,138.2379,0.0000,138.2379,3.6716,0.0000,134.5663,0.0000,134.5663,4.9654,129.6009,0.0000,129.6009,0.0000,129.6009,92.3275,10.0237,27.2497,0.0000,25833.7495,25833.7495,25833.7495
+74.2500,0.5000,1034.4490,50.0000,50.0000,0.0000,2.0000,11,900.5147,1465.9116,1794.3525,-154.5283,138.2379,169.2105,-14.5723,0.0000,138.2379,0.0000,138.2379,0.0000,138.2379,3.6716,0.0000,134.5663,0.0000,134.5663,4.9654,129.6009,0.0000,129.6009,0.0000,129.6009,92.3275,10.0237,27.2497,0.0000,25833.7495,25833.7495,25833.7495
+74.7500,0.5000,1041.3934,50.0000,50.0000,0.0000,2.0000,11,900.5147,1465.9116,1794.3525,-154.5283,138.2379,169.2105,-14.5723,0.0000,138.2379,0.0000,138.2379,0.0000,138.2379,3.6716,0.0000,134.5663,0.0000,134.5663,4.9654,129.6009,0.0000,129.6009,0.0000,129.6009,92.3275,10.0237,27.2497,0.0000,25833.7495,25833.7495,25833.7495
+75.2500,0.5000,1048.3379,50.0000,50.0000,0.0000,2.0000,11,900.5147,1465.9116,1794.3525,-154.5283,138.2379,169.2105,-14.5723,0.0000,138.2379,0.0000,138.2379,0.0000,138.2379,3.6716,0.0000,134.5663,0.0000,134.5663,4.9654,129.6009,0.0000,129.6009,0.0000,129.6009,92.3275,10.0237,27.2497,0.0000,25833.7495,25833.7495,25833.7495
+75.7500,0.5000,1055.2823,50.0000,50.0000,0.0000,2.1902,11,900.5147,1562.2930,1794.3525,-154.5283,147.3269,169.2105,-14.5723,0.0000,147.3269,0.0000,147.3269,0.0000,147.3269,3.8534,0.0000,143.4735,0.0000,143.4735,5.0990,138.3744,0.0000,138.3744,0.0000,138.3744,101.1021,10.0237,27.2487,0.0000,27591.4588,27591.4588,27591.4588
+76.2500,0.5000,1062.2268,50.0000,50.0000,0.0000,2.2500,11,900.5147,1592.6176,1836.2397,-154.5283,150.1865,173.1605,-14.5723,0.0000,150.1865,0.0000,150.1865,0.0000,150.1865,3.9106,0.0000,146.2759,0.0000,146.2759,5.1411,141.1349,0.0000,141.1349,0.0000,141.1349,103.8629,10.0237,27.2483,0.0000,28192.3403,28192.3403,28192.3403
+76.7500,0.5000,1069.1712,50.0000,50.0000,0.0000,2.2500,11,900.5147,1592.6176,1849.4187,-154.5283,150.1865,174.4033,-14.5723,0.0000,150.1865,0.0000,150.1865,0.0000,150.1865,3.9106,0.0000,146.2759,0.0000,146.2759,5.1411,141.1349,0.0000,141.1349,0.0000,141.1349,103.8629,10.0237,27.2483,0.0000,28192.3403,28192.3403,28192.3403
+77.2500,0.5000,1076.1157,50.0000,50.0000,0.0000,2.2500,11,900.5147,1592.6176,1849.4187,-154.5283,150.1865,174.4033,-14.5723,0.0000,150.1865,0.0000,150.1865,0.0000,150.1865,3.9106,0.0000,146.2759,0.0000,146.2759,5.1411,141.1349,0.0000,141.1349,0.0000,141.1349,103.8629,10.0237,27.2483,0.0000,28192.3403,28192.3403,28192.3403
+77.7500,0.5000,1083.0601,50.0000,50.0000,0.0000,2.2500,11,900.5147,1592.6176,1849.4187,-154.5283,150.1865,174.4033,-14.5723,0.0000,150.1865,0.0000,150.1865,0.0000,150.1865,3.9106,0.0000,146.2759,0.0000,146.2759,5.1411,141.1349,0.0000,141.1349,0.0000,141.1349,103.8629,10.0237,27.2483,0.0000,28192.3403,28192.3403,28192.3403
+78.2500,0.5000,1090.0045,50.0000,50.0000,0.0000,2.2500,11,900.5147,1592.6176,1849.4187,-154.5283,150.1865,174.4033,-14.5723,0.0000,150.1865,0.0000,150.1865,0.0000,150.1865,3.9106,0.0000,146.2759,0.0000,146.2759,5.1411,141.1349,0.0000,141.1349,0.0000,141.1349,103.8629,10.0237,27.2483,0.0000,28192.3403,28192.3403,28192.3403
+78.7500,0.5000,1096.9490,50.0000,50.0000,0.0000,2.2500,11,900.5147,1592.6176,1849.4187,-154.5283,150.1865,174.4033,-14.5723,0.0000,150.1865,0.0000,150.1865,0.0000,150.1865,3.9106,0.0000,146.2759,0.0000,146.2759,5.1411,141.1349,0.0000,141.1349,0.0000,141.1349,103.8629,10.0237,27.2483,0.0000,28192.3403,28192.3403,28192.3403
+79.2500,0.5000,1103.8934,50.0000,50.0000,0.0000,2.3902,11,900.5147,1663.6458,1849.4187,-154.5283,156.8846,174.4033,-14.5723,0.0000,156.8846,0.0000,156.8846,0.0000,156.8846,4.0446,0.0000,152.8400,0.0000,152.8400,5.2395,147.6005,0.0000,147.6005,0.0000,147.6005,110.3295,10.0237,27.2474,0.0000,29478.9153,29478.9153,29478.9153
+79.7515,0.5029,1110.8379,49.7084,50.0000,-0.3221,2.5000,0,900.5147,0.0000,1880.2875,-154.5283,0.0000,177.3143,-14.5723,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,2.9297,-2.9297,0.0000,-2.9297,-3.8169,0.8872,114.7234,9.8496,27.0878,-150.7736,2374.5374,2374.5374,2374.5374
+80.2544,0.5030,1117.7013,49.1256,50.0000,-0.3216,2.5000,0,900.5147,0.0000,1161.6078,-154.5283,0.0000,109.5416,-14.5723,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,2.8954,-2.8954,0.0000,-2.8954,-3.7666,0.8712,113.3784,9.5073,26.7702,-148.7847,2374.5374,2374.5374,2374.5374
+80.7561,0.5003,1124.4839,48.8020,50.0000,-0.0360,2.5000,10,999.2296,1434.3060,1434.3060,-159.9576,150.0845,150.0845,-16.7378,22.2556,127.8288,0.0000,127.8288,0.0000,140.5505,4.0328,0.0000,136.5177,0.0000,136.5177,4.9241,131.5936,0.0000,131.5936,-0.4186,132.0122,112.6316,9.3203,26.5939,-16.5336,27859.8878,27859.8878,27859.8878
+81.2557,0.4989,1131.2574,48.8734,50.0000,0.1155,2.5000,10,1100.2796,1869.5233,1869.5233,-169.5266,215.4084,215.4084,-19.5330,0.5813,214.8271,0.0000,214.8271,0.0000,214.8271,5.5210,0.0000,209.3060,0.0000,209.3060,6.0201,203.2859,0.0000,203.2859,1.3455,201.9404,112.7962,9.3613,26.6327,53.1502,39886.0121,39886.0121,39886.0121
+81.7544,0.4984,1138.0598,49.1313,50.0000,0.1719,2.5000,10,1106.0873,2112.3881,2112.3881,-170.0783,244.6762,244.6762,-19.7000,0.8700,243.8062,0.0000,243.8062,0.0000,243.8062,6.1105,0.0000,237.6957,0.0000,237.6957,6.4612,231.2346,0.0000,231.2346,2.0138,229.2208,113.3916,9.5103,26.7733,79.5456,46052.2587,46052.2587,46052.2587
+82.2527,0.4982,1144.9050,49.4614,50.0000,0.1960,2.5000,10,1113.5171,2216.7210,2216.7210,-170.7841,258.4857,258.4857,-19.9147,0.9984,257.4873,0.0000,257.4873,0.0000,257.4873,6.3968,0.0000,251.0905,0.0000,251.0905,6.6815,244.4090,0.0000,244.4090,2.3110,242.0980,114.1532,9.7033,26.9531,91.2883,48923.5501,48923.5501,48923.5501
+82.7536,0.5035,1151.7991,49.2890,50.0000,-0.3841,3.1524,0,1117.4742,0.0000,2260.2782,-171.1600,0.0000,264.5014,-20.0294,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,2.9050,-2.9050,0.0000,-2.9050,-4.5129,1.6079,143.4149,9.6026,26.8543,-178.2640,3124.6180,3124.6180,3124.6180
+83.2580,0.5053,1158.5964,48.4320,50.0000,-0.5596,5.0000,0,1117.4742,0.0000,1306.2898,-171.1600,0.0000,152.8642,-20.0294,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,2.8545,-2.8545,0.0000,-2.8545,-6.4610,3.6065,223.3459,9.1109,26.3675,-255.2177,3124.6180,3124.6180,3124.6180
+83.7616,0.5020,1165.2524,47.7338,50.0000,-0.2094,5.0000,9,1244.4402,1442.7061,1442.7061,-184.3328,188.0098,188.0098,-24.0218,35.5323,152.4775,0.0000,152.4775,0.0000,168.7030,5.1082,0.0000,163.5948,0.0000,163.5948,5.2673,158.3275,0.0000,158.3275,-2.3828,160.7104,220.1263,8.7217,25.9874,-94.1251,34523.1323,34523.1323,34523.1323
+84.2626,0.5000,1171.8558,47.5467,50.0000,0.0023,5.0000,9,1371.4671,1870.8264,1870.8264,-199.5761,268.6875,268.6875,-28.6631,0.0189,268.6687,0.0000,268.6687,0.0000,268.6687,7.0968,0.0000,261.5719,0.0000,261.5719,6.7259,254.8460,0.0000,254.8460,0.0266,254.8194,219.2635,8.6194,25.8856,1.0509,50439.4474,50439.4474,50439.4474
+84.7622,0.4993,1178.4598,47.6158,50.0000,0.0745,5.0000,9,1373.4605,2114.1246,2114.1246,-199.8153,304.0713,304.0713,-28.7391,0.6001,303.4712,0.0000,303.4712,0.0000,303.4712,7.7968,0.0000,295.6744,0.0000,295.6744,7.2415,288.4329,0.0000,288.4329,0.8462,287.5867,219.5822,8.6571,25.9232,33.4242,57588.5778,57588.5778,57588.5778
+85.2614,0.4990,1185.0825,47.7775,50.0000,0.1054,5.0000,9,1378.1246,2218.5862,2218.5862,-200.3749,320.1794,320.1794,-28.9175,0.8516,319.3278,0.0000,319.3278,0.0000,319.3278,8.1232,0.0000,311.2046,0.0000,311.2046,7.4840,303.7206,0.0000,303.7206,1.2009,302.5198,220.3279,8.7456,26.0112,47.4351,60653.2077,60653.2077,60653.2077
+85.7603,0.4989,1191.7314,47.9787,50.0000,0.1186,5.0000,9,1383.9276,2263.3919,2263.3919,-201.0713,328.0211,328.0211,-29.1402,0.9618,327.0593,0.0000,327.0593,0.0000,327.0593,8.2894,0.0000,318.7699,0.0000,318.7699,7.6093,311.1606,0.0000,311.1606,1.3562,309.8044,221.2556,8.8565,26.1207,53.5714,62408.0822,62408.0822,62408.0822
+86.3184,0.6173,1200.0000,48.2231,50.0000,0.1241,5.0000,9,1390.9771,2282.7802,2282.7802,-201.9173,332.5161,332.5161,-29.4118,1.0120,331.5041,0.0000,331.5041,0.0000,331.5041,8.3924,0.0000,323.1118,0.0000,323.1118,7.6889,315.4229,0.0000,315.4229,1.4270,313.9959,222.3827,8.9926,26.2538,56.3668,63381.7799,63381.7799,63381.7799
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 5777e8e036..3809b81cb4 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -86,8 +86,7 @@
<Compile Include="Integration\CoachAdvancedAuxPowertrain.cs" />
<Compile Include="Integration\CoachPowerTrain.cs" />
<Compile Include="Integration\DriverStrategy\CoastingTests.cs" />
- <Compile Include="Integration\DriverStrategy\DriverStrategyTestCoach.cs" />
- <Compile Include="Integration\DriverStrategy\DriverStrategyTestTruck.cs" />
+ <Compile Include="Integration\DriverStrategy\SimpleCycles.cs" />
<Compile Include="Integration\FullCycleDeclarationTest.cs">
<SubType>Code</SubType>
</Compile>
@@ -1302,6 +1301,12 @@
<None Include="TestData\Results\Integration\24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="TestData\Results\Integration\40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v22.vmod">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Results\Integration\40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope_v3.vmod">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="TestData\Results\Integration\Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
--
GitLab