Merge pull request #19 in VECTO/vecto-dev from...

Merge pull request #19 in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1265-new-acceleration-curve-for-buses to develop

* commit '32bf3e5e':
  fix testcase.
  adding new acceleration / deceleration curve for buses

VectoCore/VectoCore/Resources/Declaration/VACC/Bus.vacc

-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

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>

VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs

@@ -941,6 +941,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
 
 		private void SetRelatedVehicleParts(List<VectoRunData> runs)
 		{
+			relatedRuns.Clear();
 			for (int i = 0; i < runs.Count; i++)
 			{
 				var relatedRun = new RelatedRun