diff --git a/Documentation/Checklist_Release_VECTO_3.3.3.1609.docx b/Documentation/Checklist_Release_VECTO_3.3.3.1609.docx
new file mode 100644
index 0000000000000000000000000000000000000000..c987997ccee975d62a8c2ab108c9425360f5a59e
Binary files /dev/null and b/Documentation/Checklist_Release_VECTO_3.3.3.1609.docx differ
diff --git a/Documentation/Checklist_Release_VECTO_3.3.3.1609.pdf b/Documentation/Checklist_Release_VECTO_3.3.3.1609.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..d74fa2044beef11fb83ee0a03b054a30208e9410
Binary files /dev/null and b/Documentation/Checklist_Release_VECTO_3.3.3.1609.pdf differ
diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf
index 8b22afb04895ce056ba9ef0a64db189e93f6223f..7e2773c23061af8e2a3baa87914e3b507e23de0d 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf and b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf differ
diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx
index 18e4932f0c4ccd330e854f52eacecaee58cdbad3..182da643bafdf3815b3b4c9bd6ca0c0c2e6b4802 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx and b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx differ
diff --git a/Documentation/User Manual/6-changelog/changelog.md b/Documentation/User Manual/6-changelog/changelog.md
index c1feb0892b182447bdeeb4f3c3df5278b837bd3e..059e8c0a233f8b4ddb214f23c59ea2d36da89e26 100644
--- a/Documentation/User Manual/6-changelog/changelog.md
+++ b/Documentation/User Manual/6-changelog/changelog.md
@@ -1,8 +1,28 @@
#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
diff --git a/Documentation/User Manual/help.html b/Documentation/User Manual/help.html
index db9e4054fc8cb2c0cf43fa34b896c935d82eab65..637bc1970b325382a3aed6b4364d899b54570eee 100644
--- a/Documentation/User Manual/help.html
+++ b/Documentation/User Manual/help.html
@@ -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
diff --git a/Documentation/VectoResults_3.3.3.1609-RC.xlsx b/Documentation/VectoResults_3.3.3.1609-RC.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..6f7d41229097bee6b6951c986da6e0690da3750a
Binary files /dev/null and b/Documentation/VectoResults_3.3.3.1609-RC.xlsx differ
diff --git a/HashingTool/Properties/Version.cs b/HashingTool/Properties/Version.cs
index 9f8a33c1b99d2c322033191f760ad8b5a7030d07..a01c33e98b088ea2fa2a7210daae7558a44336fc 100644
--- a/HashingTool/Properties/Version.cs
+++ b/HashingTool/Properties/Version.cs
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("0.2.0.1548")]
-[assembly: AssemblyFileVersion("0.2.0.1548")]
+[assembly: AssemblyVersion("0.2.0.1609")]
+[assembly: AssemblyFileVersion("0.2.0.1609")]
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 1af72a970a82c887f4b171d61de1c78a7c23bc64..5b7f4efb810981734995b831dfaba1782d3b637d 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -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>
diff --git a/VectoCommon/VectoCommon/Properties/Version.cs b/VectoCommon/VectoCommon/Properties/Version.cs
index 10211ebe31f39cdd77505c20268248e51a162c9a..c933d379139fef6d71ae0f4c5feea09a868fa1e4 100644
--- a/VectoCommon/VectoCommon/Properties/Version.cs
+++ b/VectoCommon/VectoCommon/Properties/Version.cs
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("3.3.2.1548")]
-[assembly: AssemblyFileVersion("3.3.2.1548")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.3.3.1609")]
+[assembly: AssemblyFileVersion("3.3.3.1609")]
\ No newline at end of file
diff --git a/VectoCommon/VectoHashing/Properties/Version.cs b/VectoCommon/VectoHashing/Properties/Version.cs
index a3d1b2a4b0d71e055b254f416dc3119b6559d2a8..e0526a73b0f026e8f97916e5111d4c3d9e389efc 100644
--- a/VectoCommon/VectoHashing/Properties/Version.cs
+++ b/VectoCommon/VectoHashing/Properties/Version.cs
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("1.2.0.1548")]
-[assembly: AssemblyFileVersion("1.2.0.1548")]
+[assembly: AssemblyVersion("1.2.0.1609")]
+[assembly: AssemblyFileVersion("1.2.0.1609")]
diff --git a/VectoConsole/Properties/Version.cs b/VectoConsole/Properties/Version.cs
index 94bae2c2ff03412cb8cf761dfff719f115f99746..9badfa14a9ae029bacb3be8c1af8a2a85f2bf382 100644
--- a/VectoConsole/Properties/Version.cs
+++ b/VectoConsole/Properties/Version.cs
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("3.3.2.1548")]
-[assembly: AssemblyFileVersion("3.3.2.1548")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.3.3.1609")]
+[assembly: AssemblyFileVersion("3.3.3.1609")]
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
index 65fc0262941b62bdfa88d92f560d561bbbd6d7d2..bd8fd5e189d54256706f702ce18447eaf1ea7582 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
@@ -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
diff --git a/VectoCore/VectoCore/Properties/Version.cs b/VectoCore/VectoCore/Properties/Version.cs
index 01fb2129a8831c4767383fe419ba17cd882af056..9b20ec249eb2e144766838f6d89daf9381e95ffd 100644
--- a/VectoCore/VectoCore/Properties/Version.cs
+++ b/VectoCore/VectoCore/Properties/Version.cs
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("3.3.2.1548")]
-[assembly: AssemblyFileVersion("3.3.2.1548")]
+[assembly: AssemblyVersion("3.3.3.1609")]
+[assembly: AssemblyFileVersion("3.3.3.1609")]
diff --git a/VectoCore/VectoCore/Utils/VectoVersionCore.cs b/VectoCore/VectoCore/Utils/VectoVersionCore.cs
index a1eca250f24e4b1735dc329be6ff2970200925ae..7ad7ac22f7329eb033b5c6749435b56666ba0f9b 100644
--- a/VectoCore/VectoCore/Utils/VectoVersionCore.cs
+++ b/VectoCore/VectoCore/Utils/VectoVersionCore.cs
@@ -47,7 +47,7 @@ namespace TUGraz.VectoCore.Utils
public static string VersionNumber
{
get {
- return "3.3.2.1548" + SUFFIX;
+ return "3.3.3.1609" + SUFFIX;
}
}
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 47f769f5e31279402d01d831c41a9f7762805e08..ae5ba4cbdf283b1384c69c983afb8354af830bd1 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -76,7 +76,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
- <DefineConstants>CERTIFICATION_RELEASE</DefineConstants>
+ <DefineConstants>RELEASE_CANDIDATE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -100,7 +100,8 @@
<HintPath>..\..\packages\Ninject.3.3.4\lib\net45\Ninject.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="Ninject.Extensions.Factory">
+ <Reference Include="Ninject.Extensions.Factory, Version=3.3.2.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\STUDENTEN_PROJEKTE\Kober_VectoGIT\VECTO_GIT\packages\Ninject.Extensions.Factory.3.3.2\lib\net45\Ninject.Extensions.Factory.dll</HintPath>
</Reference>
<Reference Include="Ninject.Extensions.NamedScope, Version=3.3.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
diff --git a/VectoCore/VectoCore/VersionNumber.t4 b/VectoCore/VectoCore/VersionNumber.t4
index 9c20daba623dc9f4ff369fcb8a71feff0221cb0d..3f0e67d03d36a9d0bf7c54c27d1c6868e8e3c6d3 100644
--- a/VectoCore/VectoCore/VersionNumber.t4
+++ b/VectoCore/VectoCore/VersionNumber.t4
@@ -6,6 +6,6 @@ int GetBuildNumber()
string GetVectoCoreVersionNumber()
{
- return "3.3.2." + GetBuildNumber();
+ return "3.3.3." + GetBuildNumber();
}
#>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/Tractor_4x2_vehicle-class-5_5_t_0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/Tractor_4x2_vehicle-class-5_5_t_0.xml
index a840a4b6128edd953f74939a822638cbb62f4812..0550cda00c07cf2b111ed18fdf117507c6dc743b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/Tractor_4x2_vehicle-class-5_5_t_0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/Tractor_4x2_vehicle-class-5_5_t_0.xml
@@ -533,7 +533,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_quam
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
<Date>2017-09-26T15:33:45.1110278Z</Date>
<AppVersion>VectoCore</AppVersion>
- <Dimension>235/60 R17 C</Dimension>
+ <Dimension>235/60 R17C</Dimension>
<RRCDeclared>0.0061</RRCDeclared>
<FzISO>33350</FzISO>
</v2.0:Data>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_tyre-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_tyre-sample.xml
index ea7ef216989c3f9bd96a90a4bc047825f277e899..fc4ba7740408e65cdf5e9ab36ea0a49979e3b2e3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_tyre-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_tyre-sample.xml
@@ -15,7 +15,7 @@
<CertificationNumber>e12*0815/8051*2017/05T0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>DemoTyreApp 1.0</AppVersion>
- <Dimension>235/60 R17 C</Dimension><!--- New tyre dimension added in version 2.2 -->
+ <Dimension>235/60 R17C</Dimension><!--- New tyre dimension added in version 2.2 -->
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>33500</FzISO>
</v2.0:Data>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-sample_LNG.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-sample_LNG.xml
index df9e81af74ef3ec415d3181ef5526eccc2d89311..fc139286087ff298f14d11878fc023c7c9544bf0 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-sample_LNG.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.2/vecto_vehicle-sample_LNG.xml
@@ -3247,7 +3247,7 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_quam
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
- <Dimension>235/60 R17 C</Dimension> <!-- New Dimesion added in v2.2 -->
+ <Dimension>235/60 R17C</Dimension> <!-- New Dimesion added in v2.2 -->
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</v2.0:Data>
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
index 35c8a9c5b8a7fe34048b5a3f8cea6fcf9a5baaae..f8b38272e8ef383eeee470412446e623eaa60d48 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
@@ -83,7 +83,7 @@ namespace TUGraz.VectoCore.Tests.XML
var filename = Path.Combine(@"TestData\XML\XMLReaderDeclaration", jobFile);
var dataProvider = xmlInputReader.CreateDeclaration(XmlReader.Create(filename));
- Assert.AreEqual("235/60 R17 C", dataProvider.JobInputData.Vehicle.Components.AxleWheels.AxlesDeclaration[1].Tyre.Dimension);
+ Assert.AreEqual("235/60 R17C", dataProvider.JobInputData.Vehicle.Components.AxleWheels.AxlesDeclaration[1].Tyre.Dimension);
}