From b03c714c183b0595c9b5460cbeb02f10c0e21c56 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 25 Apr 2019 14:22:59 +0200
Subject: [PATCH] extending shift lines to be useable for ZF gearbox, adding
more cycles to testcase
---
.../CityBus_AT/CityBus_AT_PS.vecto | 3 ++
.../CityBus_AT/CityBus_AT_Ser.vecto | 6 ++--
.../CityBus_AT/GearboxSerial.vgbx | 2 +-
.../CityBus_AT/GearshiftLinesVoith.vgsv | 30 ++++++++++++++++++-
VectoCore/VectoCoreTest/VectoCoreTest.csproj | 6 ++++
5 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/CityBus_AT_PS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/CityBus_AT_PS.vecto
index fa327ccdee..bfa8d25d49 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/CityBus_AT_PS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/CityBus_AT_PS.vecto
@@ -40,7 +40,10 @@
"UnderSpeed": 5.0
},
"Cycles": [
+ "RegionalDelivery.vdri",
"UrbanDelivery.vdri",
+ "Urban.vdri",
+ "InterUrban.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/CityBus_AT_Ser.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/CityBus_AT_Ser.vecto
index d0ab8cb0db..4821175845 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/CityBus_AT_Ser.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/CityBus_AT_Ser.vecto
@@ -40,7 +40,9 @@
"UnderSpeed": 5.0
},
"Cycles": [
- "UrbanDelivery.vdri"
- ]
+ "RegionalDelivery.vdri",
+ "UrbanDelivery.vdri",
+ "Urban.vdri",
+ "InterUrban.vdri" ]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/GearboxSerial.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/GearboxSerial.vgbx
index 93fbbc4a5b..0620238ba2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/GearboxSerial.vgbx
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/GearboxSerial.vgbx
@@ -53,7 +53,7 @@
}
],
"TqReserve": 0.0,
- "ShiftTime": 0.0,
+ "ShiftTime": 1.0,
"StartTqReserve": 0.0,
"StartSpeed": 2.0,
"StartAcc": 0.6,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/GearshiftLinesVoith.vgsv b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/GearshiftLinesVoith.vgsv
index 74eb2c7eaf..10522e7fc4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/GearshiftLinesVoith.vgsv
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT/GearshiftLinesVoith.vgsv
@@ -20,6 +20,20 @@ shift , LoadStage , n_dh_amax_lower , n_level_amax_lower , n_uh_amax_lower , n_d
3-4 , 5 , 725 , 750 , 800 , 750 , 775 , 825 , 750 , 780 , 830 , 770 , 800 , 850
3-4 , 6 , 750 , 780 , 830 , 770 , 800 , 850 , , , , , ,
#----------------------------
+4-5 , 1 , 725 , 750 , 800 , , , , , , , , ,
+4-5 , 2 , 725 , 750 , 800 , , , , , , , , ,
+4-5 , 3 , 725 , 750 , 800 , , , , , , , , ,
+4-5 , 4 , 725 , 750 , 800 , 750 , 775 , 825 , , , , , ,
+4-5 , 5 , 725 , 750 , 800 , 750 , 775 , 825 , 750 , 780 , 830 , 770 , 800 , 850
+4-5 , 6 , 750 , 780 , 830 , 770 , 800 , 850 , , , , , ,
+#----------------------------
+5-6 , 1 , 725 , 750 , 800 , , , , , , , , ,
+5-6 , 2 , 725 , 750 , 800 , , , , , , , , ,
+5-6 , 3 , 725 , 750 , 800 , , , , , , , , ,
+5-6 , 4 , 725 , 750 , 800 , 750 , 775 , 825 , , , , , ,
+5-6 , 5 , 725 , 750 , 800 , 750 , 775 , 825 , 750 , 780 , 830 , 770 , 800 , 850
+5-6 , 6 , 750 , 780 , 830 , 770 , 800 , 850 , , , , , ,
+#----------------------------
2-1 , 1 , 650 , 650 , 670 , , , , , , , , ,
2-1 , 2 , 650 , 650 , 670 , , , , , , , , ,
2-1 , 3 , 650 , 650 , 670 , , , , , , , , ,
@@ -39,4 +53,18 @@ shift , LoadStage , n_dh_amax_lower , n_level_amax_lower , n_uh_amax_lower , n_d
4-3 , 3 , 700 , 725 , 750 , , , , , , , , ,
4-3 , 4 , 700 , 725 , 750 , 725 , 740 , 770 , , , , , ,
4-3 , 5 , 700 , 725 , 750 , 725 , 740 , 770 , 725 , 740 , 770 , 740 , 760 , 800
-4-3 , 6 , 725 , 740 , 770 , 740 , 760 , 800 , , , , , ,
\ No newline at end of file
+4-3 , 6 , 725 , 740 , 770 , 740 , 760 , 800 , , , , , ,
+#----------------------------
+5-4 , 1 , 700 , 725 , 750 , , , , , , , , ,
+5-4 , 2 , 700 , 725 , 750 , , , , , , , , ,
+5-4 , 3 , 700 , 725 , 750 , , , , , , , , ,
+5-4 , 4 , 700 , 725 , 750 , 725 , 740 , 770 , , , , , ,
+5-4 , 5 , 700 , 725 , 750 , 725 , 740 , 770 , 725 , 740 , 770 , 740 , 760 , 800
+5-4 , 6 , 725 , 740 , 770 , 740 , 760 , 800 , , , , , ,
+#----------------------------
+6-5 , 1 , 700 , 725 , 750 , , , , , , , , ,
+6-5 , 2 , 700 , 725 , 750 , , , , , , , , ,
+6-5 , 3 , 700 , 725 , 750 , , , , , , , , ,
+6-5 , 4 , 700 , 725 , 750 , 725 , 740 , 770 , , , , , ,
+6-5 , 5 , 700 , 725 , 750 , 725 , 740 , 770 , 725 , 740 , 770 , 740 , 760 , 800
+6-5 , 6 , 725 , 740 , 770 , 740 , 760 , 800 , , , , , ,
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 56a75f95b3..1476d8af2f 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -261,6 +261,9 @@
<None Include="TestData\Integration\ShiftStrategyV2\CityBus_AT\GearshiftLinesVoith.vgsv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="TestData\Integration\ShiftStrategyV2\CityBus_AT\Interurban.vdri">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="TestData\Integration\ShiftStrategyV2\CityBus_AT\PredictionTimeLookup.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
@@ -285,6 +288,9 @@
<None Include="TestData\Integration\ShiftStrategyV2\CityBus_AT\TorqueConverterPowerSplit.vtcc">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="TestData\Integration\ShiftStrategyV2\CityBus_AT\Urban.vdri">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="TestData\Integration\ShiftStrategyV2\CityBus_AT\UrbanDelivery.vdri">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
--
GitLab