FIX Working-dir to work with relative-paths

* Add Evaluation-job in demo-data.

CHANGES.md

@@ -7,7 +7,6 @@
 * Possible to use any editor (not only notepad.exe).
 * Separate config/ from Declaration/ folders.
 * Added README.md, CHANGES.md, COPYING.txt files.
-
 #### Internal:
 * Auto create config/ on the 1st run, convert it to JSON with transparent error-handling.
 * FIX leaking of file-descriptors by using VB's 'Using' statement (class 'cFile_v3' now implements IDisposeable).

CSE/Classes/cSettings.vb

@@ -151,10 +151,12 @@ Public Class cSettings
         Get
             Dim value As String = Me.Json_Contents("Body")("WorkingDir")
             If value Is Nothing OrElse value.Trim().Length = 0 Then
-                value = MyPath
+                Return MyPath
+            ElseIf IO.Path.IsPathRooted(value) Then
+                Return value
+            Else
+                Return joinPaths(MyPath, value)
             End If
-
-            Return value
         End Get
         Set(ByVal value As String)
             If value IsNot Nothing Then
@@ -170,6 +172,9 @@ Public Class cSettings
                     value = IO.Path.GetFullPath(value)
                     If value.StartsWith(myPlainPath, StringComparison.OrdinalIgnoreCase) Then
                         value = value.Substring(myPlainPath.Length)
+                        If (value.First <> "\"c) Then
+                            value = value.Substring(1)
+                        End If
                         If (value.Last <> "\"c) Then
                             value = value & "\"
                         End If

DemoData/EvaluationDemo.csjob

+c Constant Speed Evaluator VECTO-CSE 2.01
+c General inputfiles
+c Path to vehicle specifications file (*.csveh)
+J:\TE-Em\Projekte\I_2012_08_HDV_CO2_LOT3\Arbeitsordner\CSE\Release_Packages\2.01\Test\WorkingDir\DemoData\VehicleDemo.csveh
+c Path to ambient conditions file (*.csamb)
+J:\TE-Em\Projekte\I_2012_08_HDV_CO2_LOT3\Arbeitsordner\CSE\Release_Packages\2.01\Test\WorkingDir\DemoData\AmbientConditionsDemo.csamb
+c Anemomenter instrument calibration factors (v_air f, v_air d, beta f, beta d)
+1,0,1,0
+c
+c Calibration test inputfiles
+c Path to measurement section specification file (*.csmsc)
+J:\TE-Em\Projekte\I_2012_08_HDV_CO2_LOT3\Arbeitsordner\CSE\Release_Packages\2.01\Test\WorkingDir\DemoData\TrackDemo.csms
+c Path to measurement data file from the calibration test (*.csdat)
+J:\TE-Em\Projekte\I_2012_08_HDV_CO2_LOT3\Arbeitsordner\CSE\Release_Packages\2.01\Test\WorkingDir\DemoData\DataDemo_CAL.csdat
+c
+c Constant speed test inputfiles
+c Path to measurement section specification file (*.csmsc)
+J:\TE-Em\Projekte\I_2012_08_HDV_CO2_LOT3\Arbeitsordner\CSE\Release_Packages\2.01\Test\WorkingDir\DemoData\TrackDemo.csms
+c Rolling resistance correction
+1
+c Path to measurement data files from the test runs LS1, HS, LS2 (*.csdat)
+J:\TE-Em\Projekte\I_2012_08_HDV_CO2_LOT3\Arbeitsordner\CSE\Release_Packages\2.01\Test\WorkingDir\DemoData\DataDemo_LS1.csdat
+J:\TE-Em\Projekte\I_2012_08_HDV_CO2_LOT3\Arbeitsordner\CSE\Release_Packages\2.01\Test\WorkingDir\DemoData\DataDemo_HS.csdat
+J:\TE-Em\Projekte\I_2012_08_HDV_CO2_LOT3\Arbeitsordner\CSE\Release_Packages\2.01\Test\WorkingDir\DemoData\DataDemo_LS2.csdat
+c Evaluation settings
+c Acceleration correction (yes = 1, no = 0)
+0
+c Gradient correction (yes = 1, no = 0)
+0
+c Output frequency (1Hz = 1, 100Hz = 100)
+1
+c Parameters for general validity criteria
+5
+0.3
+3
+25
+35
+0
+c General parameters
+1
+1.1884
+1
+20
+c Parameters for identification of measurement section
+10
+100
+10
+c Requirements on number of valid datasets
+5
+1
+2
+10
+c **DataSet validity criteria**
+25
+c *Calibration test*
+5
+8
+5
+c *Low and high speed test*
+10
+c Low speed test
+5
+8
+16
+9
+0.15
+0.1
+c High speed test
+5
+8
+80
+3
+0.3
+0.1

README.md

             VECTO-CSE
           ============
 
-Copyright: 2014 EUROPEAN COMMISSION
-Developed by TU-Graz, on behalf of DG CLIMA, supported by JRC.
+Copyright : 2014 EUROPEAN COMMISSION
+Developed : by TU-Graz, on behalf of DG CLIMA, supported by JRC.
+License   : EUPL
 
 A Constant Speed Evaluation tool for tests performed on Heavy-duty vehicles.