Merge remote-tracking branch 'origin/develop' into...

Merge remote-tracking branch 'origin/develop' into bugfix/VECTO-425-vectocmd-invalid-handle-progress

Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh

 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:06:43.0936564Z",
+    "CreatedBy": "",
+    "Date": "2017-06-22T11:15:06.0747543Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
@@ -12,7 +12,6 @@
     "CurbWeightExtra": 0.0,
     "Loading": 0.0,
     "MassMax": 11.99,
-    "CdA": 4.83,
     "rdyn": 0.0,
     "CdCorrMode": "CdofVdecl",
     "CdCorrFile": "",
@@ -31,6 +30,8 @@
       "LossMap": "",
       "Cycle": ""
     },
+    "TorqueLimits": {},
+    "IdlingSpeed": 600.0,
     "AxleConfig": {
       "Type": "4x2",
       "Axles": [
@@ -40,7 +41,8 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": false,
           "RRCISO": 0.0065,
-          "FzISO": 20850.0
+          "FzISO": 20850.0,
+          "Type": "VehicleNonDriven"
         },
         {
           "Inertia": 6.5,
@@ -48,9 +50,11 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": true,
           "RRCISO": 0.0075,
-          "FzISO": 20850.0
+          "FzISO": 20850.0,
+          "Type": "VehicleDriven"
         }
       ]
-    }
+    },
+    "CdA": 4.83
   }
 }
\ No newline at end of file

Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng

 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:06:50.6286564Z",
+    "CreatedBy": "",
+    "Date": "2017-06-22T11:14:49.3067543Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 4
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -11,11 +11,18 @@
     "Displacement": "6871",
     "IdlingSpeed": 600.0,
     "Inertia": 3.56517,
-    "FullLoadCurve": "175kW.vfld",
-    "FuelMap": "175kW.vmap",
     "WHTC-Urban": 1.04,
     "WHTC-Rural": 1.01,
-    "WHTC-Motorway": 1.00,
-    "ColdHotBalancingFactor": 1.0
+    "WHTC-Motorway": 1.0,
+    "WHTC-Engineering": 1.0,
+    "ColdHotBalancingFactor": 1.0,
+    "CFRegPer": 1.0,
+    "CFNCV": 1.0,
+    "RatedPower": 175000.0,
+    "RatedSpeed": 1950.0000000000002,
+    "MaxTorque": 1000.0,
+    "FuelType": 0,
+    "FullLoadCurve": "175kW.vfld",
+    "FuelMap": "175kW.vmap"
   }
 }
\ No newline at end of file

Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor.vveh

 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:08:01.8366564Z",
+    "CreatedBy": "",
+    "Date": "2017-06-22T11:14:19.0107543Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
@@ -12,7 +12,6 @@
     "CurbWeightExtra": 0.0,
     "Loading": 0.0,
     "MassMax": 18.0,
-    "CdA": 5.3,
     "rdyn": 0.0,
     "CdCorrMode": "CdofVdecl",
     "CdCorrFile": "",
@@ -31,6 +30,8 @@
       "LossMap": "",
       "Cycle": ""
     },
+    "TorqueLimits": {},
+    "IdlingSpeed": 600.0,
     "AxleConfig": {
       "Type": "4x2",
       "Axles": [
@@ -40,7 +41,8 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": false,
           "RRCISO": 0.0055,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleNonDriven"
         },
         {
           "Inertia": 14.9,
@@ -48,9 +50,11 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": true,
           "RRCISO": 0.0065,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleDriven"
         }
       ]
-    }
+    },
+    "CdA": 5.3
   }
 }
\ No newline at end of file

Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng

 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:08:08.3476564Z",
+    "CreatedBy": "",
+    "Date": "2017-06-22T11:14:03.7167543Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 4
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -11,11 +11,18 @@
     "Displacement": "12740",
     "IdlingSpeed": 600.0,
     "Inertia": 5.1498,
-    "FullLoadCurve": "325kW.vfld",
-    "FuelMap": "325kW.vmap",
     "WHTC-Urban": 1.04,
     "WHTC-Rural": 1.01,
-    "WHTC-Motorway": 1.00,
-    "ColdHotBalancingFactor": 1.0
+    "WHTC-Motorway": 1.0,
+    "WHTC-Engineering": 1.0,
+    "ColdHotBalancingFactor": 1.0,
+    "CFRegPer": 1.0,
+    "CFNCV": 1.0,
+    "RatedPower": 325000.0,
+    "RatedSpeed": 1600.0,
+    "MaxTorque": 2400.0,
+    "FuelType": 0,
+    "FullLoadCurve": "325kW.vfld",
+    "FuelMap": "325kW.vmap"
   }
 }
\ No newline at end of file

Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh

 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2017-05-19T08:36:54.5380903Z",
