diff --git a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
index db48f162dd1139513aaa12fda7384bfa8d2363a4..4df223386ea4d6b30234ab6d13f1dc63b5ded5f4 100644
--- a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
+++ b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
@@ -48,6 +48,10 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\VectoCommon\VectoCommon\VectoCommon.csproj">
+ <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
+ <Name>VectoCommon</Name>
+ </ProjectReference>
<ProjectReference Include="..\..\VectoCore\VectoCore\VectoCore.csproj">
<Project>{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}</Project>
<Name>VectoCore</Name>
diff --git a/Tools/DeclarationCycleZip/Program.cs b/Tools/DeclarationCycleZip/Program.cs
index d2cb24a34806ee4c21391323e3c7efe2020159ca..f9f3216132ddbb38b7e596cf7309e92c69b30a20 100644
--- a/Tools/DeclarationCycleZip/Program.cs
+++ b/Tools/DeclarationCycleZip/Program.cs
@@ -33,6 +33,7 @@ using System.Data;
using System.Globalization;
using System.IO;
using System.Linq;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
diff --git a/VECTO.sln b/VECTO.sln
index 402f43e9eae2ea39980ea33414a5ad8e5d55e757..4139526cf91391fb0d14d3e7391e04877e51c450 100644
--- a/VECTO.sln
+++ b/VECTO.sln
@@ -38,6 +38,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{351FF7E8
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VECTO 3", "VECTO 3", "{CC93EA68-F3FE-4BCB-9292-1101F94A4D09}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCommon", "VectoCommon\VectoCommon\VectoCommon.csproj", "{79A066AD-69A9-4223-90F6-6ED5D2D084F4}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -144,6 +146,14 @@ Global
{E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|Any CPU.Build.0 = Release|Any CPU
{E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|x64.ActiveCfg = Release|Any CPU
{E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|x86.ActiveCfg = Release|Any CPU
+ {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Release|x64.ActiveCfg = Release|Any CPU
+ {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -152,6 +162,7 @@ Global
{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D} = {B7C0A40B-E468-44DE-A784-7A5B8DAC1042}
{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65} = {B7C0A40B-E468-44DE-A784-7A5B8DAC1042}
{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD} = {73A5BF70-6168-456F-95E5-A1402BFA488C}
+ {79A066AD-69A9-4223-90F6-6ED5D2D084F4} = {73A5BF70-6168-456F-95E5-A1402BFA488C}
{E8B0B447-1A54-4BEC-A160-AF0017000781} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index 6aaf3cea286fafa7b658ac538c012befb1be6eb3..ea8772c2941beb4fdab9140c093bfc1af20abc46 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -42,6 +42,8 @@ Imports System.Threading
Imports NLog
Imports NLog.Config
Imports NLog.Targets
+Imports TUGraz.VectoCommon.InputData
+Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.OutputData
Imports TUGraz.VectoCore.OutputData.FileIO
Imports TUGraz.VectoCore.Utils
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index aa1b195ad7e02a871ac73ba3d460a7c7019a0dde..765eb45c20d5b74974c43285939d067354199e39 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -116,17 +116,17 @@
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<ItemGroup>
- <Reference Include="itextsharp, Version=5.5.7.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
+ <Reference Include="itextsharp, Version=5.5.9.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\iTextSharp.5.5.7\lib\itextsharp.dll</HintPath>
+ <HintPath>..\packages\iTextSharp.5.5.9\lib\itextsharp.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\NLog.4.2.0\lib\net45\NLog.dll</HintPath>
+ <HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -935,6 +935,10 @@
<Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
<Name>AdvancedAuxiliaryInterfaces</Name>
</ProjectReference>
+ <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj">
+ <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
+ <Name>VectoCommon</Name>
+ </ProjectReference>
<ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj">
<Project>{cd36938a-add9-4c65-96da-b397cdeea90a}</Project>
<Name>VectoCore</Name>
diff --git a/VECTO/app.config b/VECTO/app.config
index b1493c37e431bbdc2ec5f2ab28cb035a53ee435c..7ae650822fdef20ec280fc4c705f5f4970bd7f63 100644
--- a/VECTO/app.config
+++ b/VECTO/app.config
@@ -46,12 +46,4 @@
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
- <runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
- </dependentAssembly>
- </assemblyBinding>
- </runtime>
</configuration>
\ No newline at end of file
diff --git a/VECTO/packages.config b/VECTO/packages.config
index ba3c2baf7e1b975f7bcd33ccfb0894d4b4cb2392..04e7b562d8426836870965b55d497d2986d09a49 100644
--- a/VECTO/packages.config
+++ b/VECTO/packages.config
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="iTextSharp" version="5.5.7" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
- <package id="NLog" version="4.2.0" targetFramework="net45" />
+ <package id="iTextSharp" version="5.5.9" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+ <package id="NLog" version="4.2.3" targetFramework="net45" />
<package id="NUnit" version="2.6.2" targetFramework="net45" />
</packages>
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
index fb652c6ebe372bd5ba424578b632042a91bf0a1f..46280347a73c25a02d5b6dc19076c452f28e0619 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
@@ -95,7 +95,7 @@ Namespace Hvac
For Each line As TechListBenefitLine In DirectCast(from, SSMTOOL).TechList.TechLines
Dim newLine As New TechListBenefitLine(Me.GenInputs)
- newLine.InjectFrom()
+ newLine.InjectFrom()
newLine.InjectFrom(line)
TechList.Add(newLine, feedback)
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index dc295c00f28fc34a546d409fe41135cb65d8d943..dc3d8f96afc4b93b7c26ad600a0ce05f1da7c4fb 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -52,12 +52,12 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>3rdPartyLibraries\DocumentFormat.OpenXml.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Omu.ValueInjecter">
- <HintPath>..\..\packages\valueinjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll</HintPath>
+ <HintPath>..\..\packages\ValueInjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -265,7 +265,9 @@
<CustomToolNamespace>My</CustomToolNamespace>
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None>
- <None Include="packages.config" />
+ <None Include="packages.config">
+ <SubType>Designer</SubType>
+ </None>
</ItemGroup>
<ItemGroup>
<Folder Include="3rdPartyLibraries\" />
diff --git a/VECTOAux/VectoAuxiliaries/packages.config b/VECTOAux/VectoAuxiliaries/packages.config
index a7d552e47c7e264d5d35ff3563717de6b4b294bf..c3b630348e6dc8748b8b841409bbf0574781c609 100644
--- a/VECTOAux/VectoAuxiliaries/packages.config
+++ b/VECTOAux/VectoAuxiliaries/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
<package id="valueinjecter" version="2.3.3" targetFramework="net40" />
+ <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net40" />
</packages>
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index 1eb64c3bc59f6c387ddcadf2bc4fb7c6b572a498..1e5bdb1f7b575229560ac92889f5fac11184e893 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -58,9 +58,9 @@
<Reference Include="Moq">
<HintPath>..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
diff --git a/VECTOAux/VectoAuxiliariesTests/packages.config b/VECTOAux/VectoAuxiliariesTests/packages.config
index 7a7c1d94390641216fcad8aae7b090f184d39390..d533166308e45574854ff7d661d724597ea43d0e 100644
--- a/VECTOAux/VectoAuxiliariesTests/packages.config
+++ b/VECTOAux/VectoAuxiliariesTests/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Moq" version="4.2.1510.2205" targetFramework="net40" />
- <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
+ <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net40" />
<package id="NUnit" version="2.6.2" targetFramework="net45" />
</packages>
\ No newline at end of file
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj b/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj
index 1a4e8fcf1dc51d69dad44d6060c80b663c45915d..60e5c7ee61a08385ebd4b0eadb682d65df8872a5 100644
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj
+++ b/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj
@@ -48,9 +48,9 @@
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/packages.config b/VectoCommon/AdvancedAuxiliaryInterfaces/packages.config
index 1b9f231dee53b291eb9f59bb848f2760b48b9108..2c6c3f124c11e64130ecedfed95f3a7462b4966b 100644
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/packages.config
+++ b/VectoCommon/AdvancedAuxiliaryInterfaces/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40" />
+ <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net40" />
</packages>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Exceptions/VectoExceptions.cs b/VectoCommon/VectoCommon/Exceptions/VectoExceptions.cs
similarity index 96%
rename from VectoCore/VectoCore/Exceptions/VectoExceptions.cs
rename to VectoCommon/VectoCommon/Exceptions/VectoExceptions.cs
index 75e52f55abac669e7cef565cb9289cb82d1a67fd..2f599867421b1dc393e73812a75f12556760c5b3 100644
--- a/VectoCore/VectoCore/Exceptions/VectoExceptions.cs
+++ b/VectoCommon/VectoCommon/Exceptions/VectoExceptions.cs
@@ -34,7 +34,7 @@ using System.IO;
using JetBrains.Annotations;
using NLog;
-namespace TUGraz.VectoCore.Exceptions
+namespace TUGraz.VectoCommon.Exceptions
{
public class VectoException : Exception
{
@@ -48,14 +48,14 @@ namespace TUGraz.VectoCore.Exceptions
LogManager.Flush();
}
- [StringFormatMethod("message")]
+ //[StringFormatMethod("message")]
public VectoException(string message, params object[] args)
: base(string.Format(message, args))
{
LogManager.Flush();
}
- [StringFormatMethod("message")]
+ //[StringFormatMethod("message")]
protected VectoException(string message, Exception inner, params object[] args)
: base(string.Format(message, args), inner)
{
diff --git a/VectoCore/VectoCore/Exceptions/VectoSimulationException.cs b/VectoCommon/VectoCommon/Exceptions/VectoSimulationException.cs
similarity index 95%
rename from VectoCore/VectoCore/Exceptions/VectoSimulationException.cs
rename to VectoCommon/VectoCommon/Exceptions/VectoSimulationException.cs
index 30c3f9a3bdd626263d02f93433e9f4847c1e89ad..c4ed26983a5e2becd218a5efe40acecffd5a41f7 100644
--- a/VectoCore/VectoCore/Exceptions/VectoSimulationException.cs
+++ b/VectoCommon/VectoCommon/Exceptions/VectoSimulationException.cs
@@ -30,17 +30,17 @@
*/
using System;
+using TUGraz.VectoCommon.Models;
using JetBrains.Annotations;
-using TUGraz.VectoCore.Models.Connector.Ports;
-namespace TUGraz.VectoCore.Exceptions
+namespace TUGraz.VectoCommon.Exceptions
{
public class VectoSimulationException : VectoException
{
public VectoSimulationException(string msg) : base(msg) {}
public VectoSimulationException(string msg, Exception inner) : base(msg, inner) {}
- [StringFormatMethod("message")]
+ //[StringFormatMethod("message")]
public VectoSimulationException(string message, params object[] args) : base(message, args) {}
//[StringFormatMethod("message")]
diff --git a/VectoCore/VectoCore/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
similarity index 97%
rename from VectoCore/VectoCore/InputData/DeclarationInputData.cs
rename to VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index f76a085b083a765b6e1a2104bb12605307982491..aafdaacf782d2838421592b042681885d355dfac 100644
--- a/VectoCore/VectoCore/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -31,11 +31,10 @@
using System.Collections.Generic;
using System.Data;
-using TUGraz.VectoCore.Models.Declaration;
-using TUGraz.VectoCore.Models.SimulationComponent.Data;
-using TUGraz.VectoCore.Utils;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
-namespace TUGraz.VectoCore.InputData
+namespace TUGraz.VectoCommon.InputData
{
public interface IDeclarationJobInputData
{
@@ -132,7 +131,7 @@ namespace TUGraz.VectoCore.InputData
/// P052
/// cf. VECTO Input Parameters.xlsx
/// </summary>
- RetarderData.RetarderType Type { get; }
+ RetarderType Type { get; }
/// <summary>
/// P054
@@ -350,7 +349,7 @@ namespace TUGraz.VectoCore.InputData
/// P015
/// cf. VECTO Input Parameters.xlsx
/// </summary>
- DriverData.DriverMode Mode { get; }
+ DriverMode Mode { get; }
}
diff --git a/VectoCore/VectoCore/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
similarity index 98%
rename from VectoCore/VectoCore/InputData/EngineeringInputData.cs
rename to VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
index d10ba7730172ee550e621c7b42664f64e1a72f7d..2e65ca2d4fa89b8ca53384b96a69635e1f3ed2a6 100644
--- a/VectoCore/VectoCore/InputData/EngineeringInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
@@ -31,10 +31,10 @@
using System.Collections.Generic;
using System.Data;
-using TUGraz.VectoCore.Models.SimulationComponent.Data;
-using TUGraz.VectoCore.Utils;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
-namespace TUGraz.VectoCore.InputData
+namespace TUGraz.VectoCommon.InputData
{
public interface IEngineeringJobInputData : IDeclarationJobInputData
{
diff --git a/VectoCore/VectoCore/InputData/IInputDataProvider.cs b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
similarity index 95%
rename from VectoCore/VectoCore/InputData/IInputDataProvider.cs
rename to VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
index eb16c49c263192ffe0e811affd9da6500b1d7549..c1add1e8e15fe56847ccab196fa452701d41da46 100644
--- a/VectoCore/VectoCore/InputData/IInputDataProvider.cs
+++ b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
@@ -29,10 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using System.Collections.Generic;
-using System.Deployment.Internal;
-
-namespace TUGraz.VectoCore.InputData
+namespace TUGraz.VectoCommon.InputData
{
public interface IInputDataProvider {}
diff --git a/VectoCore/VectoCore/InputData/IntegrityStatus.cs b/VectoCommon/VectoCommon/InputData/IntegrityStatus.cs
similarity index 97%
rename from VectoCore/VectoCore/InputData/IntegrityStatus.cs
rename to VectoCommon/VectoCommon/InputData/IntegrityStatus.cs
index fd64eaada16235072e64728852c78315a0da520d..ecd68c3c9411d094ff4823282dd03f2350bbe345 100644
--- a/VectoCore/VectoCore/InputData/IntegrityStatus.cs
+++ b/VectoCommon/VectoCommon/InputData/IntegrityStatus.cs
@@ -29,7 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-namespace TUGraz.VectoCore.InputData
+namespace TUGraz.VectoCommon.InputData
{
public enum IntegrityStatus
{
diff --git a/VectoCommon/VectoCommon/Models/AuxiliaryModel.cs b/VectoCommon/VectoCommon/Models/AuxiliaryModel.cs
new file mode 100644
index 0000000000000000000000000000000000000000..2046eba0bd04e3a9c3917948af193ab9a47e0acd
--- /dev/null
+++ b/VectoCommon/VectoCommon/Models/AuxiliaryModel.cs
@@ -0,0 +1,23 @@
+namespace TUGraz.VectoCommon.Models
+{
+ public enum AuxiliaryModel
+ {
+ Classic,
+ Advanced
+ }
+
+ public class AuxiliaryModelHelper
+ {
+ public static AuxiliaryModel Parse(string auxAssemblyStr)
+ {
+ if (string.IsNullOrEmpty(auxAssemblyStr)) {
+ return AuxiliaryModel.Classic;
+ }
+ switch (auxAssemblyStr) {
+ case "BusAuxiliaries":
+ return AuxiliaryModel.Advanced;
+ }
+ return AuxiliaryModel.Classic;
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/Declaration/AxleConfiguration.cs b/VectoCommon/VectoCommon/Models/AxleConfiguration.cs
similarity index 93%
rename from VectoCore/VectoCore/Models/Declaration/AxleConfiguration.cs
rename to VectoCommon/VectoCommon/Models/AxleConfiguration.cs
index 905e094a3f7d5b4d865055be36eab990eb151367..b57948c2c5eb5a3655566b3b3dbaab32a9fe0905 100644
--- a/VectoCore/VectoCore/Models/Declaration/AxleConfiguration.cs
+++ b/VectoCommon/VectoCommon/Models/AxleConfiguration.cs
@@ -29,11 +29,9 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using System;
-using TUGraz.VectoCore.Utils;
-using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCommon.Utils;
-namespace TUGraz.VectoCore.Models.Declaration
+namespace TUGraz.VectoCommon.Models
{
public enum AxleConfiguration
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionMode.cs b/VectoCommon/VectoCommon/Models/CrossWindCorrectionMode.cs
similarity index 97%
rename from VectoCore/VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionMode.cs
rename to VectoCommon/VectoCommon/Models/CrossWindCorrectionMode.cs
index 4fca2c684b6a23c01284a3f095338f62a94c1467..54eeb0b96167e5e178d97af21900e705d5bb86d9 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionMode.cs
+++ b/VectoCommon/VectoCommon/Models/CrossWindCorrectionMode.cs
@@ -32,7 +32,7 @@
using System;
using NLog;
-namespace TUGraz.VectoCore.Models.SimulationComponent.Data
+namespace TUGraz.VectoCommon.Models
{
public enum CrossWindCorrectionMode
{
diff --git a/VectoCommon/VectoCommon/Models/DriverMode.cs b/VectoCommon/VectoCommon/Models/DriverMode.cs
new file mode 100644
index 0000000000000000000000000000000000000000..946c5da4d283f24d53f5d1f91d052792ac015a31
--- /dev/null
+++ b/VectoCommon/VectoCommon/Models/DriverMode.cs
@@ -0,0 +1,9 @@
+namespace TUGraz.VectoCommon.Models
+{
+ public enum DriverMode
+ {
+ Off,
+ Overspeed,
+ EcoRoll,
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxType.cs b/VectoCommon/VectoCommon/Models/GearboxType.cs
similarity index 96%
rename from VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxType.cs
rename to VectoCommon/VectoCommon/Models/GearboxType.cs
index 37526c3a7e5c27fafa698193520d3c95dab2d086..d35b4e5f3644c744bb524a603cc13e12cb49ec36 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxType.cs
+++ b/VectoCommon/VectoCommon/Models/GearboxType.cs
@@ -30,9 +30,9 @@
*/
using System.Diagnostics.CodeAnalysis;
-using TUGraz.VectoCore.Utils;
+using TUGraz.VectoCommon.Utils;
-namespace TUGraz.VectoCore.Models.SimulationComponent.Data
+namespace TUGraz.VectoCommon.Models
{
[SuppressMessage("ReSharper", "InconsistentNaming")]
public enum GearboxType
diff --git a/VectoCore/VectoCore/Models/Connector/Ports/IResponse.cs b/VectoCommon/VectoCommon/Models/IResponse.cs
similarity index 96%
rename from VectoCore/VectoCore/Models/Connector/Ports/IResponse.cs
rename to VectoCommon/VectoCommon/Models/IResponse.cs
index 1c653e5a0383123db0c16a11a8f0385694e51798..fffb0b55fb891671f5582714c9a5fc0a0baaaf32 100644
--- a/VectoCore/VectoCore/Models/Connector/Ports/IResponse.cs
+++ b/VectoCommon/VectoCommon/Models/IResponse.cs
@@ -29,9 +29,9 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using TUGraz.VectoCore.Utils;
+using TUGraz.VectoCommon.Utils;
-namespace TUGraz.VectoCore.Models.Connector.Ports
+namespace TUGraz.VectoCommon.Models
{
/// <summary>
/// Defines an interface for a Response.
diff --git a/VectoCommon/VectoCommon/Models/RetarderType.cs b/VectoCommon/VectoCommon/Models/RetarderType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..394ca8bfc71ccfcb700677c532f22372d6d3e8f8
--- /dev/null
+++ b/VectoCommon/VectoCommon/Models/RetarderType.cs
@@ -0,0 +1,10 @@
+namespace TUGraz.VectoCommon.Models
+{
+ public enum RetarderType
+ {
+ None,
+ Primary,
+ Secondary,
+ LossesIncludedInTransmission
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/Declaration/VehicleCategory.cs b/VectoCommon/VectoCommon/Models/VehicleCategory.cs
similarity index 97%
rename from VectoCore/VectoCore/Models/Declaration/VehicleCategory.cs
rename to VectoCommon/VectoCommon/Models/VehicleCategory.cs
index c4d1a26e7341740e8ddc827e1824296e3490a45b..1e59da35aa5dbda7b5412a2eddb9f100bf9c3eb7 100644
--- a/VectoCore/VectoCore/Models/Declaration/VehicleCategory.cs
+++ b/VectoCommon/VectoCommon/Models/VehicleCategory.cs
@@ -29,7 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-namespace TUGraz.VectoCore.Models.Declaration
+namespace TUGraz.VectoCommon.Models
{
public enum VehicleCategory
{
diff --git a/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs b/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000000000000000000000000000000000..e88f02f81d4b65fcdb1b68c3c8b440fc734161f2
--- /dev/null
+++ b/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Allgemeine Informationen über eine Assembly werden über die folgenden
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+// die mit einer Assembly verknüpft sind.
+[assembly: AssemblyTitle("VectoCommon")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("VectoCommon")]
+[assembly: AssemblyCopyright("Copyright © 2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar
+// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von
+// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
+[assembly: ComVisible(false)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: Guid("e73de4db-786a-4d33-af7d-2ba217ff9aa6")]
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+// Hauptversion
+// Nebenversion
+// Buildnummer
+// Revision
+//
+// 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")]
diff --git a/VectoCore/VectoCore/Utils/DoubleExtensionMethods.cs b/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs
similarity index 99%
rename from VectoCore/VectoCore/Utils/DoubleExtensionMethods.cs
rename to VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs
index 36f0ba7992d227c1f3f0a1874c73617a987d5466..8bf918a0ec2375fdd7587fd40635f6426e4ed7a4 100644
--- a/VectoCore/VectoCore/Utils/DoubleExtensionMethods.cs
+++ b/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs
@@ -34,7 +34,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
-namespace TUGraz.VectoCore.Utils
+namespace TUGraz.VectoCommon.Utils
{
/// <summary>
/// Extension methods for double.
diff --git a/VectoCore/VectoCore/Utils/EnumHelper.cs b/VectoCommon/VectoCommon/Utils/EnumHelper.cs
similarity index 98%
rename from VectoCore/VectoCore/Utils/EnumHelper.cs
rename to VectoCommon/VectoCommon/Utils/EnumHelper.cs
index 37fa915df10c88fcda1d3298edda3b7182942cf4..965a26231e2bd5630a966f633ea885744baee819 100644
--- a/VectoCore/VectoCore/Utils/EnumHelper.cs
+++ b/VectoCommon/VectoCommon/Utils/EnumHelper.cs
@@ -33,7 +33,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
-namespace TUGraz.VectoCore.Utils
+namespace TUGraz.VectoCommon.Utils
{
public static class EnumHelper
{
diff --git a/VectoCore/VectoCore/Utils/EnumberableExtensionMethods.cs b/VectoCommon/VectoCommon/Utils/EnumberableExtensionMethods.cs
similarity index 99%
rename from VectoCore/VectoCore/Utils/EnumberableExtensionMethods.cs
rename to VectoCommon/VectoCommon/Utils/EnumberableExtensionMethods.cs
index 11c8da334274d947d8550795526a4daf8e6b678c..3c234cf3860fe58e71b21acd348e84fe0e84de07 100644
--- a/VectoCore/VectoCore/Utils/EnumberableExtensionMethods.cs
+++ b/VectoCommon/VectoCommon/Utils/EnumberableExtensionMethods.cs
@@ -33,6 +33,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using NLog;
+using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Utils
{
diff --git a/VectoCore/VectoCore/Utils/IntExtensionMethods.cs b/VectoCommon/VectoCommon/Utils/IntExtensionMethods.cs
similarity index 98%
rename from VectoCore/VectoCore/Utils/IntExtensionMethods.cs
rename to VectoCommon/VectoCommon/Utils/IntExtensionMethods.cs
index b866614d4dd1cc834fa09c209dede915748198f8..8789fc7f18cc94ddae21cf29b9c070d0680ded9c 100644
--- a/VectoCore/VectoCore/Utils/IntExtensionMethods.cs
+++ b/VectoCommon/VectoCommon/Utils/IntExtensionMethods.cs
@@ -32,7 +32,7 @@
using System;
using System.Diagnostics;
-namespace TUGraz.VectoCore.Utils
+namespace TUGraz.VectoCommon.Utils
{
public static class IntExtensionMethods
{
diff --git a/VectoCore/VectoCore/Utils/SI.cs b/VectoCommon/VectoCommon/Utils/SI.cs
similarity index 97%
rename from VectoCore/VectoCore/Utils/SI.cs
rename to VectoCommon/VectoCommon/Utils/SI.cs
index 4f04f766caeb2ac8c21b9674625853912bdf05f3..b61089e66db49707e2382e2e10bd9e834c5d4f11 100644
--- a/VectoCore/VectoCore/Utils/SI.cs
+++ b/VectoCommon/VectoCommon/Utils/SI.cs
@@ -30,28 +30,25 @@
*/
using System;
-using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Contracts;
using System.Globalization;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCore.Utils;
-namespace TUGraz.VectoCore.Utils
+namespace TUGraz.VectoCommon.Utils
{
/// <summary>
/// SI Class for Scalar Values. Converts implicitely to double and is only castable if the SI value has no units.
/// </summary>
public class Scalar : SIBase<Scalar>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
private Scalar(double val) : base(new SI(val)) {}
public static implicit operator double(Scalar self)
@@ -119,7 +116,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class Newton : SIBase<Newton>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
private Newton(double val) : base(val)
{
Numerator = new[] { Unit.N };
@@ -157,7 +154,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class Radian : SIBase<Radian>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
private Radian(double val) : base(val) {}
}
@@ -166,7 +163,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class PerSquareSecond : SIBase<PerSquareSecond>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
private PerSquareSecond(double val) : base(val)
{
Denominator = new[] { Unit.s, Unit.s };
@@ -185,7 +182,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class MeterPerSquareSecond : SIBase<MeterPerSquareSecond>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
protected MeterPerSquareSecond(double val) : base(val)
{
Numerator = new[] { Unit.m };
@@ -208,7 +205,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class Second : SIBase<Second>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
private Second(double val) : base(val)
{
Numerator = new[] { Unit.s };
@@ -220,7 +217,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class Meter : SIBase<Meter>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
protected Meter(double val) : base(val)
{
Numerator = new[] { Unit.m };
@@ -250,7 +247,7 @@ namespace TUGraz.VectoCore.Utils
public class KilogramPerMeter : SIBase<KilogramPerMeter>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
protected KilogramPerMeter(double val)
: base(val)
{
@@ -264,7 +261,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class Kilogram : SIBase<Kilogram>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
protected Kilogram(double val) : base(val)
{
Numerator = new[] { Unit.k, Unit.g };
@@ -294,7 +291,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class KilogramPerSecond : SIBase<KilogramPerSecond>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
protected KilogramPerSecond(double val) : base(new SI(val).Kilo.Gramm.Per.Second) {}
[DebuggerHidden]
@@ -310,7 +307,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class Ton : SIBase<Ton>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
protected Ton(double val) : base(val * 1000.0)
{
Numerator = new[] { Unit.k, Unit.g };
@@ -322,7 +319,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class SquareMeter : SIBase<SquareMeter>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
private SquareMeter(double val) : base(val)
{
Numerator = new[] { Unit.m, Unit.m };
@@ -334,7 +331,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class CubicMeter : SIBase<CubicMeter>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
private CubicMeter(double val) : base(val)
{
Numerator = new[] { Unit.m, Unit.m, Unit.m };
@@ -346,7 +343,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class KilogramSquareMeter : SIBase<KilogramSquareMeter>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
protected KilogramSquareMeter(double val) : base(val)
{
Numerator = new[] { Unit.k, Unit.g, Unit.m, Unit.m };
@@ -364,7 +361,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class KilogramPerWattSecond : SIBase<KilogramPerWattSecond>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
protected KilogramPerWattSecond(double val) : base(val)
{
Numerator = new[] { Unit.k, Unit.g };
@@ -374,7 +371,7 @@ namespace TUGraz.VectoCore.Utils
public class WattSecond : SIBase<WattSecond>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
protected WattSecond(double val) : base(val)
{
Numerator = new[] { Unit.W, Unit.s };
@@ -393,7 +390,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class Watt : SIBase<Watt>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
private Watt(double val) : base(val)
{
Numerator = new[] { Unit.W };
@@ -446,7 +443,7 @@ namespace TUGraz.VectoCore.Utils
[DebuggerDisplay("rad/s: {this} | rpm: {ConvertTo().Rounds.Per.Minute}")]
public class PerSecond : SIBase<PerSecond>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
private PerSecond(double val) : base(val)
{
Denominator = new[] { Unit.s };
@@ -459,7 +456,7 @@ namespace TUGraz.VectoCore.Utils
[DebuggerDisplay("{this} | {ConvertTo().Kilo.Meter.Per.Hour}")]
public class MeterPerSecond : SIBase<MeterPerSecond>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
private MeterPerSecond(double val) : base(val)
{
Numerator = new[] { Unit.m };
@@ -518,7 +515,7 @@ namespace TUGraz.VectoCore.Utils
[DebuggerDisplay("rad/s: {this} | rpm: {ConvertTo().Rounds.Per.Minute}")]
public class RoundsPerMinute : SIBase<RoundsPerMinute>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
private RoundsPerMinute(double val) : base(new SI(val).Rounds.Per.Minute) {}
}
@@ -527,7 +524,7 @@ namespace TUGraz.VectoCore.Utils
/// </summary>
public class NewtonMeter : SIBase<NewtonMeter>
{
- [JsonConstructor, DebuggerHidden]
+ [DebuggerHidden]
private NewtonMeter(double val) : base(val)
{
Numerator = new[] { Unit.N, Unit.m };
@@ -795,40 +792,39 @@ namespace TUGraz.VectoCore.Utils
/// <remarks>
/// Usage: new SI(1.0).Newton.Meter, new SI(2.3).Rounds.Per.Minute
/// </remarks>
- [DataContract]
public class SI : IComparable
{
/// <summary>
/// The basic scalar value of the SI.
/// </summary>
- [DataMember] protected readonly double Val;
+ protected readonly double Val;
/// <summary>
/// The denominator of the SI.
/// </summary>
- [DataMember] protected Unit[] Denominator;
+ protected Unit[] Denominator;
/// <summary>
/// The numerator of the SI.
/// </summary>
- [DataMember] protected Unit[] Numerator;
+ protected Unit[] Numerator;
/// <summary>
/// The current exponent for conversion operations (Square, Cubic, Linear, e.g. new SI(3).Square.Meter).
/// Can be reseted with Reset, Per, Cast.
/// </summary>
- [DataMember] protected readonly int Exponent;
+ protected readonly int Exponent;
/// <summary>
/// A flag indicating if the current SI is in reciprocal mode (used in the <see cref="Per"/> method for reciprocal units: e.g. new SI(2).Meter.Per.Second) ==> [m/s]
/// Can be reseted with Reset, Per, Cast.
/// </summary>
- [DataMember] protected readonly bool Reciproc;
+ protected readonly bool Reciproc;
/// <summary>
/// A flag indicating if the current SI is in reverse mode (used for conversions: e.g. new SI(2).Rounds.Per.Minute.ConverTo.Radian.Per.Second ==> [rpm/min] => [rad/s]).
/// </summary>
- [DataMember] protected readonly bool Reverse;
+ protected readonly bool Reverse;
/// <summary>
diff --git a/VectoCore/VectoCore/Utils/StringExtensionMethods.cs b/VectoCommon/VectoCommon/Utils/StringExtensionMethods.cs
similarity index 97%
rename from VectoCore/VectoCore/Utils/StringExtensionMethods.cs
rename to VectoCommon/VectoCommon/Utils/StringExtensionMethods.cs
index a7d435ae6b80bc30c079b536f047e44c537544d5..2c1b9fa15cdbad5e42de3d9f4b3e105cdfcc8bf6 100644
--- a/VectoCore/VectoCore/Utils/StringExtensionMethods.cs
+++ b/VectoCommon/VectoCommon/Utils/StringExtensionMethods.cs
@@ -29,14 +29,13 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
-namespace TUGraz.VectoCore.Utils
+namespace TUGraz.VectoCommon.Utils
{
public static class StringExtensionMethods
{
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..0761967f343fb45cb142d6cbd3ead6eed0e38719
--- /dev/null
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{79A066AD-69A9-4223-90F6-6ED5D2D084F4}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>TUGraz.VectoCommon</RootNamespace>
+ <AssemblyName>VectoCommon</AssemblyName>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="JetBrains.Annotations">
+ <HintPath>..\..\VectoCore\VectoCore\bin\Debug\JetBrains.Annotations.dll</HintPath>
+ </Reference>
+ <Reference Include="NLog">
+ <HintPath>..\..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Exceptions\VectoExceptions.cs" />
+ <Compile Include="Exceptions\VectoSimulationException.cs" />
+ <Compile Include="InputData\DeclarationInputData.cs" />
+ <Compile Include="InputData\EngineeringInputData.cs" />
+ <Compile Include="InputData\IInputDataProvider.cs" />
+ <Compile Include="InputData\IntegrityStatus.cs" />
+ <Compile Include="Models\AuxiliaryModel.cs" />
+ <Compile Include="Models\AxleConfiguration.cs" />
+ <Compile Include="Models\CrossWindCorrectionMode.cs" />
+ <Compile Include="Models\DriverMode.cs" />
+ <Compile Include="Models\GearboxType.cs" />
+ <Compile Include="Models\IResponse.cs" />
+ <Compile Include="Models\RetarderType.cs" />
+ <Compile Include="Models\VehicleCategory.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Utils\DoubleExtensionMethods.cs" />
+ <Compile Include="Utils\EnumberableExtensionMethods.cs" />
+ <Compile Include="Utils\EnumHelper.cs" />
+ <Compile Include="Utils\IntExtensionMethods.cs" />
+ <Compile Include="Utils\SI.cs" />
+ <Compile Include="Utils\StringExtensionMethods.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
diff --git a/VectoCommon/VectoCommon/packages.config b/VectoCommon/VectoCommon/packages.config
new file mode 100644
index 0000000000000000000000000000000000000000..3badae825dfc3d1a02e254fa5593ee1645682be7
--- /dev/null
+++ b/VectoCommon/VectoCommon/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="NLog" version="4.2.3" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/VectoConsole/Properties/Version.cs b/VectoConsole/Properties/Version.cs
index dca748d3420fe97dedcac25efe0599b1f4fbd967..923bf64474975a92d474fc23d8b59ad12ed19459 100644
--- a/VectoConsole/Properties/Version.cs
+++ b/VectoConsole/Properties/Version.cs
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("3.0.2.456")]
-[assembly: AssemblyFileVersion("3.0.2.456")]
+[assembly: AssemblyVersion("3.0.2.467")]
+[assembly: AssemblyFileVersion("3.0.2.467")]
diff --git a/VectoConsole/VectoConsole.csproj b/VectoConsole/VectoConsole.csproj
index bcb35ad8ac8239ee583dddb2b95445564c02b207..7b92a69924c1391553f66d1adede323201b10fa5 100644
--- a/VectoConsole/VectoConsole.csproj
+++ b/VectoConsole/VectoConsole.csproj
@@ -55,7 +55,7 @@
<ItemGroup>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\NLog.4.0.1\lib\net45\NLog.dll</HintPath>
+ <HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -110,6 +110,10 @@
</None>
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj">
+ <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
+ <Name>VectoCommon</Name>
+ </ProjectReference>
<ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj">
<Project>{cd36938a-add9-4c65-96da-b397cdeea90a}</Project>
<Name>VectoCore</Name>
diff --git a/VectoConsole/packages.config b/VectoConsole/packages.config
index 573e2fd16f8cd28f35e521d53253818d0d0b2e95..3badae825dfc3d1a02e254fa5593ee1645682be7 100644
--- a/VectoConsole/packages.config
+++ b/VectoConsole/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="NLog" version="4.0.1" targetFramework="net45" />
+ <package id="NLog" version="4.2.3" targetFramework="net45" />
</packages>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Configuration/Constants.cs b/VectoCore/VectoCore/Configuration/Constants.cs
index 1fe5557a3c6da57d5367e6d7944fd0585650dcc6..c888da18c952fc38011ac4992fc3f7c698004055 100644
--- a/VectoCore/VectoCore/Configuration/Constants.cs
+++ b/VectoCore/VectoCore/Configuration/Constants.cs
@@ -30,6 +30,7 @@
*/
using System;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Configuration
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
index d88dda2be9829f8e0bf3379cc5c7c94fbc76679b..d8b4391caf014cb1cc71412fd5ed4a13beeb42ca 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
@@ -31,6 +31,8 @@
using System.Data;
using Newtonsoft.Json.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.InputData.FileIO.JSON
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
index 818dbb1aa3ce6123ef603c9248b80e2555022f29..026a75c3cb6e8102931be1861712230a8192b769 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
@@ -33,6 +33,9 @@ using System.Collections.Generic;
using System.Data;
using System.Linq;
using Newtonsoft.Json.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index b88c2b7d9bf15e188d2c2f4238bd80bb4b7bfe06..2b8aeda12eeacfe162d56278f04a9ab81e6c9145 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -36,12 +36,16 @@ using System.IO;
using System.Linq;
using System.Text;
using Newtonsoft.Json.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.InputData.Impl;
using TUGraz.VectoCore.Models;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
+using DriverData = TUGraz.VectoCore.Models.SimulationComponent.Data.DriverData;
namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
index 282a5506032b6248d6e8a4f9a91623b0d5fc0ed5..58846a5fddffb7ef28eb2ea75904175d624036f5 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
@@ -32,7 +32,8 @@
using System.IO;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index 24b28d214f296d60b7ec28ed5af347f46eb17b54..77eba9f429662aa11e172bfb3649aa4f7218088b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -34,6 +34,9 @@ using System.Collections.Generic;
using System.Data;
using System.Linq;
using Newtonsoft.Json.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Impl;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
@@ -150,13 +153,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region IRetarderInputData
- public virtual RetarderData.RetarderType Type
+ public virtual RetarderType Type
{
get
{
return
- (RetarderData.RetarderType)
- Enum.Parse(typeof(RetarderData.RetarderType),
+ (RetarderType)
+ Enum.Parse(typeof(RetarderType),
Body.GetEx(JsonKeys.Vehicle_Retarder).GetEx<string>(JsonKeys.Vehicle_Retarder_Type), true);
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JsonExtensionMethods.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JsonExtensionMethods.cs
index d1bc5ae83164373af9b5b9021514b42739e76227..dbca65e7297f3f8afb1c151dcb97294a6f281022 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JsonExtensionMethods.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JsonExtensionMethods.cs
@@ -30,7 +30,7 @@
*/
using Newtonsoft.Json.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
diff --git a/VectoCore/VectoCore/InputData/Impl/InputData.cs b/VectoCore/VectoCore/InputData/Impl/InputData.cs
index c3995328743a918bc05361f4a08ced7a12729709..9f44f79f9524a4fd121f6d442e26dd333e444787 100644
--- a/VectoCore/VectoCore/InputData/Impl/InputData.cs
+++ b/VectoCore/VectoCore/InputData/Impl/InputData.cs
@@ -31,10 +31,14 @@
using System.Collections.Generic;
using System.Data;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
+using DriverData = TUGraz.VectoCore.Models.SimulationComponent.Data.DriverData;
namespace TUGraz.VectoCore.InputData.Impl
{
@@ -67,7 +71,7 @@ namespace TUGraz.VectoCore.InputData.Impl
public class OverSpeedEcoRollInputData : IOverSpeedEcoRollEngineeringInputData
{
- public DriverData.DriverMode Mode { get; internal set; }
+ public DriverMode Mode { get; internal set; }
public MeterPerSecond MinSpeed { get; internal set; }
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
index d1115be74d6563b0bca82fabc7b563095ca03f28..0f313c6fe6714e19b89124560f7045d90260e309 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
@@ -32,6 +32,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
@@ -86,13 +89,13 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
Type = data.Type,
};
switch (retarder.Type) {
- case RetarderData.RetarderType.Primary:
- case RetarderData.RetarderType.Secondary:
+ case RetarderType.Primary:
+ case RetarderType.Secondary:
retarder.LossMap = RetarderLossMap.Create(data.LossMap);
retarder.Ratio = vehicle.RetarderRatio;
break;
- case RetarderData.RetarderType.None:
- case RetarderData.RetarderType.LossesIncludedInTransmission:
+ case RetarderType.None:
+ case RetarderType.LossesIncludedInTransmission:
retarder.Ratio = 1;
break;
default:
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
index 4fe412186ea14a34d23afc715d1f15c6e3326fe9..77a7bcf0d7a7ed9dde24a5677549d65fbdea031a 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
@@ -32,8 +32,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
@@ -41,6 +44,7 @@ using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.Utils;
+using DriverData = TUGraz.VectoCore.Models.SimulationComponent.Data.DriverData;
namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
{
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
index fb108983192749f2cf916f5835eaf8872a1fabc7..473ed99286ed736a5ffcca26038f05ced3ed2207 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
@@ -33,7 +33,9 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.Models;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
@@ -42,6 +44,7 @@ using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.Utils;
+using DriverData = TUGraz.VectoCore.Models.SimulationComponent.Data.DriverData;
namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
{
diff --git a/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs b/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
index dcfc5c2471e273133776f7ae3feb307473e231aa..8f166a00bdfcd887273e808571105e1d469aafde 100644
--- a/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
@@ -34,8 +34,9 @@ using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
index dd143650d495a6a2c2e52ecbea0909cd1e7c2189..dd8828e92d109463f4ba995c7041cd4a1f85a628 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
@@ -31,6 +31,9 @@
using System.Collections.Generic;
using System.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader.DataObjectAdaper;
using TUGraz.VectoCore.Models;
using TUGraz.VectoCore.Models.Declaration;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineOnlyVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineOnlyVectoRunDataFactory.cs
index 079ff3067374557c8f5a829070001991a42b50c2..ae3183c428de0175ffb61c138a7ae1132f175d1c 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineOnlyVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineOnlyVectoRunDataFactory.cs
@@ -30,6 +30,7 @@
*/
using System.Collections.Generic;
+using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.InputData.Reader.DataObjectAdaper;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
index 15497dad7b8d373a337c1553f4bad1ed62917d42..20608ecaa77a0fd2839c8a0a442ab87b0bdd60df 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
@@ -32,10 +32,13 @@
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.InputData.Reader.DataObjectAdaper;
using TUGraz.VectoCore.Models;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using DriverData = TUGraz.VectoCore.Models.SimulationComponent.Data.DriverData;
[assembly: InternalsVisibleTo("VectoCoreTest")]
diff --git a/VectoCore/VectoCore/Models/Connector/Ports/IDriverDemandPort.cs b/VectoCore/VectoCore/Models/Connector/Ports/IDriverDemandPort.cs
index ffb62a9727a8a3caf522c3d074c3797d2a0d05e0..33c86502a530c1dac2bf3c1196b5fd69dacb12d7 100644
--- a/VectoCore/VectoCore/Models/Connector/Ports/IDriverDemandPort.cs
+++ b/VectoCore/VectoCore/Models/Connector/Ports/IDriverDemandPort.cs
@@ -30,6 +30,8 @@
*/
using System;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Connector.Ports
diff --git a/VectoCore/VectoCore/Models/Connector/Ports/IDrivingCyclePort.cs b/VectoCore/VectoCore/Models/Connector/Ports/IDrivingCyclePort.cs
index 110e1bdea8ae2fc1e457ad164854774c650a8713..f3c00de8f6554b55572b1b3590e85aa93069db7e 100644
--- a/VectoCore/VectoCore/Models/Connector/Ports/IDrivingCyclePort.cs
+++ b/VectoCore/VectoCore/Models/Connector/Ports/IDrivingCyclePort.cs
@@ -30,6 +30,8 @@
*/
using System;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Connector.Ports
diff --git a/VectoCore/VectoCore/Models/Connector/Ports/IFvPort.cs b/VectoCore/VectoCore/Models/Connector/Ports/IFvPort.cs
index 6b802e26232dd23b53b3e2e0d7bf42eac8650423..e33c416307e82368fb09e52b136b0ba6fcaaf5e9 100644
--- a/VectoCore/VectoCore/Models/Connector/Ports/IFvPort.cs
+++ b/VectoCore/VectoCore/Models/Connector/Ports/IFvPort.cs
@@ -30,6 +30,8 @@
*/
using System;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Connector.Ports
diff --git a/VectoCore/VectoCore/Models/Connector/Ports/ISimulationPort.cs b/VectoCore/VectoCore/Models/Connector/Ports/ISimulationPort.cs
index 78e4f04e4e04d6995ac35435f15a6b13fd303c2f..c9035ad849c98d24de52aa0d2995511d92e3a338 100644
--- a/VectoCore/VectoCore/Models/Connector/Ports/ISimulationPort.cs
+++ b/VectoCore/VectoCore/Models/Connector/Ports/ISimulationPort.cs
@@ -30,6 +30,8 @@
*/
using System;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Connector.Ports
diff --git a/VectoCore/VectoCore/Models/Connector/Ports/ITnPort.cs b/VectoCore/VectoCore/Models/Connector/Ports/ITnPort.cs
index 9ff806e1b06a09a701fb58c65631a816f7547c9b..7e379f766975f65cbfef3872ef296e194b414220 100644
--- a/VectoCore/VectoCore/Models/Connector/Ports/ITnPort.cs
+++ b/VectoCore/VectoCore/Models/Connector/Ports/ITnPort.cs
@@ -29,6 +29,8 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Connector.Ports
diff --git a/VectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs b/VectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs
index 5d139b4eac3c073375615ed5f5a349888d51f182..dd1f16e4696e60660f07f802635f2d5099547f9b 100644
--- a/VectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs
+++ b/VectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs
@@ -30,6 +30,8 @@
*/
using System.Linq;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
diff --git a/VectoCore/VectoCore/Models/Declaration/AirDrag.cs b/VectoCore/VectoCore/Models/Declaration/AirDrag.cs
index bbfcdc8f4a27dbfe34acb56b43f3d2bf78ab4805..780d6a1e9312604b0761aa7f00fe93c461884e8a 100644
--- a/VectoCore/VectoCore/Models/Declaration/AirDrag.cs
+++ b/VectoCore/VectoCore/Models/Declaration/AirDrag.cs
@@ -32,6 +32,7 @@
using System;
using System.Data;
using System.Linq;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Declaration/Axle.cs b/VectoCore/VectoCore/Models/Declaration/Axle.cs
index 0435ca4dd5ad994f4fa4f0f1675797b5d9faf552..4d4150279dc94c61b0c1e17bfc757881853504bb 100644
--- a/VectoCore/VectoCore/Models/Declaration/Axle.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Axle.cs
@@ -30,6 +30,8 @@
*/
using System.ComponentModel.DataAnnotations;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index 3b7fa235f6bcd5c14093d956f22f4313ce472569..b54c2e50e058aa6783e353570ce4ec2c72b73b88 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -31,11 +31,14 @@
using System;
using System.Collections.Generic;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using TUGraz.VectoCore.Utils;
+using DriverData = TUGraz.VectoCore.Models.SimulationComponent.Data.DriverData;
namespace TUGraz.VectoCore.Models.Declaration
{
@@ -168,9 +171,9 @@ namespace TUGraz.VectoCore.Models.Declaration
public static class OverSpeedEcoRoll
{
- public static readonly IList<DriverData.DriverMode> AllowedModes = new List<DriverData.DriverMode> {
- DriverData.DriverMode.EcoRoll,
- DriverData.DriverMode.Overspeed
+ public static readonly IList<DriverMode> AllowedModes = new List<DriverMode> {
+ DriverMode.EcoRoll,
+ DriverMode.Overspeed
};
public static readonly MeterPerSecond MinSpeed = 50.KMPHtoMeterPerSecond();
diff --git a/VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs b/VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs
index c62bbd0f558ba1a4d0196888694a47ef3af13597..2b455f077a6d186f4471983e9b53a7e44b297eee 100644
--- a/VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs
+++ b/VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs
@@ -32,7 +32,8 @@
using System;
using System.Collections.Generic;
using System.Data;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Declaration/Fan.cs b/VectoCore/VectoCore/Models/Declaration/Fan.cs
index 3b7b0ddb6fff81bcad7c9ccfe7684cc2023c0f18..e9e43e1f4a726ffc9df0b2286762090300e95143 100644
--- a/VectoCore/VectoCore/Models/Declaration/Fan.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Fan.cs
@@ -32,7 +32,8 @@
using System;
using System.Collections.Generic;
using System.Data;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Declaration/HVAC.cs b/VectoCore/VectoCore/Models/Declaration/HVAC.cs
index f99c4fdbe04b07ee5af09d33e1bb934d8156018d..acb6fc93fd71ba0950c9a3c01ea6c815a6e81e7d 100644
--- a/VectoCore/VectoCore/Models/Declaration/HVAC.cs
+++ b/VectoCore/VectoCore/Models/Declaration/HVAC.cs
@@ -32,7 +32,8 @@
using System;
using System.Collections.Generic;
using System.Data;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Declaration/LookupData.cs b/VectoCore/VectoCore/Models/Declaration/LookupData.cs
index e761c6caa837b05d9eb54070288d21a9e8cbf3d1..f78c6e5bd6eb23fe1d105d87c050db9adbfcf465 100644
--- a/VectoCore/VectoCore/Models/Declaration/LookupData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/LookupData.cs
@@ -31,6 +31,7 @@
using System.Collections.Generic;
using System.Data;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Declaration/Mission.cs b/VectoCore/VectoCore/Models/Declaration/Mission.cs
index 026c7dfed4163b329d4cf7872506055c7e9888d8..fd58d428458cfa7131fadc073eed4217bd20d3f2 100644
--- a/VectoCore/VectoCore/Models/Declaration/Mission.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Mission.cs
@@ -31,6 +31,7 @@
using System.Collections.Generic;
using System.IO;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Declaration/PT1.cs b/VectoCore/VectoCore/Models/Declaration/PT1.cs
index 18ffa3c4dbd39b3e3f60da9ac859c85e3154cc41..7650481eef924da5e54950a237069d8f4e7bedda 100644
--- a/VectoCore/VectoCore/Models/Declaration/PT1.cs
+++ b/VectoCore/VectoCore/Models/Declaration/PT1.cs
@@ -32,7 +32,8 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Declaration/PneumaticSystem.cs b/VectoCore/VectoCore/Models/Declaration/PneumaticSystem.cs
index 90785b745426f841ae368a39b49ccb9ed9a0b898..85dff29c258304e2e464c292585ec825db675344 100644
--- a/VectoCore/VectoCore/Models/Declaration/PneumaticSystem.cs
+++ b/VectoCore/VectoCore/Models/Declaration/PneumaticSystem.cs
@@ -32,7 +32,8 @@
using System;
using System.Collections.Generic;
using System.Data;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Declaration/Segment.cs b/VectoCore/VectoCore/Models/Declaration/Segment.cs
index 7cb653571509c2d752a413869af64ccf1f10d73a..f9d4f0fca114272d33771cc21fcb112042f8b808 100644
--- a/VectoCore/VectoCore/Models/Declaration/Segment.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Segment.cs
@@ -30,6 +30,8 @@
*/
using System.IO;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Declaration/Segments.cs b/VectoCore/VectoCore/Models/Declaration/Segments.cs
index a76622fd53e891d7f741d5176f4e489d789f47d2..74aba6cfd6d538a3ab6d5c4d00d46e7a6114f4d0 100644
--- a/VectoCore/VectoCore/Models/Declaration/Segments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Segments.cs
@@ -33,7 +33,9 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Declaration/SteeringPump.cs b/VectoCore/VectoCore/Models/Declaration/SteeringPump.cs
index 13d9acd400048cbe6d6b9af974da2f3892fa594d..7f80fcd974cc6e0b0adf2e3e46944f116b217c74 100644
--- a/VectoCore/VectoCore/Models/Declaration/SteeringPump.cs
+++ b/VectoCore/VectoCore/Models/Declaration/SteeringPump.cs
@@ -33,7 +33,8 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Declaration/TorqueConverter.cs b/VectoCore/VectoCore/Models/Declaration/TorqueConverter.cs
index 1529a8e14f30aff9d39df68f548c24e4b8b71754..1458460b454dd04686ce0355b3b8bdd1bcd7ecfb 100644
--- a/VectoCore/VectoCore/Models/Declaration/TorqueConverter.cs
+++ b/VectoCore/VectoCore/Models/Declaration/TorqueConverter.cs
@@ -31,6 +31,7 @@
using System;
using System.Data;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Declaration/VehicleClass.cs b/VectoCore/VectoCore/Models/Declaration/VehicleClass.cs
index 05c9aff3ca457ea50adb1491e9f80fc05402bf31..4a7b46710f0cfa38cdceda534ca29412b0a2ce82 100644
--- a/VectoCore/VectoCore/Models/Declaration/VehicleClass.cs
+++ b/VectoCore/VectoCore/Models/Declaration/VehicleClass.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Declaration/Wheels.cs b/VectoCore/VectoCore/Models/Declaration/Wheels.cs
index d60f2896ab90ed5849c0f27ad00d83c915efb47c..a5f3f330cea319e0ec47f334244baf10e482fde8 100644
--- a/VectoCore/VectoCore/Models/Declaration/Wheels.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Wheels.cs
@@ -31,6 +31,7 @@
using System.Data;
using System.Linq;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs b/VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs
index 2e49b38c83b7eca184571fb3859d5ba3c5a99b6f..db5fd352f6d31640f0b35961556af535f4e4e498 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs
@@ -33,7 +33,8 @@ using System;
using System.ComponentModel;
using System.Data;
using System.Reflection;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
// ReSharper disable InconsistentNaming
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/VectoJobData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoJobData.cs
index 8e71a77a36ce001265b7506dd1eff3d8d9905deb..6d56ee77512ea37f6ac52238eaa493fa5fb446fb 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/VectoJobData.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/VectoJobData.cs
@@ -34,7 +34,6 @@ using System.Collections.Generic;
using System.IO;
using System.Runtime.Serialization;
using Newtonsoft.Json;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
namespace TUGraz.VectoCore.Models.Simulation.Data
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
index f8d192e7d4530faabff573476a71f54a4c9fdb6d..e7726908d8ec541f99c61d44bca3053ff68c5d27 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
@@ -31,12 +31,15 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.Utils;
+using DriverData = TUGraz.VectoCore.Models.SimulationComponent.Data.DriverData;
namespace TUGraz.VectoCore.Models.Simulation.Data
{
diff --git a/VectoCore/VectoCore/Models/Simulation/DataBus/IClutchInfo.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IClutchInfo.cs
index 3fd406655abdfc786af4cb7050a36f8856c5a1a2..94cd5636c2b2ec9f13a993a9a9287d4a4951d0e8 100644
--- a/VectoCore/VectoCore/Models/Simulation/DataBus/IClutchInfo.cs
+++ b/VectoCore/VectoCore/Models/Simulation/DataBus/IClutchInfo.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Simulation.DataBus
diff --git a/VectoCore/VectoCore/Models/Simulation/DataBus/IEngineInfo.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IEngineInfo.cs
index b97c979615289a3a6f55cb27ed20af5e311b91cd..4251abe9d52d76f285e71eb77149f78d805062bc 100644
--- a/VectoCore/VectoCore/Models/Simulation/DataBus/IEngineInfo.cs
+++ b/VectoCore/VectoCore/Models/Simulation/DataBus/IEngineInfo.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Simulation.DataBus
diff --git a/VectoCore/VectoCore/Models/Simulation/DataBus/IGearboxInfo.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IGearboxInfo.cs
index bf1578197bb0f9891d3f68b24dc9581b7edb0e6b..e15b521fcbd3041c6aba2fb8e5137c545423f860 100644
--- a/VectoCore/VectoCore/Models/Simulation/DataBus/IGearboxInfo.cs
+++ b/VectoCore/VectoCore/Models/Simulation/DataBus/IGearboxInfo.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/Simulation/DataBus/IMileageCounter.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IMileageCounter.cs
index bf8a16369c22b862bd03b5ad9025a5f4cc409c5b..e773fbcd692d5b453a110a0a39ab080d5e1b55ef 100644
--- a/VectoCore/VectoCore/Models/Simulation/DataBus/IMileageCounter.cs
+++ b/VectoCore/VectoCore/Models/Simulation/DataBus/IMileageCounter.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Simulation.DataBus
diff --git a/VectoCore/VectoCore/Models/Simulation/DataBus/IRoadLookAhead.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IRoadLookAhead.cs
index 539c1e3d86fa2deb29bd7a1856dbe496bdf11b67..baf4697cd449fd12046012da877733e118810f02 100644
--- a/VectoCore/VectoCore/Models/Simulation/DataBus/IRoadLookAhead.cs
+++ b/VectoCore/VectoCore/Models/Simulation/DataBus/IRoadLookAhead.cs
@@ -30,6 +30,7 @@
*/
using System.Collections.Generic;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/Simulation/DataBus/IVehicleInfo.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IVehicleInfo.cs
index 225ccb92c6aa60e8ed0aeeeadc9e10566c365e31..1309be2b90a9a5c5858babec19a37b6077a6db5d 100644
--- a/VectoCore/VectoCore/Models/Simulation/DataBus/IVehicleInfo.cs
+++ b/VectoCore/VectoCore/Models/Simulation/DataBus/IVehicleInfo.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Simulation.DataBus
diff --git a/VectoCore/VectoCore/Models/Simulation/IVehicleContainer.cs b/VectoCore/VectoCore/Models/Simulation/IVehicleContainer.cs
index 51abe32bfef1d689995e2aba77b1c3aa58e08c73..a00df4971930282ae359b47b643678f65373c246 100644
--- a/VectoCore/VectoCore/Models/Simulation/IVehicleContainer.cs
+++ b/VectoCore/VectoCore/Models/Simulation/IVehicleContainer.cs
@@ -30,6 +30,7 @@
*/
using System.ComponentModel.DataAnnotations;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.DataBus;
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/DistanceRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/DistanceRun.cs
index 6a4ce05a04293db2fda58e45b2c13b79af94684a..212fa4c2fcb6c91f25d2656f87a82d2a69da2294 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/DistanceRun.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/DistanceRun.cs
@@ -30,8 +30,9 @@
*/
using System;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index d68e0a8bbc912120064dd12f83b3dde76b02609b..2a34598bcad14caa8394e69e217eaf08b24909d6 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -32,7 +32,8 @@
using System;
using System.Diagnostics;
using System.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent;
@@ -101,19 +102,19 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
var tmp = AddComponent(cycle, new AxleGear(container, data.AxleGearData));
switch (data.Retarder.Type) {
- case RetarderData.RetarderType.Primary:
+ case RetarderType.Primary:
tmp = AddComponent(tmp, new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio));
tmp = AddComponent(tmp, gearbox);
break;
- case RetarderData.RetarderType.Secondary:
+ case RetarderType.Secondary:
tmp = AddComponent(tmp, gearbox);
tmp = AddComponent(tmp, new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio));
break;
- case RetarderData.RetarderType.None:
+ case RetarderType.None:
tmp = AddComponent(tmp, new DummyRetarder(container));
tmp = AddComponent(tmp, gearbox);
break;
- case RetarderData.RetarderType.LossesIncludedInTransmission:
+ case RetarderType.LossesIncludedInTransmission:
tmp = AddComponent(tmp, new DummyRetarder(container));
tmp = AddComponent(tmp, gearbox);
break;
@@ -149,19 +150,19 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
var tmp = AddComponent(brakes, new AxleGear(container, data.AxleGearData));
switch (data.Retarder.Type) {
- case RetarderData.RetarderType.Primary:
+ case RetarderType.Primary:
tmp = AddComponent(tmp, new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio));
tmp = AddComponent(tmp, GetGearbox(container, data.GearboxData));
break;
- case RetarderData.RetarderType.Secondary:
+ case RetarderType.Secondary:
tmp = AddComponent(tmp, GetGearbox(container, data.GearboxData));
tmp = AddComponent(tmp, new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio));
break;
- case RetarderData.RetarderType.None:
+ case RetarderType.None:
tmp = AddComponent(tmp, new DummyRetarder(container));
tmp = AddComponent(tmp, GetGearbox(container, data.GearboxData));
break;
- case RetarderData.RetarderType.LossesIncludedInTransmission:
+ case RetarderType.LossesIncludedInTransmission:
tmp = AddComponent(tmp, new DummyRetarder(container));
tmp = AddComponent(tmp, GetGearbox(container, data.GearboxData));
break;
@@ -203,19 +204,19 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
var gearbox = new CycleGearbox(container, data.GearboxData);
switch (data.Retarder.Type) {
- case RetarderData.RetarderType.Primary:
+ case RetarderType.Primary:
tmp = AddComponent(tmp, new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio));
tmp = AddComponent(tmp, gearbox);
break;
- case RetarderData.RetarderType.Secondary:
+ case RetarderType.Secondary:
tmp = AddComponent(tmp, gearbox);
tmp = AddComponent(tmp, new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio));
break;
- case RetarderData.RetarderType.None:
+ case RetarderType.None:
tmp = AddComponent(tmp, new DummyRetarder(container));
tmp = AddComponent(tmp, gearbox);
break;
- case RetarderData.RetarderType.LossesIncludedInTransmission:
+ case RetarderType.LossesIncludedInTransmission:
tmp = AddComponent(tmp, new DummyRetarder(container));
tmp = AddComponent(tmp, gearbox);
break;
@@ -259,19 +260,19 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
var tmp = AddComponent(brakes, new AxleGear(container, data.AxleGearData));
switch (data.Retarder.Type) {
- case RetarderData.RetarderType.Primary:
+ case RetarderType.Primary:
tmp = AddComponent(tmp, new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio));
tmp = AddComponent(tmp, GetGearbox(container, data.GearboxData));
break;
- case RetarderData.RetarderType.Secondary:
+ case RetarderType.Secondary:
tmp = AddComponent(tmp, GetGearbox(container, data.GearboxData));
tmp = AddComponent(tmp, new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio));
break;
- case RetarderData.RetarderType.None:
+ case RetarderType.None:
tmp = AddComponent(tmp, new DummyRetarder(container));
tmp = AddComponent(tmp, GetGearbox(container, data.GearboxData));
break;
- case RetarderData.RetarderType.LossesIncludedInTransmission:
+ case RetarderType.LossesIncludedInTransmission:
tmp = AddComponent(tmp, new DummyRetarder(container));
tmp = AddComponent(tmp, GetGearbox(container, data.GearboxData));
break;
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
index 0604bb83228f7650efc072d387bfe4a8ac43061d..da46535149dadb69a136a5dc254bfc70accc84e2 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
@@ -35,8 +35,11 @@ using System.Linq;
using System.Reflection;
using System.Security.Principal;
using System.Threading;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.InputData;
using TUGraz.VectoCore.InputData.Reader.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/TimeRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/TimeRun.cs
index 33a51a679659593752030abc3fea61fcc664d929..08638633666908b69d06af3c30c58a03fa218bda 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/TimeRun.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/TimeRun.cs
@@ -30,8 +30,9 @@
*/
using System.Collections.Generic;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
index 98c9e6e7fe67f95212d43f0f61a7ef75e82916c9..43f5771ff62678f23cffd8a5928e8b4ccf45d03b 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
@@ -34,7 +34,9 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using NLog;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.OutputData;
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs b/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
index d4d8bfc8b6c2d4008fc3cfb7bbfcf5e5f4b391e5..3cf843dc41cbc78dbfe4dc9a4176bc668c7c6aed 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
@@ -32,7 +32,8 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.DataBus;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs
index 340e1e0f98ef4be216202d8e7cba0ab47ae97055..ca50bfcc175310f6e103eaf632d85a4780d8f4da 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs
@@ -35,7 +35,8 @@ using System.Data;
using System.Diagnostics;
using System.IO;
using System.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs
index 1624e7e6ab0748cfacc67da1c510beb1726a646f..66ca1432a2b2e63ef25f8c4ebe43abb0ec274bcc 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs
@@ -32,6 +32,7 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs
index fc725d5950baadc787dd83175c36929bac7c8311..ecd21c35469b747b4fdcf58a434c900e076c8fdc 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs
@@ -35,32 +35,16 @@ using System.Data;
using System.IO;
using System.Linq;
using System.Text;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
- public enum AuxiliaryModel
- {
- Classic,
- Advanced
- }
- public class AuxiliaryModelHelper
- {
- public static AuxiliaryModel Parse(string auxAssemblyStr)
- {
- if (string.IsNullOrEmpty(auxAssemblyStr)) {
- return AuxiliaryModel.Classic;
- }
- switch (auxAssemblyStr) {
- case "BusAuxiliaries":
- return AuxiliaryModel.Advanced;
- }
- return AuxiliaryModel.Classic;
- }
- }
[CustomValidation(typeof(AuxiliaryData), "ValidateAuxMap")]
public class AuxiliaryData
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
index c1dfcbeefb20f04a4e489bcc0c64827dc652fcaf..3961e1f624116182182ec53774e5e4abc50ae3ee 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
@@ -31,6 +31,7 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionCurveReader.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionCurveReader.cs
index b70aa0c38143111c51435f4c40f8c80afb8031bb..2eb2dc5652882c96b3c51bbd637339b9e1509007 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionCurveReader.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionCurveReader.cs
@@ -33,7 +33,8 @@ using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionCdxALookup.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionCdxALookup.cs
index e254939a6ad75faeb68eb54649a7991416a331db..0bc6eb6bba755d901935e8118707fff4a259c07e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionCdxALookup.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionCdxALookup.cs
@@ -31,6 +31,8 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs
index 548656160ee069b876b6d383f338d11e4dd68fe7..518b2b0b451e7056162d468c89a1733a5bde500b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs
@@ -33,7 +33,9 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/CycleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CycleData.cs
index 6380bc4434f5302391a667b9a842121df4da35a6..5acc47bbf8d8b74f009081632db0c1794fce441e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/CycleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/CycleData.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs
index 157470b8db23b826911ff437696e4d5cb9714740..04381711857220a8a15371c6de31904647828021 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs
@@ -29,22 +29,14 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using System;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Data;
-using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
public class DriverData
{
- public enum DriverMode
- {
- Off,
- Overspeed,
- EcoRoll,
- }
-
-
public VectoRunData.StartStopData StartStop;
public OverSpeedEcoRollData OverSpeedEcoRoll;
public LACData LookAheadCoasting;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
index 53e7021ea7053749f3adf50a28063a44050a4d90..599a4bf488c095c1fdb8e1f1bb778b9baef4bebf 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
@@ -31,6 +31,7 @@
using System.Collections.Generic;
using System.Diagnostics;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs
index 74f498f61de9c563e7feca58de6c78bd0baf7546..e30fbacb47518d8b0dc003afaf905c47d6e1b91b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs
@@ -35,6 +35,7 @@ using System.Data;
using System.Diagnostics.Contracts;
using System.Dynamic;
using System.Linq;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
index 9a6a1322f19c571c8a8c027605f8d680c3a95a92..a8b4e5c1a79deaacd960fa06ef7e598eafb1f2db 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
@@ -35,8 +35,9 @@ using System.ComponentModel.DataAnnotations;
using System.Data;
using System.Diagnostics.Contracts;
using System.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/PT1Curve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/PT1Curve.cs
index 352bce2188931128948d6b046a85329e3a2c9b3c..18cab4240bcac32244bf9c96b248890bdc044216 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/PT1Curve.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/PT1Curve.cs
@@ -33,7 +33,8 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs
index 430c5eac66d8d9bd653f9d3074a5c1a1266e45a9..3be141248360ad8191090ed4b9367abd0e628754 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs
@@ -35,8 +35,9 @@ using System.ComponentModel.DataAnnotations;
using System.Data;
using System.Diagnostics;
using System.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs
index 547d61d4b1f2870b905e2685c07b84e245ca356e..208bd8d08d7486cfb483e4391377b41fc7a334d1 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs
@@ -35,7 +35,8 @@ using System.Collections.ObjectModel;
using System.Data;
using System.Diagnostics;
using System.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
index edd51f189592f32c673c45e694c289914a6f8178..3266205bf6295517130bea9a6480746a6635b2a2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
@@ -35,8 +35,9 @@ using System.ComponentModel.DataAnnotations;
using System.Data;
using System.Linq;
using Newtonsoft.Json;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
index fbd5d5f5d828b301bd6b3f52a93f59b1c15be6cd..d6e2ac3aa2a1c0cf080803b1d51256daa50e5470 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
@@ -33,6 +33,8 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ICrossWindCorrection.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ICrossWindCorrection.cs
index e79bf654368febaa64bfa8983adc7a199da268dd..8e31491c10288a61775ae955d7ca431784e540e2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/ICrossWindCorrection.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ICrossWindCorrection.cs
@@ -30,6 +30,8 @@
*/
using System.Dynamic;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderData.cs
index 924c12e332969ad680b4b256dd8af8d1d2d65528..2e4f227206ee4185f0f22eac4cae5c8ad6aa3d83 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderData.cs
@@ -29,20 +29,13 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
public class RetarderData : SimulationComponentData
{
- public enum RetarderType
- {
- None,
- Primary,
- Secondary,
- LossesIncludedInTransmission
- }
-
[ValidateObject]
public RetarderLossMap LossMap { get; internal set; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs
index bb13c0c68c469f82cd4eff930da0f32f39402c38..fc8b6904e839e0637f723addc14f50918eab5f57 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs
@@ -34,7 +34,8 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Data;
using System.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs
index d8ccb6a6a93fe32b4a011b99be615bfadd06bcf3..2411deda3fe3b67988400500353d925feea88c7e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.InputData;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
index 669651fcff296d85bef2bc412876a8ac93fce3fe..140e823bf57be97c65b671a448bb71d42976eaf6 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
@@ -33,7 +33,9 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/IBrakes.cs b/VectoCore/VectoCore/Models/SimulationComponent/IBrakes.cs
index 13621f97828077d25a593765e3698a991f4851cb..496aada910f38239bf85924b5d05351f90caacd2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/IBrakes.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/IBrakes.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/IDriverActions.cs b/VectoCore/VectoCore/Models/SimulationComponent/IDriverActions.cs
index 0d254b28e59c6b079903d1265de7ce27c776cde4..6af4b10ad0d366fe6808c8fc132f18c464099496 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/IDriverActions.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/IDriverActions.cs
@@ -29,10 +29,13 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
+using DriverData = TUGraz.VectoCore.Models.SimulationComponent.Data.DriverData;
namespace TUGraz.VectoCore.Models.SimulationComponent
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/IDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/IDriverStrategy.cs
index a729eef337fd56b027e096216aba749f531e0e56..b36202649414f8c6eec633c986062805ae4b0722 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/IDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/IDriverStrategy.cs
@@ -29,6 +29,8 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/IEngineAuxPort.cs b/VectoCore/VectoCore/Models/SimulationComponent/IEngineAuxPort.cs
index 9433e2f40a48e9d7ea9a153c3467447857900f5e..010c6cb5e7c821c18b7484d8a35a03580b4e8dac 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/IEngineAuxPort.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/IEngineAuxPort.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs
index 0b3230279fe63fc2ce9c303878501be261aa5533..fc510bb8751ee17c8fcd2971e0133034875d8f61 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs
index 95ffd3a8be2ba1b1cb854842ec387c601374765c..08ccecd91b08af6174dea717c714cabd0b8bc4dc 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs
@@ -29,16 +29,15 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using System;
-using Org.BouncyCastle.Asn1.Mozilla;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.OutputData;
-using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Brakes.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Brakes.cs
index 30236b6e8d924c3dd643e8f81e39f3b62dacfa8c..e22ec4d2baefc93a3e1e1d0d175226c99131d950 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Brakes.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Brakes.cs
@@ -30,7 +30,9 @@
*/
using System;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
index 74e60329be0a396ddeb88f970b11d125667a2eaa..0d9e86a4a3a7f758e983233ae2349d997a37fcd2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
@@ -1,5 +1,6 @@
using System;
using System.IO;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
index 09734356ae1d88670c482fcc589d47324300aed9..778a097fa4217d0f5e310e14c5eedd7b244382c9 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
@@ -29,6 +29,8 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
index 260bfc47e3bc1e1d89e4bbf72fb20eab5eed2de8..8660b816a85ca43f001833e61d98c9735bcb1915 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
@@ -33,8 +33,10 @@ using System;
using System.Collections.Generic;
using System.Linq;
using NLog;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleClutch.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleClutch.cs
index 8b14eeaeac2762a69ab5ce2c0d6762ba0f460dd7..2918989d9d7f5ef2af7eed2971dd59fe465350e1 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleClutch.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleClutch.cs
@@ -29,6 +29,8 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
index dfdc92d990a8ca26d3c949b3551e0f6daeefa2df..efa702b8c7b14d472683e6e79bac369edcfbe5df 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
@@ -30,8 +30,10 @@
*/
using System.Diagnostics;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
index 4c337a6f825e60ee7fa4f291e24481e763e3365f..cadb4fbe6c4068884148e1a9dd0480ed5a8a044a 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
@@ -35,14 +35,16 @@ using System.Diagnostics;
using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using NLog.Fluent;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
+using DriverData = TUGraz.VectoCore.Models.SimulationComponent.Data.DriverData;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
@@ -223,7 +225,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public bool OverspeedAllowed(Radian gradient, MeterPerSecond velocity)
{
- return Driver.DriverData.OverSpeedEcoRoll.Mode == DriverData.DriverMode.Overspeed &&
+ return Driver.DriverData.OverSpeedEcoRoll.Mode == DriverMode.Overspeed &&
gradient < 0 && velocity > Driver.DriverData.OverSpeedEcoRoll.MinSpeed;
}
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
index 29426e4c10fd91319357bef3d335bee62e4d2cd0..c5275b996435e23ab3a296b2de7e16aae78948a7 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
@@ -32,8 +32,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
index 9fb86f4c1714ea70fabb3d9bba854083b6bbbab2..ec93e2653ca6fb5904d238cd23d38c631ee99a4b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
@@ -34,8 +34,10 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using NLog;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation.Data;
@@ -44,6 +46,7 @@ using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.Utils;
+using DriverData = TUGraz.VectoCore.Models.SimulationComponent.Data.DriverData;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyRetarder.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyRetarder.cs
index 47d86375bc11499da458bbec4a1cffb3fe2d48d7..e7db38010c333c11b9423315774007f5c10db8b9 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyRetarder.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyRetarder.cs
@@ -29,6 +29,8 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs
index 731cf23b2be3f4e2cdbc44191ba29f4f0c61e221..3c557d66b3b97129620d360a9ac04f25618c2ece 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs
@@ -32,7 +32,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineOnlyCombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineOnlyCombustionEngine.cs
index fa753ea9c54eda7f3cbf5d409cd4f02a7f270d5b..5ae2e73d8745dbee439dd379c122324e33ebd727 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineOnlyCombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineOnlyCombustionEngine.cs
@@ -30,6 +30,8 @@
*/
using System.Collections.Generic;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
index 79812bce462d2b407b4482440ea33197786be049..a35684caa76bbeac3c5da9b13406f0445f34e6da 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
@@ -31,8 +31,10 @@
using System;
using System.Diagnostics;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
index 4edb6c005e0b631a74e8d9bd0ed00e7ccabc4e07..479006758ab4c42005d25d317ad2d5c254a316a4 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
@@ -32,8 +32,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Retarder.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Retarder.cs
index f0ce9f339e84a33c00e1f9d6bb5ec9714af6ecef..cb12fd34fa0e7c1f4da38664895dfbaad934b256 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Retarder.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Retarder.cs
@@ -30,6 +30,8 @@
*/
using System;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs
index 489395d52f3bf4d958e49852e107689c5d2cbf65..4e44cdff315206ba77ae43ea5f5584131a11c433 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs
@@ -30,6 +30,7 @@
*/
using System;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation.DataBus;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs
index 949a7ae49ba4add120c1b5e9995f9e312c93eefc..9a0f4b83c525004c71176fd1c6749ca16f870ce6 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs
@@ -30,6 +30,8 @@
*/
using System;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
index a927db6ac3e5abb068f91e62971f5ec7839a0886..25fbc552afa8364489fb7436e21eb18d2b9d154c 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
@@ -30,6 +30,8 @@
*/
using System;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs
index 9bf298a9413fad15ce9a6dc1c9b1c80b3c9364d6..16c5f9ceec9788add6faac1ada09d1782336901c 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs
@@ -29,6 +29,8 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs b/VectoCore/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs
index a03ba1e7ccc19484d725c62adde6dfbe08e23cb5..37d5e151ef064e45fec7b1a1a4d3f85b3c7b2fd3 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs
@@ -30,6 +30,7 @@
*/
using System;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Models.Simulation.Impl;
diff --git a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
index df18a017a4dd4473c21c2ef87c104cee5453864c..116ebdd358c5571d020f06c32ddd33d2f59506e5 100644
--- a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
@@ -33,6 +33,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
index 98f9657603db281f3b2150ccdc446cebe4003a03..34ab860b236f1bab0fd4cb628858b923c4277811 100644
--- a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
@@ -33,6 +33,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/OutputData/PDF/PDFDeclarationReport.cs b/VectoCore/VectoCore/OutputData/PDF/PDFDeclarationReport.cs
index a4b721fa5d49082e99b398cb23bcf43c00b01398..5ffddf0afeccd91bfa8ea04c5053efd16ea68584 100644
--- a/VectoCore/VectoCore/OutputData/PDF/PDFDeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/PDF/PDFDeclarationReport.cs
@@ -39,6 +39,8 @@ using System.Linq;
using System.Windows.Forms.DataVisualization.Charting;
using iTextSharp.text;
using iTextSharp.text.pdf;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
index f1aaabf3a4c7d947cb91fbde3733acfddc66b3fb..67944bf76d48c82bcabf937765432ae069418750 100644
--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -32,6 +32,7 @@
using System.Data;
using System.Linq;
using System.Runtime.CompilerServices;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Properties/Version.cs b/VectoCore/VectoCore/Properties/Version.cs
index dca748d3420fe97dedcac25efe0599b1f4fbd967..923bf64474975a92d474fc23d8b59ad12ed19459 100644
--- a/VectoCore/VectoCore/Properties/Version.cs
+++ b/VectoCore/VectoCore/Properties/Version.cs
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("3.0.2.456")]
-[assembly: AssemblyFileVersion("3.0.2.456")]
+[assembly: AssemblyVersion("3.0.2.467")]
+[assembly: AssemblyFileVersion("3.0.2.467")]
diff --git a/VectoCore/VectoCore/Utils/DataTableExtensionMethods.cs b/VectoCore/VectoCore/Utils/DataTableExtensionMethods.cs
index 7afa53ffc92b35a50bbc7f3aba4feafe3afb6576..0e0b708f3a6be3eae4a14df0cb28fc29eb72d5b7 100644
--- a/VectoCore/VectoCore/Utils/DataTableExtensionMethods.cs
+++ b/VectoCore/VectoCore/Utils/DataTableExtensionMethods.cs
@@ -33,7 +33,8 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Globalization;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Utils
{
diff --git a/VectoCore/VectoCore/Utils/DelauneyMap.cs b/VectoCore/VectoCore/Utils/DelauneyMap.cs
index b4dea113569ff9920398b00d3c3043b367913fed..a00ab8b9bf3f4b314703f4a2d9af57e38463a5ed 100644
--- a/VectoCore/VectoCore/Utils/DelauneyMap.cs
+++ b/VectoCore/VectoCore/Utils/DelauneyMap.cs
@@ -33,7 +33,8 @@ using System;
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models;
namespace TUGraz.VectoCore.Utils
diff --git a/VectoCore/VectoCore/Utils/Formulas.cs b/VectoCore/VectoCore/Utils/Formulas.cs
index 53885dfd2e7fab4c5ace494cf4a6a83858cdb25a..cba55efec85b6ea6807a9592d8ed4a17d6d24c54 100644
--- a/VectoCore/VectoCore/Utils/Formulas.cs
+++ b/VectoCore/VectoCore/Utils/Formulas.cs
@@ -29,7 +29,8 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Utils
{
diff --git a/VectoCore/VectoCore/Utils/Physics.cs b/VectoCore/VectoCore/Utils/Physics.cs
index 69e3b4b57c38c83339a4edb5175b9bc5f71d2fd4..d6fc577855771f0e27495b3131326c6a690a4d48 100644
--- a/VectoCore/VectoCore/Utils/Physics.cs
+++ b/VectoCore/VectoCore/Utils/Physics.cs
@@ -29,6 +29,8 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Utils;
+
namespace TUGraz.VectoCore.Utils
{
public class Physics
diff --git a/VectoCore/VectoCore/Utils/RessourceHelper.cs b/VectoCore/VectoCore/Utils/RessourceHelper.cs
index f8f89be73635a39994daed7882233b0e9c5f9a5c..d9e7fc52846417b7fb970a68ebb5e62e462baf8b 100644
--- a/VectoCore/VectoCore/Utils/RessourceHelper.cs
+++ b/VectoCore/VectoCore/Utils/RessourceHelper.cs
@@ -31,7 +31,7 @@
using System.IO;
using System.Reflection;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
namespace TUGraz.VectoCore.Utils
{
diff --git a/VectoCore/VectoCore/Utils/SearchAlgorithm.cs b/VectoCore/VectoCore/Utils/SearchAlgorithm.cs
index 929a04a67f63ef1f75709a685a2dd53f14038d0b..fc5a3b833b4d357dc037c46ba2668aa4660c0595 100644
--- a/VectoCore/VectoCore/Utils/SearchAlgorithm.cs
+++ b/VectoCore/VectoCore/Utils/SearchAlgorithm.cs
@@ -33,7 +33,8 @@ using System;
using System.Collections.Generic;
using System.Linq;
using NLog;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Utils
{
diff --git a/VectoCore/VectoCore/Utils/Validation.cs b/VectoCore/VectoCore/Utils/Validation.cs
index 2b01b5e7d1defca6d0d8f9e5cd72aba212032988..7aca0922916cb2e7973462348bfbe94cb7a349fd 100644
--- a/VectoCore/VectoCore/Utils/Validation.cs
+++ b/VectoCore/VectoCore/Utils/Validation.cs
@@ -36,6 +36,7 @@ using System.ComponentModel.DataAnnotations;
using System.IO;
using System.Linq;
using System.Reflection;
+using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Utils
{
diff --git a/VectoCore/VectoCore/Utils/VectoCSVFile.cs b/VectoCore/VectoCore/Utils/VectoCSVFile.cs
index 111e0cedb6b38de1a40ff4c9f9fd9507d81639b0..7af1b1ec03b691c4d2eaced18e711ea34f1f6f46 100644
--- a/VectoCore/VectoCore/Utils/VectoCSVFile.cs
+++ b/VectoCore/VectoCore/Utils/VectoCSVFile.cs
@@ -37,7 +37,8 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models;
namespace TUGraz.VectoCore.Utils
diff --git a/VectoCore/VectoCore/Utils/VectoMath.cs b/VectoCore/VectoCore/Utils/VectoMath.cs
index 47c324cef63a13694f7a36426cea1ca44e784322..132cabdc3087641ebadbc083e5419910fbea96f4 100644
--- a/VectoCore/VectoCore/Utils/VectoMath.cs
+++ b/VectoCore/VectoCore/Utils/VectoMath.cs
@@ -32,7 +32,8 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Utils
{
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index e7d95ffd543485e84fea75c9a0a42371eec60dc7..c4cda35b753a4632514f1811a6b33d1f77b919c8 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -80,18 +80,17 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="itextsharp">
- <HintPath>..\packages\iTextSharp.5.5.7\lib\itextsharp.dll</HintPath>
+ <HintPath>..\..\packages\iTextSharp.5.5.9\lib\itextsharp.dll</HintPath>
</Reference>
<Reference Include="JetBrains.Annotations">
- <HintPath>..\packages\JetBrains.Annotations.9.2.0\lib\net20\JetBrains.Annotations.dll</HintPath>
+ <HintPath>..\..\packages\JetBrains.Annotations.10.1.4\lib\net20\JetBrains.Annotations.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
- <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\NLog.4.2.0\lib\net45\NLog.dll</HintPath>
+ <Reference Include="NLog">
+ <HintPath>..\..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -107,9 +106,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Configuration\Constants.cs" />
- <Compile Include="Exceptions\VectoExceptions.cs" />
- <Compile Include="Exceptions\VectoSimulationException.cs" />
- <Compile Include="InputData\EngineeringInputData.cs" />
<Compile Include="InputData\FileIO\JSON\JsonExtensionMethods.cs" />
<Compile Include="InputData\Impl\InputData.cs" />
<Compile Include="InputData\FileIO\JSON\JSONEngineData.cs" />
@@ -117,9 +113,6 @@
<Compile Include="InputData\FileIO\JSON\JSONInputData.cs" />
<Compile Include="InputData\FileIO\JSON\JSONInputDataFactory.cs" />
<Compile Include="InputData\FileIO\JSON\JSONVehicleData.cs" />
- <Compile Include="InputData\IInputDataProvider.cs" />
- <Compile Include="InputData\DeclarationInputData.cs" />
- <Compile Include="InputData\IntegrityStatus.cs" />
<Compile Include="InputData\IVectoRunDataFactory.cs" />
<Compile Include="InputData\Reader\DataObjectAdaper\AbstractSimulationDataAdapter.cs" />
<Compile Include="InputData\Reader\DataObjectAdaper\DeclarationDataAdapter.cs" />
@@ -131,7 +124,6 @@
<Compile Include="InputData\Reader\Impl\EngineOnlyVectoRunDataFactory.cs" />
<Compile Include="Models\Connector\Ports\IDriverDemandPort.cs" />
<Compile Include="Models\Connector\Ports\IDrivingCyclePort.cs" />
- <Compile Include="Models\Connector\Ports\IResponse.cs" />
<Compile Include="Models\Connector\Ports\Impl\Response.cs" />
<Compile Include="Models\Connector\Ports\IFvPort.cs" />
<Compile Include="Models\Connector\Ports\ITnPort.cs" />
@@ -160,9 +152,9 @@
<Compile Include="Models\Declaration\DeclarationRims.cs" />
<Compile Include="Models\Declaration\Mission.cs" />
<Compile Include="Models\Declaration\MissionType.cs" />
+ <Compile Include="Models\SimulationComponent\Data\DriverData.cs" />
<Compile Include="Models\SimulationComponent\Data\Engine\PT1Curve.cs" />
<Compile Include="Models\LoggingObject.cs" />
- <Compile Include="Models\SimulationComponent\Data\GearboxType.cs" />
<Compile Include="Models\SimulationComponent\Data\ICrossWindCorrection.cs" />
<Compile Include="Models\SimulationComponent\Data\CrosswindCorrectionVAirBeta.cs" />
<Compile Include="Models\SimulationComponent\IAuxiliary.cs" />
@@ -212,13 +204,10 @@
</Compile>
<Compile Include="Utils\DataTableExtensionMethods.cs" />
<Compile Include="Utils\DateTimeFallbackDeserializer.cs" />
- <Compile Include="Utils\EnumHelper.cs" />
<Compile Include="Utils\RessourceHelper.cs" />
<Compile Include="Models\Declaration\Segment.cs" />
<Compile Include="Models\Declaration\Axle.cs" />
- <Compile Include="Models\Declaration\AxleConfiguration.cs" />
<Compile Include="Models\SimulationComponent\Data\CombustionEngineData.cs" />
- <Compile Include="Models\SimulationComponent\Data\CrossWindCorrectionMode.cs" />
<Compile Include="Models\SimulationComponent\Data\DrivingCycleData.cs" />
<Compile Include="Models\SimulationComponent\Data\Engine\FuelConsumptionMap.cs" />
<Compile Include="Models\SimulationComponent\Data\Engine\EngineFullLoadCurve.cs" />
@@ -229,7 +218,6 @@
<Compile Include="Models\SimulationComponent\Data\Gearbox\TorqueConverterData.cs" />
<Compile Include="Models\SimulationComponent\Data\RetarderData.cs" />
<Compile Include="Models\SimulationComponent\Data\RetarderLossMap.cs" />
- <Compile Include="Models\Declaration\VehicleCategory.cs" />
<Compile Include="Models\SimulationComponent\Data\VehicleData.cs" />
<Compile Include="Models\SimulationComponent\IClutch.cs" />
<Compile Include="Models\SimulationComponent\IPowertrainSimulation.cs" />
@@ -243,13 +231,9 @@
<Compile Include="Models\SimulationComponent\IPowerTrainComponent.cs" />
<Compile Include="Models\Simulation\Data\VectoRunData.cs" />
<Compile Include="Models\SimulationComponent\Impl\Driver.cs" />
- <Compile Include="Models\SimulationComponent\Data\DriverData.cs" />
<Compile Include="Utils\Formulas.cs" />
- <Compile Include="Utils\EnumberableExtensionMethods.cs" />
- <Compile Include="Utils\IntExtensionMethods.cs" />
<Compile Include="Utils\Physics.cs" />
<Compile Include="Utils\SearchAlgorithm.cs" />
- <Compile Include="Utils\SI.cs" />
<Compile Include="Models\SimulationComponent\Data\SimulationComponentData.cs" />
<Compile Include="Models\SimulationComponent\ICombustionEngine.cs" />
<Compile Include="Models\SimulationComponent\IGearbox.cs" />
@@ -276,13 +260,11 @@
<Compile Include="Models\Simulation\DataBus\IVehicleInfo.cs" />
<Compile Include="Models\Simulation\IVehicleContainer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Utils\StringExtensionMethods.cs" />
<Compile Include="Utils\SwitchExtension.cs" />
<Compile Include="Utils\Validation.cs" />
<Compile Include="Utils\VectoCSVFile.cs" />
<Compile Include="Utils\VectoMath.cs" />
<Compile Include="Utils\DelauneyMap.cs" />
- <Compile Include="Utils\DoubleExtensionMethods.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
@@ -346,6 +328,10 @@
<Project>{fdeee460-0b8a-4ef6-8d9e-72f203a50f65}</Project>
<Name>VectoAuxiliaries</Name>
</ProjectReference>
+ <ProjectReference Include="..\..\VectoCommon\VectoCommon\VectoCommon.csproj">
+ <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
+ <Name>VectoCommon</Name>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
diff --git a/VectoCore/VectoCore/packages.config b/VectoCore/VectoCore/packages.config
index 3b3d1d50607891e2c819cdcd092bc969740bac9f..62dcddf30b6b83ad87db7137f31742276db22453 100644
--- a/VectoCore/VectoCore/packages.config
+++ b/VectoCore/VectoCore/packages.config
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="iTextSharp" version="5.5.7" targetFramework="net45" />
- <package id="JetBrains.Annotations" version="9.2.0" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
- <package id="NLog" version="4.2.0" targetFramework="net45" />
+ <package id="iTextSharp" version="5.5.9" targetFramework="net45" />
+ <package id="JetBrains.Annotations" version="10.1.4" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+ <package id="NLog" version="4.2.3" targetFramework="net45" />
</packages>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Exceptions/ExceptionTests.cs b/VectoCore/VectoCoreTest/Exceptions/ExceptionTests.cs
index 74c76d49318df837e4e166b7d0d8fe1b3272d94a..4ff7d0935f2fce6cabaf5cdd17864a716900130b 100644
--- a/VectoCore/VectoCoreTest/Exceptions/ExceptionTests.cs
+++ b/VectoCore/VectoCoreTest/Exceptions/ExceptionTests.cs
@@ -31,7 +31,7 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
namespace TUGraz.VectoCore.Tests.Exceptions
{
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonTest.cs
index 66c5232dd897bde04c97a9bb3cdc0d3c49a81c52..8e5c7ab54bc1a5c0fc0ff6f18deff31e340329c9 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonTest.cs
@@ -35,7 +35,8 @@ using System.IO;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.InputData;
using TUGraz.VectoCore.InputData.FileIO;
using TUGraz.VectoCore.InputData.FileIO.JSON;
diff --git a/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs b/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
index 81a0e1a89da955edf915dcdebc480e5442e1c267..e37ccce5655917214c0b47e57d1251cbd9973c7d 100644
--- a/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
@@ -32,7 +32,10 @@
using System.IO;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.Reader.Impl;
@@ -80,7 +83,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual(DeclarationData.Driver.LookAhead.Deceleration.Value(),
runData.DriverData.LookAheadCoasting.Deceleration.Value(), Tolerance);
- Assert.AreNotEqual(DriverData.DriverMode.Off, runData.DriverData.OverSpeedEcoRoll.Mode);
+ Assert.AreNotEqual(DriverMode.Off, runData.DriverData.OverSpeedEcoRoll.Mode);
Assert.AreEqual(DeclarationData.Driver.OverSpeedEcoRoll.MinSpeed.Value(),
runData.DriverData.OverSpeedEcoRoll.MinSpeed.Value(), Tolerance);
Assert.AreEqual(DeclarationData.Driver.OverSpeedEcoRoll.OverSpeed.Value(),
diff --git a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs
index 540c0b2fda597ed7f244dc64aa657c90e764a861..699166033824d0f352245934c1fa85c8fdd666f6 100644
--- a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs
@@ -1,5 +1,6 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using NUnit.Framework;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Models.Simulation.Impl;
diff --git a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
index 8bebb4fe871fb5064d901f8e1c243cea49a42e38..608971e2431c5b0ea640f8e615a169315f24043e 100644
--- a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
@@ -1,5 +1,6 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using NUnit.Framework;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Tests.Utils;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
index 5fa2a266895ea6c76239fc17b50bde1f704ef84c..94c6b69784943c3975a4a279536bf934e1922856 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
@@ -167,12 +169,12 @@ namespace TUGraz.VectoCore.Tests.Integration
},
OverSpeedEcoRoll = overspeed
? new DriverData.OverSpeedEcoRollData {
- Mode = DriverData.DriverMode.Overspeed,
+ Mode = DriverMode.Overspeed,
MinSpeed = 50.KMPHtoMeterPerSecond(),
OverSpeed = 5.KMPHtoMeterPerSecond()
}
: new DriverData.OverSpeedEcoRollData {
- Mode = DriverData.DriverMode.Off
+ Mode = DriverMode.Off
},
StartStop = new VectoRunData.StartStopData {
Enabled = false
diff --git a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
index 2427a1e53a9de6d50954a75e5063dde8e9e9af82..6a2252962fedfdd04d6771bfa2ba141a7d53c7ba 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
@@ -32,6 +32,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
@@ -195,12 +197,12 @@ namespace TUGraz.VectoCore.Tests.Integration
},
OverSpeedEcoRoll = overspeed
? new DriverData.OverSpeedEcoRollData {
- Mode = DriverData.DriverMode.Overspeed,
+ Mode = DriverMode.Overspeed,
MinSpeed = 50.KMPHtoMeterPerSecond(),
OverSpeed = 5.KMPHtoMeterPerSecond()
}
: new DriverData.OverSpeedEcoRollData {
- Mode = DriverData.DriverMode.Off
+ Mode = DriverMode.Off
},
StartStop = new VectoRunData.StartStopData {
Enabled = false
diff --git a/VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs b/VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
index d63c8610dc0e762d6f59a99e1e543894cd080816..2c7f76ee5c3f0e082d0819bdb3e7006fceac3020 100644
--- a/VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
+++ b/VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
@@ -30,6 +30,7 @@
*/
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Tests.Utils;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs b/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
index 7689bfd216603ea5b0fb44086149820f3f520339..468ab0f300e1a2157172d4f1d9fa8eaf743d731f 100644
--- a/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
@@ -32,6 +32,7 @@
using System.IO;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
diff --git a/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs b/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
index 5e41d1c55e1831f5ca02e83dfac4765253246b66..715fce0884419acb151be58239b7a0affeb34c36 100644
--- a/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
@@ -33,6 +33,7 @@ using System.IO;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using NLog;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
index 9ef382389f0349193786b71d03b7d4020e1397dc..159e7b4ded3df6e971730b506797a1a4ec2e9025 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
@@ -35,6 +35,8 @@ using System.Linq;
using System.Reflection;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using NLog;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.Reader;
@@ -406,7 +408,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
Deceleration = -0.5.SI<MeterPerSquareSecond>()
},
OverSpeedEcoRoll = new DriverData.OverSpeedEcoRollData {
- Mode = DriverData.DriverMode.Off
+ Mode = DriverMode.Off
},
StartStop = new VectoRunData.StartStopData {
Enabled = false
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
index 4252dd9358cd4b99f1868f1aa7a84855c1bae975..37431a2a52a625919b61ed03d6b22c79842e4e6b 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
@@ -31,6 +31,8 @@
using System.Collections.Generic;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
@@ -301,7 +303,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
Deceleration = -0.5.SI<MeterPerSquareSecond>()
},
OverSpeedEcoRoll = new DriverData.OverSpeedEcoRollData {
- Mode = DriverData.DriverMode.Off
+ Mode = DriverMode.Off
},
StartStop = new VectoRunData.StartStopData {
Enabled = false
diff --git a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
index 447368f22181da22acd9bda7339ab8c0f2ff4440..833ef248999885eb52c8f55f522b528297b9dd57 100644
--- a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
@@ -32,6 +32,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
@@ -218,12 +220,12 @@ namespace TUGraz.VectoCore.Tests.Integration
},
OverSpeedEcoRoll = overspeed
? new DriverData.OverSpeedEcoRollData() {
- Mode = DriverData.DriverMode.Overspeed,
+ Mode = DriverMode.Overspeed,
MinSpeed = 50.KMPHtoMeterPerSecond(),
OverSpeed = 5.KMPHtoMeterPerSecond(),
}
: new DriverData.OverSpeedEcoRollData {
- Mode = DriverData.DriverMode.Off
+ Mode = DriverMode.Off
},
StartStop = new VectoRunData.StartStopData {
Enabled = false,
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
index 60027a73ee59c227658a30e7002ddff21d1c5315..40686c5d4b0726a4abd79d0a96dcb40553ca69a1 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
@@ -34,12 +34,14 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader.DataObjectAdaper;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Tests.Utils;
using TUGraz.VectoCore.Utils;
+using CrossWindCorrectionMode = TUGraz.VectoCommon.Models.CrossWindCorrectionMode;
namespace TUGraz.VectoCore.Tests.Models.Declaration
{
@@ -145,14 +147,14 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(kv.Value, airDrag.Lookup(kv.Key));
}
- var expectedCat = new Dictionary<VehicleCategory, AirDrag.AirDragEntry> {
+ var expectedCat = new Dictionary<VectoCommon.Models.VehicleCategory, AirDrag.AirDragEntry> {
{
- VehicleCategory.RigidTruck, new AirDrag.AirDragEntry { A1 = 0.013526, A2 = 0.017746, A3 = -0.000666 }
+ VectoCommon.Models.VehicleCategory.RigidTruck, new AirDrag.AirDragEntry { A1 = 0.013526, A2 = 0.017746, A3 = -0.000666 }
},
- { VehicleCategory.Tractor, new AirDrag.AirDragEntry { A1 = 0.034767, A2 = 0.039367, A3 = -0.001897 } },
- { VehicleCategory.CityBus, new AirDrag.AirDragEntry { A1 = -0.000794, A2 = 0.02109, A3 = -0.00109 } },
- { VehicleCategory.Coach, new AirDrag.AirDragEntry { A1 = -0.000794, A2 = 0.02109, A3 = -0.00109 } }, {
- VehicleCategory.InterurbanBus,
+ { VectoCommon.Models.VehicleCategory.Tractor, new AirDrag.AirDragEntry { A1 = 0.034767, A2 = 0.039367, A3 = -0.001897 } },
+ { VectoCommon.Models.VehicleCategory.CityBus, new AirDrag.AirDragEntry { A1 = -0.000794, A2 = 0.02109, A3 = -0.00109 } },
+ { VectoCommon.Models.VehicleCategory.Coach, new AirDrag.AirDragEntry { A1 = -0.000794, A2 = 0.02109, A3 = -0.00109 } }, {
+ VectoCommon.Models.VehicleCategory.InterurbanBus,
new AirDrag.AirDragEntry { A1 = -0.000794, A2 = 0.02109, A3 = -0.00109 }
}
};
@@ -166,7 +168,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
public void CrossWindCorrectionTest()
{
var crossWindCorrectionCurve = new CrosswindCorrectionCdxALookup(
- DeclarationDataAdapter.GetDeclarationAirResistanceCurve(VehicleCategory.Tractor,
+ DeclarationDataAdapter.GetDeclarationAirResistanceCurve(VectoCommon.Models.VehicleCategory.Tractor,
6.46.SI<SquareMeter>()), CrossWindCorrectionMode.DeclarationModeCorrection);
var tmp = crossWindCorrectionCurve.EffectiveAirDragArea(0.KMPHtoMeterPerSecond());
@@ -467,55 +469,55 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
public void SegmentLookupTest()
{
AssertHelper.Exception<VectoException>(
- () => DeclarationData.Segments.Lookup(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2,
+ () => DeclarationData.Segments.Lookup(VectoCommon.Models.VehicleCategory.RigidTruck, VectoCommon.Models.AxleConfiguration.AxleConfig_4x2,
1000.SI<Kilogram>(), 0.SI<Kilogram>()), "Gross vehicle mass must be greater than 7.5 tons");
- var segment = DeclarationData.Segments.Lookup(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2,
+ var segment = DeclarationData.Segments.Lookup(VectoCommon.Models.VehicleCategory.RigidTruck, VectoCommon.Models.AxleConfiguration.AxleConfig_4x2,
10000.SI<Kilogram>(), 0.SI<Kilogram>());
Assert.AreEqual(VehicleClass.Class1, segment.VehicleClass);
- segment = DeclarationData.Segments.Lookup(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2,
+ segment = DeclarationData.Segments.Lookup(VectoCommon.Models.VehicleCategory.Tractor, VectoCommon.Models.AxleConfiguration.AxleConfig_4x2,
10000.SI<Kilogram>(), 0.SI<Kilogram>());
Assert.AreEqual(VehicleClass.Class1, segment.VehicleClass);
- segment = DeclarationData.Segments.Lookup(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2,
+ segment = DeclarationData.Segments.Lookup(VectoCommon.Models.VehicleCategory.RigidTruck, VectoCommon.Models.AxleConfiguration.AxleConfig_4x2,
12000.SI<Kilogram>(), 0.SI<Kilogram>());
Assert.AreEqual(VehicleClass.Class2, segment.VehicleClass);
- segment = DeclarationData.Segments.Lookup(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2,
+ segment = DeclarationData.Segments.Lookup(VectoCommon.Models.VehicleCategory.Tractor, VectoCommon.Models.AxleConfiguration.AxleConfig_4x2,
12000.SI<Kilogram>(), 0.SI<Kilogram>());
Assert.AreEqual(VehicleClass.Class2, segment.VehicleClass);
- segment = DeclarationData.Segments.Lookup(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2,
+ segment = DeclarationData.Segments.Lookup(VectoCommon.Models.VehicleCategory.RigidTruck, VectoCommon.Models.AxleConfiguration.AxleConfig_4x2,
16000.SI<Kilogram>(), 0.SI<Kilogram>());
Assert.AreEqual(VehicleClass.Class3, segment.VehicleClass);
- segment = DeclarationData.Segments.Lookup(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2,
+ segment = DeclarationData.Segments.Lookup(VectoCommon.Models.VehicleCategory.Tractor, VectoCommon.Models.AxleConfiguration.AxleConfig_4x2,
16000.SI<Kilogram>(), 0.SI<Kilogram>());
Assert.AreEqual(VehicleClass.Class3, segment.VehicleClass);
- segment = DeclarationData.Segments.Lookup(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_4x2,
+ segment = DeclarationData.Segments.Lookup(VectoCommon.Models.VehicleCategory.RigidTruck, VectoCommon.Models.AxleConfiguration.AxleConfig_4x2,
16001.SI<Kilogram>(), 0.SI<Kilogram>());
Assert.AreEqual(VehicleClass.Class4, segment.VehicleClass);
- segment = DeclarationData.Segments.Lookup(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_4x2,
+ segment = DeclarationData.Segments.Lookup(VectoCommon.Models.VehicleCategory.Tractor, VectoCommon.Models.AxleConfiguration.AxleConfig_4x2,
16001.SI<Kilogram>(), 0.SI<Kilogram>());
Assert.AreEqual(VehicleClass.Class5, segment.VehicleClass);
- segment = DeclarationData.Segments.Lookup(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_6x2,
+ segment = DeclarationData.Segments.Lookup(VectoCommon.Models.VehicleCategory.RigidTruck, VectoCommon.Models.AxleConfiguration.AxleConfig_6x2,
7500.SI<Kilogram>(), 0.SI<Kilogram>());
Assert.AreEqual(VehicleClass.Class9, segment.VehicleClass);
- segment = DeclarationData.Segments.Lookup(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_6x2,
+ segment = DeclarationData.Segments.Lookup(VectoCommon.Models.VehicleCategory.Tractor, VectoCommon.Models.AxleConfiguration.AxleConfig_6x2,
7500.SI<Kilogram>(), 0.SI<Kilogram>());
Assert.AreEqual(VehicleClass.Class10, segment.VehicleClass);
- segment = DeclarationData.Segments.Lookup(VehicleCategory.RigidTruck, AxleConfiguration.AxleConfig_6x2,
+ segment = DeclarationData.Segments.Lookup(VectoCommon.Models.VehicleCategory.RigidTruck, VectoCommon.Models.AxleConfiguration.AxleConfig_6x2,
40000.SI<Kilogram>(), 0.SI<Kilogram>());
Assert.AreEqual(VehicleClass.Class9, segment.VehicleClass);
- segment = DeclarationData.Segments.Lookup(VehicleCategory.Tractor, AxleConfiguration.AxleConfig_6x2,
+ segment = DeclarationData.Segments.Lookup(VectoCommon.Models.VehicleCategory.Tractor, VectoCommon.Models.AxleConfiguration.AxleConfig_6x2,
40000.SI<Kilogram>(), 0.SI<Kilogram>());
Assert.AreEqual(VehicleClass.Class10, segment.VehicleClass);
}
@@ -525,8 +527,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
{
//mock vehicleData
var vehicleData = new {
- VehicleCategory = VehicleCategory.RigidTruck,
- AxleConfiguration = AxleConfiguration.AxleConfig_4x2,
+ VehicleCategory = VectoCommon.Models.VehicleCategory.RigidTruck,
+ AxleConfiguration = VectoCommon.Models.AxleConfiguration.AxleConfig_4x2,
GrossVehicleMassRating = 11900.SI<Kilogram>(),
CurbWeight = 5850.SI<Kilogram>()
};
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
index 2c0a7a7ebae3f1e56fce5f93c7e99258ea0a6ea9..de1ba740cb1c97e3e92f25704ca4ea9406303dfe 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
@@ -30,12 +30,13 @@
*/
using TUGraz.VectoCore.Utils;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Tests.Utils;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
index 9f3a7e1ea18c7f366c1185d9d457fd8197fd614d..a31b108e3765b02dd3ab3afd30b48e31b2082969 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
@@ -31,7 +31,8 @@
using System.IO;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation.Impl;
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/FactoryTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/FactoryTest.cs
index a12e08c1b8c6b7e66032c21fbd9a29faba0c1b56..e994564fa5391b6b8cdceed12cc30ef4b6259f09 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/FactoryTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/FactoryTest.cs
@@ -31,6 +31,7 @@
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.Models.Simulation.Data;
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
index cd12fd942f1dc609fed9638f975673825725af3f..01c290f85a17c899f692171e1e72f29420048303 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
@@ -41,7 +41,9 @@ using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
index 65f9bf90c2b60bbef51b633e4b2dc3f149e621ce..5dcda8bfffcfb3618640ce359bd93c321878ae08 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
@@ -31,7 +31,8 @@
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.InputData;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.Reader.Impl;
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
index b446647a8a29e523308a6f0a911c1407f1a70bb9..307f8210a98b9c274ddee08289bb71de8a75b4a0 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
@@ -42,6 +42,7 @@ using TUGraz.VectoCore.OutputData.FileIO;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.Models.Simulation.Impl;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs
index 0c9d4020d10ba56c7f6db5c1de2fe9a0fb184f3a..a0378eba2653d40dac50805c486c8af158aa54f2 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs
@@ -31,6 +31,7 @@
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Impl;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
index 040d35b26ec97a5528461b246a2f17510466866d..117ff0f57c45db9798d5e3a7defc2ea8ad9bcfaa 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
@@ -31,6 +31,7 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
index 81e122b2a232d325f9cd002fda88cd6401941baa..9610fda5651ac443f3b3a69b4a824a0c2a5c14cd 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
@@ -37,6 +37,7 @@ using System.Linq;
using System.Reflection;
using System.Windows.Forms.VisualStyles;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs
index edca85cdce9a2cfa2433e831ca3fdd71c98d8945..cbccb79643e5fd50eff7abbbeb43ec13f297b2cd 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs
@@ -31,7 +31,8 @@
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation.Impl;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
index 153dd2bd7c22f6a24bc714984ab1ec381aa72308..f3018c48e0f567b68bc2f585d46395bf29925034 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
@@ -32,6 +32,8 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
@@ -408,7 +410,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
Deceleration = -0.5.SI<MeterPerSquareSecond>()
},
OverSpeedEcoRoll = new DriverData.OverSpeedEcoRollData {
- Mode = DriverData.DriverMode.Off
+ Mode = DriverMode.Off
},
StartStop = new VectoRunData.StartStopData {
Enabled = false
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs
index db641a88bd613549fb90d2d7aedccddaad05335f..42b20013ea6a8b140dc8ca5f71d139bb72be6d02 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs
@@ -30,6 +30,7 @@
*/
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Tests.Integration;
using TUGraz.VectoCore.Tests.Utils;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
index f614ac7c60476bca3ebae8d0f9cb459596f03e68..9846166b92322edaa281ac81afa89c317807eece 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
@@ -32,7 +32,8 @@
using System;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs
index 06dcefbd9e6e4a12e4317d0ab31742e4b0e82bbc..f0cd693d6730475a60edede304b023bd9de213a7 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs
@@ -32,7 +32,8 @@
using System;
using System.Runtime.InteropServices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
index 4b914fd2a32194d52653172a5f2225ed9e8654f3..5f0842b9a42ca5e3f0c964d64416d6b78dcbf175 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
@@ -32,6 +32,8 @@
using System;
using System.IO;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader.DataObjectAdaper;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs
index 2f1a38f5c09ea7ba1104a5bf3dc9e318ca05a64c..5657debf2f973ec571c860ffc6e89e6c1b496b17 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs
@@ -31,6 +31,7 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs
index 5d4e718c38e2db1a5c4672f7b1edc7991b71443a..46df0dc5b4ff7047462559d56ddd80aae9209116 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs
@@ -30,6 +30,7 @@
*/
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs
index 436da7e3a990162eee316e5df0ba016e8aced1ae..fae1ff23b0a3a6c4b348f6f42b48a36c4086af27 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs
@@ -31,8 +31,8 @@
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCore.InputData.Reader;
-using TUGraz.VectoCore.Exceptions;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
using TUGraz.VectoCore.Tests.Integration;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs
index 860f14a3505ee30b6962869b9f454f1317137234..fc6e6f47c1fe8ba8906cb7b5368e2fe9771a3ca1 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs
@@ -33,7 +33,8 @@ using System.Globalization;
using System.IO;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
index ab1b139af2de374d1ef2523c14b99882c5363761..22c8f807038a307f52497bfb4fe7915efe845c3f 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
@@ -31,7 +31,8 @@
using System.IO;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
index bee112bdbe55e1b4e6d102f980847c890dc4857c..f3e1a475fb62ed2f8036493a9296daf3f4ed97e6 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
@@ -33,7 +33,9 @@ using System;
using System.Data;
using System.Globalization;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader.DataObjectAdaper;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
index 3472d41986e264181e614d5820e10e6866459624..bd33500b2c83c1facfe673bc777517d1afa072a5 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
@@ -34,6 +34,7 @@ using System.Data;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader.DataObjectAdaper;
using TUGraz.VectoCore.InputData.Reader.Impl;
using TUGraz.VectoCore.Models.Simulation.Data;
diff --git a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
index 10bb4e22e54d89406fa9599726641ac84fc48d5d..a40790f7a52f7bcdcd7c5730238f1effb319eb44 100644
--- a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
@@ -31,6 +31,7 @@
using System.Data;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader.Impl;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
diff --git a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
index 15925402d1daae5b061186c27a2b592ea4dbaee1..e3883f317d46c2a1c4ffd5ba7290e77410bac48c 100644
--- a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
@@ -30,6 +30,7 @@
*/
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.OutputData;
diff --git a/VectoCore/VectoCoreTest/Utils/AssertHelper.cs b/VectoCore/VectoCoreTest/Utils/AssertHelper.cs
index 36e48c052389812a55fdce0b7cd7ec3c9643e260..1e6dae3143a50bbf5f054d3fe30c2dc2a7596618 100644
--- a/VectoCore/VectoCoreTest/Utils/AssertHelper.cs
+++ b/VectoCore/VectoCoreTest/Utils/AssertHelper.cs
@@ -33,6 +33,7 @@ using System;
using System.Diagnostics;
using System.Globalization;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Utils
diff --git a/VectoCore/VectoCoreTest/Utils/DelauneyMapTest.cs b/VectoCore/VectoCoreTest/Utils/DelauneyMapTest.cs
index 77e9fb9e7e683e924ae1cd5e25ddabee8e21d5d5..413ca1740111d4f8cab927aa471911e6ad0ef5a2 100644
--- a/VectoCore/VectoCoreTest/Utils/DelauneyMapTest.cs
+++ b/VectoCore/VectoCoreTest/Utils/DelauneyMapTest.cs
@@ -31,7 +31,7 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Utils
diff --git a/VectoCore/VectoCoreTest/Utils/DoubleExtensionMethodTest.cs b/VectoCore/VectoCoreTest/Utils/DoubleExtensionMethodTest.cs
index 0cc9951f8425726b0aec20e5fac9b1f824a5f1af..a6477d2e0f2677c52563c6f0754c8736906f3b48 100644
--- a/VectoCore/VectoCoreTest/Utils/DoubleExtensionMethodTest.cs
+++ b/VectoCore/VectoCoreTest/Utils/DoubleExtensionMethodTest.cs
@@ -31,6 +31,7 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Utils
diff --git a/VectoCore/VectoCoreTest/Utils/GraphWriter.cs b/VectoCore/VectoCoreTest/Utils/GraphWriter.cs
index b16452a03f050a110461f8d878b90a26725efc09..3218a0d2c62b9a93feb6a8eff248587ab877f059 100644
--- a/VectoCore/VectoCoreTest/Utils/GraphWriter.cs
+++ b/VectoCore/VectoCoreTest/Utils/GraphWriter.cs
@@ -43,6 +43,7 @@ using System.Text.RegularExpressions;
using System.Windows.Forms.DataVisualization.Charting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using NLog;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Utils;
using Point = System.Drawing.Point;
diff --git a/VectoCore/VectoCoreTest/Utils/MockAuxiliaryDemand.cs b/VectoCore/VectoCoreTest/Utils/MockAuxiliaryDemand.cs
index 711f7f408ab43399bbb40709e4daac0b06dec78b..a4e891961a649d1b1463dcfb6b5f936ef10abd37 100644
--- a/VectoCore/VectoCoreTest/Utils/MockAuxiliaryDemand.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockAuxiliaryDemand.cs
@@ -32,6 +32,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.DataBus;
diff --git a/VectoCore/VectoCoreTest/Utils/MockBrakes.cs b/VectoCore/VectoCoreTest/Utils/MockBrakes.cs
index e15984ca019b54c5bd4289b128890752bf355e36..036c36030fb251a2487242c8c8b647b6982fc503 100644
--- a/VectoCore/VectoCoreTest/Utils/MockBrakes.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockBrakes.cs
@@ -1,3 +1,4 @@
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent;
diff --git a/VectoCore/VectoCoreTest/Utils/MockDriver.cs b/VectoCore/VectoCoreTest/Utils/MockDriver.cs
index 84367abcb57a0958bce63e3718d59accf0fcbfc3..5be4307ded3a29f8493a0c750bf95ceb4300df05 100644
--- a/VectoCore/VectoCoreTest/Utils/MockDriver.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockDriver.cs
@@ -31,6 +31,8 @@
using System;
using System.Diagnostics;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs b/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs
index a8812b6760e907df46f8609ecf3e680588a06770..2c72a9289574afc5a71c206b6cc0c9200f8339aa 100644
--- a/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs
@@ -1,4 +1,6 @@
using System.Data;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCoreTest/Utils/MockGearbox.cs b/VectoCore/VectoCoreTest/Utils/MockGearbox.cs
index 3d3dead5ae5711a78a7fb4e3fd855c9657e6fef5..51c4af583c94cca3a1a070e69c31da1cec0be918 100644
--- a/VectoCore/VectoCoreTest/Utils/MockGearbox.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockGearbox.cs
@@ -30,6 +30,8 @@
*/
using System;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
diff --git a/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs b/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
index 5b7c0f847044755d569cc129498fa86925fc4279..2986df725f74a11cd90a6432509a6612ffba20b0 100644
--- a/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
@@ -32,6 +32,7 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.OutputData;
diff --git a/VectoCore/VectoCoreTest/Utils/MockPorts.cs b/VectoCore/VectoCoreTest/Utils/MockPorts.cs
index efa6d2528cc57a48f38faf423adcf154d62b7861..4e6fc9921f5f11c67ae984e8c40fb5f479b89a5c 100644
--- a/VectoCore/VectoCoreTest/Utils/MockPorts.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockPorts.cs
@@ -32,6 +32,8 @@
using System;
using System.Diagnostics;
using NLog;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
diff --git a/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs b/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
index 1673722cedc1195a828b9cac6289cf40b86c92ac..1055054283d6d48829a9a4bf3fa88f7fc7e4e77b 100644
--- a/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
@@ -29,7 +29,8 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.InputData;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.Reader.DataObjectAdaper;
diff --git a/VectoCore/VectoCoreTest/Utils/MockVairVehicleContainer.cs b/VectoCore/VectoCoreTest/Utils/MockVairVehicleContainer.cs
index ae04caf9f52065ed5add5644634483ea45aacf0c..6a0a9a28c821f4640c349faccf74ab43f305fa99 100644
--- a/VectoCore/VectoCoreTest/Utils/MockVairVehicleContainer.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockVairVehicleContainer.cs
@@ -30,6 +30,7 @@
*/
using System.Collections.Generic;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
diff --git a/VectoCore/VectoCoreTest/Utils/MockVehicle.cs b/VectoCore/VectoCoreTest/Utils/MockVehicle.cs
index 53e04cf6763d279665d8ae645fbe427571310d2f..5667151aae119fd2941b2389d6c79989fb6ba0e3 100644
--- a/VectoCore/VectoCoreTest/Utils/MockVehicle.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockVehicle.cs
@@ -30,6 +30,8 @@
*/
using System;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs b/VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs
index bfc2723c539bf0d85fd44e3d9f60bd2d6736d6dc..2e327862794ed3a1fe21d5daebe3c9adafd098c0 100644
--- a/VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs
+++ b/VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs
@@ -34,6 +34,7 @@ using System.Data;
using System.IO;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Utils
diff --git a/VectoCore/VectoCoreTest/Utils/SITest.cs b/VectoCore/VectoCoreTest/Utils/SITest.cs
index e5c188646d1b3ec973dbf7817311a0fe840bbbf9..606cae9fa7a1b9b9caddb2ad59a0ecc32e82a398 100644
--- a/VectoCore/VectoCoreTest/Utils/SITest.cs
+++ b/VectoCore/VectoCoreTest/Utils/SITest.cs
@@ -31,7 +31,8 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Utils
diff --git a/VectoCore/VectoCoreTest/Utils/VectoMathTest.cs b/VectoCore/VectoCoreTest/Utils/VectoMathTest.cs
index 158b3f79974006b91115d84199b23a65e87f5f42..d8e807af609200decbe6e9e0165430f47ab8ad1f 100644
--- a/VectoCore/VectoCoreTest/Utils/VectoMathTest.cs
+++ b/VectoCore/VectoCoreTest/Utils/VectoMathTest.cs
@@ -30,6 +30,7 @@
*/
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Utils
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 376be51bf64945015008094b0fb30f3677ba68c3..82f6eddb8a0c415df2c440db104c354277c2334f 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -37,15 +37,16 @@
<ItemGroup>
<Reference Include="itextsharp, Version=5.5.7.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\iTextSharp.5.5.7\lib\itextsharp.dll</HintPath>
+ <HintPath>..\..\packages\iTextSharp.5.5.9\lib\itextsharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
- <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
- <Reference Include="NLog">
- <HintPath>..\packages\NLog.4.0.1\lib\net45\NLog.dll</HintPath>
+ <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -149,6 +150,10 @@
<Compile Include="Utils\VectoMathTest.cs" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\VectoCommon\VectoCommon\VectoCommon.csproj">
+ <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
+ <Name>VectoCommon</Name>
+ </ProjectReference>
<ProjectReference Include="..\VectoCore\VectoCore.csproj">
<Project>{cd36938a-add9-4c65-96da-b397cdeea90a}</Project>
<Name>VectoCore</Name>
diff --git a/VectoCore/VectoCoreTest/packages.config b/VectoCore/VectoCoreTest/packages.config
index bff0e8bf1f1f8353e6ab05f94af09274ff45a2b5..ab10608f04c28ef5420a0dd6d7a7a08c56015ac9 100644
--- a/VectoCore/VectoCoreTest/packages.config
+++ b/VectoCore/VectoCoreTest/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
- <package id="NLog" version="4.0.1" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+ <package id="NLog" version="4.2.3" targetFramework="net45" />
<package id="NUnit" version="2.6.2" targetFramework="net45" />
</packages>
\ No newline at end of file
diff --git a/packages/repositories.config b/packages/repositories.config
index 2d5418747e702dac413a14bbf7a9390c57b47485..51d7e9e6da8f3b96b494021a10846aeebc6cf119 100644
--- a/packages/repositories.config
+++ b/packages/repositories.config
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<repositories>
- <repository path="..\AdvancedAuxiliaryInterfaces\packages.config" />
<repository path="..\VECTO\packages.config" />
<repository path="..\VECTOAux\VectoAuxiliaries\packages.config" />
<repository path="..\VECTOAux\VectoAuxiliariesTests\packages.config" />
+ <repository path="..\VectoCommon\AdvancedAuxiliaryInterfaces\packages.config" />
+ <repository path="..\VectoCommon\VectoCommon\packages.config" />
<repository path="..\VectoConsole\packages.config" />
- <repository path="..\VectoCore\packages.config" />
- <repository path="..\VectoCoreTest\packages.config" />
+ <repository path="..\VectoCore\VectoCore\packages.config" />
+ <repository path="..\VectoCore\VectoCoreTest\packages.config" />
</repositories>
\ No newline at end of file