Pull request #146: Bugfix/VECTO-1519 077.2457 e2 gear oscillation

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1519-077.2457-e2-gear-oscillation to develop

* commit '0d83ad6b':
  shiftstrategy E2: do not downshift if operating point in lower gear is too high for electric motor
  update version number
  update release notes
  Hybrid strategy: fix in calculating target speed for braking
  correcting typo in user manual

Documentation/User Manual/5-input-and-output-files/VTQP.md

-##Vehcle Boosing Limits (.vemp)
+##Vehicle Boosting Limits (.vtqp)
 
-This file contains the vehilce's boosting limits depending on the combustion engine's angluar speed. The file uses the [VECTO CSV format](#csv).
+This file contains the vehicle's boosting limits depending on the combustion engine's angular speed. The file uses the [VECTO CSV format](#csv).
 
 - Filetype: .vtqp
 - Header: **n [rpm] , T_drive [Nm]**

Documentation/User Manual/help.html

@@ -232,7 +232,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="#electric-motor-max-torque-file-.vemp">Electric Motor Max Torque File (.vemp)</a></li>
 <li><a href="#electric-motor-drag-curve-file-.vemd">Electric Motor Drag Curve File (.vemd)</a></li>
 <li><a href="#electric-motor-map-.vemo">Electric Motor Map (.vemo)</a></li>
-<li><a href="#vehcle-boosing-limits-.vemp">Vehcle Boosing Limits (.vemp)</a></li>
+<li><a href="#vehicle-boosting-limits-.vtqp">Vehicle Boosting Limits (.vtqp)</a></li>
 <li><a href="#battery-internal-voltage-file-.vbatv">Battery Internal Voltage File (.vbatv)</a></li>
 <li><a href="#battery-internal-resistance-file-.vbatr">Battery Internal Resistance File (.vbatr)</a></li>
 <li><a href="#battery-max-current-map-.vimax">Battery Max Current Map (.vimax)</a></li>
@@ -3123,7 +3123,7 @@ Example: “Gears\Gear1.vtlm” points to the “Gears” subdirectory of the Ge
 </tr>
 <tr class="even">
 <td>Allowed gear range (skip of gears)</td>
-<td>Total number of mechanical gears ≤ 6: 1, else 22</td>
+<td>Total number of mechanical gears ≤ 6: 1, else 2</td>
 </tr>
 <tr class="odd">
 <td>CCMinAcceleration</td>
@@ -4743,9 +4743,9 @@ If the battery’s SoC is below the lower SoC threshold <img style="vertical-ali
 47.746 , 0     , 0.1449
 ...</code></pre>
 </div>
-<div id="vehcle-boosing-limits-.vemp" class="section level2">
-<h2>Vehcle Boosing Limits (.vemp)</h2>
-<p>This file contains the vehilce’s boosting limits depending on the combustion engine’s angluar speed. The file uses the <a href="#csv">VECTO CSV format</a>.</p>
+<div id="vehicle-boosting-limits-.vtqp" class="section level2">
+<h2>Vehicle Boosting Limits (.vtqp)</h2>
+<p>This file contains the vehicle’s boosting limits depending on the combustion engine’s angular speed. The file uses the <a href="#csv">VECTO CSV format</a>.</p>
 <ul>
 <li>Filetype: .vtqp</li>
 <li>Header: <strong>n [rpm] , T_drive [Nm]</strong></li>

VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs

@@ -405,6 +405,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				}
 
 				var nextGear = GearList.Predecessor(currentGear);
+				if (SpeedTooHighForEngine(nextGear, outAngularVelocity)) {
+					return currentGear;
+				}
 
 				while (GearList.HasPredecessor(nextGear)) {
 					// check skip gears

VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs

@@ -1313,7 +1313,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 			}
 
 			var targetEngineSpeed = ModelData.EngineData.IdleSpeed +
-									0.7 * ModelData.EngineData.FullLoadCurves[0].NP98hSpeed;
+									0.7 * (ModelData.EngineData.FullLoadCurves[0].NP98hSpeed - ModelData.EngineData.IdleSpeed);
 			var best = candidates.MinBy(x => VectoMath.Abs(x.Value - targetEngineSpeed)).Key;
 			return best;
 		}

VectoCore/VectoCore/Utils/VectoVersionCore.cs

@@ -47,7 +47,7 @@ namespace TUGraz.VectoCore.Utils
 		public static string VersionNumber
 		{
 			get {
-				return "0.7.5.2380" + SUFFIX;
+				return "0.7.7.2547" + SUFFIX;
 			}
 		}
 

VectoCore/VectoCore/VersionNumber.t4

@@ -6,6 +6,6 @@ int GetBuildNumber()
 
 string GetVectoCoreVersionNumber()
 {
-	return "0.7.6." + GetBuildNumber();
+	return "0.7.7." + GetBuildNumber();
 }
 #>
\ No newline at end of file