diff --git a/Documentation/User Manual Source/ConvertPPTXtoPDF.bat b/Documentation/User Manual Source/ConvertPPTXtoPDF.bat
new file mode 100644
index 0000000000000000000000000000000000000000..08bb8e26858bd342549b3adac69d36ebaa5c6ca7
--- /dev/null
+++ b/Documentation/User Manual Source/ConvertPPTXtoPDF.bat
@@ -0,0 +1 @@
+CSCRIPT ConvertPPTXtoPDF.vbs "%~dp0Release Notes Vecto3.x.pptx" "%~dp0Release Notes Vecto3.x.pdf"
\ No newline at end of file
diff --git a/Documentation/User Manual Source/ConvertPPTXtoPDF.vbs b/Documentation/User Manual Source/ConvertPPTXtoPDF.vbs
new file mode 100644
index 0000000000000000000000000000000000000000..50b2907653756ec6608a24828ec887bcb3ee5771
--- /dev/null
+++ b/Documentation/User Manual Source/ConvertPPTXtoPDF.vbs
@@ -0,0 +1,87 @@
+Option Explicit
+
+' http://msdn.microsoft.com/en-us/library/office/aa432714(v=office.12).aspx
+Const msoFalse = 0 ' False.
+Const msoTrue = -1 ' True.
+
+' http://msdn.microsoft.com/en-us/library/office/bb265636(v=office.12).aspx
+Const ppFixedFormatIntentScreen = 1 ' Intent is to view exported file on screen.
+Const ppFixedFormatIntentPrint = 2 ' Intent is to print exported file.
+
+' http://msdn.microsoft.com/en-us/library/office/ff746754.aspx
+Const ppFixedFormatTypeXPS = 1 ' XPS format
+Const ppFixedFormatTypePDF = 2 ' PDF format
+
+' http://msdn.microsoft.com/en-us/library/office/ff744564.aspx
+Const ppPrintHandoutVerticalFirst = 1 ' Slides are ordered vertically, with the first slide in the upper-left corner and the second slide below it.
+Const ppPrintHandoutHorizontalFirst = 2 ' Slides are ordered horizontally, with the first slide in the upper-left corner and the second slide to the right of it.
+
+' http://msdn.microsoft.com/en-us/library/office/ff744185.aspx
+Const ppPrintOutputSlides = 1 ' Slides
+Const ppPrintOutputTwoSlideHandouts = 2 ' Two Slide Handouts
+Const ppPrintOutputThreeSlideHandouts = 3 ' Three Slide Handouts
+Const ppPrintOutputSixSlideHandouts = 4 ' Six Slide Handouts
+Const ppPrintOutputNotesPages = 5 ' Notes Pages
+Const ppPrintOutputOutline = 6 ' Outline
+Const ppPrintOutputBuildSlides = 7 ' Build Slides
+Const ppPrintOutputFourSlideHandouts = 8 ' Four Slide Handouts
+Const ppPrintOutputNineSlideHandouts = 9 ' Nine Slide Handouts
+Const ppPrintOutputOneSlideHandouts = 10 ' Single Slide Handouts
+
+' http://msdn.microsoft.com/en-us/library/office/ff745585.aspx
+Const ppPrintAll = 1 ' Print all slides in the presentation.
+Const ppPrintSelection = 2 ' Print a selection of slides.
+Const ppPrintCurrent = 3 ' Print the current slide from the presentation.
+Const ppPrintSlideRange = 4 ' Print a range of slides.
+Const ppPrintNamedSlideShow = 5 ' Print a named slideshow.
+
+' http://msdn.microsoft.com/en-us/library/office/ff744228.aspx
+Const ppShowAll = 1 ' Show all.
+Const ppShowNamedSlideShow = 3 ' Show named slideshow.
+Const ppShowSlideRange = 2 ' Show slide range.
+
+'
+' This is the actual script
+'
+
+Dim inputFile
+Dim outputFile
+Dim objPPT
+Dim objPresentation
+Dim objPrintOptions
+Dim objFso
+
+If WScript.Arguments.Count <> 2 Then
+ WScript.Stdout.WriteLine "You need to specify input and output files."
+ WScript.Quit
+End If
+
+inputFile = WScript.Arguments(0)
+outputFile = WScript.Arguments(1)
+
+Set objFso = CreateObject("Scripting.FileSystemObject")
+
+If Not objFso.FileExists( inputFile ) Then
+ WScript.Stdout.WriteLine "Unable to find your input file " & inputFile
+ WScript.Quit
+End If
+
+WScript.Stdout.WriteLine "Input File: " & inputFile
+WScript.Stdout.WriteLine "Output File: " & outputFile
+
+Set objPPT = CreateObject( "PowerPoint.Application" )
+
+
+objPPT.Presentations.Open inputFile
+
+Set objPresentation = objPPT.ActivePresentation
+Set objPrintOptions = objPresentation.PrintOptions
+
+objPrintOptions.Ranges.Add 1,objPresentation.Slides.Count
+objPrintOptions.RangeType = ppShowAll
+
+' Reference for this at http://msdn.microsoft.com/en-us/library/office/ff746080.aspx
+objPresentation.ExportAsFixedFormat outputFile, ppFixedFormatTypePDF, ppFixedFormatIntentScreen, msoTrue, ppPrintHandoutHorizontalFirst, ppPrintOutputSlides, msoFalse, objPrintOptions.Ranges(1), ppPrintAll, "Release", False, False, False, False, False
+
+objPresentation.Close
+ObjPPT.Quit
diff --git a/Documentation/User Manual Source/README for Declaration Directory.txt b/Documentation/User Manual Source/README for Declaration Directory.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8e0493203c2dd09a459e263b0e9253bdc55b7382
--- /dev/null
+++ b/Documentation/User Manual Source/README for Declaration Directory.txt
@@ -0,0 +1,7 @@
+DECLARATION DATA
+================
+
+This directory contains A COPY of the Declaration Data files which are used in VECTO.
+They are just intended for documentational and informational purpose.
+
+Changes to this files do NOT influence the simulation!
\ No newline at end of file
diff --git a/Documentation/User Manual Source/README for Mission Profiles Directory.txt b/Documentation/User Manual Source/README for Mission Profiles Directory.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6df95aeeaf086c6156eb2b97607e32ea45ad8b36
--- /dev/null
+++ b/Documentation/User Manual Source/README for Mission Profiles Directory.txt
@@ -0,0 +1,7 @@
+MISSION PROFILES
+================
+
+This directory contains A COPY of the Mission Profiles which are used in VECTO.
+They are just intended for documentational and informational purpose.
+
+Changes to this files do NOT influence the simulation!
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG.vsum b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG.vsum
deleted file mode 100644
index 99cb9e049dd7bbb5c252a30d2856cb9cc410cbcc..0000000000000000000000000000000000000000
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG.vsum
+++ /dev/null
@@ -1,2 +0,0 @@
-Job [-],Input File [-],Cycle [-],Status,Mass [kg],Loading [kg],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],CO2 [g/km],CO2 [g/tkm],P_wheel_in_pos [kW],P_brake_loss [kW],P_angle_loss [kW],P_tc_loss [kW],P_clutch_pos [kW],P_clutch_neg [kW],P_fcmap_pos [kW],E_aux_CYCLE [kWh],E_aux_CONSTANTAUX [kWh],E_aux_ES [kWh],E_aux_sum [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],E_inertia [kWh],E_brake [kWh],E_gbx_loss [kWh],E_axl_loss [kWh],E_angle_loss [kWh],E_ret_loss [kWh],E_tc_loss [kWh],E_clutch_pos [kWh],E_clutch_neg [kWh],E_fcmap_pos [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%]
-1-0,Class5_Tractor_ENG,Long_Haul.vdri,Success,15729.0000,19300.0000,5352.7246,108.1910,72.7644,0.1702,22838.5126,313.8695,22838.5126,313.8695,22838.5126,313.8695,22838.5126,313.8695,22838.5126,313.8695,37.7247,1.9546,991.8275,51.3900,101.6342,15.1578,0.0000,0.0000,154.7178,-24.5568,150.7650,0.0000,7.4350,4.0021,11.4371,56.8832,60.9612,0.0026,-0.0138,22.5376,9.7783,7.5428,0.0000,2.0417,0.0000,167.1868,-7.5101,176.9343,0.0000,0.3424,-0.4739,6.5396,4.6898,0.0000,4.5584
diff --git a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng
index 27be26b719707d4a9a1b74d05c646c0a70fe357e..5e17fea53ff954bc854c36b7a0a11535cf0e828f 100644
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng
+++ b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng
@@ -16,6 +16,7 @@
"WHTC-Urban": 0.0,
"WHTC-Rural": 0.0,
"WHTC-Motorway": 0.0,
+ "WHTC-Engineering": 1.0,
"ColdHotBalancingFactor": 0.0
}
}
\ No newline at end of file
diff --git a/VECTO/My Project/AssemblyInfo.vb b/VECTO/My Project/AssemblyInfo.vb
index ead781488a4be9701c367c9b2b571e390a27aa40..23ca07a043c1ba044c537b917dbb91dd5ac17fda 100644
--- a/VECTO/My Project/AssemblyInfo.vb
+++ b/VECTO/My Project/AssemblyInfo.vb
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("Vehicle Energy Consumption Calculation Tool")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("VECTO")>
-<Assembly: AssemblyCopyright("© European Commission 2014")>
+<Assembly: AssemblyCopyright("© European Commission 2016")>
<Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(False)>
diff --git a/VectoConsole/Properties/Version.cs b/VectoConsole/Properties/Version.cs
index 8c4aa69cf90b0ef62603b1af582e3fb74c7c55e1..7aef1701726a367169cbe6351307b7811902c684 100644
--- a/VectoConsole/Properties/Version.cs
+++ b/VectoConsole/Properties/Version.cs
@@ -11,7 +11,7 @@
* 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
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("3.1.0.662")]
-[assembly: AssemblyFileVersion("3.1.0.662")]
+[assembly: AssemblyVersion("3.1.0.680")]
+[assembly: AssemblyFileVersion("3.1.0.680")]
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
index 843925cacfcbd8223b25c91469852a94a1c86398..238da75a9e1c7aef1bd2eb5c76a4d3252de84fb9 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
@@ -31,12 +31,14 @@
using System;
using System.ComponentModel.DataAnnotations;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
+ [CustomValidation(typeof(CombustionEngineData), "ValidateData")]
public class CombustionEngineData : SimulationComponentData
{
[Required, SIRange(1000 * 1E-6, 20000 * 1E-6)]
@@ -89,5 +91,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
WHTCCorrectionFactor = WHTCCorrectionFactor,
};
}
+
+ // ReSharper disable once UnusedMember.Global -- used in CustomValidation
+ public static ValidationResult ValidateData(CombustionEngineData data, ValidationContext context)
+ {
+ if (data.Inertia.IsEqual(0)) {
+ LogManager.GetLogger(typeof(CombustionEngineData).FullName).Error("Warning: Engine Inertia is 0!");
+ }
+ return ValidationResult.Success;
+ }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
index 9b396b42c17f94991ff7751e3c3cc17c17e19382..76affc693c7f3b968791e2090be3d16790f9082e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
@@ -32,12 +32,14 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
+using System.Diagnostics;
using System.Linq;
using System.Runtime.Serialization;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
+using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
@@ -46,13 +48,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
/// </summary>
/// <remarks>The Axle Gear has its own Property "AxleGearData" and is *not included* in the Gears-Dictionary.</remarks>
[DataContract, CustomValidation(typeof(GearboxData), "ValidateGearboxData")]
+ [DebuggerDisplay("GearboxData({Type}, #Gears: {Gears.Count}, ...)")]
public class GearboxData : SimulationComponentData
{
public GearboxType Type { get; internal set; }
- /// <summary>
- /// The gear data.
- /// </summary>
[Required, ValidateObject] public Dictionary<uint, GearData> Gears = new Dictionary<uint, GearData>();
public TorqueConverterData TorqueConverterData { get; internal set; }
@@ -89,14 +89,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[Required, SIRange(double.Epsilon, 2)]
public MeterPerSquareSecond StartAcceleration { get; internal set; }
- ///// <summary>
- ///// Gets a value indicating whether this instance has torque converter.
- ///// </summary>
- ///// <value>
- ///// <c>true</c> if this instance has torque converter; otherwise, <c>false</c>.
- ///// </value>
- //public bool HasTorqueConverter { get; internal set; }
-
[Required, SIRange(0, double.MaxValue)]
public Second UpshiftAfterDownshiftDelay { get; internal set; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs
index 411d17352dcda0fe65dc85b6564ec39ebf4af313..30759237beb28c4a4a3ee4e8c73642d6b4582b37 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs
@@ -126,7 +126,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
// Emergency Upshift: if higher than engine rated speed
- if (inAngularVelocity.IsGreaterOrEqual(DataBus.EngineRatedSpeed)) {
+ if (inAngularVelocity.IsGreaterOrEqual(DataBus.EngineRatedSpeed) && Data.Gears.ContainsKey(gear + 1)) {
Log.Debug("engine speed would be above rated speed - shift up");
Upshift(absTime, gear);
return true;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
index a240612444e697c3efc86f622a121e206e61b841..549e8b1c9d5bf85507401d4500e63c45416d4c47 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
@@ -50,7 +50,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
protected bool? TorqueConverterActive;
- protected internal TorqueConverterData TorqueConverter;
+ protected internal readonly TorqueConverterData TorqueConverter;
private readonly KilogramSquareMeter _engineInertia;
public CycleGearbox(IVehicleContainer container, GearboxData gearboxModelData, KilogramSquareMeter engineInertia)
@@ -164,11 +164,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
private IResponse RequestEngaged(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
bool dryRun)
{
- var TorqueConverterLocked = TorqueConverterActive != null && !TorqueConverterActive.Value;
+ var torqueConverterLocked = TorqueConverterActive == null || !TorqueConverterActive.Value;
var effectiveRatio = ModelData.Gears[Gear].Ratio;
var effectiveLossMap = ModelData.Gears[Gear].LossMap;
- if (!TorqueConverterLocked) {
+ if (!torqueConverterLocked) {
effectiveRatio = ModelData.Gears[Gear].TorqueConverterRatio;
effectiveLossMap = ModelData.Gears[Gear].TorqueConverterGearLossMap;
}
@@ -179,17 +179,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var inTorque = outTorque / effectiveRatio + inTorqueLossResult.Value;
CurrentState.TorqueLossResult = inTorqueLossResult;
- if (!TorqueConverterLocked && !ModelData.Gears[Gear].HasTorqueConverter) {
+ if (!torqueConverterLocked && !ModelData.Gears[Gear].HasTorqueConverter) {
throw new VectoSimulationException("Torque converter requested by strategy for gear without torque converter!");
}
var inAngularVelocity = outAngularVelocity * effectiveRatio;
- if (ModelData.Type.AutomaticTransmission() && TorqueConverterLocked &&
+ if (ModelData.Type.AutomaticTransmission() && torqueConverterLocked &&
inAngularVelocity.IsSmaller(DataBus.EngineIdleSpeed)) {
Log.Error(
"ERROR: EngineSpeed is lower than Idlespeed in Measuredspeed-Cycle with given Gear (Automatic Transmission). AbsTime: {0}, Gear: {1} TC-Active: {2}, EngineSpeed: {3}",
- absTime, Gear, !TorqueConverterLocked, inAngularVelocity.AsRPM);
+ absTime, Gear, !torqueConverterLocked, inAngularVelocity.AsRPM);
return new ResponseEngineSpeedTooLow { Source = this };
}
@@ -204,7 +204,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
if (dryRun) {
- if (TorqueConverter != null && TorqueConverterActive != null && TorqueConverterActive.Value) {
+ if (TorqueConverter != null && !torqueConverterLocked) {
return RequestTorqueConverter(absTime, dt, inTorque, inAngularVelocity, true);
}
if (outTorque.IsSmaller(0) && inAngularVelocity.IsSmaller(DataBus.EngineIdleSpeed)) {
@@ -226,7 +226,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
CurrentState.Gear = Gear;
// end critical section
- if (TorqueConverter != null && TorqueConverterActive != null && TorqueConverterActive.Value) {
+ if (TorqueConverter != null && !torqueConverterLocked) {
CurrentState.TorqueConverterActive = true;
return RequestTorqueConverter(absTime, dt, inTorque, inAngularVelocity);
}
diff --git a/VectoCore/VectoCore/Properties/Version.cs b/VectoCore/VectoCore/Properties/Version.cs
index 8c4aa69cf90b0ef62603b1af582e3fb74c7c55e1..8137e1cfc63fc11d23062ad9c6446188c5b52de6 100644
--- a/VectoCore/VectoCore/Properties/Version.cs
+++ b/VectoCore/VectoCore/Properties/Version.cs
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("3.1.0.662")]
-[assembly: AssemblyFileVersion("3.1.0.662")]
+[assembly: AssemblyVersion("3.1.0.680")]
+[assembly: AssemblyFileVersion("3.1.0.680")]
diff --git a/VectoCore/VectoCore/Resources/Declaration/SegmentTable Description.md b/VectoCore/VectoCore/Resources/Declaration/SegmentTable Description.md
deleted file mode 100644
index a4647dafcde02afd689c42e310a6a9b43ce160c6..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCore/Resources/Declaration/SegmentTable Description.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# SegmentTable
-
-This document describes the structure of the file SegmentTable.csv. This
-document resembles the Vehicle Classes table from the ACEA Whitebook and
-defines standard vehicle classes, values and driving cycles.
-(ACEA Whitebook April 2016, Part 1, Page 51).
-
-If a value is not defined there is a "-".
-
-| column | values | description |
-|-----------------------------------|------------------------------------------------|----------------------------------------------------------------------------------------------------|
-| Valid | 0,1 | 1 means the entry is enabled, 0 means the entry is disabled and will not be used in vecto. |
-| Vehicle Category | RigidTruck,Tractor,CityBus,InterurbanBus,Coach | The basic vehicle category from whitebook. |
-| Axle Conf. | 4x2,4x4,6x2,6x4,6x6,8x2,8x4,8x6,8x8 | |
-| GVW_Min | | |
-| GVW_Max | | |
-| HDV class | | |
-| Body | B1,B2,B3,B4,B5,B6 | Standard bodies (see standardbodies.csv) |
-| Trailer | T1, T2 | Standard trailers (see standardbodies.csv) |
-| Semitrailer | ST1, ST1-v2 | Standard semitrailer (see standardbodies.csv) |
-| .vacc file | <filename>.vacc | |
-| Cross Wind Correction - Long haul | RigidSolo, RigidTrailer, TractorSemitrailer | |
-| Cross Wind Correction - Other | RigidSolo, TractorSemitrailer, CoachBus | |
-| Truck Axles - Long haul | percent(/percent)\* (e.g. 40/60) | percent share for each axle on the truck. sum must be < 100. sum + trailer must be 100. |
-| Truck Axles - Other | percent(/percent)\* | percent share for each axle on the truck. sum must be < 100. sum + trailer must be 100. |
-| Trailer Axles - Long haul | percent/count | percent share divides amongst the axles of the trailer. e.g. for 3 axles: 60/3 (means 20%/20%/20%) |
-| Trailer Axles - Other | percent/count | percent share divides amongst the axles of the trailer. e.g. for 3 axles: 60/3 (means 20%/20%/20%) |
-| Long haul | 0,1 | if 1 then this driving cycle is enabled for declaration, 0 means it is disabled. |
-| Regional delivery | 0,1 | if 1 then this driving cycle is enabled for declaration, 0 means it is disabled. |
-| Urban delivery | 0,1 | if 1 then this driving cycle is enabled for declaration, 0 means it is disabled. |
-| Municipal utility | 0,1 | if 1 then this driving cycle is enabled for declaration, 0 means it is disabled. |
-| Construction | 0,1 | if 1 then this driving cycle is enabled for declaration, 0 means it is disabled. |
-| Heavy Urban | 0,1 | if 1 then this driving cycle is enabled for declaration, 0 means it is disabled. |
-| Urban | 0,1 | if 1 then this driving cycle is enabled for declaration, 0 means it is disabled. |
-| Suburban | 0,1 | if 1 then this driving cycle is enabled for declaration, 0 means it is disabled. |
-| Interurban | 0,1 | if 1 then this driving cycle is enabled for declaration, 0 means it is disabled. |
-| Coach | 0,1 | if 1 then this driving cycle is enabled for declaration, 0 means it is disabled. |
-| Mass Extra - Long haul | | |
-| Mass Extra - Regional delivery | | |
-| Mass Extra - Urban delivery | | |
-| Mass Extra - Municipal utility | | |
-| Mass Extra - Construction | | |
-| Mass Extra - Heavy Urban | | |
-| Mass Extra - Urban | | |
-| Mass Extra - Suburban | | |
-| Mass Extra - Interurban | | |
-| Mass Extra - Coach | | |
-| Payload - Long haul | | |
-| Payload - Regional delivery | | |
-| Payload - Urban delivery | | |
-| Payload - Municipal utility | | |
-| Payload - Construction | | |
-| Payload - Heavy Urban | | |
-| Payload - Urban | | |
-| Payload - Suburban | | |
-| Payload - Interurban | | |
-| Payload - Coach | | |
diff --git a/VectoCore/VectoCore/Resources/Declaration/VCDV/parameters.csv b/VectoCore/VectoCore/Resources/Declaration/VCDV/parameters.csv
index 7a6e9b270ebc04b4494ded8c808d2c6369cb4fca..99ddf04bd38b643d3543e79ab95ff8d8e82c9daa 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VCDV/parameters.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VCDV/parameters.csv
@@ -1,6 +1,5 @@
Parameters,a1,a2,a3
RigidSolo,0.013526,0.017746,-0.000666
RigidTrailer,0.017125,0.072275,-0.004148
-TractorSemitrailer,0.034767,0.039367,-0.001897
+TractorSemitrailer,0.030042,0.040817,-0.00213
CoachBus,-0.000794,0.02109,-0.00109
-
diff --git a/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs b/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
index df0a95bb978e5b1c93a2ba01e034ff628505311d..e4c06384b38065620f1784a83efcbd3e26d87eb0 100644
--- a/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
@@ -107,8 +107,9 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual(downshiftSpeeds.Length, runData.GearboxData.Gears[2].ShiftPolygon.Downshift.Count);
for (var i = 0; i < downshiftSpeeds.Length; i++) {
Assert.AreEqual(downshiftSpeeds[i].RPMtoRad().Value(),
- runData.GearboxData.Gears[2].ShiftPolygon.Downshift[i].AngularSpeed.Value(), Tolerance);
- Assert.AreEqual(downshiftTorque[i], runData.GearboxData.Gears[2].ShiftPolygon.Downshift[i].Torque.Value(), Tolerance);
+ runData.GearboxData.Gears[2].ShiftPolygon.Downshift[i].AngularSpeed.Value(), Tolerance, "i: " + i);
+ Assert.AreEqual(downshiftTorque[i], runData.GearboxData.Gears[2].ShiftPolygon.Downshift[i].Torque.Value(), Tolerance,
+ "i: " + i);
}
var upshiftSpeed = new[] { 1889.6633, 1889.6633, 606.64575 / Constants.RPMToRad };
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGear_AT-PS.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGear_AT-PS.vdri
index 88f0ff3eff1b3f80822365496b9eb25915fa1949..8ba5ba57ddbf308f1a084dd7bedc633852242e9d 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGear_AT-PS.vdri
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGear_AT-PS.vdri
@@ -172,7 +172,7 @@
171,31.0,-0.3,2,0,4.5
172,26.6,-0.3,1,0,4.5
173,22.0,-0.3,1,0,4.5
-174,17.0,-0.3,1,0,4.5
+174,17.0,-0.3,0,0,4.5
175,11.9,-0.3,0,0,4.5
176,6.8,-0.3,0,0,4.5
177,2.4,-0.3,0,0,4.5
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGear_AT-Ser.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGear_AT-Ser.vdri
index 925d3dbda1175286c6ec050ebdb4462b7ce0e985..507c016419d8d61a3744377d418ed7c53e0a76fc 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGear_AT-Ser.vdri
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGear_AT-Ser.vdri
@@ -20,7 +20,7 @@
19,18.1,-0.3,3,0,4.5
20,15.1,-0.3,2,0,4.5
21,11.5,-0.3,1,0,4.5
-22,8.0,-0.3,1,0,4.5
+22,8.0,-0.3,1,1,4.5
23,4.2,-0.3,1,1,4.5
24,0.6,-0.3,1,1,4.5
25,0.0,-0.3,1,1,4.5
@@ -73,7 +73,7 @@
72,17.4,-0.3,1,0,4.5
73,13.8,-0.3,1,0,4.5
74,10.3,-0.3,1,0,4.5
-75,7.0,-0.3,1,0,4.5
+75,7.0,-0.3,1,1,4.5
76,2.5,-0.3,1,1,4.5
77,0.0,-0.3,1,1,4.5
78,0.0,-0.3,1,1,4.5
@@ -124,7 +124,7 @@
123,16.8,-0.3,1,0,4.5
124,13.5,-0.3,1,0,4.5
125,10.1,-0.3,1,0,4.5
-126,7.0,-0.3,1,0,4.5
+126,7.0,-0.3,1,1,4.5
127,3.1,-0.3,1,1,4.5
128,0.2,-0.3,1,1,4.5
129,0.0,-0.3,1,1,4.5
@@ -152,7 +152,7 @@
151,18.9,0.3,2,0,4.5
152,16.5,0.3,2,0,4.5
153,12.8,0.3,1,0,4.5
-154,8.5,0.3,1,0,4.5
+154,8.5,0.3,1,1,4.5
155,3.8,0.3,1,1,4.5
156,0.2,0.3,1,1,4.5
157,0.0,0.3,1,1,4.5