+    "CreatedBy": "",
+    "Date": "2017-06-22T11:16:11.6047543Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
@@ -12,7 +12,6 @@
     "CurbWeightExtra": 0.0,
     "Loading": 0.0,
     "MassMax": 26.0,
-    "CdA": 5.2,
     "rdyn": 0.0,
     "CdCorrMode": "CdofVdecl",
     "CdCorrFile": "",
@@ -32,6 +31,7 @@
       "Cycle": ""
     },
     "TorqueLimits": {},
+    "IdlingSpeed": 600.0,
     "AxleConfig": {
       "Type": "6x2",
       "Axles": [
@@ -41,7 +41,8 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": false,
           "RRCISO": 0.0055,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleNonDriven"
         },
         {
           "Inertia": 14.9,
@@ -49,7 +50,8 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": true,
           "RRCISO": 0.0055,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleDriven"
         },
         {
           "Inertia": 14.9,
@@ -57,9 +59,11 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": false,
           "RRCISO": 0.0055,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleNonDriven"
         }
       ]
-    }
+    },
+    "CdA": 5.2
   }
 }
\ No newline at end of file

Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng

 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2017-05-19T08:13:02.2025457Z",
+    "CreatedBy": "",
+    "Date": "2017-06-22T11:15:58.5117543Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 4
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -11,12 +11,18 @@
     "Displacement": "7000",
     "IdlingSpeed": 600.0,
     "Inertia": 3.6,
-    "FullLoadCurve": "324kW.vfld",
-    "FuelMap": "350kW.vmap",
     "WHTC-Urban": 1.0,
     "WHTC-Rural": 1.0,
     "WHTC-Motorway": 1.0,
     "WHTC-Engineering": 1.0,
-    "ColdHotBalancingFactor": 1.0
+    "ColdHotBalancingFactor": 1.0,
+    "CFRegPer": 1.0,
+    "CFNCV": 1.0,
+    "RatedPower": 324000.0,
+    "RatedSpeed": 1600.0,
+    "MaxTorque": 2300.0,
+    "FuelType": 0,
+    "FullLoadCurve": "324kW.vfld",
+    "FuelMap": "350kW.vmap"
   }
 }
\ No newline at end of file

HashingCmd/Program.cs

@@ -242,7 +242,6 @@ hashingcmd.exe
 			WriteLine("computing hashes");
 			var components = h.GetContainigComponents();
 
-
 			if (components.Count > 1) {
 				var grouped = components.GroupBy(s => s)
 					.Select(g => new { Entry = g.Key, Count = g.Count() });
@@ -290,7 +289,7 @@ hashingcmd.exe
 
 		private static void ShowVersionInformation()
 		{
-			var hashingLib = AssemblyName.GetAssemblyName("VectoHashing.dll");
+			var hashingLib = Assembly.LoadFile(AppDomain.CurrentDomain.BaseDirectory + "VectoHashing.dll").GetName();
 			WriteLine(string.Format(@"HashingLibrary: {0}", hashingLib.Version));
 		}
 	}

VECTO/GUI/VehicleForm.vb

@@ -362,7 +362,7 @@ Public Class VehicleForm
 		TbMassExtra.Text = vehicle.CurbMassExtra.ToGUIFormat()
 		TbLoad.Text = vehicle.Loading.ToGUIFormat()
 		TBrdyn.Text = (vehicle.DynamicTyreRadius.Value() * 1000).ToGUIFormat()
-		tbVehIdlingSpeed.Text = vehicle.EngineIdleSpeed.AsRPM.ToGUIFormat()
+		tbVehIdlingSpeed.Text = If(vehicle.EngineIdleSpeed Is Nothing, "", vehicle.EngineIdleSpeed.AsRPM.ToGUIFormat())
 
 		CbCdMode.SelectedValue = airdrag.CrossWindCorrectionMode
 		TbCdFile.Text =

VECTO/OutputData/JSONFileWriter.vb

@@ -55,7 +55,7 @@ Public Class JSONFileWriter
 		body.Add("RatedPower", eng.RatedPowerDeclared.Value())
 		body.Add("RatedSpeed", eng.RatedSpeedDeclared.AsRPM)
 		body.Add("MaxTorque", eng.MaxTorqueDeclared.Value())
-		body.Add("FuelType", eng.FuelType)
+		body.Add("FuelType", eng.FuelType.ToString())
 
 		body.Add("FullLoadCurve", GetRelativePath(eng.FullLoadCurve.Source, Path.GetDirectoryName(filename)))
 

VectoCommon/VectoCommon/Properties/AssemblyInfo.cs

@@ -62,5 +62,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+//[assembly: AssemblyVersion("1.0.0.0")]
+//[assembly: AssemblyFileVersion("1.0.0.0")]

VectoCommon/VectoCommon/Properties/Version.cs

+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+*              Institute of Internal Combustion Engines and Thermodynamics,
+*              Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
+
+using System.Reflection;
+[assembly: AssemblyVersion("3.1.2.903")]
+[assembly: AssemblyFileVersion("3.1.2.903")]

VectoCommon/VectoCommon/Properties/Version.tt

+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+*              Institute of Internal Combustion Engines and Thermodynamics,
+*              Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+*   Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+*   Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+*   Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+*   Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+*   Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+*   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
+
+<#@ template language="C#" #>
+<#@ output extension=".cs"#>
+using System.Reflection;
+[assembly: AssemblyVersion("3.1.2.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("3.1.2.<#= this.RevisionNumber #>")]
+<#+ 
+	int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2015, 1, 1)).TotalDays; 
+#>
\ No newline at end of file

VectoCommon/VectoCommon/VectoCommon.csproj

@@ -74,6 +74,11 @@
     <Compile Include="OutputData\IOutputFileWriter.cs" />
     <Compile Include="OutputData\IOutputPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Version.cs">
+      <DependentUpon>Version.tt</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Include="Resources\XMLNames.Designer.cs">
       <DependentUpon>XMLNames.resx</DependentUpon>
       <AutoGen>True</AutoGen>
@@ -90,6 +95,10 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <None Include="Properties\Version.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>Version.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\XMLNames.resx">

VectoCommon/VectoHashingTest/VectoHashTest.cs

@@ -32,13 +32,10 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Security.Cryptography;
-using System.Security.Cryptography.Xml;
 using System.Text;
 using System.Xml;
 using System.Xml.Linq;
 using System.Xml.Schema;
-using System.Xml.XPath;
 using NUnit.Framework;
 using TUGraz.VectoCore.Utils;
 using TUGraz.VectoHashing;
@@ -421,7 +418,6 @@ namespace VectoHashingTest
 		TestCase(VectoComponents.Angledrive, "ANGL-"),
 		TestCase(VectoComponents.Airdrag, "AD-"),
 		TestCase(VectoComponents.Tyre, "TYRE-"),
-		
 		]
 		public void TestIdPrefix(VectoComponents component, string expectedPrefix)
 		{

VectoConsole/Program.cs

@@ -337,9 +337,9 @@ Examples:
 
 		private static void ShowVersionInformation()
 		{
-			var vectodll = AssemblyName.GetAssemblyName("VectoCore.dll");
 			WriteLine(string.Format(@"VectoConsole: {0}", Assembly.GetExecutingAssembly().GetName().Version));
-			WriteLine(string.Format(@"VectoCore: {0}", vectodll.Version));
+			WriteLine(string.Format(@"VectoCore: {0}",
+				Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + "VectoCore.dll").GetName().Version));
 		}
 
 		private static void PrintProgress(Dictionary<int, JobContainer.ProgressEntry> progessData,

VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs

@@ -153,7 +153,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			var inAngularVelocity = outAngularVelocity * effectiveRatio;
 			var torqueLossResult = torqueConverterLocked
 				? ModelData.Gears[gear].LossMap.GetTorqueLoss(outAngularVelocity, outTorque)
-				: ModelData.Gears[Gear].TorqueConverterGearLossMap.GetTorqueLoss(outAngularVelocity, outTorque);
+				: ModelData.Gears[gear].TorqueConverterGearLossMap.GetTorqueLoss(outAngularVelocity, outTorque);
 
 			var inTorque = outTorque / effectiveRatio + torqueLossResult.Value;
 

VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs

@@ -573,11 +573,29 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 					Case<ResponseUnderload>(r => {
 						response = Driver.DrivingActionBrake(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed,
 							gradient, r);
-						response.Switch().Case<ResponseGearShift>(() => {
-							DataBus.BrakePower = 0.SI<Watt>();
-							response = Driver.DrivingActionBrake(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed,
-								gradient, r);
-						});
+						response.Switch().
+							Case<ResponseGearShift>(() => {
+								DataBus.BrakePower = 0.SI<Watt>();
+								response = Driver.DrivingActionBrake(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed,
+									gradient, r);
+							}).
+							Case<ResponseOverload>(() => {
+								DataBus.BrakePower = 0.SI<Watt>();
+								if (DataBus.GearboxType.AutomaticTransmission() || DataBus.ClutchClosed(absTime)) {
+									if (DataBus.VehicleSpeed.IsGreater(0)) {
+										response = Driver.DrivingActionAccelerate(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed, gradient);
+									} else {
+										if (RetryDistanceExceeded) {
+											response = Driver.DrivingActionAccelerate(absTime, ds, targetVelocity, gradient);
+										} else {
+											RetryDistanceExceeded = true;
+											response = new ResponseDrivingCycleDistanceExceeded() { MaxDistance = ds / 2 };
+										}
+									}
+								} else {
+									response = Driver.DrivingActionRoll(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed, gradient);
+								}
+							});
 					});
 				return response;
 			}