diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 12541e1c72ae8105f6733470b71efad4ff8d4fda..ac437b23eefabe3b0cd4c8e0fbc80b91b43ad838 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -461,7 +461,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <None Include="ClassDiagram1.cd" />
<None Include="My Project\app.manifest">
<SubType>Designer</SubType>
</None>
@@ -551,16 +550,6 @@
<ItemGroup>
<WCFMetadata Include="Service References\" />
</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>
- </ProjectReference>
- </ItemGroup>
<ItemGroup>
<Content Include="Libraries\vectolic.dll" />
<None Include="Resources\Up.bmp" />
@@ -588,7 +577,16 @@
<Content Include="Resources\up.ico" />
<Content Include="Resources\up.png" />
</ItemGroup>
- <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>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PostBuildEvent>
diff --git a/VECTO/VECTO.vbproj.user b/VECTO/VECTO.vbproj.user
index de2f13e5e6ff4cff869eb443faa8215d3edaca41..42332ddfe40b4130cde45e54191b1ad52cad539b 100644
--- a/VECTO/VECTO.vbproj.user
+++ b/VECTO/VECTO.vbproj.user
@@ -13,7 +13,7 @@
<FallbackCulture>de-DE</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
<ErrorReportUrlHistory />
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartArguments>
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
index 5657bb3950d45f187093c33336d68376733a162e..cf279b7bcf2c2f1c5074d497e89d4d98d32139f4 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
@@ -15,7 +15,7 @@ Public Class MockFuel50PC
Public Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As PerSecond) As KilogramPerSecond _
- Implements IFuelConsumptionMap.GetFuelConsumption
+ Implements IFuelConsumptionMap.GetFuelConsumptionValue
Return (fFCdelaunay_Intp(angularVelocity.AsRPM, torque.Value()) / 3600 / 1000).SI(Of KilogramPerSecond)()
End Function
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
index 1650b0cfd3e1b965ab085122b52e5289e9fed8ba..7a873ac2308dbf60ea63bd858de00d603887eec8 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
@@ -805,7 +805,7 @@ Namespace UnitTests
Dim auxFresh = GetDefaultAuxiliaryConfig()
Dim auxNow = GetDefaultAuxiliaryConfig()
Dim compareResult As Boolean
- CType (auxNow.PneumaticUserInputsConfig, PneumaticUserInputsConfig).KneelingHeightMillimeters += 1.SI(Of Meter)
+ CType (auxNow.PneumaticUserInputsConfig, PneumaticUserInputsConfig).KneelingHeight += 1.SI(Of Meter)
'Act
compareResult = auxFresh.ConfigValuesAreTheSameAs(auxNow)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
index a725be13136fb3d44f778eaa90709f25143304f5..73649b60a0b348f62caacae84b409d6d69ae5e0d 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
@@ -51,7 +51,7 @@ Namespace UnitTests
_defaultInputConfig.CompressorGearEfficiency = 0.8
_defaultInputConfig.SmartRegeneration = True
'_defaultInputConfig.RetarderBrake = True
- _defaultInputConfig.KneelingHeightMillimeters = 80.SI(Unit.SI.Milli.Meter).Cast (of Meter)
+ _defaultInputConfig.KneelingHeight = 80.SI(Unit.SI.Milli.Meter).Cast (of Meter)
_defaultInputConfig.AirSuspensionControl = ConsumerTechnology.Electrically ' "Electrically"
_defaultInputConfig.AdBlueDosing = ConsumerTechnology.Pneumatically ' "Pneumatic"
_defaultInputConfig.Doors = ConsumerTechnology.Pneumatically ' "Pneumatic"
@@ -247,7 +247,7 @@ Namespace UnitTests
initialise()
- _defaultInputConfig.KneelingHeightMillimeters = 100.SI(Unit.si.Milli.Meter).Cast (Of Meter)
+ _defaultInputConfig.KneelingHeight = 100.SI(Unit.si.Milli.Meter).Cast (Of Meter)
Dim psAuxConfig = New DeclarationDataAdapterPrimaryBus().CreatePneumaticAuxConfig(RetarderType.LossesIncludedInTransmission)
Dim psCompressorMap = CompressorMapReader.ReadFile(_compressorMapPath)
@@ -352,7 +352,7 @@ Namespace UnitTests
.PneumaticAuxillariesConfig = psAuxConfig,
.PneumaticUserInputsConfig = _defaultInputConfig,
.VehicleData = New VehicleData() with {
- .CurbWeight = _vehicleMassKG.SI(of Kilogram)
+ .CurbMass = _vehicleMassKG.SI(of Kilogram)
},
.Actuations = New Actuations() With {
.Braking = 153,
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
index e36c600bb6e2dafc3c5a7406eed24d3e3422d6da..807df02d177ef792fa7dac624ac10f478615fe44 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
@@ -93,7 +93,7 @@ Namespace UnitTests
Dim sgnlsMock As New Mock(Of ISignals)
Dim psac As New Mock(Of IPneumaticsConsumersDemand)
- fMapMock.Setup(Function(x) x.GetFuelConsumption(1.SI(Of NewtonMeter), 1.RPMtoRad())).Returns(
+ fMapMock.Setup(Function(x) x.GetFuelConsumptionValue(1.SI(Of NewtonMeter), 1.RPMtoRad())).Returns(
(-1 / 1000).SI(Of KilogramPerSecond)())
m6Mock.Setup(Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC).Returns(IP1.SI(Of Watt))
m1Mock.Setup(Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicals).Returns(IP2.SI(Of Watt))
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb
index d0857ef624d964b2ce4c0f7d67e02f76a286ba4f..aa0b6418db9bf38cb748c2e82aafc4657ec81fb8 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb
@@ -70,7 +70,7 @@ Public Class Utils
Public Shared Function GetDefaultVehicleData(optional vehicleWeight As Kilogram = Nothing) as VehicleData
Return New VehicleData With {
- .CurbWeight = If(vehicleWeight, 0.si (of Kilogram)),
+ .CurbMass = If(vehicleWeight, 0.si (of Kilogram)),
.Length = 10.655.SI (Of Meter)(),
.Width = 2.55.SI (Of Meter)(),
.Height = 2.275.SI (of Meter)(),
@@ -133,7 +133,7 @@ Public Class Utils
.AdBlueDosing = ConsumerTechnology.Pneumatically,
.AirSuspensionControl = ConsumerTechnology.Mechanically,
.Doors = ConsumerTechnology.Pneumatically,
- .KneelingHeightMillimeters = 70.SI(Unit.SI.Milli.Meter).Cast (Of Meter),
+ .KneelingHeight = 70.SI(Unit.SI.Milli.Meter).Cast (Of Meter),
.SmartAirCompression = False,
.SmartRegeneration = False
},
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index 4e3786ce410523f1e298e7c86014d0644d555a5c..66f4baf353191f69513f14df048783468d53c81a 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -66,12 +66,9 @@
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<ItemGroup>
- <HintPath>..\..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
- <Private>True</Private>
- </Reference>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
- <Reference Include="Moq, Version=4.10.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
- <HintPath>..\..\packages\Moq.4.10.0\lib\net45\Moq.dll</HintPath>
+ <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -89,14 +86,6 @@
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
- <Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
- <Private>True</Private>
- </Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
@@ -189,6 +178,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <None Include="app.config" />
<None Include="TestFiles\CombinedAlternatorDefaultsTest.aalt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
diff --git a/VECTOAux/VectoAuxiliariesTests/packages.config b/VECTOAux/VectoAuxiliariesTests/packages.config
index 18654e00009b72436be8a2a50e64646934b4697f..6c8ebecc462ce6fae6a9e58fc0603923e31104a7 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="Moq" version="4.2.1510.2205" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net40" requireReinstallation="True" />
<package id="NUnit" version="3.11.0" targetFramework="net45" />
<package id="NUnit3TestAdapter" version="3.11.2" targetFramework="net45" />
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
index b7bbfe6cdcbf05ba40ee882b7930fe7f14262125..56d434204d24b049681b563218ce439d3acb7719 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
@@ -43,7 +43,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
public override IList<VectoRunData.AuxData> CreateAuxiliaryData(
IAuxiliariesDeclarationInputData auxInputData, IBusAuxiliariesDeclarationData busAuxData, MissionType mission,
- VehicleClass hvdClass, Meter vehicleLength)
+ VehicleClass hdvClass, Meter vehicleLength)
{
if (auxInputData != null) {
throw new VectoException("Only BusAuxiliaries can be provided as input!");
@@ -56,7 +56,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
DemandType = AuxiliaryDemandType.Constant,
Technology = new List<string>() { busAuxData.FanTechnology },
ID = Constants.Auxiliaries.IDs.Fan,
- PowerDemand = DeclarationData.Fan.Lookup(mission, busAuxData.FanTechnology).PowerDemand
+ PowerDemand = DeclarationData.Fan.Lookup(hdvClass, mission, busAuxData.FanTechnology).PowerDemand
});
retVal.Add(
new VectoRunData.AuxData() {
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index de240b9ba59744924523244f4ac2ad1e3622405e..0dd5a4a01526ea1001820b82a960a03e9e27ac79 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -209,7 +209,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
retVal.FullLoadCurves = fullLoadCurves;
- }
+
retVal.WHRType = engine.WHRType;
if ((retVal.WHRType & WHRType.ElectricalOutput) != 0) {
retVal.ElectricalWHR = CreateWHRData(
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 973c0e76777c101f526d5f038822ffcb7ef80b25..e3d5011f6cb4e1b69d0b3b44df6c3c3e0d741e58 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -657,11 +657,6 @@
<Compile Include="Utils\XMLValidator.cs" />
<Compile Include="Utils\XPathHelper.cs" />
<Compile Include="Ninject\VectoNinjectModule.cs" />
- <Compile Include="VersionNumber1.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>VersionNumber.t4</DependentUpon>
- </Compile>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />