From 834b35777228e05b573ac713625c5fef0033b8fd Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 24 Jan 2019 10:54:10 +0100
Subject: [PATCH] adding testcases with different FC-Map

---
 .../Models/Simulation/ShiftStrategyV2Test.cs  |  16 +
 ...2_vehicle-class-5_EURO6_2018_FlatFCMap.xml | 466 ++++++++++++++++++
 ...cle-class-5_EURO6_2018_IncreasingFCMap.xml | 466 ++++++++++++++++++
 VectoCore/VectoCoreTest/VectoCoreTest.csproj  |   6 +
 4 files changed, 954 insertions(+)
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml

diff --git a/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs b/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs
index a39214dc55..2ca40726a4 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs
@@ -280,6 +280,22 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 			}
 		}
 
+
+		[TestCase("Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml", null, TestName = "AMT ShiftV2 Group5 FlatMap ALL"),
+		TestCase("Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml", null, TestName = "AMT ShiftV2 Group5 IncreasingMap ALL"),
+		]
+		public void RunDeclarationTestNewShiftStrategy_Group5_FCMapInfluence(string filename, int? idx)
+		{
+			var job = @"TestData\Integration\ShiftStrategyV2\SampleVehicles\" + filename;
+
+			if (idx.HasValue) {
+				RunJob_DeclSingle(job, idx.Value);
+			} else {
+				RunJob_DeclAll(job);
+			}
+		}
+
+
 		public void RunJob_DeclSingle(string jobName, int runIdx)
 		{
 			var relativeJobPath = jobName;
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
new file mode 100644
index 0000000000..96ee0bde6d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+  <Vehicle id="VEH-Class5_FlatFC">
+    <Manufacturer>Generic Vendor</Manufacturer>
+    <ManufacturerAddress>N.A.</ManufacturerAddress>
+    <Model>N.A.</Model>
+    <VIN>N/A</VIN>
+    <Date>2017-07-06T15:06:08.3093609Z</Date>
+    <LegislativeClass>N3</LegislativeClass>
+    <VehicleCategory>Tractor</VehicleCategory>
+    <AxleConfiguration>4x2</AxleConfiguration>
+    <CurbMassChassis>8229</CurbMassChassis>
+    <GrossVehicleMass>18000</GrossVehicleMass>
+    <IdlingSpeed>600</IdlingSpeed>
+    <RetarderType>Transmission Output Retarder</RetarderType>
+    <RetarderRatio>1.000</RetarderRatio>
+    <AngledriveType>None</AngledriveType>
+    <PTO>
+      <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+      <PTOOtherElements>none</PTOOtherElements>
+    </PTO>
+    <Components>
+      <Engine>
+        <Data id="ENG-N.A.">
+          <Manufacturer>Generic Vendor</Manufacturer>
+          <Model>N.A.</Model>
+          <CertificationNumber>ENG-N.A.</CertificationNumber>
+          <Date>2017-07-06T15:06:08.3103609Z</Date>
+          <AppVersion>VectoCore</AppVersion>
+          <Displacement>12740</Displacement>
+          <IdlingSpeed>600</IdlingSpeed>
+          <RatedSpeed>1736</RatedSpeed>
+          <RatedPower>325032</RatedPower>
+          <MaxEngineTorque>2134</MaxEngineTorque>
+          <WHTCUrban>1.0000</WHTCUrban>
+          <WHTCRural>1.0000</WHTCRural>
+          <WHTCMotorway>1.0000</WHTCMotorway>
+          <BFColdHot>1.0000</BFColdHot>
+          <CFRegPer>1.0000</CFRegPer>
+          <CFNCV>1.0000</CFNCV>
+          <FuelType>Diesel CI</FuelType>
+          <FuelConsumptionMap>
+            <Entry engineSpeed="500.00" torque="-300.00" fuelConsumption="2000.00" />
+            <Entry engineSpeed="3000.00" torque="-300.00" fuelConsumption="2000.00" />
+            <Entry engineSpeed="500.00" torque="5000.00" fuelConsumption="2000.00" />
+            <Entry engineSpeed="3000.00" torque="5000.00" fuelConsumption="2000.00" />
+            
+          </FuelConsumptionMap>
+          <FullLoadAndDragCurve>
+            <Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00" />
+            <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00" />
+            <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00" />
+            <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00" />
+            <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00" />
+            <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00" />
+            <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00" />
+            <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00" />
+            <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00" />
+            <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
+          </FullLoadAndDragCurve>
+        </Data>
+        <Signature>
+          <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+            <Transforms>
+              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+            </Transforms>
+            <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+            <DigestValue></DigestValue>
+          </Reference>
+        </Signature>
+      </Engine>
+      <Gearbox>
+        <Data id="GBX-N.A.">
+          <Manufacturer>Generic Vendor</Manufacturer>
+          <Model>N.A.</Model>
+          <CertificationNumber>GBX-N.A.</CertificationNumber>
+          <Date>2017-07-06T15:06:08.3133609Z</Date>
+          <AppVersion>VectoCore</AppVersion>
+          <TransmissionType>AMT</TransmissionType>
+          <MainCertificationMethod>Standard values</MainCertificationMethod>
+          <Gears>
+            <Gear number="1">
+              <Ratio>14.930</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="2">
+              <Ratio>11.640</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="3">
+              <Ratio>9.020</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="4">
+              <Ratio>7.040</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="5">
+              <Ratio>5.640</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="6">
+              <Ratio>4.400</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="7">
+              <Ratio>3.390</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="8">
+              <Ratio>2.650</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="9">
+              <Ratio>2.050</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="10">
+              <Ratio>1.600</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="11">
+              <Ratio>1.280</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="12">
+              <Ratio>1.000</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="200.00" />
+                <Entry inputSpeed="0.00" inputTorque="-250.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="250.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="200.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="200.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-845.00" torqueLoss="17.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00" />
+                <Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="200.00" />
+              </TorqueLossMap>
+            </Gear>
+          </Gears>
+        </Data>
+        <Signature>
+          <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+            <Transforms>
+              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+            </Transforms>
+            <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+            <DigestValue></DigestValue>
+          </Reference>
+        </Signature>
+      </Gearbox>
+      <Retarder>
+        <Data id="RET-N.A.">
+          <Manufacturer>Generic Vendor</Manufacturer>
+          <Model>N.A.</Model>
+          <CertificationNumber>N/A</CertificationNumber>
+          <Date>2017-07-06T15:06:08.3133609Z</Date>
+          <AppVersion>VectoCore</AppVersion>
+          <CertificationMethod>Standard values</CertificationMethod>
+          <RetarderLossMap>
+            <Entry retarderSpeed="0.00" torqueLoss="10.00" />
+            <Entry retarderSpeed="100.00" torqueLoss="10.00" />
+            <Entry retarderSpeed="200.00" torqueLoss="10.10" />
+            <Entry retarderSpeed="300.00" torqueLoss="10.20" />
+            <Entry retarderSpeed="400.00" torqueLoss="10.30" />
+            <Entry retarderSpeed="500.00" torqueLoss="10.50" />
+            <Entry retarderSpeed="600.00" torqueLoss="10.70" />
+            <Entry retarderSpeed="700.00" torqueLoss="11.00" />
+            <Entry retarderSpeed="800.00" torqueLoss="11.30" />
+            <Entry retarderSpeed="900.00" torqueLoss="11.60" />
+            <Entry retarderSpeed="1000.00" torqueLoss="12.00" />
+            <Entry retarderSpeed="1100.00" torqueLoss="12.40" />
+            <Entry retarderSpeed="1200.00" torqueLoss="12.90" />
+            <Entry retarderSpeed="1300.00" torqueLoss="13.40" />
+            <Entry retarderSpeed="1400.00" torqueLoss="13.90" />
+            <Entry retarderSpeed="1500.00" torqueLoss="14.50" />
+            <Entry retarderSpeed="1600.00" torqueLoss="15.10" />
+            <Entry retarderSpeed="1700.00" torqueLoss="15.80" />
+            <Entry retarderSpeed="1800.00" torqueLoss="16.50" />
+            <Entry retarderSpeed="1900.00" torqueLoss="17.20" />
+            <Entry retarderSpeed="2000.00" torqueLoss="18.00" />
+            <Entry retarderSpeed="2100.00" torqueLoss="18.80" />
+            <Entry retarderSpeed="2200.00" torqueLoss="19.70" />
+            <Entry retarderSpeed="2300.00" torqueLoss="20.60" />
+            <Entry retarderSpeed="2400.00" torqueLoss="21.50" />
+            <Entry retarderSpeed="2500.00" torqueLoss="22.50" />
+            <Entry retarderSpeed="2600.00" torqueLoss="23.50" />
+            <Entry retarderSpeed="2700.00" torqueLoss="24.60" />
+            <Entry retarderSpeed="2800.00" torqueLoss="25.70" />
+            <Entry retarderSpeed="2900.00" torqueLoss="26.80" />
+            <Entry retarderSpeed="3000.00" torqueLoss="28.00" />
+          </RetarderLossMap>
+        </Data>
+        <Signature>
+          <Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+            <Transforms>
+              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+            </Transforms>
+            <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+            <DigestValue></DigestValue>
+          </Reference>
+        </Signature>
+      </Retarder>
+      <Axlegear>
+        <Data id="AXLGEAR-2.640">
+          <Manufacturer>Generic Vendor</Manufacturer>
+          <Model>N.A.</Model>
+          <CertificationNumber>AXLGEAR-2.640</CertificationNumber>
+          <Date>2017-07-06T15:06:08.3153609Z</Date>
+          <AppVersion>VectoCore</AppVersion>
+          <LineType>Single portal axle</LineType>
+          <Ratio>2.640</Ratio>
+          <CertificationMethod>Standard values</CertificationMethod>
+          <TorqueLossMap>
+            <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+            <Entry inputSpeed="0.00" inputTorque="-50.00" torqueLoss="2.00" />
+            <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="0.00" />
+            <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="2.00" />
+            <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+            <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+            <Entry inputSpeed="5000.00" inputTorque="-50.00" torqueLoss="2.00" />
+            <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="0.00" />
+            <Entry inputSpeed="5000.00" inputTorque="50.00" torqueLoss="2.00" />
+            <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+          </TorqueLossMap>
+        </Data>
+        <Signature>
+          <Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
+            <Transforms>
+              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+            </Transforms>
+            <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+            <DigestValue></DigestValue>
+          </Reference>
+        </Signature>
+      </Axlegear>
+      <AxleWheels>
+        <Data>
+          <Axles>
+            <Axle axleNumber="1">
+              <AxleType>VehicleNonDriven</AxleType>
+              <TwinTyres>false</TwinTyres>
+              <Steered>true</Steered>
+              <Tyre>
+                <Data id="TYRE-315_70R22.5">
+                  <Manufacturer>Generic Vendor</Manufacturer>
+                  <Model>315/70 R22.5</Model>
+                  <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
+                  <Date>2017-07-06T15:06:08.3153609Z</Date>
+                  <AppVersion>VectoCore</AppVersion>
+                  <Dimension>315/70 R22.5</Dimension>
+                  <RRCDeclared>0.0051</RRCDeclared>
+                  <FzISO>33350</FzISO>
+                </Data>
+                <Signature>
+                  <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
+                    <Transforms>
+                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    </Transforms>
+                    <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                    <DigestValue></DigestValue>
+                  </Reference>
+                </Signature>
+              </Tyre>
+            </Axle>
+            <Axle axleNumber="2">
+              <AxleType>VehicleDriven</AxleType>
+              <TwinTyres>true</TwinTyres>
+              <Steered>false</Steered>
+              <Tyre>
+                <Data id="TYRE-315_70R22.5">
+                  <Manufacturer>Generic Vendor</Manufacturer>
+                  <Model>315/70 R22.5</Model>
+                  <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
+                  <Date>2017-07-06T15:06:08.3153609Z</Date>
+                  <AppVersion>VectoCore</AppVersion>
+                  <Dimension>315/70 R22.5</Dimension>
+                  <RRCDeclared>0.0061</RRCDeclared>
+                  <FzISO>33350</FzISO>
+                </Data>
+                <Signature>
+                  <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
+                    <Transforms>
+                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    </Transforms>
+                    <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                    <DigestValue></DigestValue>
+                  </Reference>
+                </Signature>
+              </Tyre>
+            </Axle>
+          </Axles>
+        </Data>
+      </AxleWheels>
+      <Auxiliaries>
+        <Data>
+          <Fan>
+            <Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
+          </Fan>
+          <SteeringPump>
+            <Technology>Fixed displacement</Technology>
+          </SteeringPump>
+          <ElectricSystem>
+            <Technology>Standard technology</Technology>
+          </ElectricSystem>
+          <PneumaticSystem>
+            <Technology>Small</Technology>
+          </PneumaticSystem>
+          <HVAC>
+            <Technology>None</Technology>
+          </HVAC>
+        </Data>
+      </Auxiliaries>
+      <AirDrag>
+        <Data id="Airdrag-N.A.">
+          <Manufacturer>Generic Vendor</Manufacturer>
+          <Model>N.A.</Model>
+          <CertificationNumber>N.A.</CertificationNumber>
+          <Date>2017-07-06T15:06:08.3163609Z</Date>
+          <AppVersion>VectoCore</AppVersion>
+          <CdxA_0>5.45</CdxA_0>
+          <TransferredCdxA>5.45</TransferredCdxA>
+          <DeclaredCdxA>5.45</DeclaredCdxA>
+        </Data>
+        <Signature>
+          <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+            <Transforms>
+              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+            </Transforms>
+            <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+            <DigestValue></DigestValue>
+          </Reference>
+        </Signature>
+      </AirDrag>
+    </Components>
+  </Vehicle>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
new file mode 100644
index 0000000000..635f90fe05
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+  <Vehicle id="VEH-Class5_IncreasingFC">
+    <Manufacturer>Generic Vendor</Manufacturer>
+    <ManufacturerAddress>N.A.</ManufacturerAddress>
+    <Model>N.A.</Model>
+    <VIN>N/A</VIN>
+    <Date>2017-07-06T15:06:08.3093609Z</Date>
+    <LegislativeClass>N3</LegislativeClass>
+    <VehicleCategory>Tractor</VehicleCategory>
+    <AxleConfiguration>4x2</AxleConfiguration>
+    <CurbMassChassis>8229</CurbMassChassis>
+    <GrossVehicleMass>18000</GrossVehicleMass>
+    <IdlingSpeed>600</IdlingSpeed>
+    <RetarderType>Transmission Output Retarder</RetarderType>
+    <RetarderRatio>1.000</RetarderRatio>
+    <AngledriveType>None</AngledriveType>
+    <PTO>
+      <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+      <PTOOtherElements>none</PTOOtherElements>
+    </PTO>
+    <Components>
+      <Engine>
+        <Data id="ENG-N.A.">
+          <Manufacturer>Generic Vendor</Manufacturer>
+          <Model>N.A.</Model>
+          <CertificationNumber>ENG-N.A.</CertificationNumber>
+          <Date>2017-07-06T15:06:08.3103609Z</Date>
+          <AppVersion>VectoCore</AppVersion>
+          <Displacement>12740</Displacement>
+          <IdlingSpeed>600</IdlingSpeed>
+          <RatedSpeed>1736</RatedSpeed>
+          <RatedPower>325032</RatedPower>
+          <MaxEngineTorque>2134</MaxEngineTorque>
+          <WHTCUrban>1.0000</WHTCUrban>
+          <WHTCRural>1.0000</WHTCRural>
+          <WHTCMotorway>1.0000</WHTCMotorway>
+          <BFColdHot>1.0000</BFColdHot>
+          <CFRegPer>1.0000</CFRegPer>
+          <CFNCV>1.0000</CFNCV>
+          <FuelType>Diesel CI</FuelType>
+          <FuelConsumptionMap>
+            <Entry engineSpeed="500.00" torque="-300.00" fuelConsumption="200.00" />
+            <Entry engineSpeed="3000.00" torque="-300.00" fuelConsumption="200.00" />
+            <Entry engineSpeed="500.00" torque="5000.00" fuelConsumption="2000.00" />
+            <Entry engineSpeed="3000.00" torque="5000.00" fuelConsumption="2000.00" />
+            
+          </FuelConsumptionMap>
+          <FullLoadAndDragCurve>
+            <Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00" />
+            <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00" />
+            <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00" />
+            <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00" />
+            <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00" />
+            <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00" />
+            <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00" />
+            <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00" />
+            <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00" />
+            <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
+          </FullLoadAndDragCurve>
+        </Data>
+        <Signature>
+          <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+            <Transforms>
+              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+            </Transforms>
+            <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+            <DigestValue></DigestValue>
+          </Reference>
+        </Signature>
+      </Engine>
+      <Gearbox>
+        <Data id="GBX-N.A.">
+          <Manufacturer>Generic Vendor</Manufacturer>
+          <Model>N.A.</Model>
+          <CertificationNumber>GBX-N.A.</CertificationNumber>
+          <Date>2017-07-06T15:06:08.3133609Z</Date>
+          <AppVersion>VectoCore</AppVersion>
+          <TransmissionType>AMT</TransmissionType>
+          <MainCertificationMethod>Standard values</MainCertificationMethod>
+          <Gears>
+            <Gear number="1">
+              <Ratio>14.930</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="2">
+              <Ratio>11.640</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="3">
+              <Ratio>9.020</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="4">
+              <Ratio>7.040</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="5">
+              <Ratio>5.640</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="6">
+              <Ratio>4.400</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="7">
+              <Ratio>3.390</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="8">
+              <Ratio>2.650</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="9">
+              <Ratio>2.050</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="10">
+              <Ratio>1.600</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="11">
+              <Ratio>1.280</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00" />
+              </TorqueLossMap>
+            </Gear>
+            <Gear number="12">
+              <Ratio>1.000</Ratio>
+              <TorqueLossMap>
+                <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="200.00" />
+                <Entry inputSpeed="0.00" inputTorque="-250.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="250.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="200.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="200.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-845.00" torqueLoss="17.00" />
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00" />
+                <Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00" />
+                <Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="200.00" />
+              </TorqueLossMap>
+            </Gear>
+          </Gears>
+        </Data>
+        <Signature>
+          <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+            <Transforms>
+              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+            </Transforms>
+            <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+            <DigestValue></DigestValue>
+          </Reference>
+        </Signature>
+      </Gearbox>
+      <Retarder>
+        <Data id="RET-N.A.">
+          <Manufacturer>Generic Vendor</Manufacturer>
+          <Model>N.A.</Model>
+          <CertificationNumber>N/A</CertificationNumber>
+          <Date>2017-07-06T15:06:08.3133609Z</Date>
+          <AppVersion>VectoCore</AppVersion>
+          <CertificationMethod>Standard values</CertificationMethod>
+          <RetarderLossMap>
+            <Entry retarderSpeed="0.00" torqueLoss="10.00" />
+            <Entry retarderSpeed="100.00" torqueLoss="10.00" />
+            <Entry retarderSpeed="200.00" torqueLoss="10.10" />
+            <Entry retarderSpeed="300.00" torqueLoss="10.20" />
+            <Entry retarderSpeed="400.00" torqueLoss="10.30" />
+            <Entry retarderSpeed="500.00" torqueLoss="10.50" />
+            <Entry retarderSpeed="600.00" torqueLoss="10.70" />
+            <Entry retarderSpeed="700.00" torqueLoss="11.00" />
+            <Entry retarderSpeed="800.00" torqueLoss="11.30" />
+            <Entry retarderSpeed="900.00" torqueLoss="11.60" />
+            <Entry retarderSpeed="1000.00" torqueLoss="12.00" />
+            <Entry retarderSpeed="1100.00" torqueLoss="12.40" />
+            <Entry retarderSpeed="1200.00" torqueLoss="12.90" />
+            <Entry retarderSpeed="1300.00" torqueLoss="13.40" />
+            <Entry retarderSpeed="1400.00" torqueLoss="13.90" />
+            <Entry retarderSpeed="1500.00" torqueLoss="14.50" />
+            <Entry retarderSpeed="1600.00" torqueLoss="15.10" />
+            <Entry retarderSpeed="1700.00" torqueLoss="15.80" />
+            <Entry retarderSpeed="1800.00" torqueLoss="16.50" />
+            <Entry retarderSpeed="1900.00" torqueLoss="17.20" />
+            <Entry retarderSpeed="2000.00" torqueLoss="18.00" />
+            <Entry retarderSpeed="2100.00" torqueLoss="18.80" />
+            <Entry retarderSpeed="2200.00" torqueLoss="19.70" />
+            <Entry retarderSpeed="2300.00" torqueLoss="20.60" />
+            <Entry retarderSpeed="2400.00" torqueLoss="21.50" />
+            <Entry retarderSpeed="2500.00" torqueLoss="22.50" />
+            <Entry retarderSpeed="2600.00" torqueLoss="23.50" />
+            <Entry retarderSpeed="2700.00" torqueLoss="24.60" />
+            <Entry retarderSpeed="2800.00" torqueLoss="25.70" />
+            <Entry retarderSpeed="2900.00" torqueLoss="26.80" />
+            <Entry retarderSpeed="3000.00" torqueLoss="28.00" />
+          </RetarderLossMap>
+        </Data>
+        <Signature>
+          <Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+            <Transforms>
+              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+            </Transforms>
+            <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+            <DigestValue></DigestValue>
+          </Reference>
+        </Signature>
+      </Retarder>
+      <Axlegear>
+        <Data id="AXLGEAR-2.640">
+          <Manufacturer>Generic Vendor</Manufacturer>
+          <Model>N.A.</Model>
+          <CertificationNumber>AXLGEAR-2.640</CertificationNumber>
+          <Date>2017-07-06T15:06:08.3153609Z</Date>
+          <AppVersion>VectoCore</AppVersion>
+          <LineType>Single portal axle</LineType>
+          <Ratio>2.640</Ratio>
+          <CertificationMethod>Standard values</CertificationMethod>
+          <TorqueLossMap>
+            <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+            <Entry inputSpeed="0.00" inputTorque="-50.00" torqueLoss="2.00" />
+            <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="0.00" />
+            <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="2.00" />
+            <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+            <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+            <Entry inputSpeed="5000.00" inputTorque="-50.00" torqueLoss="2.00" />
+            <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="0.00" />
+            <Entry inputSpeed="5000.00" inputTorque="50.00" torqueLoss="2.00" />
+            <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+          </TorqueLossMap>
+        </Data>
+        <Signature>
+          <Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
+            <Transforms>
+              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+            </Transforms>
+            <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+            <DigestValue></DigestValue>
+          </Reference>
+        </Signature>
+      </Axlegear>
+      <AxleWheels>
+        <Data>
+          <Axles>
+            <Axle axleNumber="1">
+              <AxleType>VehicleNonDriven</AxleType>
+              <TwinTyres>false</TwinTyres>
+              <Steered>true</Steered>
+              <Tyre>
+                <Data id="TYRE-315_70R22.5">
+                  <Manufacturer>Generic Vendor</Manufacturer>
+                  <Model>315/70 R22.5</Model>
+                  <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
+                  <Date>2017-07-06T15:06:08.3153609Z</Date>
+                  <AppVersion>VectoCore</AppVersion>
+                  <Dimension>315/70 R22.5</Dimension>
+                  <RRCDeclared>0.0051</RRCDeclared>
+                  <FzISO>33350</FzISO>
+                </Data>
+                <Signature>
+                  <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
+                    <Transforms>
+                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    </Transforms>
+                    <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                    <DigestValue></DigestValue>
+                  </Reference>
+                </Signature>
+              </Tyre>
+            </Axle>
+            <Axle axleNumber="2">
+              <AxleType>VehicleDriven</AxleType>
+              <TwinTyres>true</TwinTyres>
+              <Steered>false</Steered>
+              <Tyre>
+                <Data id="TYRE-315_70R22.5">
+                  <Manufacturer>Generic Vendor</Manufacturer>
+                  <Model>315/70 R22.5</Model>
+                  <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
+                  <Date>2017-07-06T15:06:08.3153609Z</Date>
+                  <AppVersion>VectoCore</AppVersion>
+                  <Dimension>315/70 R22.5</Dimension>
+                  <RRCDeclared>0.0061</RRCDeclared>
+                  <FzISO>33350</FzISO>
+                </Data>
+                <Signature>
+                  <Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
+                    <Transforms>
+                      <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+                      <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    </Transforms>
+                    <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                    <DigestValue></DigestValue>
+                  </Reference>
+                </Signature>
+              </Tyre>
+            </Axle>
+          </Axles>
+        </Data>
+      </AxleWheels>
+      <Auxiliaries>
+        <Data>
+          <Fan>
+            <Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
+          </Fan>
+          <SteeringPump>
+            <Technology>Fixed displacement</Technology>
+          </SteeringPump>
+          <ElectricSystem>
+            <Technology>Standard technology</Technology>
+          </ElectricSystem>
+          <PneumaticSystem>
+            <Technology>Small</Technology>
+          </PneumaticSystem>
+          <HVAC>
+            <Technology>None</Technology>
+          </HVAC>
+        </Data>
+      </Auxiliaries>
+      <AirDrag>
+        <Data id="Airdrag-N.A.">
+          <Manufacturer>Generic Vendor</Manufacturer>
+          <Model>N.A.</Model>
+          <CertificationNumber>N.A.</CertificationNumber>
+          <Date>2017-07-06T15:06:08.3163609Z</Date>
+          <AppVersion>VectoCore</AppVersion>
+          <CdxA_0>5.45</CdxA_0>
+          <TransferredCdxA>5.45</TransferredCdxA>
+          <DeclaredCdxA>5.45</DeclaredCdxA>
+        </Data>
+        <Signature>
+          <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+            <Transforms>
+              <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
+              <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+            </Transforms>
+            <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+            <DigestValue></DigestValue>
+          </Reference>
+        </Signature>
+      </AirDrag>
+    </Components>
+  </Vehicle>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 68963d4335..f9aeb3ceae 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -2907,6 +2907,12 @@
     <Content Include="TestData\Integration\ShiftStrategyV2\SampleVehicles\Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\Integration\ShiftStrategyV2\SampleVehicles\Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="TestData\Integration\ShiftStrategyV2\SampleVehicles\Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\Integration\ShiftStrategyV2\SampleVehicles\Tractor_4x2_vehicle-class-5_EURO6_2018.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-- 
GitLab