This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit cf3b51d4 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'vecto-cert/develop' into develop 

# Conflicts:
#	HashingTool/Properties/Version.cs
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/Properties/Version.cs
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/VersionNumber.t4
parents 65a9c2d3 2386b0a6
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 229 additions and 41 deletions
Documentation/Checklist_Release_VECTO_3.3.3.1609.docx 0 → 100644
+ 0
− 0
View file @ cf3b51d4
File added
Documentation/Checklist_Release_VECTO_3.3.3.1609.pdf 0 → 100644
+ 0
− 0
View file @ cf3b51d4
File added
Documentation/User Manual Source/Release Notes Vecto3.x.pdf
+ 0
− 0
View file @ cf3b51d4
No preview for this file type
Documentation/User Manual Source/Release Notes Vecto3.x.pptx
+ 0
− 0
View file @ cf3b51d4
No preview for this file type
Documentation/User Manual/6-changelog/changelog.md
+ 22
− 2
View file @ cf3b51d4
#Changelog
**VECTO 3.3.3**
***Build 1609 (2019-05-29) RELEASE CANDIDATE***
- Improvement
* [VECTO-916] - Adding new tyre sizes
* [VECTO-946] - Refactoring XML reading
* [VECTO-965] - Add input fields for ADAS into VECTO GUI
* [VECTO-966] - Allow selecting Tank System for NG engines in GUI
* [VECTO-932] - Consistency in NA values in the vsum file
- Bugfixes
* [VECTO-954] - Failed to find operating point for braking power (Fix for Notification Art. 10(2) - [VECTO-952])
* [VECTO-979] - VECTO Simulation abort with 8-speed MT transmission (Fix for Notification Art. 10(2) - [VECTO-978])
* [VECTO-931] - AT error in VECTO version 3.3.2.1519
* [VECTO-950] - Error when loading Engine Full-load curve
* [VECTO-967] - Engine-Only mode: Engine Torque reported in .vmod does not match the provided cycle
* [VECTO-980] - Error during simulation run
**VECTO 3.3.2**
**Build 1548 (2019-03-29) OFFICIAL RELEASE**
***Build 1548 (2019-03-29) OFFICIAL RELEASE***
- Bugfixes
......@@ -14,7 +34,7 @@
* [VECTO-920] - Urban Delivery: Simulation Run Aborted, TargetVelocity and VehicleVelocity must be zero when vehicle is halting!
**Build 1519 (2019-03-01) RELEASE CANDIDATE**
***Build 1519 (2019-03-01) RELEASE CANDIDATE***
Release Notes - VECTO: Vehicle Energy Calculation Tool - Version 3.3.2.1519-RC
......
Documentation/User Manual/help.html
+ 23
− 2
View file @ cf3b51d4
......@@ -7560,8 +7560,29 @@ CycleTime,UnknownCycleName,3600</code></pre>
</div>
<div id="changelog" class="section level1">
<h1>Changelog</h1>
<p><strong>VECTO 3.3.3</strong></p>
<p><strong><em>Build 1609 (2019-05-29) RELEASE CANDIDATE</em></strong></p>
<ul>
<li>Improvement
<ul>
<li>[VECTO-916] - Adding new tyre sizes</li>
<li>[VECTO-946] - Refactoring XML reading</li>
<li>[VECTO-965] - Add input fields for ADAS into VECTO GUI</li>
<li>[VECTO-966] - Allow selecting Tank System for NG engines in GUI</li>
<li>[VECTO-932] - Consistency in NA values in the vsum file</li>
</ul></li>
<li>Bugfixes
<ul>
<li>[VECTO-954] - Failed to find operating point for braking power (Fix for Notification Art. 10(2) - [VECTO-952])</li>
<li>[VECTO-979] - VECTO Simulation abort with 8-speed MT transmission (Fix for Notification Art. 10(2) - [VECTO-978])</li>
<li>[VECTO-931] - AT error in VECTO version 3.3.2.1519</li>
<li>[VECTO-950] - Error when loading Engine Full-load curve</li>
<li>[VECTO-967] - Engine-Only mode: Engine Torque reported in .vmod does not match the provided cycle</li>
<li>[VECTO-980] - Error during simulation run</li>
</ul></li>
</ul>
<p><strong>VECTO 3.3.2</strong></p>
<p><strong>Build 1548 (2019-03-29) OFFICIAL RELEASE</strong></p>
<p><strong><em>Build 1548 (2019-03-29) OFFICIAL RELEASE</em></strong></p>
<ul>
<li>Bugfixes
<ul>
......@@ -7573,7 +7594,7 @@ CycleTime,UnknownCycleName,3600</code></pre>
<li>[VECTO-920] - Urban Delivery: Simulation Run Aborted, TargetVelocity and VehicleVelocity must be zero when vehicle is halting!</li>
</ul></li>
</ul>
<p><strong>Build 1519 (2019-03-01) RELEASE CANDIDATE</strong></p>
<p><strong><em>Build 1519 (2019-03-01) RELEASE CANDIDATE</em></strong></p>
<p>Release Notes - VECTO: Vehicle Energy Calculation Tool - Version 3.3.2.1519-RC</p>
<ul>
<li>Improvement
Documentation/VectoResults_3.3.3.1609-RC.xlsx 0 → 100644
+ 0
− 0
View file @ cf3b51d4
File added
VECTO.sln
+ 93
− 0
View file @ cf3b51d4
......@@ -71,6 +71,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Article10Notifications", ".
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VECTO_GIT", "..\STUDENTEN_PROJEKTE\Kober_VectoGIT\VECTO_GIT\VECTO_GIT\VECTO_GIT.csproj", "{A684BC49-C9B3-4C0C-8D2E-A13077853EDA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandaloneApplication", "..\VECTO_API\StandaloneApplication\StandaloneApplication.csproj", "{C234077C-F81E-42FA-9367-1319753678A6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VECTO-GIT", "VECTO-GIT", "{5DDEEEC2-743F-4395-B058-687B5773E3D2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VECTO_GIT_TEST", "..\STUDENTEN_PROJEKTE\Kober_VectoGIT\VECTO_GIT\VECTO_GIT_TEST\VECTO_GIT_TEST.csproj", "{52430C51-892A-4D8E-9189-B6C9D09791C0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug PerformanceStats|Any CPU = Debug PerformanceStats|Any CPU
......@@ -768,6 +774,90 @@ Global
{A684BC49-C9B3-4C0C-8D2E-A13077853EDA}.ReleaseTUG|x64.Build.0 = Release|Any CPU
{A684BC49-C9B3-4C0C-8D2E-A13077853EDA}.ReleaseTUG|x86.ActiveCfg = Release|Any CPU
{A684BC49-C9B3-4C0C-8D2E-A13077853EDA}.ReleaseTUG|x86.Build.0 = Release|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug PerformanceStats|Any CPU.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug PerformanceStats|Any CPU.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug PerformanceStats|x64.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug PerformanceStats|x64.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug PerformanceStats|x86.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug PerformanceStats|x86.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug PerformanceTrace|Any CPU.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug PerformanceTrace|Any CPU.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug PerformanceTrace|x64.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug PerformanceTrace|x64.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug PerformanceTrace|x86.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug PerformanceTrace|x86.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug|x64.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug|x64.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug|x86.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Debug|x86.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.DebugTUG|Any CPU.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.DebugTUG|x64.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.DebugTUG|x86.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Deploy|x64.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Deploy|x64.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Deploy|x86.ActiveCfg = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Deploy|x86.Build.0 = Debug|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Release|Any CPU.Build.0 = Release|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Release|x64.ActiveCfg = Release|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Release|x64.Build.0 = Release|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Release|x86.ActiveCfg = Release|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.Release|x86.Build.0 = Release|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.ReleaseTUG|Any CPU.ActiveCfg = Release|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.ReleaseTUG|Any CPU.Build.0 = Release|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.ReleaseTUG|x64.ActiveCfg = Release|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.ReleaseTUG|x64.Build.0 = Release|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.ReleaseTUG|x86.ActiveCfg = Release|Any CPU
{C234077C-F81E-42FA-9367-1319753678A6}.ReleaseTUG|x86.Build.0 = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug PerformanceStats|Any CPU.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug PerformanceStats|Any CPU.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug PerformanceStats|x64.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug PerformanceStats|x64.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug PerformanceStats|x86.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug PerformanceStats|x86.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug PerformanceTrace|Any CPU.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug PerformanceTrace|Any CPU.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug PerformanceTrace|x64.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug PerformanceTrace|x64.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug PerformanceTrace|x86.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug PerformanceTrace|x86.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug|x64.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug|x64.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug|x86.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Debug|x86.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.DebugTUG|Any CPU.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.DebugTUG|x64.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.DebugTUG|x86.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Deploy|x64.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Deploy|x64.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Deploy|x86.ActiveCfg = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Deploy|x86.Build.0 = Debug|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Release|Any CPU.Build.0 = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Release|x64.ActiveCfg = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Release|x64.Build.0 = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Release|x86.ActiveCfg = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.Release|x86.Build.0 = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.ReleaseTUG|Any CPU.ActiveCfg = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.ReleaseTUG|Any CPU.Build.0 = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.ReleaseTUG|x64.ActiveCfg = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.ReleaseTUG|x64.Build.0 = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.ReleaseTUG|x86.ActiveCfg = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.ReleaseTUG|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -791,5 +881,8 @@ Global
{7C364099-9B85-473A-8A42-BBEBE4798FF5} = {CC93EA68-F3FE-4BCB-9292-1101F94A4D09}
{B673E12F-D323-4C4C-8805-9915B2C72D3D} = {73A5BF70-6168-456F-95E5-A1402BFA488C}
{760C1C5B-A767-463E-BA85-F0BCFC23A550} = {73A5BF70-6168-456F-95E5-A1402BFA488C}
{A684BC49-C9B3-4C0C-8D2E-A13077853EDA} = {5DDEEEC2-743F-4395-B058-687B5773E3D2}
{C234077C-F81E-42FA-9367-1319753678A6} = {D29E62A2-CF08-469F-B29F-1B25DCB35386}
{52430C51-892A-4D8E-9189-B6C9D09791C0} = {5DDEEEC2-743F-4395-B058-687B5773E3D2}
EndGlobalSection
EndGlobal
VECTO/GUI/VehicleAxleDialog.vb
+ 1
− 1
View file @ cf3b51d4
......@@ -29,7 +29,7 @@ Public Class VehicleAxleDialog
InitializeComponent()
CbWheels.Items.Add("-")
CbWheels.Items.AddRange(DeclarationData.Wheels.GetWheelsDimensions())
CbWheels.Items.AddRange(DeclarationData.Wheels.GetWheelsDimensions().OrderBy(function(s) s).ToArray())
cbAxleType.Items.Clear()
cbAxleType.ValueMember = "Value"
......
VECTO/VECTO.vbproj
+ 1
− 0
View file @ cf3b51d4
......@@ -74,6 +74,7 @@
<Prefer32Bit>false</Prefer32Bit>
<WarningLevel>1</WarningLevel>
<WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
<DefineConstants>RELEASE_CANDIDATE</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>
......
VectoCore/VectoCore/InputData/Reader/ComponentData/TransmissionLossMapReader.cs
+ 10
− 8
View file @ cf3b51d4
......@@ -129,7 +129,8 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
VectoMath.LeastSquaresFitting(speedBucket.Value, x => x.InputTorque.Value(), x => x.TorqueLoss.Value(), out k, out d,
out r);
var inTq = DeclarationData.LossMapExtrapolationFactor * maxTorque;
for (var i = 2; i <= DeclarationData.LossMapExtrapolationFactor; i++) {
var inTq = i * maxTorque;
if (k > 0) {
entries.Add(new TransmissionLossMap.GearLossMapEntry(speedBucket.Key, inTq, k * inTq + d.SI<NewtonMeter>()));
entries.Add(new TransmissionLossMap.GearLossMapEntry(speedBucket.Key, -inTq, k * inTq + d.SI<NewtonMeter>()));
......@@ -139,6 +140,7 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
entries.Add(new TransmissionLossMap.GearLossMapEntry(speedBucket.Key, -inTq, torqueLossLastEntry));
}
}
}
return entries;
}
......
VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+ 1
− 1
View file @ cf3b51d4
......@@ -77,7 +77,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public static readonly StandardBodies StandardBodies = new StandardBodies();
public static readonly Payloads Payloads = new Payloads();
public static readonly PTOTransmission PTOTransmission = new PTOTransmission();
public const double LossMapExtrapolationFactor = 3;
public const double LossMapExtrapolationFactor = 6;
public static readonly ADASCombinations ADASCombinations = new ADASCombinations();
public static readonly ADASBenefits ADASBenefits = new ADASBenefits();
......
VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
+ 1
− 1
View file @ cf3b51d4
......@@ -115,7 +115,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
PerSecond angularVelocityIn;
var slippingClutchWhenDriving = (DataBus.Gear <= 2 && DataBus.DriverBehavior != DrivingBehavior.Braking);
var slippingClutchDuringBraking = DataBus.Gear == 1 && DataBus.DriverBehavior == DrivingBehavior.Braking && outTorque > 0;
var slippingClutchDuringBraking = DataBus.Gear == 1 && DataBus.DriverBehavior == DrivingBehavior.Braking && outTorque > 0 && DataBus.BrakePower.IsEqual(0);
//var slippingClutchWhenDriving = (DataBus.Gear == 1 && outTorque > 0);
AddClutchLoss(outTorque, outAngularVelocity,
slippingClutchWhenDriving || slippingClutchDuringBraking || startClutch || outAngularVelocity.IsEqual(0),
......
VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+ 17
− 5
View file @ cf3b51d4
......@@ -89,9 +89,16 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
UpdateDrivingAction(currentDistance, ds);
if (NextDrivingAction != null) {
var remainingDistance = NextDrivingAction.ActionDistance - currentDistance;
var estimatedNextTimestep = remainingDistance / Driver.DataBus.VehicleSpeed;
if (remainingDistance.IsEqual(0.SI<Meter>(), Constants.SimulationSettings.DriverActionDistanceTolerance) ||
estimatedNextTimestep.IsSmaller(Constants.SimulationSettings.LowerBoundTimeInterval)) {
var estimatedTimestep = remainingDistance / Driver.DataBus.VehicleSpeed;
var atTriggerTistance = remainingDistance.IsEqual(
0.SI<Meter>(), Constants.SimulationSettings.DriverActionDistanceTolerance);
var closeBeforeBraking = estimatedTimestep.IsSmaller(Constants.SimulationSettings.LowerBoundTimeInterval);
var brakingIntervalTooShort = NextDrivingAction.Action == DrivingBehavior.Braking &&
((NextDrivingAction.TriggerDistance - NextDrivingAction.ActionDistance) / Driver.DataBus.VehicleSpeed)
.IsSmaller(
Constants.SimulationSettings.LowerBoundTimeInterval / 20) && !Driver.DataBus.ClutchClosed(absTime);
if ( atTriggerTistance || closeBeforeBraking || brakingIntervalTooShort) {
CurrentDrivingMode = DrivingMode.DrivingModeBrake;
DrivingModes[CurrentDrivingMode].ResetMode();
Log.Debug("Switching to DrivingMode BRAKE");
......@@ -431,9 +438,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
throw new VectoException("HandleRequestEngaged found no operating point.");
} else {
return HandleRequestDisengaged(absTime, ds, gradient, velocity, debug);
}
var response = HandleRequestDisengaged(absTime, ds, gradient, velocity, debug);
if (!(response is ResponseSuccess) && DataBus.ClutchClosed(absTime)) {
response = HandleRequestEngaged(absTime, ds, targetVelocity, gradient, prohibitOverspeed, velocity, debug);
}
return response;
}
private IResponse HandleRequestDisengaged(
......
VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
+ 10
− 1
View file @ cf3b51d4
......@@ -352,7 +352,16 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
IterationStatistics.Increment(this, "Coast");
Log.Debug("DrivingAction Coast");
return CoastOrRollAction(absTime, ds, maxVelocity, gradient, false);
var gear = DataBus.Gear;
var tcLocked = DataBus.TCLocked;
var retVal = CoastOrRollAction(absTime, ds, maxVelocity, gradient, false);
var gearChanged = !(DataBus.Gear == gear && DataBus.TCLocked == tcLocked);
if (DataBus.GearboxType.AutomaticTransmission() && gearChanged && (retVal is ResponseOverload || retVal is ResponseUnderload)) {
Log.Debug("Gear changed after a valid operating point was found - re-try coasting!");
retVal = CoastOrRollAction(absTime, ds, maxVelocity, gradient, false);
}
return retVal;
}
/// <summary>
......
VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
+ 1
− 1
View file @ cf3b51d4
......@@ -160,7 +160,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public double Progress
{
get { return AbsTime.Value() / Data.Entries.Last().Time.Value(); }
get { return Math.Max(0, AbsTime.Value() / Data.Entries.Last().Time.Value()); }
}
#endregion
......
VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
+ 1
− 1
View file @ cf3b51d4
......@@ -230,7 +230,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return operatingPoint;
} catch (VectoException ve) {
Log.Error(ve, "TorqueConverter: Failed to find operating point for DragPower {0}", engineResponse.DragPower);
var engineSpeed = VectoMath.Max(DataBus.EngineIdleSpeed, 0.8 * DataBus.EngineSpeed);
var engineSpeed = VectoMath.Max(DataBus.EngineIdleSpeed * 1.001, 0.8 * DataBus.EngineSpeed);
var retVal = FindValidTorqueConverterOperatingPoint(
absTime, dt, outAngularVelocity, engineSpeed,
......
VectoCore/VectoCore/Resources/Declaration/Wheels.csv
+ 16
− 0
View file @ cf3b51d4
......@@ -86,3 +86,19 @@ Wheel , cross-sectional width [mm] , tire aspect ratio [%] , rim diameter
8 R17.5 , 208 , 0.80 , 17.5 , 784 , 4.00 , 3.05
LT265/75 R16 , 267 , 0.75 , 16 , 804 , 5.82 , 3.05
385/55 R19.5 , 386 , 0.55 , 19.5 , 919 , 11.14 , 3.03
#
24 R21 , 610 , 0.80 , 21 , 1372 , 70.15 , 3.05
205/70 R15C , 209 , 0.70 , 15 , 669 , 1.66 , 3.03
215/70 R15C , 221 , 0.70 , 15 , 683 , 1.60 , 3.03
225/70 R15C , 228 , 0.70 , 15 , 697 , 1.82 , 3.03
185/75 R16C , 184 , 0.75 , 16 , 684 , 1.67 , 3.03
195/65 R16C , 201 , 0.65 , 16 , 660 , 1.59 , 3.03
195/75 R16C , 196 , 0.75 , 16 , 698 , 1.80 , 3.03
205/65 R16C , 209 , 0.65 , 16 , 672 , 1.68 , 3.03
205/75 R16C , 203 , 0.75 , 16 , 714 , 2.09 , 3.03
215/65 R16C , 221 , 0.65 , 16 , 686 , 1.83 , 3.03
215/75 R16C , 216 , 0.75 , 16 , 728 , 2.24 , 3.03
225/65 R16C , 228 , 0.65 , 16 , 698 , 1.93 , 3.03
235/65 R16C , 240 , 0.65 , 16 , 712 , 2.12 , 3.03
215/60 R17C , 221 , 0.60 , 17 , 690 , 1.50 , 3.03
235/60 R17C , 240 , 0.60 , 17 , 714 , 2.29 , 3.03
VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
+ 16
− 1
View file @ cf3b51d4
......@@ -2519,6 +2519,21 @@ ToDo: -0.00
<xs:enumeration value="8 R17.5"/>
<xs:enumeration value="LT265/75 R16"/>
<xs:enumeration value="385/55 R19.5"/>
<xs:enumeration value="24 R21"/>
<xs:enumeration value="205/70 R15C"/>
<xs:enumeration value="215/70 R15C"/>
<xs:enumeration value="225/70 R15C"/>
<xs:enumeration value="185/75 R16C"/>
<xs:enumeration value="195/65 R16C"/>
<xs:enumeration value="195/75 R16C"/>
<xs:enumeration value="205/65 R16C"/>
<xs:enumeration value="205/75 R16C"/>
<xs:enumeration value="215/65 R16C"/>
<xs:enumeration value="215/75 R16C"/>
<xs:enumeration value="225/65 R16C"/>
<xs:enumeration value="235/65 R16C"/>
<xs:enumeration value="215/60 R17C"/>
<xs:enumeration value="235/60 R17C"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="TyreFzISOType">
......
VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.2.xsd
+ 16
− 17
View file @ cf3b51d4
......@@ -151,19 +151,18 @@
<xs:enumeration value="8 R17.5"/>
<xs:enumeration value="LT265/75 R16"/>
<xs:enumeration value="385/55 R19.5"/>
<xs:enumeration value="455/45 R22.5"/>
<xs:enumeration value="195/75 R16 C"/>
<xs:enumeration value="205/65 R16 C"/>
<xs:enumeration value="24 R21"/>
<xs:enumeration value="205/70 R15C"/>
<xs:enumeration value="215/70 R15C"/>
<xs:enumeration value="225/70 R15C"/>
<xs:enumeration value="185/75 R16C"/>
<xs:enumeration value="195/65 R16C"/>
<xs:enumeration value="195/75 R16C"/>
<xs:enumeration value="205/65 R16C"/>
<xs:enumeration value="205/75 R16C"/>
<xs:enumeration value="215/65 R16C"/>
<xs:enumeration value="215/75 R16C"/>
<xs:enumeration value="225/65 R16C"/>
<xs:enumeration value="225/75 R16 C"/>
<xs:enumeration value="235/65 R16C"/>
<xs:enumeration value="215/60 R17C"/>
<xs:enumeration value="235/60 R17C"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about