diff --git a/Tools/PicCoordLogger.exe b/Tools/PicCoordLogger.exe
new file mode 100644
index 0000000000000000000000000000000000000000..61fe3092879cca1ab04f7ad1256af5372f707be6
Binary files /dev/null and b/Tools/PicCoordLogger.exe differ
diff --git a/User Manual Source/material User Manual.pptx b/User Manual Source/material User Manual.pptx
index b40ca1bddcbfcecfa36169699088d9dca6912ee2..76ac5ce1c869c80d7115520afb1a84e41c5e5815 100644
Binary files a/User Manual Source/material User Manual.pptx and b/User Manual Source/material User Manual.pptx differ
diff --git a/User Manual/GUI/ENG-Editor.html b/User Manual/GUI/ENG-Editor.html
index b3587eaad4551eeeba033cb49e13c220a612e414..9d003e6568e0847e1e873512038cc8ce809b5283 100644
--- a/User Manual/GUI/ENG-Editor.html
+++ b/User Manual/GUI/ENG-Editor.html
@@ -1,8 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html><head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Engine Editor - VECTO User Manual</title></head>
-<body>
-<map name="linkmap"><area shape="rect" coords="12,33,31,50"" href="#new"><area shape="rect" coords="34,33,52,52"" href="#open"><area shape="rect" coords="57,33,76,50"" href="#save"><area shape="rect" coords="79,32,99,51"" href="#saveas"><area shape="rect" coords="108,33,132,51"" href="#sendto"><area shape="rect" coords="130,113,504,133"" href="#make"><area shape="rect" coords="132,149,190,170"" href="#power"><area shape="rect" coords="132,176,194,196"" href="#ccm"><area shape="rect" coords="133,203,192,222"" href="#inertia"><area shape="rect" coords="410,149,471,170"" href="#nidle"><area shape="rect" coords="411,177,471,199"" href="#nrated"><area shape="rect" coords="16,251,504,272"" href="#fld"><area shape="rect" coords="16,303,505,323"" href="#map"><area shape="rect" coords="17,353,505,375"" href="#cal"><area shape="rect" coords="348,394,420,412"" href="#ok"><area shape="rect" coords="430,392,501,414"" href="#cancel"></map>
+<body> <map name="linkmap"><area shape="rect" coords="12,33,31,50"" href="#new"><area shape="rect" coords="34,33,52,52"" href="#open"><area shape="rect" coords="57,33,76,50"" href="#save"><area shape="rect" coords="79,32,99,51"" href="#saveas"><area shape="rect" coords="108,33,132,51"" href="#sendto"><area shape="rect" coords="130,113,504,133"" href="#make"><area shape="rect" coords="132,149,190,170"" href="#power"><area shape="rect" coords="132,176,194,196"" href="#ccm"><area shape="rect" coords="133,203,192,222"" href="#inertia"><area shape="rect" coords="410,149,471,170"" href="#nidle"><area shape="rect" coords="411,177,471,199"" href="#nrated"><area shape="rect" coords="16,251,504,272"" href="#fld"><area shape="rect" coords="16,303,505,323"" href="#map"><area shape="rect" coords="17,353,505,375"" href="#cal"><area shape="rect" coords="348,394,420,412"" href="#ok"><area shape="rect" coords="430,392,501,414"" href="#cancel"></map>
<table style="width: 100%; height: 54px; text-align: left; margin-left: auto; margin-right: auto;" border="0" cellpadding="2" cellspacing="2">
<tbody>
<tr>
@@ -31,8 +30,7 @@ file<br>
<img src="../pics/icons/Open-icon.png" style="width: 16px; height: 16px;" alt="open"><span style="font-weight: bold;"><a name="open"></a>Open
existing file</span><br>
<div style="margin-left: 40px;">Open an existing .veng
-file (using the VECTO File
-Browser)<br>
+file<br>
</div>
<span style="font-family: Verdana;"></span><br><br>
<span style="font-family: Verdana;"></span><img src="../pics/icons/Actions-document-save-icon.png" style="width: 16px; height: 16px;" alt="save"><a name="save"></a> <span style="font-weight: bold;">Save
@@ -40,9 +38,7 @@ current file</span><br>
<span style="font-family: Verdana;"></span><br><br>
<span style="font-family: Verdana;"></span><img src="../pics/icons/Actions-document-save-as-icon.png" style="width: 16px; height: 16px;" alt="SaveAs"><a name="saveas"></a> <span style="font-weight: bold;">Save
file as...</span><br>
-<div style="margin-left: 40px;">Using the VECTO File
-Browser.<br>
-</div>
+
<span style="font-family: Verdana;"></span><br><br>
<span style="font-family: Verdana;"></span><img src="../pics/icons/export-icon.png" style="width: 16px; height: 16px;" alt="sendto"><a name="sendto"></a> <span style="font-weight: bold;">Send
current file to the <a href="VECTO-Editor.html">VECTO
@@ -86,7 +82,7 @@ Engine Power</span> [kW]<br>
<th style="text-align: center; width: 148px;"><span style="color: rgb(51, 102, 255);">c </span>Engine
Speed</th>
<th style="text-align: center; width: 156px;">Max.
-Torque</th>
+Torque<br>(Static full load)</th>
<th style="text-align: center; width: 149px;">Motoring Torque</th>
<td style="width: 149px; text-align: center;"><span style="font-weight: bold;">PT1 time constant</span></td>
</tr>
@@ -116,10 +112,10 @@ lines (header, comments,
etc.) </span><span style="text-decoration: underline; font-style: italic; color: rgb(51, 102, 255);">must</span><span style="font-style: italic; color: rgb(51, 102, 255);"> start
with "<span style="font-weight: bold;">c</span> "</span><br>
</div>
-<br><br>
+<br><div style="margin-left: 40px;">The PT1 approach to calculate the dynamic full load is applied using this formula:<br><img style="width: 555px; height: 65px;" alt="" src="pics/ENG-PT1.png"><br>with:<br><div style="margin-left: 40px;">n<sub>i</sub> = current engine speed<br>T(n<sub>i</sub>) = PT1 time constant at engine speed n<sub>i</sub> (col. 4 in .vfld file)<br>P_fld_stat(n<sub>i</sub>) = Static full load at engine speed n<sub>i</sub> (col. 2 in .vfld file)<br>P_act<sub>i-1</sub> = Engine power in previous time stet</div><br></div><br>
<a name="map"></a><span style="font-weight: bold;">Fuel Consumption Map</span>
(.vmap)<br>
-<div style="margin-left: 40px;">Fuel Consumption Map measued in stationary conditions.<br></div><br>
+<div style="margin-left: 40px;">Fuel Consumption Map measued in stationary conditions.<br>The following rules apply:<br><ul><li>The map must cover the full engine range between full load and motoring curve. <span style="font-weight: bold; color: red;">Extrapolation is not possible and will abort the calculation!</span></li><li>At least four points are required.</li></ul></div><br>
<div style="margin-left: 40px;"><span style="font-weight: bold;">Format</span>
(comma-separated, dot = decimal-mark):
</div>
@@ -154,7 +150,7 @@ Consumption</th>
<div style="margin-left: 40px;"><span style="font-weight: bold; font-style: italic; color: rgb(51, 102, 255);">Note:</span><span style="font-style: italic; color: rgb(51, 102, 255);"> text
lines (header, comments,
etc.) </span><span style="text-decoration: underline; font-style: italic; color: rgb(51, 102, 255);">must</span><span style="font-style: italic; color: rgb(51, 102, 255);"> start
-with "<span style="font-weight: bold;">c</span> "</span><br>
+with "<span style="font-weight: bold;">c</span> "</span><br><h2>Fuel Map Interpolation</h2>The interpolation is based on <a href="http://en.wikipedia.org/wiki/Delaunay_triangulation">Delaunay Triangulation </a><a href="http://en.wikipedia.org/wiki/Delaunay_triangulation"><img style="border: 0px solid ; width: 12px; height: 12px;" alt="" src="../pics/misc/external-icon%2012x12.png"></a> and works as follows:<br><ol><li>Triangulate the given rpm/torque/fuel points (= x,y,z) to create a network of triangles with each point of the map being part of at least one triangle.</li><li>Find the triangle where the to-be-interpolated load point (x,y) is inside. If no triangle meets the criterion the calculation will be aborted.</li><li>Calculate the z-value (= fuel) of the given x,y-point in the plane of the triangle</li></ol>
</div>
<br><br>
<a name="cal"></a><span style="font-weight: bold;">Calibration Test Cycle</span><br>
@@ -162,7 +158,7 @@ with "<span style="font-weight: bold;">c</span> "</span><br>
transient calibration test cycle and model internal calculation of
correction factor(s) to be applied to stationary fuel consumption map.<br>
</div>
-<br><img style="width: 28px; height: 21px;" alt="" src="../pics/misc/browse.png"> <span style="font-weight: bold;">Open file browser</span>.<br><br><img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with GRAPHi or an user-defined tool (see <a href="settings.html#opencmd">File Open Command)</a>.<br><br>
+<br><img style="width: 28px; height: 21px;" alt="" src="../pics/misc/browse.png"> <span style="font-weight: bold;">Open file browser</span>.<br><br><img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with <a href="../../GRAPHi/documentation/HTML%20Manual/mainwindow.html">GRAPHi</a> or an user-defined tool (see <a href="settings.html#opencmd">File Open Command)</a>.<br><br>
<img src="../pics/misc/OK.png" style="width: 75px; height: 23px;" alt="OK"><a name="ok"></a><span style="font-weight: bold;">Save
and close file</span><br>
<div style="margin-left: 40px;">If necessary the file path
diff --git a/User Manual/GUI/GBX-Editor.html b/User Manual/GUI/GBX-Editor.html
index 83c559a4879b8c7f1a50d7653f433bbcc5ec082a..59be173c9a040a68a9db9717126da0415b236167 100644
--- a/User Manual/GUI/GBX-Editor.html
+++ b/User Manual/GUI/GBX-Editor.html
@@ -23,32 +23,29 @@ Manual</span></a><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman
<span style="font-family: Verdana;"><br>
</span>
<div style="text-align: left;">
-<div style="margin-left: 40px;"><img src="../pics/icons/blue-document-icon.png" style="width: 16px; height: 16px;" alt="new"><span style="font-weight: bold;"><a name="new"></a>
-New
+<div style="margin-left: 40px;"><img src="../pics/icons/blue-document-icon.png" style="width: 16px; height: 16px;" alt="new"><span style="font-weight: bold;"><a name="new"></a>New
file</span><br>
</div>
<div style="margin-left: 80px;">Create a new empty .vgbx
file<br>
</div>
-<div style="margin-left: 40px;"><br>
+<div style="margin-left: 40px;"><br><br>
<img src="../pics/icons/Open-icon.png" style="width: 16px; height: 16px;" alt="open"><span style="font-weight: bold;"><a name="open"></a>
Open
existing file</span><br>
</div>
<div style="text-align: left;">
<div style="margin-left: 80px;">Open an existing .vgbx
-file (using the VECTO File
-Browser)<br>
-<br>
+file<br>
+<br><br>
</div>
<div style="margin-left: 40px;"><img src="../pics/icons/Actions-document-save-icon.png" style="width: 16px; height: 16px;" alt="save"><a name="save"></a> <span style="font-weight: bold;">Save
current file</span></div>
-<div style="margin-left: 80px;"><br>
+<div style="margin-left: 80px;"><br><br>
</div>
<div style="margin-left: 40px;"><img src="../pics/icons/Actions-document-save-as-icon.png" style="width: 16px; height: 16px;" alt="SaveAs"><a name="saveas"></a> <span style="font-weight: bold;">Save
file as...</span><br>
-<div style="margin-left: 40px;">Using the VECTO File
-Browser.<br>
+<div style="margin-left: 40px;"><br>
<br>
</div>
</div>
@@ -60,33 +57,74 @@ file was opened via the <a href="VECTO-Editor.html">VECTO
Editor</a> the file will be sent automatically when saved.<br>
</div>
</div>
-<div style="margin-left: 40px;"><br>
-<span style="font-weight: bold;"><a name="make"></a> Make and Model</span><br>
+<div style="margin-left: 40px;"><br><br>
+<span style="font-weight: bold;"><a name="make"></a>
+Make and Model</span><br>
<div style="margin-left: 40px;">Free text defining the
gearbox model, type, etc.<br>
</div>
-<br><a name="type"></a><span style="font-weight: bold;"> Transmission Type</span><br><div style="margin-left: 40px;">Depending on the transmission type some options below are not available. The following types are available:<ul><li><span style="font-weight: bold;">Manual Transmission</span> (MT)</li><ul><li>Activates the "<span style="font-weight: bold;">Skip Gears</span>" option. No torque converter.</li></ul><li><span style="font-weight: bold;">Automated Manual Transmission</span> (AMT)</li><ul><li>Activates the <span style="font-weight: bold;">"Allow shift-up inside polygons"</span> and "<span style="font-weight: bold;">Skip Gears</span>" option. No torque converter.</li></ul><li><span style="font-weight: bold;">Automatic Transmission</span> (AT)</li><ul><li>Torque converter ist set and must be parameterized.<span style="font-weight: bold;"></span></li></ul><li style="font-weight: bold;">Custom</li><ul><li style="font-weight: bold;"><span style="font-weight: normal;">Enables all options for user-defined settings.</span></li></ul></ul></div>
-<a name="inertia"></a> <span style="font-weight: bold;">Inertia</span> [kgm<sup>2</sup>]
+<br><br>
+<a name="type"></a><span style="font-weight: bold;"> Transmission Type</span><br>
+<div style="margin-left: 40px;">Depending on the
+transmission type some options below are not available. The following
+types are available:
+<ul>
+<li><span style="font-weight: bold;">Manual
+Transmission</span> (MT)</li>
+<ul>
+<li>Activates the "<span style="font-weight: bold;">Skip
+Gears</span>" option. No torque converter.</li>
+</ul>
+<li><span style="font-weight: bold;">Automated
+Manual Transmission</span> (AMT)</li>
+<ul>
+<li>Activates the <span style="font-weight: bold;">"Allow shift-up inside polygons"</span>
+and "<span style="font-weight: bold;">Skip Gears</span>"
+option. No torque converter.</li>
+</ul>
+<li><span style="font-weight: bold;">Automatic
+Transmission</span> (AT)</li>
+<ul>
+<li>Torque converter ist set and must be parameterized.<span style="font-weight: bold;"></span></li>
+</ul>
+<li style="font-weight: bold;">Custom</li>
+<ul>
+<li style="font-weight: bold;"><span style="font-weight: normal;">Enables all options for
+user-defined settings.</span></li>
+</ul>
+</ul>
+</div>
+<a name="inertia"></a><span style="font-weight: bold;">Inertia</span> [kgm<sup>2</sup>]
<div style="margin-left: 40px;">Rotational inertia of the
gearbox (constant for all gears).<br>
-<br>
+<br><br>
</div>
<a name="trint"></a> <span style="font-weight: bold;">Traction Interruption</span>
[s]
<div style="margin-left: 40px;">Interruption during
gear shift event.<br>
-<br>
+<br><br>
</div>
<a name="gears"></a> <span style="font-weight: bold;">Gears</span><br>
-<div style="margin-left: 40px;"><ul><li>Doubleclick items to edit
-ratio and efficiency of the selected gear. </li><li>
-Gear "A" defines the ratio of the axle transmission / differential.</li><li>Gear
-"TC" (AT only): For AT gearboxes with torque converter a seperate (fictional) gear
-is defined for cases where the lock-up clutch is open. This gear
+<div style="margin-left: 40px;">
+<ul>
+<li>Doubleclick items to edit
+ratio and efficiency of the selected gear. </li>
+<li>Gear "A" defines the ratio of the axle transmission /
+differential.</li>
+<li>Gear
+"TC" (AT only): For AT gearboxes with torque converter a seperate
+(fictional) gear
+is defined for cases where the lock-up clutch is open.
+This gear
is used at vehicle start; when the up-shift rpm is reached VECTO
will shift to the next gear (Gear 1) which means the lock-up clutch is
-closed. In the <a href="../fileformat/VMOD.html">modal result files (.vmod)</a> the "TC" gear will be output as "0.5" (to avoid non-numeric characters). </li><li>
-Set ratio=0 for unused gears.</li></ul>Alternatively to setting a constant efficiency value it is possible to
+closed. In the <a href="../fileformat/VMOD.html">modal
+result files (.vmod)</a> the "TC" gear will be output
+as "0.5" (to avoid non-numeric characters). </li>
+<li>Set ratio=0 for unused gears.</li>
+</ul>
+Alternatively to setting a constant efficiency value it is possible to
define a Torque Loss Map in the following format:<br>
<br>
<span style="font-weight: bold;">Torque Loss
@@ -94,9 +132,8 @@ Map Format</span> (comma-separated, dot = decimal-mark):</div>
<table style="background-color: white; text-align: left; height: 115px; width: 481px; margin-left: 40px;" border="1" cellpadding="2" cellspacing="1">
<tbody>
<tr>
-<th style="text-align: center; width: 150px;"><span style="color: rgb(51, 102, 255);">c </span>Input Speed</th>
-<th style="text-align: center; width: 155px;">Input
-Torque</th>
+<th style="text-align: center; width: 150px;"><span style="color: rgb(51, 102, 255);">c </span>Input Speed*</th>
+<th style="text-align: center; width: 155px;">Input Torque*</th>
<th style="text-align: center; width: 154px;">Torque
Loss</th>
</tr>
@@ -121,19 +158,36 @@ Loss</th>
lines (header, comments,
etc.) </span><span style="text-decoration: underline; font-style: italic; color: rgb(51, 102, 255);">must</span><span style="font-style: italic; color: rgb(51, 102, 255);"> start
with "<span style="font-weight: bold;">c</span> "</span><br>
-<br>
+<br><span style="font-weight: bold;">*Input Speed & Torque always
+means engine-side. The Torque Loss Map must include negative torque
+values for engine motoring operation!</span><br><br>
<img style="width: 16px; height: 16px;" alt="rem" src="../pics/icons/minus-circle-icon.png"><a name="remgear"></a> Remove Gear<br>
</div>
-<br><br><big><big><span style="font-weight: bold;">Gear shift parameters</span></big></big><br><div style="margin-left: 40px;"><span style="font-weight: bold;"><br><a name="polyfile"></a>Shift polygons file</span> (.vgbs)<br><div style="margin-left: 40px;">This
+<br>
+<br>
+<big><big><span style="font-weight: bold;">Gear
+shift parameters</span></big></big><br>
+<div style="margin-left: 40px;"><span style="font-weight: bold;"><br>
+<a name="polyfile"></a>Shift polygons file</span>
+(.vgbs)<br>
+<div style="margin-left: 40px;">This
file contains the up- and down- shift curves that control the gear
shift behaviour. Whenever the actual engine speed crosses the up- or
-down-shift line a gear-shift is initiated.<br><img style="width: 485px; height: 341px;" alt="" src="pics/GBX-Editor-shift1.PNG"><br><br><br><span style="font-weight: bold;">Shift Polygons File Format</span> (comma-separated, dot = decimal-mark):
+down-shift line a gear-shift is initiated.<br>
+<img style="width: 485px; height: 341px;" alt="" src="pics/GBX-Editor-shift1.PNG"><br>
+<br>
+<br>
+<span style="font-weight: bold;">Shift Polygons File Format</span>
+(comma-separated, dot = decimal-mark):
<table style="background-color: white; text-align: left; height: 115px; margin-left: 0px; width: 541px;" border="1" cellpadding="2" cellspacing="1">
<tbody>
<tr>
-<th style="text-align: center; width: 163px;"><span style="color: rgb(51, 102, 255);">c </span>Engine Torque</th>
-<th style="text-align: center; width: 180px;">Downshift rpm</th>
-<th style="text-align: center; width: 176px;">Upshift rpm</th>
+<th style="text-align: center; width: 163px;"><span style="color: rgb(51, 102, 255);">c </span>Engine
+Torque</th>
+<th style="text-align: center; width: 180px;">Downshift
+rpm</th>
+<th style="text-align: center; width: 176px;">Upshift
+rpm</th>
</tr>
<tr>
<td style="text-align: center; width: 163px;"><span style="color: rgb(51, 102, 255);"><span style="font-weight: bold;">c</span> </span>[Nm]</td>
@@ -156,25 +210,92 @@ down-shift line a gear-shift is initiated.<br><img style="width: 485px; height:
lines (header, comments,
etc.) </span><span style="text-decoration: underline; font-style: italic; color: rgb(51, 102, 255);">must</span><span style="font-style: italic; color: rgb(51, 102, 255);"> start
with "<span style="font-weight: bold;">c</span> "</span><br>
-<br></div></div><div style="margin-left: 40px;"><a name="shiftinside"></a><span style="font-weight: bold;">Allow shift-up inside polygons</span><br><div style="margin-left: 40px;">If the next higher gear provides the required <a href="#torqres">torque reserve</a> and it's rpm is still above down-shift-rpm VECTO will shift up.<br><img style="width: 567px; height: 341px;" alt="" src="pics/GBX-Editor-shift2.PNG"></div><br><a name="skipgear"></a><span style="font-weight: bold;">Skip Gears</span><br><div style="margin-left: 40px;">Whenever
+<br><img style="width: 28px; height: 21px;" alt="" src="../pics/misc/browse.png"> <span style="font-weight: bold;">Open file browser</span>.<br>
+<br>
+<img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with
+<a href="../../GRAPHi/documentation/HTML%20Manual/mainwindow.html">GRAPHi</a> or an user-defined tool (see <a href="settings.html#opencmd">File
+Open Command)</a>.<br><br><br>
+</div>
+</div>
+<div style="margin-left: 40px;"><a name="shiftinside"></a><span style="font-weight: bold;"><img alt="" src="../pics/misc/checkbox.png"> Allow shift-up inside polygons</span><br>
+<div style="margin-left: 40px;">If the next higher gear
+provides the required <a href="#torqres">torque reserve</a>
+and it's rpm is still above down-shift-rpm VECTO will shift up.<br>
+<img style="width: 567px; height: 341px;" alt="" src="pics/GBX-Editor-shift2.PNG"></div>
+<br><br>
+<a name="skipgear"></a><span style="font-weight: bold;"><img style="width: 15px; height: 15px;" alt="" src="../pics/misc/checkbox.png"> Skip Gears</span><br>
+<div style="margin-left: 40px;">Whenever
a gear change is initiated (by crossing the up- or down-shift line)
-VECTO may skip one or several gears as long as the required <a href="#torqres">torque reserve</a> is provided.<br><img style="width: 568px; height: 341px;" alt="" src="pics/GBX-Editor-shift3.PNG"></div><br><a name="torqres"></a><span style="font-weight: bold;">Torque Reserve</span><br><div style="margin-left: 40px;">This parameter is required for the "<span style="font-weight: bold;">Allow shift-up inside polygons</span>" and "<span style="font-weight: bold;">Skip Gears</span>" options.</div><br><a style="font-weight: bold;" name="mintime"></a><span style="font-weight: bold;">Minimum time between two gear shifts</span><br><div style="margin-left: 40px;">Limits
+VECTO may skip one or several gears as long as the required <a href="#torqres">torque reserve</a> is provided.<br>
+<img style="width: 568px; height: 341px;" alt="" src="pics/GBX-Editor-shift3.PNG"></div>
+<br><br>
+<a name="torqres"></a><span style="font-weight: bold;">Torque Reserve</span><br>
+<div style="margin-left: 40px;">This parameter is required
+for the "<span style="font-weight: bold;">Allow shift-up
+inside polygons</span>" and "<span style="font-weight: bold;">Skip
+Gears</span>" options.</div>
+<br><br>
+<a style="font-weight: bold;" name="mintime"></a><span style="font-weight: bold;">Minimum time between two gear
+shifts</span><br>
+<div style="margin-left: 40px;">Limits
the time between two gear shifts in whole seconds. This rule will be
ignored if rpms are too high or too low. Note that high values may
-cause high rpms during acceleration.<br></div><br><a name="startgear"></a><span style="font-weight: bold;">Start Gear</span><br><div style="margin-left: 40px;">In order to calculate an appropriate
+cause high rpms during acceleration.<br>
+</div>
+<br><br>
+<a name="startgear"></a><span style="font-weight: bold;">Start Gear</span><br>
+<div style="margin-left: 40px;">In order to calculate an
+appropriate
gear for vehicle start (first gear after vehicle standstill) a
-fictional load case is calculated using a specified <span style="font-weight: bold;">reference vehicle speed</span> and <span style="font-weight: bold;">reference acceleration</span>
+fictional load case is calculated using a specified <span style="font-weight: bold;">reference vehicle speed</span>
+and <span style="font-weight: bold;">reference
+acceleration</span>
together with the actual road gradient, transmission losses and
auxiliary power demand. This way the start gear is independent from the
target speed. VECTO uses the highest possible gear which provides the
-defined <span style="font-weight: bold;">torque reserve</span>.</div><br></div><br><big><big><span style="font-weight: bold;">Torque Converter</span></big></big><br><br><div style="margin-left: 40px;"><a name="tcon"></a><span style="font-weight: bold;">Torque Converter installed</span><br><div style="margin-left: 40px;">This option is only available if <a href="#type">transmission type</a> is set to <span style="font-weight: bold;">Custom</span>. For AT this option is always On, for MT and AMT always Off.</div></div><br><div style="margin-left: 40px;"><a name="tcfile"></a><span style="font-weight: bold;">Torque converter characteristics file</span> (.vtcc)<br><div style="margin-left: 40px;">This file defines the torque converter characteristics as described in VDI 2153:<br><span style="font-weight: bold;">Speed Ratio (</span>ν) = Output Speed / Input Speed<br><span style="font-weight: bold;">Torque Ratio</span> (μ) = Output Torque / Input Torque<br><span style="font-weight: bold;">Input Torque</span> is the input torque (over ν) for a specific reference engine speed (see below).<br><br>The torque converter characteristics must also be defined for speed ratios of more than one (<span style="font-weight: bold;"></span>ν>1) in order to calculate overrun conditions (torque<0).<br><br><span style="font-weight: bold;">Torque Loss
+defined <span style="font-weight: bold;">torque reserve</span>.</div>
+<br>
+</div>
+<br>
+<a name="tcon"></a><big><big><span style="font-weight: bold;">Torque
+Converter</span></big></big><br>
+<br>
+<div style="margin-left: 40px;">The torque converter is defined as (virtual) separate gear, i.e. <span style="text-decoration: underline; font-weight: bold;">only first gear with TC active</span>.<br>While TC active: Iterative calculation of engine torque and speed based on TC characteristic.<br>Creeping: Engine speed set to idling. Brakes engaged to absorb surplus torque.<br><img style="width: 900px; height: 293px;" alt="" src="pics/GBX-TC.png"><br></div>
+<br>
+<br>
+<div style="margin-left: 40px;"><span style="font-weight: bold;"><img style="width: 15px; height: 15px;" alt="" src="../pics/misc/checkbox.png"> Installed</span><br>
+<div style="margin-left: 40px;">This option is only
+available if <a href="#type">transmission type</a>
+is set to <span style="font-weight: bold;">Custom</span>.
+For AT this option is always On, for MT and AMT always Off.</div>
+</div>
+<br>
+<div style="margin-left: 40px;"><a name="tcfile"></a><span style="font-weight: bold;">Torque converter characteristics
+file</span> (.vtcc)<br>
+<div style="margin-left: 40px;">This file defines the
+torque converter characteristics as described in VDI 2153:<br>
+<span style="font-weight: bold;">Speed Ratio (</span>ν)
+= Output Speed / Input Speed<br>
+<span style="font-weight: bold;">Torque Ratio</span>
+(μ) = Output Torque / Input Torque<br>
+<span style="font-weight: bold;">Input Torque</span> (T<sub>ref(ν)</sub>) is the input torque (over ν) for a specific reference engine speed (see
+below).<br>
+<br>The Input Torque at reference engine speed is needed to needed to calculate the actual engine torque using this formula:<br><img style="width: 300px; height: 72px;" alt="" src="pics/GBX-TC2.png"><br>with:<br><div style="margin-left: 40px;">T<sub>in</sub> = engine torque [Nm]<br>T<sub>ref(ν)</sub> = reference torque at reference rpm (form .vtcc file) [Nm]<br>n<sub>in</sub> = engine speed [1/min]<br>n<sub>ref</sub> = reference rpm [1/min] (see below)<br></div><br>
+The torque converter characteristics must also be defined for speed
+ratios of more than one (<span style="font-weight: bold;"></span>ν>1)
+in order to calculate overrun conditions (torque<0).<br>
+<br>
+<span style="font-weight: bold;">Torque Loss
Map Format</span> (comma-separated, dot = decimal-mark):
<table style="background-color: white; text-align: left; height: 115px; width: 560px; margin-left: 0px;" border="1" cellpadding="2" cellspacing="1">
<tbody>
<tr>
-<th style="text-align: center; width: 179px;"><span style="color: rgb(51, 102, 255);">c </span>Speed Ratio ν</th>
-<th style="text-align: center; width: 187px;">Torque Ratio μ</th>
-<th style="text-align: center; width: 170px;">Input Torque at reference rpm</th>
+<th style="text-align: center; width: 179px;"><span style="color: rgb(51, 102, 255);">c </span>Speed
+Ratio ν</th>
+<th style="text-align: center; width: 187px;">Torque
+Ratio μ</th>
+<th style="text-align: center; width: 170px;">Input
+Torque at reference rpm</th>
</tr>
<tr>
<td style="text-align: center; width: 179px;"><span style="color: rgb(51, 102, 255);"><span style="font-weight: bold;">c</span> </span>[-]</td>
@@ -196,7 +317,26 @@ Map Format</span> (comma-separated, dot = decimal-mark):
<span style="font-weight: bold; font-style: italic; color: rgb(51, 102, 255);">Note:</span><span style="font-style: italic; color: rgb(51, 102, 255);"> text
lines (header, comments,
etc.) </span><span style="text-decoration: underline; font-style: italic; color: rgb(51, 102, 255);">must</span><span style="font-style: italic; color: rgb(51, 102, 255);"> start
-with "<span style="font-weight: bold;">c</span> "</span><br></div><br><a name="tcrefspeed"></a><span style="font-weight: bold;">Reference rpm for torque characteristic</span><br><div style="margin-left: 40px;">Reference engine speed associated with the <span style="font-weight: bold;">Input Torque</span> curve in the .vtcc file.</div></div><br><img style="width: 28px; height: 21px;" alt="" src="../pics/misc/browse.png"> <span style="font-weight: bold;">Open file browser</span>.<br><br><img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with GRAPHi or an user-defined tool (see <a href="settings.html#opencmd">File Open Command)</a>.<br><br>
+with "<span style="font-weight: bold;">c</span> "</span><br><br><img style="width: 28px; height: 21px;" alt="" src="../pics/misc/browse.png"> <span style="font-weight: bold;">Open file browser</span>.<br>
+<br>
+<img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with
+<a href="../../GRAPHi/documentation/HTML%20Manual/mainwindow.html">GRAPHi</a> or an user-defined tool (see <a href="settings.html#opencmd">File
+Open Command)</a>.<br>
+</div>
+<br><br>
+<a name="tcrefspeed"></a><span style="font-weight: bold;">Reference rpm for torque
+characteristic</span><br>
+<div style="margin-left: 40px;">Reference engine speed
+associated with the <span style="font-weight: bold;">Input
+Torque</span> curve in the .vtcc file.</div>
+</div>
+<br>
+<img style="width: 28px; height: 21px;" alt="" src="../pics/misc/browse.png"> <span style="font-weight: bold;">Open file browser</span>.<br>
+<br>
+<img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with
+<a href="../../GRAPHi/documentation/HTML%20Manual/mainwindow.html">GRAPHi</a> or an user-defined tool (see <a href="settings.html#opencmd">File
+Open Command)</a>.<br>
+<br>
</div>
<div style="margin-left: 40px;"><img style="width: 75px; height: 23px;" alt="OK" src="../pics/misc/OK.png"><a name="ok"></a><span style="font-weight: bold;">Save and close file</span><br>
<div style="margin-left: 40px;">If necessary the file path
diff --git a/User Manual/GUI/VECTO-Editor.html b/User Manual/GUI/VECTO-Editor.html
index 980595c53b0b44f8c0b518cfc86dac74781b7685..bdbf24f2d45e2694db72c38b2932efac027059af 100644
--- a/User Manual/GUI/VECTO-Editor.html
+++ b/User Manual/GUI/VECTO-Editor.html
@@ -47,9 +47,7 @@ current Job File</span></div>
</div>
<div style="margin-left: 40px;"><img src="../pics/icons/Actions-document-save-as-icon.png" style="width: 16px; height: 16px;" alt="SaveAs"><a name="saveas"></a> <span style="font-weight: bold;">Save
Job File as...</span><br>
-<div style="margin-left: 40px;">Using the VECTO File
-Browser<br>
-<br>
+<div style="margin-left: 40px;"><br>
<br>
</div>
</div>
@@ -64,7 +62,7 @@ be sent to the Job List automatically when saved.<br>
<a name="engonly"></a> <span style="font-weight: bold;">Engine Only Mode</span><br><div style="margin-left: 40px;">This
mode is used to calculate fuel consumption from a given load cycle
(engine speed and torque). Vehicle (.vveh), Gearbox (.vgbx) and
-Auxiliary (.vaux) files are notrequired. <br>The <a href="../fileformat/VDRI.html">driving cylce (.vdri)</a> must contain:<br><ul><li>Engine speed: header: <n></li><li>Engine torque <Me> <span style="text-decoration: underline;">or</span> engine power <Pe> at clutch. <span style="font-weight: bold; color: red;">Note that VECTO adds engine inertia power demand!</span></li><li>[Optional] Additional power demand (aux) <Padd></li></ul></div><span style="font-weight: bold;">Driver Tab</span><br>
+Auxiliary (.vaux) files are not required. <br>The <a href="../fileformat/VDRI.html">driving cylce (.vdri)</a> must contain:<br><ul><li>Engine speed: header: <n></li><li>Engine torque <Me> <span style="text-decoration: underline; font-weight: bold;">or</span> engine power <Pe> at clutch. <span style="font-weight: bold; color: red;">Note that VECTO adds engine inertia power demand!</span></li><li>[Optional] Additional power demand (aux) <Padd></li></ul></div><span style="font-weight: bold;">Driver Tab</span><br>
<div style="margin-left: 40px;">Open <a href="VECTO-Editor_Driver.html">Driver Tab</a></div>
</div>
<br>
@@ -81,9 +79,7 @@ Editor</a></span><br>
<a name="browse"></a>
<span style="font-weight: bold;">Browse for
vehicle/engine/gearbox files</span><br>
-<div style="margin-left: 40px;">...using the VECTO File
-Browser<br>
-<br>
+<div style="margin-left: 40px;"><br>
<br>
</div>
</div>
@@ -107,8 +103,7 @@ calculation.<br>
Open Command</a>).<br>
<span style="font-weight: bold;">Click</span>
selected items to edit file paths.<br>
-<img style="width: 16px; height: 16px;" alt="addcycle" src="../pics/icons/plus-circle-icon.png"> Add cycle (.vdri)
-using the VECTO file browser<br>
+<img style="width: 16px; height: 16px;" alt="addcycle" src="../pics/icons/plus-circle-icon.png"> Add cycle (.vdri)<br>
<img style="width: 16px; height: 16px;" alt="remcycle" src="../pics/icons/minus-circle-icon.png"> Remove the
selected cycle from the list<br>
The .vdri format is described <a href="../fileformat/VDRI.html">here</a>.<br>
diff --git a/User Manual/GUI/VECTO-Editor_Aux.html b/User Manual/GUI/VECTO-Editor_Aux.html
index d4938e5be34a771b6fbe780b0dec28527fbe94c5..5b9a260956f99a968dffb278b99057658efef87c 100644
--- a/User Manual/GUI/VECTO-Editor_Aux.html
+++ b/User Manual/GUI/VECTO-Editor_Aux.html
@@ -107,7 +107,7 @@ lines (header, comments,
etc.) </span><span style="text-decoration: underline; font-style: italic; color: rgb(51, 102, 255);">must</span><span style="font-style: italic; color: rgb(51, 102, 255);"> start
with "c "</span><br>
</div>
-<br><div style="margin-left: 40px;"><span style="font-weight: bold;">Example:</span><br><img style="width: 370px; height: 288px;" alt="" src="pics/VECTO-Editor_Aux0.PNG"></div><br>
+<br><div style="margin-left: 40px;"><span style="font-weight: bold;">Example:</span><br><img style="width: 370px; height: 288px;" alt="" src="pics/VECTO-Editor_Aux0.PNG"></div><br><br><h2>Calculation of auxiliary power consumption</h2><div style="margin-left: 40px;"><img style="width: 850px; height: 444px;" alt="" src="pics/VECTO-Editor_Aux1.PNG"><br><ol><li>Auxiliary speed: <span style="font-weight: bold;">n</span><sub style="font-weight: bold;">Aux</sub> = n<sub>Eng</sub> * <span style="color: rgb(51, 204, 0); font-weight: bold;"><span style="color: rgb(43, 174, 0);">TransRatio</span> </span>(with: n<sub>Eng</sub> = engine speed)</li><li>Auxiliary output power: <span style="font-weight: bold;">P</span><sub style="font-weight: bold;">AuxOut</sub> = <span style="font-weight: bold; color: rgb(35, 71, 179);">P</span><sub style="font-weight: bold; color: rgb(35, 71, 179);">supply</sub> / <span style="font-weight: bold; color: rgb(102, 0, 204);">EffToSply</span></li><li>Auxiliary input power: <span style="font-weight: bold;">P</span><sub style="font-weight: bold;">AuxIn</sub> = <span style="color: red; font-weight: bold;">AuxMap(</span>n<sub>Aux</sub>, P<sub>AuxOut</sub><span style="color: red; font-weight: bold;">)</span></li><li>Auxiliary power consumption: <span style="font-weight: bold;">P</span><sub style="font-weight: bold;">AuxDemand</sub> = P<sub>AuxIn</sub> / <span style="font-weight: bold; color: rgb(214, 128, 0);">EffToEng</span></li><li><span style="font-weight: bold;">P</span><sub style="font-weight: bold;">AuxDemand</sub><span style="font-weight: bold;"> is added to the engine's power demand</span></li></ol></div><br><br><br><br>
<img style="width: 75px; height: 23px;" alt="ok" src="../pics/misc/OK.png"><a name="ok"></a> <span style="font-weight: bold;">Save and close</span><br>
<br>
<img style="width: 75px; height: 23px;" alt="cancel" src="../pics/misc/Cancel.png"><a name="cancel"></a> <span style="font-weight: bold;">Close without saving<br></span><table style="text-align: left; width: 100%; height: 1200px;" border="0" cellpadding="2" cellspacing="2"><tbody><tr><td></td></tr></tbody></table></div>
diff --git a/User Manual/GUI/VECTO-Editor_Driver.html b/User Manual/GUI/VECTO-Editor_Driver.html
index 7ecf99f9f7076acbe9f55c349655cc0fbd388713..b9d2ecb0e0bca5dfd6bf254da1b25c8a11b55ee1 100644
--- a/User Manual/GUI/VECTO-Editor_Driver.html
+++ b/User Manual/GUI/VECTO-Editor_Driver.html
@@ -2,7 +2,7 @@
<html><head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>VECTO Editor Driver Tab - VECTO User Manual</title></head>
<body>
-<map name="linkmap"><area shape="rect" coords="11,142,110,164"" href="VECTO-Editor.html"><area shape="rect" coords="20,196,680,218"" href="#vacc"></map>
+<map name="linkmap"><area shape="rect" coords="11,142,110,164"" href="VECTO-Editor.html"><area shape="rect" coords="20,196,680,218"" href="#vacc"><area shape="rect" coords="19,248,414,340"" href="#startstop"><area shape="rect" coords="19,365,414,484"" href="#eco"><area shape="rect" coords="19,505,415,602"" href="#look"></map>
<table style="width: 100%; height: 54px; text-align: left; margin-left: auto; margin-right: auto;" border="0" cellpadding="2" cellspacing="2">
<tbody>
<tr>
@@ -25,7 +25,7 @@ Manual</span></a><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman
<div style="text-align: left;"><span style="font-family: Verdana;"></span><span style="font-weight: bold;"><a name="vacc"></a>Max.
acceleration and brake curves </span>(.vacc Input File)<br>
<div style="margin-left: 40px;">Limits vehicle
-acceleration and deceleration depending on vehicle speed.<br>
+acceleration and deceleration depending on vehicle speed. If <a href="#look">Look-Ahead Coasting</a> is enabled then the deceleration is applied in the brake phase.<br>
<span style="font-weight: bold;"><br>
Input File Format</span>
(comma-separated, dot = decimal-mark):<br>
@@ -60,10 +60,27 @@ deceleration</th>
<div style="margin-left: 40px;"><span style="font-weight: bold; font-style: italic; color: rgb(51, 102, 255);">Note:</span><span style="font-style: italic; color: rgb(51, 102, 255);"> text
lines (header, comments,
etc.) </span><span style="text-decoration: underline; font-style: italic; color: rgb(51, 102, 255);">must</span><span style="font-style: italic; color: rgb(51, 102, 255);"> start
-with "<span style="font-weight: bold;">c</span> "</span><br><br><img style="width: 28px; height: 21px;" alt="" src="../pics/misc/browse.png"> <span style="font-weight: bold;">Open file browser</span>.<br><br><img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with GRAPHi or an user-defined tool (see <a href="settings.html#opencmd">File Open Command)</a>.<br>
-</div>
+with "<span style="font-weight: bold;">c</span> "</span><br>
+<br>
+<img style="width: 28px; height: 21px;" alt="" src="../pics/misc/browse.png"> <span style="font-weight: bold;">Open file browser</span>.<br>
<br>
-<span style="font-weight: bold;"><br></span><div style="margin-left: 40px;"><br>
+<img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with
+<a href="../../GRAPHi/documentation/HTML%20Manual/mainwindow.html">GRAPHi</a> or an user-defined tool (see <a href="settings.html#opencmd">File
+Open Command)</a>.<br>
+</div>
+<br><br>
+<span style="font-weight: bold;"><a name="startstop"></a>Engine Start/Stop<br></span><div style="margin-left: 40px;">If enabled the engine will be turned off if:<br><ul><li>Power demand (without Aux) ≤ 0</li><li>Vehicle speed is below <span style="font-weight: bold;">Max Speed [km/h] </span></li><li>Engine was running for at least <span style="font-weight: bold;">Min ICE-On Time [s]</span></li></ul><span style="font-weight: bold;"><span style="color: red;">Note:
+Currently there is not method defined to compensate invalid auxiliary
+cycle work when Engine Start/Stop is enabled, i.e. if enabled the total
+auxiliary work is less than without Start/Stop</span><br></span><br><span style="font-weight: bold;"></span></div><span style="font-weight: bold;"><br><br><a name="eco"></a>Overspeed / Eco-Roll</span><span style="font-weight: bold;"><br><br></span><div style="margin-left: 40px;"><span style="font-weight: bold;">Overspeed</span><br></div><div style="margin-left: 80px;">If Pwheel < 0: Coasting with brakes not applied for speed < target speed + allowed overspeed<br>Parameters:<br><ul><li><span style="font-weight: bold;">Minimum Target Speed</span></li><li><span style="font-weight: bold;">Allowed Overspeed</span></li></ul><span style="font-weight: bold;"><img style="width: 700px; height: 597px;" alt="" src="pics/Overspeed.png"><br></span><br><span style="font-weight: bold;"></span></div><div style="margin-left: 40px;"><span style="font-weight: bold;"></span><span style="font-weight: bold;"></span><br><span style="font-weight: bold;">Eco-Roll</span><br><span style="font-weight: bold;"></span></div><div style="margin-left: 80px;">If
+P<sub>wheel</sub> < 0: Neutral gear, engine idling. Engine- and service- brake
+if target speed + allowed overspeed is reached. Normal driving if
+target speed + allowed underspeed is reached.<br>Parameters:<br></div><ul style="margin-left: 80px;"><li><span style="font-weight: bold;">Minimum Target Speed</span></li><li><span style="font-weight: bold;">Allowed Overspeed</span></li><li><span style="font-weight: bold;">Allowed Underspeed</span></li></ul><div style="margin-left: 40px;"><div style="margin-left: 40px;"><span style="font-weight: bold;"><img style="width: 700px; height: 657px;" alt="" src="pics/Eco-Roll.png"></span><br></div><span style="font-weight: bold;"></span></div><br><span style="font-weight: bold;"><br></span><span style="font-weight: bold;"><br><br><a name="look"></a>Look-Ahead Coasting<br></span><div style="margin-left: 40px;">Enables
+coasting before each braking phase. Coasting will begin at T seconds
+before new lower target speed (see picture below). Braking deceleration
+is defined by the <a href="#vacc">.vacc file</a>.<br>Parameters:<br><ul><li><span style="font-weight: bold;">Target Retardation</span> = <span style="font-size: 12pt; font-family: Arial; color: black;">a</span><sub><span style="font-size: 12pt; font-family: Arial; color: black; vertical-align: sub;">lookahead</span></sub></li><li><span style="font-weight: bold;">Minimum Target Speed</span></li></ul><span style="font-weight: bold;"><img style="width: 775px; height: 499px;" alt="" src="pics/Look-Ahead.png"><br></span><br><span style="font-weight: bold;"></span></div><span style="font-weight: bold;"><br><br><br><br><br>
+</span>
+<div style="margin-left: 40px;"><br>
<br>
<br>
<table style="text-align: left; width: 100%; height: 1200px;" border="0" cellpadding="2" cellspacing="2">
diff --git a/User Manual/GUI/VEH-Editor.html b/User Manual/GUI/VEH-Editor.html
index 602fdfd289ddb716301837399fe3196fc7ed4782..0943d6bd8f42bb4dd9cd838b1da96b9be516a076 100644
--- a/User Manual/GUI/VEH-Editor.html
+++ b/User Manual/GUI/VEH-Editor.html
@@ -27,21 +27,19 @@ file</span><br>
<div style="margin-left: 40px;">Create a new empty .vveh
file<br>
</div>
-<br>
+<br><br>
<img src="../pics/icons/Open-icon.png" style="width: 16px; height: 16px;" alt="open"><span style="font-weight: bold;"><a name="open"></a>Open
existing file</span><br>
<div style="margin-left: 40px;">Open an existing .vveh
-file (using the VECTO File
-Browser)<br>
+file<br>
</div>
-<span style="font-family: Verdana;"></span><br>
+<span style="font-family: Verdana;"></span><br><br>
<span style="font-family: Verdana;"></span><img src="../pics/icons/Actions-document-save-icon.png" style="width: 16px; height: 16px;" alt="save"><a name="save"></a> <span style="font-weight: bold;">Save
current file</span><br>
-<span style="font-family: Verdana;"></span><br>
+<span style="font-family: Verdana;"></span><br><br>
<span style="font-family: Verdana;"></span><img src="../pics/icons/Actions-document-save-as-icon.png" style="width: 16px; height: 16px;" alt="SaveAs"><a name="saveas"></a> <span style="font-weight: bold;">Save
file as...</span><br>
-<div style="margin-left: 40px;">Using the VECTO File
-Browser.<br>
+<div style="margin-left: 40px;"><br>
</div>
<span style="font-family: Verdana;"></span><br>
<span style="font-family: Verdana;"></span><img src="../pics/icons/export-icon.png" style="width: 16px; height: 16px;" alt="sendto"><a name="sendto"></a> <span style="font-weight: bold;">Send
@@ -51,7 +49,7 @@ Editor</a></span><br>
file was opened via the <a href="VECTO-Editor.html">VECTO
Editor</a> the file will be sent automatically when saved.<br>
</div>
-<span style="font-family: Verdana;"></span><br>
+<span style="font-family: Verdana;"></span><br><br>
<span style="font-weight: bold;"><a name="cat"></a>Category</span> (Not used in current version!)
<div style="margin-left: 40px;">The HDV category is needed
in Declaration Mode to assign the correct driving cycles. Available
@@ -86,7 +84,7 @@ Class</span><span style="font-weight: bold;"></span> (Not used in current versio
<div style="margin-left: 40px;">Displayes the
automatically selected HDV Class depending on Category, Axle
Configuration and GVW.</div>
-<br>
+<br><br>
<span style="font-weight: bold;"><a name="load"></a>Weight
/ Loading</span> [kg]<br>
<div style="margin-left: 40px;">These fields define the
@@ -97,7 +95,7 @@ Weight Vehicle</span><span style="color: rgb(253, 0, 0);">,
</span><span style="font-weight: bold; color: rgb(253, 0, 0);">Curb
Weight Extra Trailer/Body</span><span style="color: rgb(253, 0, 0);"> and </span><span style="font-weight: bold; color: rgb(253, 0, 0);">Loading</span><span style="color: rgb(253, 0, 0);"> for calculation!</span><br>
</div>
-<br>
+<br><br>
<a name="air"></a><span style="font-weight: bold;">Air
Resistance</span><br>
<div style="margin-left: 40px;">The product of <span style="font-weight: bold;">Drag Coefficient</span>
@@ -109,7 +107,7 @@ vehicle) defines the Air Resistance. Note that the Drag Coefficient may
be altered when using <span style="font-weight: bold;">Cross
Wind Correction</span> (see below).<br>
</div>
-<br>
+<br><br>
<span style="font-weight: bold;"><a name="axl"></a>Axles
/ Wheels</span><br>
<div style="margin-left: 40px;">Rolling Resistance
@@ -120,20 +118,20 @@ Curb Weight Extra Trailer/Body and Loading).<br>Use the <img style="width: 16px;
remove axles form the vehicle. Doubleclick entries to edit existing
axle configurations.<br>
<span style="font-weight: bold;"></span></div>
-<br>
+<br><br>
<span style="font-weight: bold;"><a name="inertia"></a>Wheels
Inertia</span><span style="font-weight: bold;"></span>
[kgm<sup>2</sup>]<br>
<div style="margin-left: 40px;">Rotational inertia of all
wheels combined.<br>
</div>
-<br>
+<br><br>
<span style="font-weight: bold;"><a name="diam"></a>Wheel
Diameter (dyn)</span> [m]<br>
<div style="margin-left: 40px;">Effective (dynamic) wheel
diameter used to calculate engine speed.<br>
</div>
-<br>
+<br><br>
<span style="font-weight: bold;"><a name="wind"></a>Cross
Wind Correction</span><br>
<div style="margin-left: 40px;">Three different options
@@ -236,10 +234,7 @@ input for Air Speed and Yaw Angle, see <a href="../fileformat/VDRI.html">.vdri f
<div style="margin-left: 40px;"><img src="../pics/misc/browse.png" style="width: 28px; height: 21px;" alt="browse"> <span style="font-weight: bold;">Browse
for .vcdv/.vcdb files</span><br>
</div>
-<div style="margin-left: 80px;">Using the VECTO File
-Browser<br>
-</div>
-<br><div style="margin-left: 40px;"><img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with GRAPHi or an user-defined tool (see <a href="settings.html#opencmd">File Open Command)</a>.<br></div><br>
+<br><br><div style="margin-left: 40px;"><img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with <a href="../../GRAPHi/documentation/HTML%20Manual/mainwindow.html">GRAPHi</a> or an user-defined tool (see <a href="settings.html#opencmd">File Open Command)</a>.<br></div><br><br>
<a name="retard"></a><span style="font-weight: bold;">Retarder</span><br>
<div style="margin-left: 40px;">If available a <span style="font-weight: bold;">Retarder Torque Loss Map</span> can be defined here. Three options are available:<br>
<ul>
@@ -283,19 +278,16 @@ with "<span style="font-weight: bold;">c</span> "</span><br>
</div>
<br>
<div style="margin-left: 40px;"><img src="../pics/misc/browse.png" style="width: 28px; height: 21px;" alt="browse"> <span style="font-weight: bold;">Browse
-for Retarder Input Files</span><br>
-<div style="margin-left: 40px;">Using the VECTO File
-Browser<br>
-</div>
+for Retarder Input Files</span>
</div>
-<br>
+<br><br>
<img src="../pics/misc/OK.png" style="width: 75px; height: 23px;" alt="OK"><a name="ok"></a><span style="font-weight: bold;">Save
and close file</span><br>
<div style="margin-left: 40px;">If necessary the file path
in the <a href="VECTO-Editor.html">VECTO Editor</a>
will be updated.<br>
</div>
-<br>
+<br><br>
<img src="../pics/misc/Cancel.png" style="width: 75px; height: 23px;" alt="Cancel"><a name="cancel"></a><span style="font-weight: bold;">
Cancel without saving</span><br>
<span style="font-weight: bold;"></span></div>
diff --git a/User Manual/GUI/mainform.html b/User Manual/GUI/mainform.html
index 17d64eaabc0a59cd59c6c06d5a7b6676d5654c56..629f1af21da52e138b026d3f08cde4a338d41576 100644
--- a/User Manual/GUI/mainform.html
+++ b/User Manual/GUI/mainform.html
@@ -38,7 +38,7 @@ existing Job or Input File</span><br>
<div style="text-align: left;">
<div style="margin-left: 80px;">Open an existing .vecto,
.vveh, .veng or .vgbx
-file (using the VECTO File Browser)<br>
+file<br>
</div>
<div style="margin-left: 40px;"><br>
<br>
@@ -48,8 +48,8 @@ Tools</span><br>
<div style="text-align: left;">
<div style="margin-left: 40px;">
<ul>
-<li><span style="font-weight: bold;">VECTO,
-Vehicle, Engine Gearbox Editor</span></li>
+<li><span style="font-weight: bold;"><a href="VECTO-Editor.html">VECTO</a>,
+<a href="VEH-Editor.html">Vehicle</a>, <a href="ENG-Editor.html">Engine</a>, <a href="GBX-Editor.html">Gearbox</a> Editor</span></li>
<ul>
<li>Opens the respective Editor </li>
</ul>
@@ -60,9 +60,7 @@ editor</li>
</ul>
<li style="font-weight: bold;">Change Working Directory</li>
<ul>
-<li>Change the current Working Directory (using the
-VECTO File
-Browser)</li>
+<li>Change the current Working Directory. More details <a href="settings.html#workdir">here</a>.</li>
</ul><li style="font-weight: bold;">Settings</li><ul><li>Opens the <a href="settings.html">Settings</a> dialog.</li></ul>
</ul>
</div>
@@ -79,7 +77,7 @@ Browser)</li>
<ul>
<li style="font-weight: bold;"><span style="font-weight: normal;">Opens this User Manual</span></li>
</ul>
-<li style="font-weight: bold;"><span style="font-weight: bold;">Quick Start Guide</span></li>
+<li style="font-weight: bold;"><a href="../quickstart.html"><span style="font-weight: bold;">Quick Start Guide</span></a></li>
<ul>
<li style="font-weight: bold;"><span style="font-weight: normal;">Start Quick Start Guide<br>
</span></li>
@@ -91,8 +89,8 @@ for Licensing</span></li>
</ul>
<li style="font-weight: bold;">About VECTO</li>
<ul>
-<li>Information about the software, license and support
-contact</li>
+<li>Information about the software, license and <a href="../contact.html">support
+contact</a></li>
</ul>
<ul>
</ul>
@@ -139,9 +137,7 @@ Job List. Only checked files are calculated when clicking START.<br>
</div>
<div style="margin-left: 40px;"><img style="width: 16px; height: 16px;" alt="add" src="../pics/icons/plus-circle-icon.png"><a name="addfile"></a>
<span style="font-weight: bold;">Add files to Job List</span><br>
-<div style="margin-left: 40px;">...using the VECTO File
-Browser<br>
-<br>
+<div style="margin-left: 40px;"><br>
</div>
</div>
<div style="margin-left: 40px;"><img style="width: 16px; height: 16px;" alt="remove" src="../pics/icons/minus-circle-icon.png"><a name="remfile"></a> <span style="font-weight: bold;">Remove selected files from List</span><br>
@@ -154,8 +150,7 @@ Options</span><br>
<ul style="margin-left: 40px;">
<li>Save/Load List</li>
<ul>
-<li>Save or load Job List to text file (using the VECTO File
-Browser)</li>
+<li>Save or load Job List to text file</li>
</ul>
<li>Load Autosave-List</li>
<ul>
diff --git a/User Manual/GUI/mainform_batch.html b/User Manual/GUI/mainform_batch.html
index 9e151cf92506d54abe315593bae4afc449206e6c..de9fef66db62e05d1973a59b5fd262d94c9d1c86 100644
--- a/User Manual/GUI/mainform_batch.html
+++ b/User Manual/GUI/mainform_batch.html
@@ -43,9 +43,7 @@ Cycle List<br>
</div>
<div style="margin-left: 80px;"><img style="width: 16px; height: 16px;" alt="add" src="../pics/icons/plus-circle-icon.png"><a name="addfile"></a>
<span style="font-weight: bold;">Add files to Job List</span><br>
-<div style="margin-left: 40px;">...using the VECTO File
-Browser<br>
-<br>
+<div style="margin-left: 40px;"><br>
</div>
</div>
<div style="margin-left: 80px;"><img style="width: 16px; height: 16px;" alt="remove" src="../pics/icons/minus-circle-icon.png"><a name="remfile"></a> <span style="font-weight: bold;">Remove selected
@@ -60,8 +58,7 @@ Options</span><br>
<ul style="margin-left: 80px;">
<li>Save/Load List</li>
<ul>
-<li>Save or load the Cycle List to text file (using the VECTO
-File Browser)</li>
+<li>Save or load the Cycle List to text file</li>
</ul>
<li>Load Autosave-List</li>
<ul>
diff --git a/User Manual/GUI/mainform_options.html b/User Manual/GUI/mainform_options.html
index 1df9b63e13e522d622438568189bf436cac14791..fe04f1fa9e6b0188a847fbfd9ffa3374aefb3805 100644
--- a/User Manual/GUI/mainform_options.html
+++ b/User Manual/GUI/mainform_options.html
@@ -32,15 +32,15 @@ Selection</span><br>
<li style="font-weight: bold;">STANDARD Mode</li>
<ul>
<li>Calculate all <span style="text-decoration: underline;">checked</span>
-jobs in the Job Files List</li>
+jobs (.vecto) in the Job Files List</li>
</ul>
<ul>
</ul>
<li style="font-weight: bold;">BATCH Mode</li>
<ul>
<li>Calculate all <span style="text-decoration: underline;">checked</span>
-jobs in the Job Files List with all <span style="text-decoration: underline;">checked</span>
-cycles in the Cycle Files. Cycles defined in the Job Files will be
+jobs (.vecto) in the Job Files List with all <span style="text-decoration: underline;">checked</span>
+cycles (.vdri) in the Cycle Files. Cycles defined in the Job Files will be
ignored!</li>
</ul>
</ul>
@@ -49,7 +49,10 @@ ignored!</li>
<div style="margin-left: 40px;"><img src="../pics/misc/checkbox.png" style="width: 15px; height: 15px;" alt="cb"><a name="CycleDistCor"></a> <span style="font-weight: bold;">Cycle Distance Correction</span><br>
</div>
<div style="margin-left: 80px;">Toggle Cycle Distance
-Correction. Always ON in Declaration Mode.<br>
+Correction. Always ON in Declaration Mode.<br>Cycle
+Distance Correction monitors the driven distance in each time step and,
+if necessary, adds or removes time steps in order to keep the original
+distance given in the driving cycle.<br><ul><li>If <span style="font-weight: bold;">enabled</span> the vehicle drives the same <span style="font-weight: bold;">distance</span> as given in the driving cycle</li><li>If <span style="font-weight: bold;">disabled</span> the vehicle travels the same <span style="font-weight: bold;">time</span> as given in the driving cycle (Note that distance-based cycles (see <a href="../fileformat/VDRI.html">here</a>) are always converted to time-based cycles internally)</li></ul>
<br>
</div>
<div style="margin-left: 40px;"><img src="../pics/misc/checkbox.png" style="width: 15px; height: 15px;" alt="cb"><a name="UseGears"></a>
@@ -57,7 +60,7 @@ Correction. Always ON in Declaration Mode.<br>
driving cycle</span><br>
</div>
<div style="margin-left: 80px;">If activated VECTO will
-use gear and/or engine speed defintions included in the driving cycle.<br>
+use gear and/or engine speed defintions included in the driving cycle (see <a href="../fileformat/VDRI.html">here</a>).<br>
<br>
</div>
<div style="margin-left: 40px;"><img src="../pics/misc/checkbox.png" style="width: 15px; height: 15px;" alt="cb"><a name="ModOut"></a>
diff --git a/User Manual/GUI/pics/ENG-PT1.png b/User Manual/GUI/pics/ENG-PT1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e53b7d4e8a1c65c95f14ff0dd7e4e161ccbead96
Binary files /dev/null and b/User Manual/GUI/pics/ENG-PT1.png differ
diff --git a/User Manual/GUI/pics/Eco-Roll.png b/User Manual/GUI/pics/Eco-Roll.png
new file mode 100644
index 0000000000000000000000000000000000000000..d964b615734360597b4c225c62aa55ef327cb522
Binary files /dev/null and b/User Manual/GUI/pics/Eco-Roll.png differ
diff --git a/User Manual/GUI/pics/GBX-TC.png b/User Manual/GUI/pics/GBX-TC.png
new file mode 100644
index 0000000000000000000000000000000000000000..42fca98dbc109d7bc3fd81a7bae5b8be7a2bd957
Binary files /dev/null and b/User Manual/GUI/pics/GBX-TC.png differ
diff --git a/User Manual/GUI/pics/GBX-TC2.png b/User Manual/GUI/pics/GBX-TC2.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a1810ef9eefad6b453ced37ecc24427aebcae00
Binary files /dev/null and b/User Manual/GUI/pics/GBX-TC2.png differ
diff --git a/User Manual/GUI/pics/Look-Ahead.png b/User Manual/GUI/pics/Look-Ahead.png
new file mode 100644
index 0000000000000000000000000000000000000000..41da5c47864d28e4cd9b5ab3aa572b3e85a10697
Binary files /dev/null and b/User Manual/GUI/pics/Look-Ahead.png differ
diff --git a/User Manual/GUI/pics/Overspeed.png b/User Manual/GUI/pics/Overspeed.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cd3abd743ccfb25e248114ecad4e61c83bd7b64
Binary files /dev/null and b/User Manual/GUI/pics/Overspeed.png differ
diff --git a/User Manual/GUI/pics/Settings.PNG b/User Manual/GUI/pics/Settings.PNG
index b565a6b70f0099af1ea032fe27a681111903f9aa..9e891fa4c22e1ba6b31a6bdc146436852599c125 100644
Binary files a/User Manual/GUI/pics/Settings.PNG and b/User Manual/GUI/pics/Settings.PNG differ
diff --git a/User Manual/GUI/pics/VECTO-Editor_Aux1.PNG b/User Manual/GUI/pics/VECTO-Editor_Aux1.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..55229296b8ce2fb2f35f8ae59e47642b9136722a
Binary files /dev/null and b/User Manual/GUI/pics/VECTO-Editor_Aux1.PNG differ
diff --git a/User Manual/GUI/pics/VECTO-Editor_Driver.PNG b/User Manual/GUI/pics/VECTO-Editor_Driver.PNG
index 195b9946f0e9d241ae9aa5595f76f5d5584b04fc..c2597590ba06ead15db9d034529afef080139e39 100644
Binary files a/User Manual/GUI/pics/VECTO-Editor_Driver.PNG and b/User Manual/GUI/pics/VECTO-Editor_Driver.PNG differ
diff --git a/User Manual/GUI/settings.html b/User Manual/GUI/settings.html
index 051d11612e00225cbab7248af3bec4f9a2ea782d..c00a5156b92c7c61a03eb1e7a4df4c492bef63e4 100644
--- a/User Manual/GUI/settings.html
+++ b/User Manual/GUI/settings.html
@@ -2,7 +2,7 @@
<html><head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Settings - VECTO User Manual</title></head>
<body>
-<map name="mainformoptlinks"><area shape="rect" coords="24,72,495,95"" href="#workdir"><area shape="rect" coords="145,129,182,151"" href="#log"><area shape="rect" coords="361,128,495,151"" href="#opencmd"><area shape="rect" coords="94,195,142,214"" href="#air"><area shape="rect" coords="270,196,317,214"" href="#fuel"><area shape="rect" coords="125,239,178,258"" href="#pi"><area shape="rect" coords="42,292,148,317"" href="#reset"></map>
+<map name="mainformoptlinks"><area shape="rect" coords="23,69,496,96"" href="#workdir"><area shape="rect" coords="150,148,187,167"" href="#log"><area shape="rect" coords="246,129,494,220"" href="#opencmd"><area shape="rect" coords="92,259,143,280"" href="#air"><area shape="rect" coords="272,257,320,279"" href="#fuel"><area shape="rect" coords="127,302,177,322"" href="#pi"><area shape="rect" coords="43,355,148,382"" href="#reset"></map>
<table style="width: 100%; height: 54px; text-align: left; margin-left: auto; margin-right: auto;" border="0" cellpadding="2" cellspacing="2">
<tbody>
<tr>
@@ -16,22 +16,95 @@ Manual</span></a><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman
<hr style="width: 100%; height: 2px;"><a href="usermanual.html"><span style="font-family: Verdana;"></span></a><span style="font-family: Verdana;"></span>
<div style="text-align: center;">
<div style="text-align: left; font-family: Verdana;">
-<h2><a href="mainform.html">Main Form</a> / Settings<span style="font-family: Verdana;"></span></h2>
+<h2><a href="mainform.html">Main Form</a> /
+Settings<span style="font-family: Verdana;"></span></h2>
</div>
<div style="text-align: left;">
<div style="text-align: left;">
<div style="text-align: left;">
<div style="text-align: center;">
-<div style="text-align: center;"><img src="pics/Settings.PNG" usemap="#mainformoptlinks" style="width: 521px; height: 336px;" alt="options"><br>
+<div style="text-align: center;"><img src="pics/Settings.PNG" usemap="#mainformoptlinks" style="width: 521px; height: 401px;" alt="options"><br>
</div>
-<span style="font-family: Verdana;"></span><br><div style="text-align: left;"><span style="font-weight: bold;"><a name="workdir"></a>Working Directory<br></span><div style="margin-left: 40px;">The
-Working Directory can be accessed in the VECTO File Browser via
+<span style="font-family: Verdana;"></span><br>
+<div style="text-align: left;"><span style="font-weight: bold;"><a name="workdir"></a>Working
+Directory<br>
+</span>
+<div style="margin-left: 40px;">The
+Working Directory can be accessed in the VECTO File Browser
+via
the "Work-Dir" button. Further it is used as root directory for
relative file paths in the job list and cycle list (BATCH Mode) of the
-Main Form. In input files you can point to this directory using
-the <span style="font-weight: bold;"><WORKDIR></span> wildcard<br><span style="font-weight: bold; font-style: italic;">Example</span><span style="font-style: italic;">: In "<WORKDIR>\VECTO\Job1.vecto"</span> the <span style="font-style: italic;"><WORKDIR> part will be replaced by the actual Working Directory.</span><br></div><br><br><a name="log"></a><span style="font-weight: bold;">Logfile Size Limit</span> [MB]<br><div style="margin-left: 40px;">Whenever
+Main Form. In input files you can point to this directory
+using
+the <span style="font-weight: bold;"><WORKDIR></span>
+wildcard<br>
+<span style="font-weight: bold; font-style: italic;">Example</span><span style="font-style: italic;">: In
+"<WORKDIR>\VECTO\Job1.vecto"</span> the <span style="font-style: italic;"><WORKDIR> part
+will be replaced by the actual Working Directory.</span><br>
+</div>
+<br>
+<br>
+<a name="log"></a><span style="font-weight: bold;">Logfile
+Size Limit</span> [MB]<br>
+<div style="margin-left: 40px;">Whenever
the logfile (LOG.txt in the application folder) reaches this size it
-will be restarted. One backup is always stored as LOG_backup.txt.<br></div><br><br><span style="font-weight: bold;"><a name="opencmd"></a>File Open Command</span><br><div style="margin-left: 40px;">This command will be used to open CSV Input Files like Driving Cycles (.vdri). See: <a href="http://en.wikipedia.org/wiki/Run_command">Run command <img style="border: 0px solid ; width: 12px; height: 12px;" alt="" src="../pics/misc/external-icon%2012x12.png"></a><br><span style="font-weight: bold;">Name</span>: Name of the command as it will be shown in the menu when clicking the <img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG" align="top"> button.<br><span style="font-weight: bold;">Command</span>: The actual command.<br><br><span style="font-style: italic;"><span style="font-weight: bold;">Example</span>: If the command is <span style="font-weight: bold;">excel</span> and the file <span style="font-weight: bold;">C:\VECTO\cycle1.vdri</span> then VECTO will run: <span style="font-weight: bold;">excel "</span></span><span style="font-style: italic; font-weight: bold;">C:\VECTO\cycle1.vdri"</span><br></div><span style="font-weight: bold;"><br><br><a name="air"></a>Air Density</span> [kg/m<sup>3</sup>]<br><div style="margin-left: 40px;">The Air Density is needed to calculate the air resistance together with the <span style="font-weight: bold;">Drag Coefficient</span> and the <span style="font-weight: bold;">Cross Sectional Area</span> (see <a href="VEH-Editor.html">Vehicle Editor</a>).<br></div><br><br><a name="fuel"></a><span style="font-weight: bold;">Fuel Density</span> [kg/l<sup></sup>]<br><div style="margin-left: 40px;">The Fuel Density is used to calculate the l/km results.<br></div><br><br><a name="pi"></a><span style="font-weight: bold;">CO</span><sub style="font-weight: bold;">2</sub><span style="font-weight: bold;">-to-Fuel Ratio</span> [-]<br><div style="margin-left: 40px;">Mass ratio (kg<sub>CO2</sub> / kg<sub>FC</sub>) used to calculate CO<sub>2</sub> emissions.<br></div><br><br><a name="reset"></a><span style="font-weight: bold;">Reset All Settings</span><br><div style="margin-left: 40px;">Alle values in the Settings dialog and <a href="mainform_options.html">Options</a> tab will be restored to default values.<br></div><br><br><img style="width: 75px; height: 23px;" alt="" src="../pics/misc/OK.png"> <span style="font-weight: bold;">Save and close dialog</span><br><br><br><img style="width: 75px; height: 23px;" alt="" src="../pics/misc/Cancel.png"> <span style="font-weight: bold;">Close without saving</span><br style="font-weight: bold;"><br></div><div style="text-align: left;"><table style="text-align: left; width: 100%; height: 1200px;" border="0" cellpadding="2" cellspacing="2">
+will be restarted. One backup is always stored as LOG_backup.txt.<br>
+</div>
+<br>
+<br>
+<span style="font-weight: bold;"><a name="opencmd"></a>File
+Open Command</span><br>
+<div style="margin-left: 40px;">This command will be used
+to open CSV Input Files like Driving Cycles (.vdri). See: <a href="http://en.wikipedia.org/wiki/Run_command">Run command <img style="border: 0px solid ; width: 12px; height: 12px;" alt="" src="../pics/misc/external-icon%2012x12.png"></a><br>
+<span style="font-weight: bold;">Name</span>: Name
+of the command as it will be shown in the menu when clicking the <img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG" align="top"> button (beside the option to open with <a href="../../GRAPHi/documentation/HTML%20Manual/mainwindow.html">GRAPHi</a>).<br>
+<span style="font-weight: bold;">Command</span>: The
+actual command.<br>
+<br>
+<span style="font-style: italic;"><span style="font-weight: bold;">Example</span>: If the
+command is <span style="font-weight: bold;">excel</span>
+and the file is <span style="font-weight: bold;">C:\VECTO\cycle1.vdri</span>
+then VECTO will run: <span style="font-weight: bold;">excel
+"</span></span><span style="font-style: italic; font-weight: bold;">C:\VECTO\cycle1.vdri"</span><br>
+</div>
+<span style="font-weight: bold;"><br>
+<br>
+<a name="air"></a>Air Density</span> [kg/m<sup>3</sup>]<br>
+<div style="margin-left: 40px;">The Air Density is needed
+to calculate the air resistance together with the <span style="font-weight: bold;">Drag Coefficient</span> and
+the <span style="font-weight: bold;">Cross Sectional Area</span>
+(see <a href="VEH-Editor.html">Vehicle Editor</a>).<br>
+</div>
+<br>
+<br>
+<a name="fuel"></a><span style="font-weight: bold;">Fuel Density</span> [kg/l]<br>
+<div style="margin-left: 40px;">The Fuel Density is used
+to calculate the l/km results.<br>
+</div>
+<br>
+<br>
+<a name="pi"></a><span style="font-weight: bold;">CO</span><sub style="font-weight: bold;">2</sub><span style="font-weight: bold;">-to-Fuel Ratio</span> [-]<br>
+<div style="margin-left: 40px;">Mass ratio (kg<sub>CO2</sub>
+/ kg<sub>FC</sub>) used to calculate CO<sub>2</sub>
+emissions.<br>
+</div>
+<br>
+<br>
+<a name="reset"></a><span style="font-weight: bold;">Reset All Settings</span><br>
+<div style="margin-left: 40px;">Alle values in the
+Settings dialog and <a href="mainform_options.html">Options</a>
+tab will be restored to default values.<br>
+</div>
+<br>
+<br>
+<img style="width: 75px; height: 23px;" alt="" src="../pics/misc/OK.png"> <span style="font-weight: bold;">Save and close dialog</span><br>
+<br>
+<br>
+<img style="width: 75px; height: 23px;" alt="" src="../pics/misc/Cancel.png"> <span style="font-weight: bold;">Close without saving</span><br style="font-weight: bold;">
+<br>
+</div>
+<div style="text-align: left;">
+<table style="text-align: left; width: 100%; height: 1200px;" border="0" cellpadding="2" cellspacing="2">
<tbody>
<tr>
<td></td>
diff --git a/User Manual/changelog.html b/User Manual/changelog.html
new file mode 100644
index 0000000000000000000000000000000000000000..2266e3c7ce66ea76a4215b842acddd88e3660cad
--- /dev/null
+++ b/User Manual/changelog.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html><head>
+<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>VECTO Changelog</title></head>
+<body>
+<table style="width: 100%; height: 54px; text-align: left; margin-left: auto; margin-right: auto;" border="0" cellpadding="2" cellspacing="2">
+<tbody>
+<tr>
+<td style="width: 110px;"><a href="usermanual.html"><img style="border: 0px solid ; width: 106px; height: 36px;" alt="VECTO-Logo" src="pics/VECTO-small.PNG"></a></td>
+<td><a href="usermanual.html"><span style="color: rgb(0, 0, 0); font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: center; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; font-family: Verdana;">User
+Manual</span></a><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: center; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;"></span></td>
+<td style="text-align: right; width: 405px;"><a href="http://ec.europa.eu/dgs/jrc/index.cfm" target="_blank"><img style="border: 0px solid ; width: 173px; height: 36px;" alt="JRC-Logo" src="pics/JRC.png" hspace="5"></a><a href="http://www.ivt.tugraz.at/" target="_blank"><img src="pics/IVT.png" alt="IVT-Logo" style="border: 0px solid ; width: 74px; height: 36px;" hspace="5"></a><a href="http://portal.tugraz.at/pls/portal/url/page/TU_Graz" target="_blank"><img src="pics/TUG.png" alt="TUG-Logo" style="border: 0px solid ; width: 96px; height: 36px;" hspace="5"></a></td>
+</tr>
+</tbody>
+</table>
+<hr style="width: 100%; height: 2px;"><span style="font-family: Verdana;"><span style="text-decoration: underline;"></span></span><a href="usermanual.html"><span style="font-family: Verdana;"></span></a>
+<div style="text-align: center;"><img style="width: 536px; height: 209px;" alt="VECTO" src="pics/VECTOlarge.png" vspace="10"><br>
+<br>
+<span style="font-family: Verdana;"><big><big><big><span style="font-weight: bold;">Changelog</span></big></big></big><br><br style="font-family: Verdana;"></span>
+<hr style="width: 100%; height: 2px;"><div style="text-align: left;"><span style="font-family: Tahoma;">VECTO 1.3</span><br><span style="font-family: Tahoma;"></span></div><ul style="text-align: left;"><li><span style="font-family: Tahoma;">Some file-specific error messages link to files</span></li><li><span style="font-family: Tahoma;">Eco-Roll, Overspeed, Look Ahead Coasting</span></li></ul><div style="text-align: left;"><span style="font-family: Tahoma;"></span><span style="font-family: Tahoma;">VECTO 1.2</span><span style="font-family: Tahoma;"> - </span><span style="font-family: Tahoma;">08.04.2013</span><br><span style="font-family: Tahoma;"></span></div><ul style="text-align: left;"><li><span style="font-family: Tahoma;">Engine Start/Stop implemented</span></li><li><span style="font-family: Tahoma;">Bugfix: Fixed error in FC interpolation (invalid extrapolation errors)</span></li><li><span style="font-family: Tahoma;">FC Extrapolation will abort the calculation</span></li><li><span style="font-family: Tahoma;">Transmission Type selection in Gearbox (.vgbx) file.</span></li><ul><li><span style="font-family: Tahoma;">Enables/Disables transmission type-specific options </span></li></ul><ul><li><span style="font-family: Tahoma;">In Proof-Of-Concept mode "Custom" type is available with all options enabled.</span></li></ul><li><span style="font-family: Tahoma;">Automatic Transmission mode with Torque converter: Input parameters in Gearbox file !!still being tested!!</span></li><li><span style="font-family: Tahoma;">Option to open files with GRAPHi or user-defined tool</span></li><li><span style="font-family: Tahoma;">User Manual updated</span></li><li><span style="font-family: Tahoma;">Bugfix: Files with relative paths were not located correctly</span></li><li><span style="font-family: Tahoma;">Corrected comment line for wheels inertia and axle config in .vveh file</span></li><li><span style="font-family: Tahoma;">Changed RRC unit in GUI from [-] to [N/N]</span></li><li><span style="font-family: Tahoma;">Tranmission Loss Maps are not converted to n,Pe-Maps anymore. Should fix non-linear interpolation effects.</span></li><li><span style="font-family: Tahoma;">Engine Only Mode</span></li></ul><div style="text-align: left;"><span style="font-family: Tahoma;">VECTO 1.1 - </span><span style="font-family: Tahoma;">06.02.2013</span><br><span style="font-family: Tahoma;"></span></div><ul style="text-align: left;"><li><span style="font-family: Tahoma;">Speed values below 0.09km/h are set to 0km/h</span></li><li><span style="font-family: Tahoma;">New gear shift model</span></li><ul><li><span style="font-family: Tahoma;">Replaces old gear shift model!</span></li></ul><ul><li><span style="font-family: Tahoma;">New parameters in .vgbx file including path to gear shift polygons file</span></li></ul><ul><li><span style="font-family: Tahoma;">Old gear shift model parameters removed from .vecto file</span></li></ul><li><span style="font-family: Tahoma;">Command Line Arguments processing (see User Manual):</span></li><ul><li><span style="font-family: Tahoma;">Changed prefix form "/" to "-"</span></li></ul><ul><li><span style="font-family: Tahoma;">Bugfix: Argument "-run" was not processed</span></li></ul><ul><li><span style="font-family: Tahoma;">Job files and driving cycles can be added via command line</span></li></ul><ul><li><span style="font-family: Tahoma;">Files without path are expected in the Working Directory</span></li></ul><li><span style="font-family: Tahoma;">User Manual update for command line arguments</span></li><li><span style="font-family: Tahoma;">Various fixes in GUI</span></li><li><span style="font-family: Tahoma;">Bugfix: Error in Cycle Conversion (distance- to time-based) when using Aux Power Input.</span></li><li><span style="font-family: Tahoma;">Distance Correction is now active only in acceleration and cruise phases.</span></li><li><span style="font-family: Tahoma;">Fixed cycles starting with vehicle speed = 0. In V1.0 the first and second time step were averaged to speed values > 0.</span></li><li><span style="font-family: Tahoma;">Demo data updated for new gear shift model</span></li><li><span style="font-family: Tahoma;">New independent licensing dll replaces TUG's version</span></li></ul><div style="text-align: left;"><span style="font-family: Tahoma;"></span><br><span style="font-family: Tahoma;"></span></div><span style="font-family: Tahoma;"><br></span>
+<br>
+<br>
+<div style="text-align: left;"><span style="font-family: Calibri;"></span>
+<hr style="width: 100%; height: 2px;"><a href="contact.html"><span style="font-family: Calibri;">Contact</span></a>
+</div>
+</div>
+</body></html>
\ No newline at end of file
diff --git a/User Manual/fileformat/VDRI.html b/User Manual/fileformat/VDRI.html
index b1be5e88b1c08fe54a1ca715846e2f52b32a3f0c..1f24dc8b35f5ae7ade793be1efeea823003d61cf 100644
--- a/User Manual/fileformat/VDRI.html
+++ b/User Manual/fileformat/VDRI.html
@@ -18,9 +18,9 @@ Manual</span></a><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman
<h2><a href="index.html">Input Files</a> / Driving Cycle (.vdri)</h2>
</div><div style="text-align: left;"><span style="font-family: Verdana;"></span>The
Driving Cycle defines vehicle speed, road gradient and other parameters
-either time- or distance-based. It's open format requires <span style="color: rgb(0, 0, 0); font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">Idenfiers<span class="Apple-converted-space"> to</span></span> define the content of each column. <br><br><br><br><br><span style="font-weight: bold;">Supported Identifiers:</span><br><table style="text-align: left; width: 100%; height: 116px;" border="1" cellpadding="5" cellspacing="0"><tbody><tr><td style="font-weight: bold; width: 95px;">Identifier</td><td style="width: 112px;"><span style="font-weight: bold;">Quantity</span></td><td style="width: 58px;"><span style="font-weight: bold;">Unit</span></td><td style="width: 665px;"><span style="font-weight: bold;">Description</span></td></tr><tr><td style="font-weight: bold; width: 95px;"><s></td><td style="width: 112px;">Distance</td><td style="width: 58px;">[m]</td><td style="width: 665px;"><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">Travelled distance used for distance-based cycles. If <t> is also defined this column will be ignored.</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;"></span></td></tr><tr><td style="font-weight: bold; width: 95px;"><t></td><td style="width: 112px;">Time</td><td style="width: 58px;">[s]</td><td style="width: 665px;">Used for time-based cycles. If neither this nor the distance <s> is defined the data will be <span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">interpreted as 1Hz.</span></td></tr><tr><td style="font-weight: bold; width: 95px;"><grad></td><td style="width: 112px;">Road Gradient</td><td style="width: 58px;">[%]</td><td style="width: 665px;">Optional.</td></tr><tr><td style="font-weight: bold; width: 95px;"><stop></td><td style="width: 112px;">Stopping Time</td><td style="width: 58px;">[s]</td><td style="width: 665px;">Required
+either time- or distance-based. It's open format requires <span style="color: rgb(0, 0, 0); font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">Idenfiers<span class="Apple-converted-space"> to</span></span> define the content of each column. <br><br><br><br><big><big><span style="font-weight: bold;">Supported Identifiers:</span></big></big><br><table style="text-align: left; width: 100%; height: 116px;" border="1" cellpadding="5" cellspacing="0"><tbody><tr><td style="font-weight: bold; width: 95px;">Identifier</td><td style="width: 112px;"><span style="font-weight: bold;">Quantity</span></td><td style="width: 58px;"><span style="font-weight: bold;">Unit</span></td><td style="width: 665px;"><span style="font-weight: bold;">Description</span></td></tr><tr><td style="font-weight: bold; width: 95px;"><s></td><td style="width: 112px;">Distance</td><td style="width: 58px;">[m]</td><td style="width: 665px;"><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">Travelled distance used for distance-based cycles. If <t> is also defined this column will be ignored.</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;"></span></td></tr><tr><td style="font-weight: bold; width: 95px;"><t></td><td style="width: 112px;">Time</td><td style="width: 58px;">[s]</td><td style="width: 665px;">Used for time-based cycles. If neither this nor the distance <s> is defined the data will be <span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">interpreted as 1Hz.</span></td></tr><tr><td style="font-weight: bold;"><v></td><td>Vehicle Speed</td><td>[km/h]</td><td>Required except for <a href="../GUI/VECTO-Editor.html#engonly">Engine Only Mode</a> calculations.</td></tr><tr><td style="font-weight: bold; width: 95px;"><grad></td><td style="width: 112px;">Road Gradient</td><td style="width: 58px;">[%]</td><td style="width: 665px;">Optional.</td></tr><tr><td style="font-weight: bold; width: 95px;"><stop></td><td style="width: 112px;">Stopping Time</td><td style="width: 58px;">[s]</td><td style="width: 665px;">Required
for distance-based cycles. Not used in time based cycles. <stop>
-defines the time the vehicle spends in stop phases.</td></tr><tr><td style="font-weight: bold; width: 95px;"><Aux_xxx></td><td style="width: 112px;">Auxiliary Supply Power</td><td style="width: 58px;">[kW]</td><td style="width: 665px;"><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">Supply Power input for each auxiliary defined in the <a href="../GUI/VECTO-Editor.html">.vecto file</a> where<span class="Apple-converted-space"> </span></span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; font-style: italic; font-weight: bold;">xxx</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;"><span class="Apple-converted-space"> </span>matches the ID of the corresponding <a href="../GUI/VECTO-Editor_Aux.html">Auxiliary</a>. </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">ID's are not case sensitive and must not contain space or special characters.</span></td></tr><tr><td><span style="font-weight: bold;"><n></span></td><td style="width: 112px;">Engine Speed</td><td style="width: 58px;">[rpm]</td><td style="width: 665px;">If <n> is defined VECTO uses that instead of the calculated engine speed value.</td></tr><tr><td><span style="font-weight: bold;"><gear></span></td><td style="width: 112px;">Gear</td><td style="width: 58px;">[-]</td><td style="width: 665px;">Gear input. Overwrites the gear shift model.</td></tr><tr><td><span style="font-weight: bold;"><Padd></span></td><td style="width: 112px;">Additional Aux Power Demand</td><td style="width: 58px;">[kW]</td><td style="width: 665px;">This power input will be directly added to the engine power in addition to possible other auxiliaries. Also used in <a href="../GUI/VECTO-Editor.html#engonly">Engine Only Mode</a>.</td></tr><tr><td><span style="font-weight: bold;"><vair_res></span></td><td style="width: 112px;">Air speed relative to vehicle</td><td style="width: 58px;">[km/h]</td><td style="width: 665px;">Only required if <span style="font-weight: bold;">Cross Wind Correction</span> is set to<span style="font-family: 'Times New Roman';"> </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none; font-weight: bold;">Vair & Beta Input</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">. See <a href="../GUI/VEH-Editor.html#wind">here</a> for details.</span></td></tr><tr><td style="font-weight: bold;"><vair_beta></td><td style="width: 112px;">Wind Yaw Angle</td><td style="width: 58px;">[°]</td><td style="width: 665px;">Only required if <span style="font-weight: bold;">Cross Wind Correction</span> is set to<span style="font-family: 'Times New Roman';"> </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none; font-weight: bold;">Vair & Beta Input</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">. See <a href="../GUI/VEH-Editor.html#wind">here</a> for details.</span></td></tr><tr><td><span style="font-weight: bold;"><Pe></span></td><td>Engine power</td><td>[kW]</td><td>Effective engine power at clutch. Only required in <a href="../GUI/VECTO-Editor.html#engonly">Engine Only Mode</a>. Alternatively torque <Me> can be defined.</td></tr><tr><td><span style="font-weight: bold;"><Me></span></td><td>Engine torque</td><td>[Nm]</td><td>Effective engine torque at clutch. Only required in <a href="../GUI/VECTO-Editor.html#engonly">Engine Only Mode</a>. Alternatively power <Pe> can be defined.</td></tr></tbody></table><span style="color: red;">Note: The Identifiers line is no comment line and therefore does not start with "c"</span><br><span style="font-family: Verdana;"><br></span><big><big><small><small><span style="font-weight: bold;">Example 1: </span></small></small></big></big>Distance-based cycle with<span style="font-weight: bold;"> Road Gradient</span> and two <span style="font-weight: bold;">Auxiliaries</span> (as provided in the demo data)<span style="font-family: Verdana;"></span><br><span style="font-family: Verdana;"></span><span style="font-family: Verdana;"><img style="width: 590px; height: 219px;" alt="" src="pics/VDRI01.png"></span><br><big><big><small><small><span style="font-weight: bold;">Example 2:</span> Time</small></small></big></big>-based cycle with Engine Speed, <span style="font-weight: bold;">Vair & Beta Input</span>, one <span style="font-weight: bold;">Auxiliary</span> and <span style="font-weight: bold;">Additional Aux Demand</span><br><span style="font-family: Verdana;"></span><span style="font-family: Verdana;"><img style="width: 632px; height: 189px;" alt="" src="pics/VDRI02.png"></span><br><br>The demo data provided with VECTO contains several .vdri files that may be used as template.<br><span style="font-family: Verdana;"></span></div><span style="font-family: Verdana;"></span><br>
+defines the time the vehicle spends in stop phases.</td></tr><tr><td style="font-weight: bold; width: 95px;"><Aux_xxx></td><td style="width: 112px;">Auxiliary Supply Power</td><td style="width: 58px;">[kW]</td><td style="width: 665px;"><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">Supply Power input for each auxiliary defined in the <a href="../GUI/VECTO-Editor.html">.vecto file</a> where<span class="Apple-converted-space"> </span></span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; font-style: italic; font-weight: bold;">xxx</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;"><span class="Apple-converted-space"> </span>matches the ID of the corresponding <a href="../GUI/VECTO-Editor_Aux.html">Auxiliary</a>. </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">ID's are not case sensitive and must not contain space or special characters.</span></td></tr><tr><td><span style="font-weight: bold;"><n></span></td><td style="width: 112px;">Engine Speed</td><td style="width: 58px;">[rpm]</td><td style="width: 665px;">If <n> is defined VECTO uses that instead of the calculated engine speed value.</td></tr><tr><td><span style="font-weight: bold;"><gear></span></td><td style="width: 112px;">Gear</td><td style="width: 58px;">[-]</td><td style="width: 665px;">Gear input. Overwrites the gear shift model.</td></tr><tr><td><span style="font-weight: bold;"><Padd></span></td><td style="width: 112px;">Additional Aux Power Demand</td><td style="width: 58px;">[kW]</td><td style="width: 665px;">This power input will be directly added to the engine power in addition to possible other auxiliaries. Also used in <a href="../GUI/VECTO-Editor.html#engonly">Engine Only Mode</a>.</td></tr><tr><td><span style="font-weight: bold;"><vair_res></span></td><td style="width: 112px;">Air speed relative to vehicle</td><td style="width: 58px;">[km/h]</td><td style="width: 665px;">Only required if <span style="font-weight: bold;">Cross Wind Correction</span> is set to<span style="font-family: 'Times New Roman';"> </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none; font-weight: bold;">Vair & Beta Input</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">. See <a href="../GUI/VEH-Editor.html#wind">here</a> for details.</span></td></tr><tr><td style="font-weight: bold;"><vair_beta></td><td style="width: 112px;">Wind Yaw Angle</td><td style="width: 58px;">[°]</td><td style="width: 665px;">Only required if <span style="font-weight: bold;">Cross Wind Correction</span> is set to<span style="font-family: 'Times New Roman';"> </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none; font-weight: bold;">Vair & Beta Input</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">. See <a href="../GUI/VEH-Editor.html#wind">here</a> for details.</span></td></tr><tr><td><span style="font-weight: bold;"><Pe></span></td><td>Engine power</td><td>[kW]</td><td>Effective engine power at clutch. Only required in <a href="../GUI/VECTO-Editor.html#engonly">Engine Only Mode</a>. Alternatively torque <Me> can be defined.</td></tr><tr><td><span style="font-weight: bold;"><Me></span></td><td>Engine torque</td><td>[Nm]</td><td>Effective engine torque at clutch. Only required in <a href="../GUI/VECTO-Editor.html#engonly">Engine Only Mode</a>. Alternatively power <Pe> can be defined.</td></tr></tbody></table><big><big><span style="color: red; font-weight: bold;">Note: The Identifiers line is no comment line and therefore does not start with "c"</span></big></big><br><big><big><span style="font-weight: bold;"><br>Examples:</span></big></big><br>The demo data provided with VECTO contains several .vdri files that may be used as template.<br><br><big><big><small><small><span style="font-weight: bold;">Example 1: </span></small></small></big></big>Distance-based cycle with<span style="font-weight: bold;"> Road Gradient</span> and two <span style="font-weight: bold;">Auxiliaries</span> (as provided in the demo data)<span style="font-family: Verdana;"></span><br><span style="font-family: Verdana;"></span><span style="font-family: Verdana;"><img style="width: 590px; height: 219px;" alt="" src="pics/VDRI01.png"></span><br><big><big><small><small><span style="font-weight: bold;">Example 2:</span> Time</small></small></big></big>-based cycle with Engine Speed, <span style="font-weight: bold;">Vair & Beta Input</span>, one <span style="font-weight: bold;">Auxiliary</span> and <span style="font-weight: bold;">Additional Aux Demand</span><br><span style="font-family: Verdana;"></span><span style="font-family: Verdana;"><img style="width: 632px; height: 189px;" alt="" src="pics/VDRI02.png"></span><br><br><br><span style="font-family: Verdana;"></span></div><span style="font-family: Verdana;"></span><br>
<div style="text-align: left;">
<div style="text-align: left;">
<div style="text-align: left;">
diff --git a/User Manual/fileformat/index.html b/User Manual/fileformat/index.html
index 96d6b9be62037b51a98e19d940020a8544dcf0a6..9e5a67beb1d6cde3755c5aeadb5e3c977b47ccbb 100644
--- a/User Manual/fileformat/index.html
+++ b/User Manual/fileformat/index.html
@@ -45,8 +45,7 @@ the comment line. Number and position of comment lines is not limited.</td>
</table>
<br>
<hr style="width: 100%; height: 2px;">
-<div style="text-align: left;"><big><big style="font-weight: bold;">Input Files:<br></big></big><span style="font-style: italic;">Note: Editor-supported Input Files are described in the "User Interface" section of the
-User Manual.</span></div><div style="text-align: left;"><ul style="line-height: 1.7em;"><li><a href="VDRI.html">Driving Cycle (.vdri)</a></li>
+<div style="text-align: left;"><big><big style="font-weight: bold;">Input Files:</big></big><span style="font-style: italic;"><br></span></div><div style="text-align: left;"><ul style="line-height: 1.7em;"><li><a href="../GUI/VECTO-Editor.html">Job File (.vecto)</a></li><li><a href="../GUI/VEH-Editor.html">Vehicle File (.vveh)</a></li><li><a href="../GUI/ENG-Editor.html">Engine File (.veng)</a></li><li><a href="../GUI/GBX-Editor.html">Gearbox File (.vgbx)</a></li><li><a href="VDRI.html">Driving Cycle (.vdri)</a></li>
<li><a href="../GUI/VEH-Editor.html#cdv">Speed dependent Cross Wind Correction Input File (.vcdv)</a></li><li><a href="../GUI/VEH-Editor.html#cdb">Cross Wind Correction via Vair & Beta Input File (.vcdb)</a></li><li><a href="../GUI/VEH-Editor.html#retard">Retarder Torque Loss Map</a></li><li><a href="../GUI/ENG-Editor.html#fld">Full Load and Drag Torque (.vfld)</a></li><li><a href="../GUI/ENG-Editor.html#map">Fuel Consumption Map (.vmap)</a></li><li><a href="../GUI/GBX-Editor.html#gears">Transmission Loss Map</a></li><li><a href="../GUI/VECTO-Editor_Aux.html#file">Auxiliary (.vaux)</a></li><li><a href="../GUI/VECTO-Editor_Driver.html#vacc">Max. acceleration and brake curves (.vacc)</a></li><li><a href="../GUI/GBX-Editor.html#polyfile">Shift polygons (.vgbs)</a></li><li><a href="../GUI/GBX-Editor.html#tcfile">Torque Converter Characteristics (.vtcc)</a></li>
</ul>
<br>
diff --git a/User Manual/qsg/qsg03.html b/User Manual/qsg/qsg03.html
index 9c9a9d469b8516d757dfc4529d036e451871ef6d..775c119f7dfb5216a5ddd015fd6786470f96cd71 100644
--- a/User Manual/qsg/qsg03.html
+++ b/User Manual/qsg/qsg03.html
@@ -13,6 +13,6 @@
</table>
<hr style="width: 100%; height: 2px;"><span style="font-family: Verdana;"><span style="text-decoration: underline;"></span></span><a href="usermanual.html"><span style="font-family: Verdana;"></span></a><div style="text-align: center;"><h1 style="text-align: left;"><small>Open an existing .vveh file</small></h1>
<img src="pics/step03.png" style="width: 497px; height: 545px;" alt="s1"><br>
-<span style="font-family: Verdana;"></span><span style="font-family: Verdana;"></span><hr style="width: 100%; height: 2px;"><span style="font-family: Verdana;"></span><div style="text-align: left;"><span style="font-weight: bold;"></span><img style="width: 11px; height: 11px;" alt="" src="pics/_redbox.png"> In this example we will open the .vveh file which was provided in the demo data. Use the <img style="width: 16px; height: 16px;" alt="" src="../pics/icons/Open-icon.png"> button to open the VECTO File Browser and open the file <span style="font-weight: bold;">Demo_VehicleDeclaration.vveh</span> from the <span style="font-weight: bold;">DemoData\Declaration </span>folder.</div><br><table style="text-align: left; width: 100%;" border="0" cellpadding="2" cellspacing="2"><tbody><tr><td><a href="qsg02.html"><img src="../pics/misc/Actions-go-previous-icon.png" style="border: 0px solid ; width: 72px; height: 72px;" alt="back"></a></td><td style="text-align: right;"><a href="qsg04.html"><img src="../pics/misc/Actions-go-next-icon.png" style="border: 0px solid ; width: 72px; height: 72px;" alt="next"></a></td></tr></tbody></table><div style="text-align: left;"><span style="font-family: Calibri;"></span><hr style="width: 100%; height: 2px;"><a href="../contact.html"><span style="font-family: Calibri;">Contact</span></a>
+<span style="font-family: Verdana;"></span><span style="font-family: Verdana;"></span><hr style="width: 100%; height: 2px;"><span style="font-family: Verdana;"></span><div style="text-align: left;"><span style="font-weight: bold;"></span><img style="width: 11px; height: 11px;" alt="" src="pics/_redbox.png"> In this example we will open the .vveh file which was provided in the demo data. Use the <img style="width: 16px; height: 16px;" alt="" src="../pics/icons/Open-icon.png"> button to open the file browser and open the file <span style="font-weight: bold;">Demo_VehicleDeclaration.vveh</span> from the <span style="font-weight: bold;">DemoData\Declaration </span>folder.</div><br><table style="text-align: left; width: 100%;" border="0" cellpadding="2" cellspacing="2"><tbody><tr><td><a href="qsg02.html"><img src="../pics/misc/Actions-go-previous-icon.png" style="border: 0px solid ; width: 72px; height: 72px;" alt="back"></a></td><td style="text-align: right;"><a href="qsg04.html"><img src="../pics/misc/Actions-go-next-icon.png" style="border: 0px solid ; width: 72px; height: 72px;" alt="next"></a></td></tr></tbody></table><div style="text-align: left;"><span style="font-family: Calibri;"></span><hr style="width: 100%; height: 2px;"><a href="../contact.html"><span style="font-family: Calibri;">Contact</span></a>
</div></div>
</body></html>
\ No newline at end of file
diff --git a/User Manual/usermanual.html b/User Manual/usermanual.html
index 28c3a86b639089b033762fa726d1e85398f95106..d717b006c23f5dc814df975d5b23fcd3ef0b6b9c 100644
--- a/User Manual/usermanual.html
+++ b/User Manual/usermanual.html
@@ -17,20 +17,19 @@ Manual</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; f
<br>
<span style="font-family: Verdana;"><big><big><big><span style="font-weight: bold;">User Manual</span></big></big></big>
<br>
-VECTO 1.1<br><br style="font-family: Verdana;"></span>
+VECTO 1.3<br><br style="font-family: Verdana;"></span>
<hr style="width: 100%; height: 2px;"><ul style="text-align: left; font-family: Tahoma; line-height: 1.7em;">
-<li style="font-family: Calibri;"><big><a href="quickstart.html">Quick Start Guide</a></big></li><li style="font-family: Calibri;"><big>User
+<li style="font-family: Calibri;"><a href="changelog.html"><big>Changes from previous version</big></a></li><li style="font-family: Calibri;"><big><a href="quickstart.html">Quick Start Guide</a></big></li><li style="font-family: Calibri;"><big>User
Interface</big></li>
<ul>
<li style="font-family: Calibri;"><big><a href="GUI/mainform.html">Main Form</a></big></li><ul><li style="font-family: Calibri;"><big><a href="GUI/settings.html">Settings</a><br></big></li></ul>
<li style="font-family: Calibri;"><big><a href="GUI/VECTO-Editor.html">VECTO Editor</a></big></li><ul><li style="font-family: Calibri;"><big><a href="GUI/VECTO-Editor_Aux.html">Aux Dialog</a><br></big></li></ul>
<li style="font-family: Calibri;"><big><a href="GUI/VEH-Editor.html">Vehicle Editor</a></big></li>
<li style="font-family: Calibri;"><big><a href="GUI/ENG-Editor.html">Engine Editor</a></big></li>
-<li style="font-family: Calibri;"><big><a href="GUI/GBX-Editor.html">Gearbox Editor</a></big></li>
-</ul>
+<li style="font-family: Calibri;"><big><a href="GUI/GBX-Editor.html">Gearbox Editor</a></big></li><li style="font-family: Calibri;"><big><a href="../GRAPHi/documentation/HTML%20Manual/mainwindow.html">GRAPHi (2D Visualiser)</a><br></big></li>
+</ul><li style="font-family: Calibri;"><big>Functions</big></li><ul><li style="font-family: Calibri;"><a href="GUI/VECTO-Editor_Aux.html"><big>Auxiliaries</big></a></li><li style="font-family: Calibri;"><a href="GUI/VEH-Editor.html#wind"><big>Cross Wind Correction</big></a></li><li style="font-family: Calibri;"><a href="GUI/mainform_options.html#CycleDistCor"><big>Cycle Distance Correction</big></a></li><li style="font-family: Calibri;"><a href="GUI/VECTO-Editor_Driver.html#eco"><big>Eco-Roll</big></a></li><li style="font-family: Calibri;"><a href="GUI/VECTO-Editor.html#engonly"><big>Engine Only Mode</big></a></li><li style="font-family: Calibri;"><a href="GUI/VECTO-Editor_Driver.html#startstop"><big>Engine Start/Stop</big></a></li><li style="font-family: Calibri;"><a href="GUI/ENG-Editor.html#map"><big>Fuel Map Interpolation</big></a></li><li style="font-family: Calibri;"><a href="GUI/ENG-Editor.html#fld"><big>Full Load and Drag Curve (incl. PT1 approach)</big></a></li><li style="font-family: Calibri;"><a href="GUI/GBX-Editor.html#polyfile"><big>Gear shift model</big></a></li><li style="font-family: Calibri;"><big><a href="GUI/VECTO-Editor_Driver.html#vacc">Limit acceleration and deceleration</a> </big></li><li style="font-family: Calibri;"><a href="GUI/VECTO-Editor_Driver.html#look"><big>Look-Ahead Coasting</big></a></li><li style="font-family: Calibri;"><a href="GUI/VECTO-Editor_Driver.html#eco"><big>Overspeed</big></a></li><li style="font-family: Calibri;"><a href="GUI/VEH-Editor.html#retard"><big>Retarder Losses</big></a></li><li style="font-family: Calibri;"><a href="GUI/GBX-Editor.html#tcon"><big>Torque Converter</big></a></li><li style="font-family: Calibri;"><big><a href="GUI/GBX-Editor.html#gears">Transmission Loss Maps</a><br></big></li><li style="font-family: Calibri;"><big><a href="GUI/mainform_options.html#UseGears">Use gears/rpm's form driving cycle</a><br></big></li></ul>
<li style="font-family: Calibri;"><big><a href="general/cmd.html">Command line arguments<br></a></big></li>
-<li style="font-family: Calibri;"><big><a href="fileformat/index.html">Input and Output Files</a></big></li>
-<li style="font-family: Calibri;"><big><a href="contact.html">Contact & Support</a></big></li>
+<li style="font-family: Calibri;"><big><a href="fileformat/index.html">Input and Output Files</a></big></li><ul><li style="font-family: Calibri;"><a href="fileformat/index.html"><big>CSV Format</big></a></li><li style="font-family: Calibri;"><big>Input Files</big></li><ul style="font-family: Calibri;"><li><font size="+1"><a href="GUI/VECTO-Editor.html">Job File (.vecto)</a></font></li><li><font size="+1"><a href="GUI/VEH-Editor.html">Vehicle File (.vveh)</a></font></li><li><font size="+1"><a href="GUI/ENG-Editor.html">Engine File (.veng)</a></font></li><li><font size="+1"><a href="GUI/GBX-Editor.html">Gearbox File (.vgbx)</a></font></li><li><font size="+1"><a href="fileformat/VDRI.html">Driving Cycle (.vdri)</a></font></li><li><font size="+1"><a href="GUI/VEH-Editor.html#cdv">Speed dependent Cross Wind Correction Input File (.vcdv)</a></font></li><li><font size="+1"><a href="GUI/VEH-Editor.html#cdb">Cross Wind Correction via Vair & Beta Input File (.vcdb)</a></font></li><li><font size="+1"><a href="GUI/VEH-Editor.html#retard">Retarder Torque Loss Map</a></font></li><li><font size="+1"><a href="GUI/ENG-Editor.html#fld">Full Load and Drag Torque (.vfld)</a></font></li><li><font size="+1"><a href="GUI/ENG-Editor.html#map">Fuel Consumption Map (.vmap)</a></font></li><li><font size="+1"><a href="GUI/GBX-Editor.html#gears">Transmission Loss Map</a></font></li><li><font size="+1"><a href="GUI/VECTO-Editor_Aux.html#file">Auxiliary (.vaux)</a></font></li><li><font size="+1"><a href="GUI/VECTO-Editor_Driver.html#vacc">Max. acceleration and brake curves (.vacc)</a></font></li><li><font size="+1"><a href="GUI/GBX-Editor.html#polyfile">Shift polygons (.vgbs)</a></font></li><li><font size="+1"><a href="GUI/GBX-Editor.html#tcfile">Torque Converter Characteristics (.vtcc)</a></font></li></ul><li style="font-family: Calibri;"><big>Output Files</big></li><ul style="font-family: Calibri;"><li><big><a href="fileformat/VMOD.html">Modal Results (.vmod)</a></big></li><li><big><a href="fileformat/VSUM.html">Summary Results (.vsum)</a></big></li></ul></ul><li style="font-family: Calibri;"><big><a href="contact.html">Contact & Support</a></big></li>
</ul>
<br>
<br>
diff --git a/VECTO Changelog.txt b/VECTO Changelog.txt
index 169cf71dc610a146a483f863bb42e3a29edf9bc4..6fac3f4b8f71f917bb6aafbae51ffbacdc843675 100644
--- a/VECTO Changelog.txt
+++ b/VECTO Changelog.txt
@@ -4,13 +4,12 @@ VECTO ?.? (future release)
VECTO 1.3 (current source - next release)
- Some file-specific error messages link to files
- Eco-Roll, Overspeed, Look Ahead Coasting
-
-
+- User Manual updated
VECTO 1.2
- Bugfix: When opening the Gearbox Editor the Gear Shift Settings (e.g. Skip Gears) were not valid for MT
-- Fixed error in FC interpolation (invalid extrapolation errors caused by rounding errors)
-- Bugfix: Cycle was cut by one second (as usual in Vehicle Mode)
+- Fixed inaccuracy in FC interpolation (invalid extrapolation errors caused by rounding errors)
+- Bugfix: Cycle was cut by one second in Engine Only (as usual in Vehicle Mode)
VECTO 1.1 beta 4
- Engine Start/Stop implemented
diff --git a/VECTO/GUI/F_GEN.Designer.vb b/VECTO/GUI/F_GEN.Designer.vb
index 585dd372e4df1388577f3711954598829ca7da02..72c91f7184e98a50c02918074177840f48a11ad1 100644
--- a/VECTO/GUI/F_GEN.Designer.vb
+++ b/VECTO/GUI/F_GEN.Designer.vb
@@ -110,10 +110,14 @@ Partial Class F_GEN
Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TabPgDriver = New System.Windows.Forms.TabPage()
Me.GroupBox4 = New System.Windows.Forms.GroupBox()
+ Me.PnLookAhead = New System.Windows.Forms.Panel()
+ Me.Label29 = New System.Windows.Forms.Label()
Me.Label25 = New System.Windows.Forms.Label()
- Me.CbLookAhead = New System.Windows.Forms.CheckBox()
Me.TbAlookahead = New System.Windows.Forms.TextBox()
Me.Label24 = New System.Windows.Forms.Label()
+ Me.TbVminLA = New System.Windows.Forms.TextBox()
+ Me.Label28 = New System.Windows.Forms.Label()
+ Me.CbLookAhead = New System.Windows.Forms.CheckBox()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.Label21 = New System.Windows.Forms.Label()
Me.Label20 = New System.Windows.Forms.Label()
@@ -197,10 +201,6 @@ Partial Class F_GEN
Me.OpenWithGRAPHiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.PnLookAhead = New System.Windows.Forms.Panel()
- Me.Label28 = New System.Windows.Forms.Label()
- Me.TbVminLA = New System.Windows.Forms.TextBox()
- Me.Label29 = New System.Windows.Forms.Label()
Me.TabPgHEV.SuspendLayout()
Me.TabPgColdSt.SuspendLayout()
Me.GroupBox3.SuspendLayout()
@@ -210,6 +210,7 @@ Partial Class F_GEN
Me.TabControl1.SuspendLayout()
Me.TabPgDriver.SuspendLayout()
Me.GroupBox4.SuspendLayout()
+ Me.PnLookAhead.SuspendLayout()
Me.GroupBox1.SuspendLayout()
Me.GrStartStop.SuspendLayout()
Me.PnStartStop.SuspendLayout()
@@ -221,7 +222,6 @@ Partial Class F_GEN
Me.ToolStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.CmOpenFile.SuspendLayout()
- Me.PnLookAhead.SuspendLayout()
Me.SuspendLayout()
'
'ButOpenEXS
@@ -1137,10 +1137,32 @@ Partial Class F_GEN
Me.GroupBox4.Location = New System.Drawing.Point(12, 331)
Me.GroupBox4.Name = "GroupBox4"
Me.GroupBox4.Size = New System.Drawing.Size(375, 87)
- Me.GroupBox4.TabIndex = 41
+ Me.GroupBox4.TabIndex = 5
Me.GroupBox4.TabStop = False
Me.GroupBox4.Text = "Look-Ahead Coasting"
'
+ 'PnLookAhead
+ '
+ Me.PnLookAhead.Controls.Add(Me.Label29)
+ Me.PnLookAhead.Controls.Add(Me.Label25)
+ Me.PnLookAhead.Controls.Add(Me.TbAlookahead)
+ Me.PnLookAhead.Controls.Add(Me.Label24)
+ Me.PnLookAhead.Controls.Add(Me.TbVminLA)
+ Me.PnLookAhead.Controls.Add(Me.Label28)
+ Me.PnLookAhead.Location = New System.Drawing.Point(117, 10)
+ Me.PnLookAhead.Name = "PnLookAhead"
+ Me.PnLookAhead.Size = New System.Drawing.Size(252, 71)
+ Me.PnLookAhead.TabIndex = 1
+ '
+ 'Label29
+ '
+ Me.Label29.AutoSize = True
+ Me.Label29.Location = New System.Drawing.Point(197, 38)
+ Me.Label29.Name = "Label29"
+ Me.Label29.Size = New System.Drawing.Size(38, 13)
+ Me.Label29.TabIndex = 3
+ Me.Label29.Text = "[km/h]"
+ '
'Label25
'
Me.Label25.AutoSize = True
@@ -1150,24 +1172,12 @@ Partial Class F_GEN
Me.Label25.TabIndex = 3
Me.Label25.Text = "[m/s²]"
'
- 'CbLookAhead
- '
- Me.CbLookAhead.AutoSize = True
- Me.CbLookAhead.Checked = True
- Me.CbLookAhead.CheckState = System.Windows.Forms.CheckState.Checked
- Me.CbLookAhead.Location = New System.Drawing.Point(16, 21)
- Me.CbLookAhead.Name = "CbLookAhead"
- Me.CbLookAhead.Size = New System.Drawing.Size(65, 17)
- Me.CbLookAhead.TabIndex = 0
- Me.CbLookAhead.Text = "Enabled"
- Me.CbLookAhead.UseVisualStyleBackColor = True
- '
'TbAlookahead
'
Me.TbAlookahead.Location = New System.Drawing.Point(127, 9)
Me.TbAlookahead.Name = "TbAlookahead"
Me.TbAlookahead.Size = New System.Drawing.Size(64, 20)
- Me.TbAlookahead.TabIndex = 2
+ Me.TbAlookahead.TabIndex = 0
'
'Label24
'
@@ -1178,6 +1188,34 @@ Partial Class F_GEN
Me.Label24.TabIndex = 1
Me.Label24.Text = "Target Retardation"
'
+ 'TbVminLA
+ '
+ Me.TbVminLA.Location = New System.Drawing.Point(127, 35)
+ Me.TbVminLA.Name = "TbVminLA"
+ Me.TbVminLA.Size = New System.Drawing.Size(64, 20)
+ Me.TbVminLA.TabIndex = 1
+ '
+ 'Label28
+ '
+ Me.Label28.AutoSize = True
+ Me.Label28.Location = New System.Drawing.Point(26, 38)
+ Me.Label28.Name = "Label28"
+ Me.Label28.Size = New System.Drawing.Size(95, 13)
+ Me.Label28.TabIndex = 1
+ Me.Label28.Text = "Min. Target Speed"
+ '
+ 'CbLookAhead
+ '
+ Me.CbLookAhead.AutoSize = True
+ Me.CbLookAhead.Checked = True
+ Me.CbLookAhead.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.CbLookAhead.Location = New System.Drawing.Point(16, 21)
+ Me.CbLookAhead.Name = "CbLookAhead"
+ Me.CbLookAhead.Size = New System.Drawing.Size(65, 17)
+ Me.CbLookAhead.TabIndex = 0
+ Me.CbLookAhead.Text = "Enabled"
+ Me.CbLookAhead.UseVisualStyleBackColor = True
+ '
'GroupBox1
'
Me.GroupBox1.Controls.Add(Me.Label21)
@@ -1195,7 +1233,7 @@ Partial Class F_GEN
Me.GroupBox1.Location = New System.Drawing.Point(12, 192)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(372, 109)
- Me.GroupBox1.TabIndex = 40
+ Me.GroupBox1.TabIndex = 4
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Overspeed / Eco-Roll"
'
@@ -1231,21 +1269,21 @@ Partial Class F_GEN
Me.TbVmin.Location = New System.Drawing.Point(244, 73)
Me.TbVmin.Name = "TbVmin"
Me.TbVmin.Size = New System.Drawing.Size(64, 20)
- Me.TbVmin.TabIndex = 2
+ Me.TbVmin.TabIndex = 5
'
'TbUnderSpeed
'
Me.TbUnderSpeed.Location = New System.Drawing.Point(244, 47)
Me.TbUnderSpeed.Name = "TbUnderSpeed"
Me.TbUnderSpeed.Size = New System.Drawing.Size(64, 20)
- Me.TbUnderSpeed.TabIndex = 2
+ Me.TbUnderSpeed.TabIndex = 4
'
'TbOverspeed
'
Me.TbOverspeed.Location = New System.Drawing.Point(244, 21)
Me.TbOverspeed.Name = "TbOverspeed"
Me.TbOverspeed.Size = New System.Drawing.Size(64, 20)
- Me.TbOverspeed.TabIndex = 2
+ Me.TbOverspeed.TabIndex = 3
'
'Label23
'
@@ -1281,7 +1319,7 @@ Partial Class F_GEN
Me.RdEcoRoll.Location = New System.Drawing.Point(13, 68)
Me.RdEcoRoll.Name = "RdEcoRoll"
Me.RdEcoRoll.Size = New System.Drawing.Size(65, 17)
- Me.RdEcoRoll.TabIndex = 0
+ Me.RdEcoRoll.TabIndex = 2
Me.RdEcoRoll.TabStop = True
Me.RdEcoRoll.Text = "Eco-Roll"
Me.RdEcoRoll.UseVisualStyleBackColor = True
@@ -1292,7 +1330,7 @@ Partial Class F_GEN
Me.RdOverspeed.Location = New System.Drawing.Point(13, 45)
Me.RdOverspeed.Name = "RdOverspeed"
Me.RdOverspeed.Size = New System.Drawing.Size(77, 17)
- Me.RdOverspeed.TabIndex = 0
+ Me.RdOverspeed.TabIndex = 1
Me.RdOverspeed.Text = "Overspeed"
Me.RdOverspeed.UseVisualStyleBackColor = True
'
@@ -1313,7 +1351,7 @@ Partial Class F_GEN
Me.GrStartStop.Location = New System.Drawing.Point(9, 83)
Me.GrStartStop.Name = "GrStartStop"
Me.GrStartStop.Size = New System.Drawing.Size(375, 87)
- Me.GrStartStop.TabIndex = 38
+ Me.GrStartStop.TabIndex = 3
Me.GrStartStop.TabStop = False
Me.GrStartStop.Text = "Engine Start Stop"
'
@@ -1328,7 +1366,7 @@ Partial Class F_GEN
Me.PnStartStop.Location = New System.Drawing.Point(148, 10)
Me.PnStartStop.Name = "PnStartStop"
Me.PnStartStop.Size = New System.Drawing.Size(221, 71)
- Me.PnStartStop.TabIndex = 0
+ Me.PnStartStop.TabIndex = 1
'
'Label27
'
@@ -1344,7 +1382,7 @@ Partial Class F_GEN
Me.TBSSspeed.Location = New System.Drawing.Point(99, 9)
Me.TBSSspeed.Name = "TBSSspeed"
Me.TBSSspeed.Size = New System.Drawing.Size(64, 20)
- Me.TBSSspeed.TabIndex = 34
+ Me.TBSSspeed.TabIndex = 0
'
'LabelSSspeed
'
@@ -1378,7 +1416,7 @@ Partial Class F_GEN
Me.TBSStime.Location = New System.Drawing.Point(99, 35)
Me.TBSStime.Name = "TBSStime"
Me.TBSStime.Size = New System.Drawing.Size(64, 20)
- Me.TBSStime.TabIndex = 36
+ Me.TBSStime.TabIndex = 1
'
'ChBStartStop
'
@@ -1388,7 +1426,7 @@ Partial Class F_GEN
Me.ChBStartStop.Location = New System.Drawing.Point(16, 21)
Me.ChBStartStop.Name = "ChBStartStop"
Me.ChBStartStop.Size = New System.Drawing.Size(65, 17)
- Me.ChBStartStop.TabIndex = 39
+ Me.ChBStartStop.TabIndex = 0
Me.ChBStartStop.Text = "Enabled"
Me.ChBStartStop.UseVisualStyleBackColor = True
'
@@ -1398,7 +1436,7 @@ Partial Class F_GEN
Me.BtAccOpen.Location = New System.Drawing.Point(617, 28)
Me.BtAccOpen.Name = "BtAccOpen"
Me.BtAccOpen.Size = New System.Drawing.Size(23, 23)
- Me.BtAccOpen.TabIndex = 33
+ Me.BtAccOpen.TabIndex = 2
Me.BtAccOpen.TabStop = False
Me.BtAccOpen.UseVisualStyleBackColor = True
'
@@ -1416,7 +1454,7 @@ Partial Class F_GEN
Me.BtDesMaxBr.Location = New System.Drawing.Point(583, 29)
Me.BtDesMaxBr.Name = "BtDesMaxBr"
Me.BtDesMaxBr.Size = New System.Drawing.Size(28, 21)
- Me.BtDesMaxBr.TabIndex = 31
+ Me.BtDesMaxBr.TabIndex = 1
Me.BtDesMaxBr.Text = "..."
Me.BtDesMaxBr.UseVisualStyleBackColor = True
'
@@ -1425,7 +1463,7 @@ Partial Class F_GEN
Me.TbDesMaxFile.Location = New System.Drawing.Point(6, 30)
Me.TbDesMaxFile.Name = "TbDesMaxFile"
Me.TbDesMaxFile.Size = New System.Drawing.Size(571, 20)
- Me.TbDesMaxFile.TabIndex = 30
+ Me.TbDesMaxFile.TabIndex = 0
'
'TabPgKF
'
@@ -1982,44 +2020,6 @@ Partial Class F_GEN
Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
- 'PnLookAhead
- '
- Me.PnLookAhead.Controls.Add(Me.Label29)
- Me.PnLookAhead.Controls.Add(Me.Label25)
- Me.PnLookAhead.Controls.Add(Me.TbAlookahead)
- Me.PnLookAhead.Controls.Add(Me.Label24)
- Me.PnLookAhead.Controls.Add(Me.TbVminLA)
- Me.PnLookAhead.Controls.Add(Me.Label28)
- Me.PnLookAhead.Location = New System.Drawing.Point(117, 10)
- Me.PnLookAhead.Name = "PnLookAhead"
- Me.PnLookAhead.Size = New System.Drawing.Size(252, 71)
- Me.PnLookAhead.TabIndex = 1
- '
- 'Label28
- '
- Me.Label28.AutoSize = True
- Me.Label28.Location = New System.Drawing.Point(26, 38)
- Me.Label28.Name = "Label28"
- Me.Label28.Size = New System.Drawing.Size(95, 13)
- Me.Label28.TabIndex = 1
- Me.Label28.Text = "Min. Target Speed"
- '
- 'TbVminLA
- '
- Me.TbVminLA.Location = New System.Drawing.Point(127, 35)
- Me.TbVminLA.Name = "TbVminLA"
- Me.TbVminLA.Size = New System.Drawing.Size(64, 20)
- Me.TbVminLA.TabIndex = 2
- '
- 'Label29
- '
- Me.Label29.AutoSize = True
- Me.Label29.Location = New System.Drawing.Point(197, 38)
- Me.Label29.Name = "Label29"
- Me.Label29.Size = New System.Drawing.Size(38, 13)
- Me.Label29.TabIndex = 3
- Me.Label29.Text = "[km/h]"
- '
'F_GEN
'
Me.AcceptButton = Me.ButOK
@@ -2056,6 +2056,8 @@ Partial Class F_GEN
Me.TabPgDriver.PerformLayout()
Me.GroupBox4.ResumeLayout(False)
Me.GroupBox4.PerformLayout()
+ Me.PnLookAhead.ResumeLayout(False)
+ Me.PnLookAhead.PerformLayout()
Me.GroupBox1.ResumeLayout(False)
Me.GroupBox1.PerformLayout()
Me.GrStartStop.ResumeLayout(False)
@@ -2075,8 +2077,6 @@ Partial Class F_GEN
Me.ToolStrip1.PerformLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.CmOpenFile.ResumeLayout(False)
- Me.PnLookAhead.ResumeLayout(False)
- Me.PnLookAhead.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
diff --git a/VECTO/GUI/F_MAINForm.Designer.vb b/VECTO/GUI/F_MAINForm.Designer.vb
index 4615895b103389827f0478341e9b42756b5bb979..b5efd508e33a22504f3c1b9614173dcb08f0d474 100644
--- a/VECTO/GUI/F_MAINForm.Designer.vb
+++ b/VECTO/GUI/F_MAINForm.Designer.vb
@@ -79,6 +79,8 @@ Partial Class F_MAINForm
Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader8 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader9 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.ConMenFilelist = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.SaveListToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.LoadListToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -703,7 +705,7 @@ Partial Class F_MAINForm
Me.LvDEVoptions.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.LvDEVoptions.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader7, Me.ColumnHeader5, Me.ColumnHeader6})
+ Me.LvDEVoptions.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader7, Me.ColumnHeader5, Me.ColumnHeader6, Me.ColumnHeader8, Me.ColumnHeader9})
Me.LvDEVoptions.FullRowSelect = True
Me.LvDEVoptions.GridLines = True
Me.LvDEVoptions.Location = New System.Drawing.Point(6, 6)
@@ -717,12 +719,12 @@ Partial Class F_MAINForm
'ColumnHeader4
'
Me.ColumnHeader4.Text = "Property"
- Me.ColumnHeader4.Width = 73
+ Me.ColumnHeader4.Width = 89
'
'ColumnHeader7
'
Me.ColumnHeader7.Text = "Description"
- Me.ColumnHeader7.Width = 563
+ Me.ColumnHeader7.Width = 527
'
'ColumnHeader5
'
@@ -732,7 +734,17 @@ Partial Class F_MAINForm
'ColumnHeader6
'
Me.ColumnHeader6.Text = "Value"
- Me.ColumnHeader6.Width = 273
+ Me.ColumnHeader6.Width = 134
+ '
+ 'ColumnHeader8
+ '
+ Me.ColumnHeader8.Text = "Default"
+ Me.ColumnHeader8.Width = 120
+ '
+ 'ColumnHeader9
+ '
+ Me.ColumnHeader9.Text = "Saved In DEVconfig.txt"
+ Me.ColumnHeader9.Width = 129
'
'ConMenFilelist
'
@@ -1173,5 +1185,7 @@ Partial Class F_MAINForm
Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents GRAPHiToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ColumnHeader8 As System.Windows.Forms.ColumnHeader
+ Friend WithEvents ColumnHeader9 As System.Windows.Forms.ColumnHeader
End Class
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index 658d24fb266a9782df864d61fbe98e852988db8e..6327ea94e4216d3e5bef31cbaa9c3b555ef3e89c 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -2007,6 +2007,12 @@ lbFound:
LV0.SubItems.Add(Config0.Value.Description)
LV0.SubItems.Add(Config0.Value.TypeString)
LV0.SubItems.Add("")
+ LV0.SubItems.Add(Config0.Value.ValTextDef)
+ If Config0.Value.SaveInFile Then
+ LV0.SubItems.Add("True")
+ Else
+ LV0.SubItems.Add("False")
+ End If
LV0.Tag = Config0.Key
If Not Config0.Value.Enabled Then
@@ -2162,9 +2168,22 @@ lbFound:
'If it is a Link => Open it
Private Sub LvMsg_MouseClick(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles LvMsg.MouseClick
+ Dim txt As String
If Me.LvMsg.SelectedIndices.Count > 0 Then
If Not Me.LvMsg.SelectedItems(0).Tag Is Nothing Then
- OpenFiles(CStr(Me.LvMsg.SelectedItems(0).Tag))
+ If Len(CStr(Me.LvMsg.SelectedItems(0).Tag)) > 4 AndAlso Microsoft.VisualBasic.Left(CStr(Me.LvMsg.SelectedItems(0).Tag), 4) = "<UM>" Then
+ txt = CStr(Me.LvMsg.SelectedItems(0).Tag).Replace("<UM>", MyAppPath & "User Manual")
+ txt = txt.Replace(" ", "%20")
+ txt = txt.Replace("\", "/")
+ txt = "file:///" & txt
+ Try
+ System.Diagnostics.Process.Start(txt)
+ Catch ex As Exception
+ MsgBox("Cannot open link! (-_-;)")
+ End Try
+ Else
+ OpenFiles(CStr(Me.LvMsg.SelectedItems(0).Tag))
+ End If
End If
End If
End Sub
@@ -2173,7 +2192,7 @@ lbFound:
Private Sub LvMsg_MouseMove(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles LvMsg.MouseMove
Dim lv0 As ListViewItem
lv0 = Me.LvMsg.GetItemAt(e.Location.X, e.Location.Y)
- If Not lv0 Is Nothing AndAlso lv0.Tag Is Nothing Then
+ If lv0 Is Nothing OrElse lv0.Tag Is Nothing Then
LvMsg.Cursor = Cursors.Arrow
Else
LvMsg.Cursor = Cursors.Hand
diff --git a/VECTO/GUI/F_Options.Designer.vb b/VECTO/GUI/F_Options.Designer.vb
index 48ba842124d7497111673de67b92a22d24a019d9..0fc8ad10a03f22ef6ee6e42fb0940ec1cddd84a7 100644
--- a/VECTO/GUI/F_Options.Designer.vb
+++ b/VECTO/GUI/F_Options.Designer.vb
@@ -262,9 +262,9 @@ Partial Class F_Options
Me.Label3.AutoSize = True
Me.Label3.Location = New System.Drawing.Point(130, 22)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(48, 13)
+ Me.Label3.Size = New System.Drawing.Size(41, 13)
Me.Label3.TabIndex = 16
- Me.Label3.Text = "[kg/m³]"
+ Me.Label3.Text = "[kg/m²]"
'
'TbCO2toFC
'
diff --git a/VECTO/Input Files/cDRI.vb b/VECTO/Input Files/cDRI.vb
index 7787c1795f05e23816c6bc8292ce230e57654d60..663ce435fdaaffec0010d0da4076182cba092df2 100644
--- a/VECTO/Input Files/cDRI.vb
+++ b/VECTO/Input Files/cDRI.vb
@@ -790,7 +790,7 @@ lbEr:
a = vm * dv / ds
- am = GEN.aDesMin((Speed(i) + Speed(i - 1)) / 2)
+ am = GEN.aDesMin(vm)
Do While a < am
@@ -801,7 +801,7 @@ lbEr:
a = vm * dv / ds
- am = GEN.aDesMin((Speed(i) + Speed(i - 1)) / 2)
+ am = GEN.aDesMin(vm)
Loop
diff --git a/VECTO/MODcalc/Em Calc.vb b/VECTO/MODcalc/Em Calc.vb
index a2403cfb0ea9e900643c031a49987a2137594a6b..f838383bce89763d2844d1e6f1851cad1eb19694 100644
--- a/VECTO/MODcalc/Em Calc.vb
+++ b/VECTO/MODcalc/Em Calc.vb
@@ -22,6 +22,9 @@ Public Class cEm
Dim KV As KeyValuePair(Of String, cEmComp)
Dim Em0 As cEmComp
Dim Result As Boolean
+ Dim MsgSrc As String
+
+ MsgSrc = ""
Result = True
@@ -53,6 +56,16 @@ Public Class cEm
If KV.Value.MapCompID = tMapComp.FC Then
'Delaunay
v = MAP.fFCdelaunay_Intp(MODdata.nn(i), MODdata.Pe(i))
+
+ If v < 0 Then
+ If v < DEV.negFCerr Then
+ WorkerMsg(tMsgID.Err, "FC= " & v & "!", "MAP/FC_Intp")
+ Result = False
+ Else
+ v = 0
+ End If
+ End If
+
If Result Then
If v < -999 Then Result = False
End If
diff --git a/VECTO/MODcalc/cPower.vb b/VECTO/MODcalc/cPower.vb
index 26c03251827d4c0e2e1d539620daa87d31c7e0a4..0036f3b6167804cebc211e93c8ac9d9e87c77ce2 100644
--- a/VECTO/MODcalc/cPower.vb
+++ b/VECTO/MODcalc/cPower.vb
@@ -647,7 +647,7 @@ lb10:
LookAheadDone = False
adec = GEN.aDesMin(Vist)
- If Vh.a(i) < adec Then Vh.SetAccBackw(i, adec)
+ If Vh.a(i) < adec Then Vh.SetMinAccBackw(i)
i0 = i
@@ -658,7 +658,7 @@ lb10:
adec = GEN.aDesMin(Vist)
If aist < adec Then
- Vh.SetAccBackw(i, adec)
+ Vh.SetMinAccBackw(i)
Positions(i) = 2
Else
'Coasting (Forward)
@@ -672,6 +672,7 @@ lb10:
'If Vrollout < Vist Then
Vh.SetSpeed(j, vCoasting)
Positions(j) = 3
+ Vh.NoDistCorr(j) = True
Else
Exit For
End If
@@ -785,6 +786,9 @@ lb10:
Return False
End If
+ 'Messages
+ If Not Cfg.WegKorJa Then WorkerMsg(tMsgID.Warn, "Distance Correction is disabled!", MsgSrc, "<UM>/GUI/mainform_options.html#CycleDistCor")
+
' Initialize
Vh = MODdata.Vh
If Cfg.GnVorgab Then
@@ -913,12 +917,7 @@ lbGschw:
If GEN.DesMaxJa Then
'Check if Acceleration is too high
-
- If jz = 0 Then
- amax = GEN.aDesMax(Vist)
- Else
- amax = GEN.aDesMax(Vh.V(jz - 1))
- End If
+ amax = GEN.aDesMax(Vist)
If amax < 0.0001 Then
WorkerMsg(tMsgID.Err, "aDesMax(acc) invalid! v= " & Vist & ", aDesMax(acc) =" & amax, MsgSrc)
@@ -927,7 +926,8 @@ lbGschw:
If aist > amax + 0.0001 Then
- Vh.SetSpeed0(jz, Vh.V0(jz) + amax)
+ 'Vh.SetSpeed0(jz, Vh.V0(jz) + amax)
+ Vh.SetMaxAcc(jz)
GoTo lbGschw
@@ -1646,10 +1646,18 @@ lb_nOK:
If Cfg.WegKorJa Then
If MODdata.tDim > MODdata.tDimOgl Then WorkerMsg(tMsgID.Normal, "Cycle extended by " & MODdata.tDim - MODdata.tDimOgl & " seconds to meet target distance.", MsgSrc)
+
+ If Math.Abs(Vh.WegIst - Vh.WegSoll) > 80 Then
+ WorkerMsg(tMsgID.Warn, "Target distance= " & (Vh.WegSoll / 1000).ToString("#.000") & "[km], Actual distance= " & (Vh.WegIst / 1000).ToString("#.000") & "[km], Error= " & Math.Abs(Vh.WegIst - Vh.WegSoll).ToString("#.0") & "[m]", MsgSrc)
+ Else
+ WorkerMsg(tMsgID.Normal, "Target distance= " & (Vh.WegSoll / 1000).ToString("#.000") & "[km], Actual distance= " & (Vh.WegIst / 1000).ToString("#.000") & "[km], Error= " & Math.Abs(Vh.WegIst - Vh.WegSoll).ToString("#.0") & "[m]", MsgSrc)
+ End If
End If
If SecSpeedRed > 0 Then WorkerMsg(tMsgID.Normal, "Speed reduction > 1.5 m/s in " & SecSpeedRed & " time steps.", MsgSrc)
+
+
End If
'CleanUp
diff --git a/VECTO/MODcalc/cVh.vb b/VECTO/MODcalc/cVh.vb
index f80e1fe9fad80722ac3b80473598a2fd84201812..b7d23dbb48d774043ff064dc8ebe6dc7186f3314 100644
--- a/VECTO/MODcalc/cVh.vb
+++ b/VECTO/MODcalc/cVh.vb
@@ -17,11 +17,13 @@ Public Class cVh
Private la As List(Of Single)
'WegKor |@@| Route(Weg)Correct
- Private WegIst As Double
+ Private dWegIst As Double
Public Weg As List(Of Double)
Private WegX As Integer
Private WegV As List(Of Single)
+ Public NoDistCorr As List(Of Boolean)
+
Public Sub Init()
lV = New List(Of Single)
@@ -35,6 +37,7 @@ Public Class cVh
lVairVres = New List(Of Single)
lVairBeta = New List(Of Single)
EcoRoll = New List(Of Boolean)
+ NoDistCorr = New List(Of Boolean)
End Sub
Public Sub CleanUp()
@@ -49,6 +52,7 @@ Public Class cVh
lVairVres = Nothing
lVairBeta = Nothing
EcoRoll = Nothing
+ NoDistCorr = Nothing
End Sub
Public Sub VehCylceInit()
@@ -152,6 +156,7 @@ Public Class cVh
For s = 0 To MODdata.tDim
EcoRoll.Add(False)
+ NoDistCorr.Add(False)
Next
@@ -263,7 +268,33 @@ Public Class cVh
End If
End Sub
- Public Sub SetAcc(ByVal t As Integer, ByVal a As Single)
+
+
+ Public Sub SetMaxAcc(ByVal t As Integer)
+ Dim a As Single
+ Dim v As Single
+ Dim v0plus As Single
+ Dim a0 As Single
+
+ v0plus = lV0(t + 1)
+
+ v = (v0plus + lV0(t)) / 2
+ a0 = GEN.aDesMax(v)
+
+ v0plus = lV0(t) + a
+ v = (v0plus + lV0(t)) / 2
+ a = GEN.aDesMax(v)
+
+ Do While Math.Abs(a - a0) > 0.0001
+
+ a0 = a
+
+ v0plus = lV0(t) + a
+ v = (v0plus + lV0(t)) / 2
+ a = GEN.aDesMax(v)
+
+ Loop
+
la(t) = a
lV0(t + 1) = lV0(t) + a
lV(t) = (lV0(t + 1) + lV0(t)) / 2
@@ -274,7 +305,31 @@ Public Class cVh
End Sub
- Public Sub SetAccBackw(ByVal t As Integer, ByVal a As Single)
+ Public Sub SetMinAccBackw(ByVal t As Integer)
+ Dim a As Single
+ Dim v As Single
+ Dim v0 As Single
+ Dim a0 As Single
+
+ v0 = lV0(t)
+
+ v = (lV0(t + 1) + v0) / 2
+ a0 = GEN.aDesMin(v)
+
+ v0 = lV0(t + 1) - a
+ v = (lV0(t + 1) + v0) / 2
+ a = GEN.aDesMin(v)
+
+ Do While Math.Abs(a - a0) > 0.0001
+
+ a0 = a
+
+ v0 = lV0(t + 1) - a
+ v = (lV0(t + 1) + v0) / 2
+ a = GEN.aDesMin(v)
+
+ Loop
+
la(t) = a
lV0(t) = lV0(t + 1) - a
lV(t) = (lV0(t + 1) + lV0(t)) / 2
@@ -288,7 +343,7 @@ Public Class cVh
Dim i As Int16
WegX = 0
- WegIst = 0
+ dWegIst = 0
WegV = New List(Of Single)
@@ -305,24 +360,26 @@ Public Class cVh
v = lV(t)
- WegIst += v
+ dWegIst += v
If WegX < MODdata.tDimOgl Then
'If repeating of current time-step is closer to the target distance => Repeat time-step
- If (Math.Abs(WegIst + Vsoll(t) - Weg(WegX)) < Math.Abs(WegIst - Weg(WegX))) And v > 1 Then
+ If Not NoDistCorr(t) AndAlso (Math.Abs(dWegIst + Vsoll(t) - Weg(WegX)) < Math.Abs(dWegIst - Weg(WegX))) And v > 1 Then
Duplicate(t + 1)
MODdata.tDim += 1
'Debug.Print("Duplicate," & t & "," & WegIst & "," & Weg(WegX))
+ NoDistCorr(t + 1) = True
Return True
'If deleting the next time-step is closer to target distance => Delete Next Time-step
- ElseIf WegX < MODdata.tDimOgl - 1 AndAlso t < MODdata.tDim - 1 AndAlso Math.Abs(WegIst - Weg(WegX + 1)) <= Math.Abs(WegIst - Weg(WegX)) AndAlso v > 1 Then
+ ElseIf Not NoDistCorr(t) AndAlso WegX < MODdata.tDimOgl - 1 AndAlso t < MODdata.tDim - 1 AndAlso Math.Abs(dWegIst - Weg(WegX + 1)) <= Math.Abs(dWegIst - Weg(WegX)) AndAlso v > 1 Then
Cut(t + 1)
MODdata.tDim -= 1
'Debug.Print("Cut," & t & "," & WegIst & "," & Weg(WegX))
+ NoDistCorr(t + 1) = True
WegX += 2
Return True
@@ -366,6 +423,7 @@ Public Class cVh
lGears.Insert(t, lGears(t))
lPadd.Insert(t, lPadd(t))
EcoRoll.Insert(t, EcoRoll(t))
+ NoDistCorr.Insert(t, NoDistCorr(t))
If DRI.VairVorg Then
lVairVres.Insert(t, lVairVres(t))
@@ -400,6 +458,7 @@ Public Class cVh
lGears.Insert(t, lGears(t))
lPadd.Insert(t, lPadd(t))
EcoRoll.Insert(t, EcoRoll(t))
+ NoDistCorr.Insert(t, NoDistCorr(t))
If DRI.VairVorg Then
lVairVres.Insert(t, lVairVres(t))
@@ -439,6 +498,7 @@ Public Class cVh
lGears.RemoveAt(t)
lPadd.RemoveAt(t)
EcoRoll.RemoveAt(t)
+ NoDistCorr.RemoveAt(t)
If DRI.VairVorg Then
lVairVres.RemoveAt(t)
@@ -509,4 +569,17 @@ Public Class cVh
End Get
End Property
+ Public ReadOnly Property WegIst As Double
+ Get
+ Return dWegIst
+ End Get
+ End Property
+
+ Public ReadOnly Property WegSoll As Double
+ Get
+ Return Weg(WegX)
+ End Get
+ End Property
+
+
End Class
diff --git a/VECTO/cDEV.vb b/VECTO/cDEV.vb
index 7544b6bef25a637c0cfb8e917366c6db251019e0..08e3c1221fae34c4fb7ce2cf1957ca6695962f6c 100644
--- a/VECTO/cDEV.vb
+++ b/VECTO/cDEV.vb
@@ -16,6 +16,7 @@ Public Class cDEV
Public SpeedPeEps As Single
Public PreRun As Boolean
Public IgnoreFCextrapol As Boolean
+ Public negFCerr As Single
@@ -150,10 +151,14 @@ Public Class cDEV
Conf0.BoolVal = True
MyOptions.Add("PreRun", Conf0)
- Conf0 = New cDEVoption(tDEVconfType.tBoolean, "Don't abort calculation if extrapolation in FC map. FC output is not valid!!", False)
+ Conf0 = New cDEVoption(tDEVconfType.tBoolean, "Don't abort calculation if extrapolation or values < negFCerr in FC map. FC output is not valid!!", False)
Conf0.BoolVal = False
MyOptions.Add("IgnoreFCextrapol", Conf0)
+ Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "FC values below negFCerr cause errors and abort calculation. Values between zero and negFCerr are set to zero.")
+ Conf0.SingleVal = -0.000001
+ MyOptions.Add("negFCerr", Conf0)
+
'**************************** END: Parameters Configuration '*****************************
'*****************************************************************************************
'*****************************************************************************************
@@ -172,7 +177,9 @@ Public Class cDEV
SpeedPeEps = MyOptions("SpeedPeEps").SingleVal
PreRun = MyOptions("PreRun").BoolVal
+
IgnoreFCextrapol = MyOptions("IgnoreFCextrapol").BoolVal
+ negFCerr = MyOptions("negFCerr").SingleVal
End Sub
@@ -322,6 +329,9 @@ Public Class cDEVoption
Private sStringVal As String
Private iModeIndex As Integer
+ Private sValTextDef As String
+ Private sValTextDefdef As Boolean
+
Public Delegate Function dActionDelegate() As String
Public ActionDelegate As dActionDelegate
@@ -361,6 +371,14 @@ Public Class cDEVoption
sValText = "<undefined>"
End If
+ sValTextDef = ""
+ sValTextDefdef = False
+
+ End Sub
+
+ Private Sub DefValTextDef()
+ sValTextDefdef = True
+ sValTextDef = sValText
End Sub
Public Sub DoAction()
@@ -378,6 +396,7 @@ Public Class cDEVoption
Select Case MyConfType
Case tDEVconfType.tAction
'??? Darf nicht sein |@@| May not be
+ Return False
Case tDEVconfType.tBoolean
BoolVal = CBool(StrExpr)
@@ -437,6 +456,12 @@ Public Class cDEVoption
End Get
End Property
+ Public ReadOnly Property ValTextDef As String
+ Get
+ Return sValTextDef
+ End Get
+ End Property
+
Public Property IntVal As Integer
Get
Return iIntVal
@@ -444,6 +469,7 @@ Public Class cDEVoption
Set(value As Integer)
iIntVal = value
sValText = iIntVal.ToString
+ If Not sValTextDefdef Then DefValTextDef()
End Set
End Property
@@ -454,6 +480,7 @@ Public Class cDEVoption
Set(value As Single)
sSingleVal = value
sValText = sSingleVal.ToString
+ If Not sValTextDefdef Then DefValTextDef()
End Set
End Property
@@ -468,6 +495,7 @@ Public Class cDEVoption
Else
sValText = "False"
End If
+ If Not sValTextDefdef Then DefValTextDef()
End Set
End Property
@@ -478,6 +506,7 @@ Public Class cDEVoption
Set(value As String)
sStringVal = value
sValText = ChrW(34) & sStringVal & ChrW(34)
+ If Not sValTextDefdef Then DefValTextDef()
End Set
End Property
@@ -488,6 +517,7 @@ Public Class cDEVoption
Set(value As Integer)
iModeIndex = value
sValText = "(" & iModeIndex & ") " & sModes(iModeIndex)
+ If Not sValTextDefdef Then DefValTextDef()
End Set
End Property
diff --git a/VECTO/cDelaunayMap.vb b/VECTO/cDelaunayMap.vb
index 307b75ecdafb789286f5f8a7a873ec481ae307cd..c2325cb5fee5634c17d64f1901595d091bd936d6 100644
--- a/VECTO/cDelaunayMap.vb
+++ b/VECTO/cDelaunayMap.vb
@@ -94,14 +94,26 @@ Public Class cDelaunayMap
j = -1
+ 'Try exact solution for IsInside()
For Each tr In lDT
j += 1
- If IsInside(tr, x, y) Then
+ If IsInside(tr, x, y, True) Then
l0 = planes(j)
Return (l0(3) - x * l0(0) - y * l0(1)) / l0(2)
End If
Next
+ 'Try approx. solution (fixes rounding errors when points lies exactly on an edge of a triangle)
+ For Each tr In lDT
+ j += 1
+ If IsInside(tr, x, y, False) Then
+ l0 = planes(j)
+ Return (l0(3) - x * l0(0) - y * l0(1)) / l0(2)
+ End If
+ Next
+
+
+
'ERROR: Extrapolation
'#If DEBUG Then
@@ -125,9 +137,19 @@ Public Class cDelaunayMap
j = -1
+ 'Try exact solution for IsInside()
For Each tr In lDTXZ
j += 1
- If IsInside(tr, x, z) Then
+ If IsInside(tr, x, z, True) Then
+ l0 = planesXZ(j)
+ Return (l0(3) - x * l0(0) - z * l0(1)) / l0(2)
+ End If
+ Next
+
+ 'Try approx. solution (fixes rounding errors when points lies exactly on an edge of a triangle)
+ For Each tr In lDTXZ
+ j += 1
+ If IsInside(tr, x, z, False) Then
l0 = planesXZ(j)
Return (l0(3) - x * l0(0) - z * l0(1)) / l0(2)
End If
@@ -174,7 +196,7 @@ Public Class cDelaunayMap
End Function
- Private Function IsInside(ByRef tr As dTriangle, ByVal xges As Double, ByVal yges As Double) As Boolean
+ Private Function IsInside(ByRef tr As dTriangle, ByVal xges As Double, ByVal yges As Double, ByVal Exact As Boolean) As Boolean
Dim v0(1) As Double
Dim v1(1) As Double
Dim v2(1) As Double
@@ -219,7 +241,11 @@ Public Class cDelaunayMap
v = (dot00 * dot12 - dot01 * dot02) * invDenom
' Check if point is in triangle
- Return (u >= -0.000001) And (v >= -0.000001) And (u + v <= 1.000001)
+ If Exact Then
+ Return (u >= 0) And (v >= 0) And (u + v <= 1)
+ Else
+ Return (u >= -0.000001) And (v >= -0.000001) And (u + v <= 1.000001)
+ End If
End Function
diff --git a/readme.txt b/readme.txt
index 1500c66110acd571aa1a5cf820f003e3cc30734b..89d2fd9d198902a2feb7bdcc43bd3cc2776db0d2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,3 +1,4 @@
The following directories need to be provided in the application folder (e.g. ..\bin\Debug):
User Manual
-Declaration
\ No newline at end of file
+Declaration
+GRAPHi (not included with the repository)
\ No newline at end of file