From 6f1cbcd96ad2600568ab5cc100ff9c3f8e11a307 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 19 May 2020 15:16:00 +0200
Subject: [PATCH] adding new acceleration / deceleration curve for buses
---
.../Resources/Declaration/VACC/Bus.vacc | 22 +++++++++++++------
VectoCore/VectoCore/VectoCore.csproj | 8 +++----
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/VectoCore/VectoCore/Resources/Declaration/VACC/Bus.vacc b/VectoCore/VectoCore/Resources/Declaration/VACC/Bus.vacc
index b7a3ef6a40..8ae1ce2696 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VACC/Bus.vacc
+++ b/VectoCore/VectoCore/Resources/Declaration/VACC/Bus.vacc
@@ -1,7 +1,15 @@
-v [km/h],acc [m/s²],dec [m/s²]
-0,0.2,-1
-7,1.1,-1
-25,1.1,-1
-50,0.6,-1
-60,0.6,-0.5
-120,0.6,-0.5
+v [km/h] , acc [m/s²] , dec [m/s²]
+0 , 0.88 , -0.94
+10 , 1.00 , -0.94
+13 , 1.00 , -0.94
+20 , 1.00 , -0.88
+30 , 0.97 , -0.81
+40 , 0.80 , -0.73
+50 , 0.63 , -0.66
+58 , 0.50 , -0.52
+60 , 0.46 , -0.50
+70 , 0.39 , -0.50
+80 , 0.39 , -0.50
+90 , 0.39 , -0.50
+100 , 0.39 , -0.50
+120 , 0.39 , -0.50
\ No newline at end of file
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index a7fb186d1b..d3b90e3a46 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -881,8 +881,6 @@
<EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.2.6_Buses.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="Resources\Declaration\VAUXBus\SP-Axles_Bus.csv" />
- <EmbeddedResource Include="Resources\Declaration\VAUXBus\SP-Factors_Bus.csv" />
<EmbeddedResource Include="Resources\Declaration\VAUXBus\DEFAULT_1-Cylinder_1-Stage_393ccm.acmp" />
<EmbeddedResource Include="Resources\Declaration\VAUXBus\DEFAULT_2-Cylinder_1-Stage_650ccm.acmp" />
<EmbeddedResource Include="Resources\Declaration\VAUXBus\DEFAULT_2-Cylinder_2-Stage_398ccm.acmp" />
@@ -910,9 +908,9 @@
<EmbeddedResource Include="Resources\Declaration\CompletedBusSegmentationTable.csv" />
<EmbeddedResource Include="Resources\Declaration\GenericBusData\EngineConsumptionMap_CI_Normed.vmap" />
<EmbeddedResource Include="Resources\Declaration\GenericBusData\EngineConsumptionMap_PI_Normed.vmap" />
- <None Include="Resources\Declaration\VAUXBus\SP-AxleFactor.csv" />
- <None Include="Resources\Declaration\VAUXBus\SP-Axles_Bus.csv" />
- <None Include="Resources\Declaration\VAUXBus\SP-Factors_Bus.csv" />
+ <EmbeddedResource Include="Resources\Declaration\VAUXBus\SP-AxleFactor.csv" />
+ <EmbeddedResource Include="Resources\Declaration\VAUXBus\SP-Axles_Bus.csv" />
+ <EmbeddedResource Include="Resources\Declaration\VAUXBus\SP-Factors_Bus.csv" />
<None Include="Utils\VectoVersionCore.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>VectoVersionCore.cs</LastGenOutput>
--
GitLab