Merge pull request #796 in VECTO/vecto-sim from...

Merge pull request #796 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:ReleaseCandidates/v3.3.4.1686 to master

* commit 'ee7ab587':
  updating release report
  adding results and release report
  compiling release version
  updating changelog
  updating release report
  updating .gitignore
  bugfix: Increasing number of iterations to find operating point
  validation of run-data: limit max. speed for checking loss-maps up to vehicle's design speed + ovespeed, limited by vehicle's max possible speed

.gitignore

@@ -203,3 +203,4 @@ Documentation/VehiclesReleaseComparisonDeclarationMode/*.vmod
 Documentation/VehiclesReleaseComparisonDeclarationMode/*.vsum
 
 DISTR/
+Documentation/VehiclesReleaseComparisonDeclarationMode/tmp/

Documentation/User Manual/6-changelog/changelog.md

@@ -2,6 +2,13 @@
 
 **VECTO 3.3.4**
 
+***Build 1716 (2019-09-13) OFFICIAL RELEASE***
+
+- Bugfixes
+    * [VECTO-1074] - Vecto Calculation Aborts with Interpolation Error ([VECTO-1046])
+    * [VECTO-1111] - Simulation Abort in Municipal Reference Load
+
+
 ***Build 1686 (2019-08-14) RELEASE CANDIDATE***
 
 - Improvement

Documentation/User Manual/help.html

@@ -7564,6 +7564,14 @@ CycleTime,UnknownCycleName,3600</code></pre>
 <div id="changelog" class="section level1">
 <h1>Changelog</h1>
 <p><strong>VECTO 3.3.4</strong></p>
+<p><strong><em>Build 1716 (2019-09-13) OFFICIAL RELEASE</em></strong></p>
+<ul>
+<li>Bugfixes
+<ul>
+<li>[VECTO-1074] - Vecto Calculation Aborts with Interpolation Error ([VECTO-1046])</li>
+<li>[VECTO-1111] - Simulation Abort in Municipal Reference Load</li>
+</ul></li>
+</ul>
 <p><strong><em>Build 1686 (2019-08-14) RELEASE CANDIDATE</em></strong></p>
 <ul>
 <li>Improvement

HashingTool/Properties/Version.cs

 /*
 * This file is part of VECTO.
 *
-* Copyright © 2012-2019 European Union
+* Copyright © 2012-2017 European Union
 *
 * Developed by Graz University of Technology,
 *              Institute of Internal Combustion Engines and Thermodynamics,
@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("0.2.0.1686")]
-[assembly: AssemblyFileVersion("0.2.0.1686")]
+[assembly: AssemblyVersion("0.2.0.1716")]
+[assembly: AssemblyFileVersion("0.2.0.1716")]

VECTO/VECTO.vbproj

@@ -58,7 +58,7 @@
     <WarningLevel>1</WarningLevel>
     <UseVSHostingProcess>true</UseVSHostingProcess>
     <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
-    <DefineConstants>RELEASE_CANDIDATE</DefineConstants>
+    <DefineConstants>CERTIFICATION_RELEASE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>None</DebugType>
@@ -141,7 +141,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DefineConstants>RELEASE_CANDIDATE</DefineConstants>
+    <DefineConstants>CERTIFICATION_RELEASE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|x86'">
     <DefineTrace>true</DefineTrace>

VectoCommon/VectoCommon/Properties/Version.cs

 /*
 * This file is part of VECTO.
 *
-* Copyright © 2012-2019 European Union
+* Copyright © 2012-2017 European Union
 *
 * Developed by Graz University of Technology,
 *              Institute of Internal Combustion Engines and Thermodynamics,
@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.3.3.1686")]
-[assembly: AssemblyFileVersion("3.3.3.1686")]
+[assembly: AssemblyVersion("3.3.4.1716")]
+[assembly: AssemblyFileVersion("3.3.4.1716")]
\ No newline at end of file

VectoCommon/VectoHashing/Properties/Version.cs

 /*
 * This file is part of VECTO.
 *
-* Copyright © 2012-2019 European Union
+* Copyright © 2012-2016 European Union
 *
 * Developed by Graz University of Technology,
 *              Institute of Internal Combustion Engines and Thermodynamics,
@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("1.2.0.1686")]
-[assembly: AssemblyFileVersion("1.2.0.1686")]
+[assembly: AssemblyVersion("1.2.0.1716")]
+[assembly: AssemblyFileVersion("1.2.0.1716")]

VectoConsole/Properties/Version.cs

 /*
 * This file is part of VECTO.
 *
-* Copyright © 2012-2019 European Union
+* Copyright © 2012-2017 European Union
 *
 * Developed by Graz University of Technology,
 *              Institute of Internal Combustion Engines and Thermodynamics,
@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.3.4.1686")]
-[assembly: AssemblyFileVersion("3.3.4.1686")]
+[assembly: AssemblyVersion("3.3.4.1716")]
+[assembly: AssemblyFileVersion("3.3.4.1716")]
\ No newline at end of file

VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs

@@ -200,6 +200,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 				foreach (var loading in mission.Loadings) {
 					var simulationRunData = new VectoRunData {
 						Loading = loading.Key,
+						VehicleDesignSpeed = _segment.DesignSpeed,
 						VehicleData = _dao.CreateVehicleData(vehicle, mission, loading.Value),
 						AirdragData = _dao.CreateAirdragData(vehicle.Components.AirdragInputData, mission, _segment),
 						EngineData = _engineData.Copy(), // a copy is necessary because every run has a different correction factor!

VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs

@@ -49,11 +49,14 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
 	[CustomValidation(typeof(VectoRunData), "ValidateRunData")]
 	public class VectoRunData : SimulationComponentData
 	{
+
 		public VectoRunData()
 		{
 			Exempted = false;
 		}
 
+		public MeterPerSecond VehicleDesignSpeed { get; internal set; }
+
 		[ValidateObject]
 		public VehicleData VehicleData { get; internal set; }
 
@@ -157,7 +160,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
 		private static ValidationResult CheckPowertrainLossMapsSize(VectoRunData runData, GearboxData gearboxData,
 			CombustionEngineData engineData)
 		{
-			var maxSpeed = 95.KMPHtoMeterPerSecond();
+			
 			var axleGearData = runData.AxleGearData;
 			var angledriveData = runData.AngledriveData;
 			var hasAngleDrive = angledriveData != null && angledriveData.Angledrive != null;
@@ -167,6 +170,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
 			var axlegearRatio = axleGearData != null ? axleGearData.AxleGear.Ratio : 1.0;
 			var dynamicTyreRadius = runData.VehicleData != null ? runData.VehicleData.DynamicTyreRadius : 0.0.SI<Meter>();
 
+			var vehicleMaxSpeed = runData.EngineData.FullLoadCurves[0].N95hSpeed /
+								runData.GearboxData.Gears[runData.GearboxData.Gears.Keys.Max()].Ratio / axlegearRatio /
+								angledriveRatio * dynamicTyreRadius;
+			var maxSpeed = VectoMath.Min(vehicleMaxSpeed, (runData.VehicleDesignSpeed ?? 90.KMPHtoMeterPerSecond()) + (runData.DriverData?.OverSpeedEcoRoll?.OverSpeed ?? 0.KMPHtoMeterPerSecond()));
+
 			if (gearboxData.Gears.Count + 1 != engineData.FullLoadCurves.Count) {
 				return
 					new ValidationResult(
@@ -202,7 +210,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
 		}
 
 		private static ValidationResult CheckLossMapsEntries(KeyValuePair<uint, GearData> gear, PerSecond angularVelocity,
-			NewtonMeter inTorque, AngledriveData angledriveData, AxleGearData axleGearData, SI velocity)
+			NewtonMeter inTorque, AngledriveData angledriveData, AxleGearData axleGearData, MeterPerSecond velocity)
 		{
 			var hasAngleDrive = angledriveData != null && angledriveData.Angledrive != null;
 			var angledriveRatio = hasAngleDrive && angledriveData.Type == AngledriveType.SeparateAngledrive

VectoCore/VectoCore/Properties/Version.cs

 /*
 * This file is part of VECTO.
 *
-* Copyright © 2012-2019 European Union
+* Copyright © 2012-2017 European Union
 *
 * Developed by Graz University of Technology,
 *              Institute of Internal Combustion Engines and Thermodynamics,
@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.3.4.1686")]
-[assembly: AssemblyFileVersion("3.3.4.1686")]
+[assembly: AssemblyVersion("3.3.4.1716")]
+[assembly: AssemblyFileVersion("3.3.4.1716")]

VectoCore/VectoCore/Utils/SearchAlgorithm.cs

@@ -132,7 +132,7 @@ namespace TUGraz.VectoCore.Utils
 			log.Debug("Log Disabled during LineSearch.");
 			LogManager.DisableLogging();
 			try {
-				for (var count = 1; count < 100; count++, iterationCount++) {
+				for (var count = 1; count < 150; count++, iterationCount++) {
 					if (origY.Sign() != y.Sign()) {
 						intervalFactor = 0.5;
 					}

VectoCore/VectoCore/Utils/VectoVersionCore.cs

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

VectoCore/VectoCore/VectoCore.csproj

@@ -20,7 +20,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;BETA_RELEASE</DefineConstants>
+    <DefineConstants>DEBUG;CERTIFICATION_RELEASE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
@@ -76,7 +76,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>RELEASE_CANDIDATE</DefineConstants>
+    <DefineConstants>CERTIFICATION_RELEASE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>