diff --git a/Documentation/User Manual/3-simulation-models/Driver_LAC.md b/Documentation/User Manual/3-simulation-models/Driver_LAC.md
index 3990692399e967f41decda3a153364bc5da9ca68..3c1efb052ffc37b7a8051e3d1ff79debcd0b1f21 100644
--- a/Documentation/User Manual/3-simulation-models/Driver_LAC.md
+++ b/Documentation/User Manual/3-simulation-models/Driver_LAC.md
@@ -1,6 +1,6 @@
##Look-Ahead Coasting
-
+<div class="vecto22">
Like Overspeed, Look-Ahead Coasting is a function that aims on modelling real-life driver behaviour. It is a forward-looking function that detects forthcoming reductions in target speed in the mission profile (e.g. speed limit, etc.) and induces an early deceleration using engine braking before applying mechanical brakes according to the [deceleration limit](#acceleration-limiting).
The implemented approach uses a predefined target deceleration (a~lookahead~) to calculate the deceleration time for each particular target speed change.
@@ -13,3 +13,55 @@ coasting trajectory until it meets the brake deceleration trajectory. The result
Parameters in [Job File](#job-file):
: - **Target Retardation** = a~lookahead~
- **Minimum speed**. Below this speed the function is disabled.
+</div>
+
+<div class="vecto3">
+Since Vecto 3.0.4 the coasting strategy according to the ACEA White Book 2016 is implemented.
+
+The look ahead coasting functionality represents the driver behavior prior to a deceleration event. Due to information of the route ahead the driver is able to anticipate on the deceleration event by releasing the accelerator pedal.
+
+This pedal release decision is based on an estimation of kinetical and potential (height) energy gain versus the expected dissipated energy tue to vehicle resistances during the route section ahead.
+
+For an upcoming target speed change the energy level after the speed change is compared to the vehicle's current energy level (kinetic and potential energy). The difference of those energy levels is used to estimate the average deceleration force to reach the next target speed. Coasting starts if the vehicle's (estimated) average resistance force during coasting multiplied by a speed dependent 'Decision Factor' becomes smaller than the average deceleration force. (For details on the equations please see the ACEA White Book 2016, Section 8)
+
+The *Decision Factor (DF)* depends on the next target speed and the speed change:
+
+$DF_{Coasting} = 2.5 - 1.5 * DF_{vel} * DF_{vdrop}$
+
+whereas $DF_{vel}$ and $DF_{vdrop}$ are speed dependent and speed change dependent lookup curves, giving a value from 0 and 1.
+
+For the look ahead coasting target speed changes within the preview distance are considered.
+
+$preview distance [m] = 10 * vehicle speed [km/h]$
+
+Parameters in [Job File](#job-file):
+: - **PreviewDistanceFactor**
+- **DF_offset**: offset in the equation for DF~coasting~ (default 2.5)
+- **DF_scaling**: factor in the equation for DF~coasting~ (default 1.5)
+- **DF_targetSpeedLookup**: csv file for DF~vel~ lookup (see below)
+- **Df_velocityDropLookup**: csv file for DF~vdrop~ lookup (see below)
+
+####Decision Factor for target velocity lookup (DF~vel~)
+
+Example (default values):
+
+~~~
+v_target [km/h], decision_factor [-]
+0 , 0
+48 , 0
+52 , 1
+100 , 1
+~~~
+
+####Decision Factor for velocity drop lookup (DF~vdrop~)
+
+Example (default values):
+
+~~~
+v_drop [km/h], decision_factor [-]
+-100 , 1
+9 , 1
+11 , 0
+100 , 0
+~~~
+</div>
\ No newline at end of file
diff --git a/Documentation/User Manual/6-changelog/changelog.md b/Documentation/User Manual/6-changelog/changelog.md
index dd0e2e4a7d34a2ca1675bf4541c56c9533bb1044..0a019acace3180d8057efe66f7116601554e5091 100644
--- a/Documentation/User Manual/6-changelog/changelog.md
+++ b/Documentation/User Manual/6-changelog/changelog.md
@@ -1,5 +1,20 @@
#Changelog
+**VECTO 3.0.4**
+
+***Build 537 (2016-06-28)***
+
+- Main Updates
+ + New gear shift strategy according to White Book 2016
+ + New coasting strategy according to White Book 2016
+ + New input parameters (enineering mode) for coasting and gear shift behavior
+ + Use SI units in Advanced Auxiliaries Module and compile with strict compiler settings (no implicit casts, etc.)
+
+- Bugfixes
+ + Auxiliary TechList not read from JSON input data
+ + Improvements in driver strategy
+ + Bugfixes in MeasuredSpeed mode
+
**VECTO 3.0.3**
***Build 537 (2016-06-21)***
diff --git a/Documentation/User Manual/UserManual.sublime-workspace b/Documentation/User Manual/UserManual.sublime-workspace
index 2c5769523888cefee0c6c5fbf9c54225ea919450..14dd04edc9b95d9822e27b524ff1dc3a0373e5bb 100644
--- a/Documentation/User Manual/UserManual.sublime-workspace
+++ b/Documentation/User Manual/UserManual.sublime-workspace
@@ -7,6 +7,30 @@
},
"buffers":
[
+ {
+ "file": "6-changelog/changelog.md",
+ "settings":
+ {
+ "buffer_size": 16373,
+ "line_ending": "Windows"
+ }
+ },
+ {
+ "file": "3-simulation-models/Driver_LAC.md",
+ "settings":
+ {
+ "buffer_size": 3413,
+ "line_ending": "Windows"
+ }
+ },
+ {
+ "file": "5-input-and-output-files/VAUX.md",
+ "settings":
+ {
+ "buffer_size": 1413,
+ "line_ending": "Windows"
+ }
+ }
],
"build_system": "",
"build_system_choices":
@@ -40,7 +64,11 @@
},
"expanded_folders":
[
- "/E/QUAM/Workspace/VECTO_quam/User Manual"
+ "/E/QUAM/Workspace/VECTO_quam_master/Documentation/User Manual",
+ "/E/QUAM/Workspace/VECTO_quam_master/Documentation/User Manual/1-user-interface",
+ "/E/QUAM/Workspace/VECTO_quam_master/Documentation/User Manual/3-simulation-models",
+ "/E/QUAM/Workspace/VECTO_quam_master/Documentation/User Manual/5-input-and-output-files",
+ "/E/QUAM/Workspace/VECTO_quam_master/Documentation/User Manual/6-changelog"
],
"file_history":
[
@@ -90,8 +118,95 @@
"groups":
[
{
+ "selected": 0,
"sheets":
[
+ {
+ "buffer": 0,
+ "file": "6-changelog/changelog.md",
+ "semi_transient": false,
+ "settings":
+ {
+ "buffer_size": 16373,
+ "regions":
+ {
+ },
+ "selection":
+ [
+ [
+ 12,
+ 531
+ ]
+ ],
+ "settings":
+ {
+ "syntax": "Packages/Markdown/Markdown.sublime-syntax",
+ "tab_size": 4,
+ "translate_tabs_to_spaces": true
+ },
+ "translation.x": 0.0,
+ "translation.y": 0.0,
+ "zoom_level": 1.0
+ },
+ "stack_index": 0,
+ "type": "text"
+ },
+ {
+ "buffer": 1,
+ "file": "3-simulation-models/Driver_LAC.md",
+ "semi_transient": false,
+ "settings":
+ {
+ "buffer_size": 3413,
+ "regions":
+ {
+ },
+ "selection":
+ [
+ [
+ 0,
+ 3413
+ ]
+ ],
+ "settings":
+ {
+ "syntax": "Packages/Markdown/Markdown.sublime-syntax"
+ },
+ "translation.x": 0.0,
+ "translation.y": 0.0,
+ "zoom_level": 1.0
+ },
+ "stack_index": 1,
+ "type": "text"
+ },
+ {
+ "buffer": 2,
+ "file": "5-input-and-output-files/VAUX.md",
+ "semi_transient": true,
+ "settings":
+ {
+ "buffer_size": 1413,
+ "regions":
+ {
+ },
+ "selection":
+ [
+ [
+ 0,
+ 0
+ ]
+ ],
+ "settings":
+ {
+ "syntax": "Packages/Markdown/Markdown.sublime-syntax"
+ },
+ "translation.x": 0.0,
+ "translation.y": 0.0,
+ "zoom_level": 1.0
+ },
+ "stack_index": 2,
+ "type": "text"
+ }
]
}
],
@@ -172,7 +287,7 @@
"show_open_files": false,
"show_tabs": true,
"side_bar_visible": true,
- "side_bar_width": 146.0,
+ "side_bar_width": 325.0,
"status_bar_visible": true,
"template_settings":
{