diff --git a/VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj b/VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj
index b4889beeed98963007eadd2006abf8524fe66b8b..b4cdb4b1be5499e0167d696d44db0347a0f8e9f9 100644
--- a/VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj
+++ b/VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj
@@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TUGraz.VectoCore.BusAuxiliaries</RootNamespace>
- <AssemblyName>BusAuxiliariesC</AssemblyName>
+ <AssemblyName>BusAuxiliaries</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMCalculate.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMCalculate.cs
index b206d71468ecf1c9180370076b3597401c3032ea..5e96572d751ad407f05fe2dd5f474c2a6795e400 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMCalculate.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMCalculate.cs
@@ -8,13 +8,14 @@ namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
public class SSMCalculate : ISSMCalculate
{
private ISSMTOOL ssmTOOL;
- public ISSMRun Run1 { get; set; }
- public ISSMRun Run2 { get; set; }
+
+ private ISSMRun Run1; // { get; set; }
+ private ISSMRun Run2 { get; set; }
// Constructor
public SSMCalculate(ISSMTOOL ssmTool)
{
- this.ssmTOOL = ssmTool;
+ ssmTOOL = ssmTool;
Run1 = new SSMRun(this.ssmTOOL, 1);
Run2 = new SSMRun(this.ssmTOOL, 2);
}
@@ -383,7 +384,21 @@ namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
// Dim C43 As Double = gen.BC_MaxPossibleBenefitFromTechnologyList
// Dim C53 As string = gen.AC_CompressorType
- result = gen.AC_CompressorType.ToLower() == "mechanical" ? tl.CValueVariation : 0 > 0 ? Math.Min(gen.AC_CompressorType.ToLower() == "mechanical" ? tl.CValueVariation : 0, gen.BC_MaxPossibleBenefitFromTechnologyList) : Math.Max(gen.AC_CompressorType.ToLower() == "mechanical" ? tl.CValueVariation : 0, -gen.BC_MaxPossibleBenefitFromTechnologyList);
+ //result = If(If(gen.AC_CompressorType.ToLower() = "mechanical", tl.CValueVariation, 0) > 0,
+ // Math.Min(If(gen.AC_CompressorType.ToLower() = "mechanical", tl.CValueVariation, 0),
+ // gen.BC_MaxPossibleBenefitFromTechnologyList),
+ // Math.Max(If(gen.AC_CompressorType.ToLower() = "mechanical", tl.CValueVariation, 0),
+ // -gen.BC_MaxPossibleBenefitFromTechnologyList))
+
+ result = (gen.AC_CompressorType.ToLower() == "mechanical"
+ ? tl.CValueVariation
+ : 0) > 0
+ ? Math.Min(
+ gen.AC_CompressorType.ToLower() == "mechanical" ? tl.CValueVariation : 0,
+ gen.BC_MaxPossibleBenefitFromTechnologyList)
+ : Math.Max(
+ gen.AC_CompressorType.ToLower() == "mechanical" ? tl.CValueVariation : 0,
+ -gen.BC_MaxPossibleBenefitFromTechnologyList);
return result;
}
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMTOOL.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMTOOL.cs
index f95831aa1376b150ce4e0954bee5b4418838fd35..94c9ce57fd4f32b3ddc40c824a16d78bdf795f84 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMTOOL.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMTOOL.cs
@@ -96,7 +96,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
{
var feedback = string.Empty;
- GenInputs.InjectFrom((SSMTOOL)from.GenInputs);
+ GenInputs.InjectFrom(((SSMTOOL)from).GenInputs);
TechList.Clear();
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMCalculate.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMCalculate.cs
index 4f3a63eebc5398b8254bdf1455f421aa3313ed62..2517041bef47e493919f239011fe79babbae0058 100644
--- a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMCalculate.cs
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMCalculate.cs
@@ -2,8 +2,8 @@
{
public interface ISSMCalculate
{
- ISSMRun Run1 { get; set; }
- ISSMRun Run2 { get; set; }
+ //ISSMRun Run1 { get; set; }
+ //ISSMRun Run2 { get; set; }
double ElectricalWBase { get; }
diff --git a/VECTOAux/BusAuxiliaries/Util/FilePathUtils.cs b/VECTOAux/BusAuxiliaries/Util/FilePathUtils.cs
index 5a5db65d9c6f3980a28832df2e31720d5b7826c8..34385bbcfe52a533710b84c94530f06bd154e556 100644
--- a/VECTOAux/BusAuxiliaries/Util/FilePathUtils.cs
+++ b/VECTOAux/BusAuxiliaries/Util/FilePathUtils.cs
@@ -89,7 +89,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Util {
{
// No Vecto Path supplied
- if (vectoPath == "")
+ if (string.IsNullOrEmpty(vectoPath))
return filename;
// This is not relative
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index 022ffe820c72e4e22c447c704c2f65bf9108f36f..6a8179abeacce62a53449da114ed87a079c57884 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -71,15 +71,15 @@ Public Class AdvancedAuxiliaries
Private hvacConstants As HVACConstants
'Event Handler top level bubble.
- Public Sub VectoEventHandler(ByRef sender As Object, message As String, messageType As AdvancedAuxiliaryMessageType) _
- Handles compressorMap.AuxiliaryEvent, alternatorMap.AuxiliaryEvent, ssmTool.Message, ssmToolModule14.Message
+ 'Public Sub VectoEventHandler(ByRef sender As Object, message As String, messageType As AdvancedAuxiliaryMessageType) _
+ ' Handles compressorMap.AuxiliaryEvent, alternatorMap.AuxiliaryEvent, ssmTool.Message, ssmToolModule14.Message
- If Signals.AuxiliaryEventReportingLevel <= messageType Then
+ ' If Signals.AuxiliaryEventReportingLevel <= messageType Then
- RaiseEvent AuxiliaryEvent(sender, message, messageType)
+ ' RaiseEvent AuxiliaryEvent(sender, message, messageType)
- End If
- End Sub
+ ' End If
+ 'End Sub
'Constructor
Public Sub New()
@@ -105,16 +105,19 @@ Public Class AdvancedAuxiliaries
Signals.SmartElectrics = auxConfig.ElectricalUserInputsConfig.SmartElectrical
Signals.StoredEnergyEfficiency = auxConfig.ElectricalUserInputsConfig.StoredEnergyEfficiency
Signals.SmartPneumatics = auxConfig.PneumaticUserInputsConfig.SmartAirCompression
- Signals.PneumaticOverrunUtilisation = auxConfig.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction
+ Signals.PneumaticOverrunUtilisation =
+ auxConfig.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction
alternatorMap = New CombinedAlternator(
FilePathUtils.ResolveFilePath(vectoDirectory, auxConfig.ElectricalUserInputsConfig.AlternatorMap), Signals)
actuationsMap = New PneumaticActuationsMAP(FilePathUtils.ResolveFilePath(vectoDirectory,
- auxConfig.PneumaticUserInputsConfig.ActuationsMap))
+ auxConfig.PneumaticUserInputsConfig.
+ ActuationsMap))
compressorMap = New CompressorMap(FilePathUtils.ResolveFilePath(vectoDirectory,
- auxConfig.PneumaticUserInputsConfig.CompressorMap))
+ auxConfig.PneumaticUserInputsConfig.
+ CompressorMap))
compressorMap.Initialise()
'fuelMap = New cMAP()
@@ -131,7 +134,7 @@ Public Class AdvancedAuxiliaries
'SSM HVAC
Dim ssmPath As String = FilePathUtils.ResolveFilePath(vectoDirectory, auxConfig.HvacUserInputsConfig.SSMFilePath)
Dim BusDatabase As String = FilePathUtils.ResolveFilePath(vectoDirectory,
- auxConfig.HvacUserInputsConfig.BusDatabasePath)
+ auxConfig.HvacUserInputsConfig.BusDatabasePath)
ssmTool = New SSMTOOL(ssmPath, hvacConstants, auxConfig.HvacUserInputsConfig.SSMDisabled)
'This duplicate SSM is being created for use in M14 as its properties will be dynamically changed at that point
@@ -147,46 +150,50 @@ Public Class AdvancedAuxiliaries
M0 = New M00Impl(auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
- alternatorMap,
- auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI(Of Volt),
- Signals,
- ssmTool)
+ alternatorMap,
+ auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI (Of Volt),
+ Signals,
+ ssmTool)
Dim M05tmp As IM0_5_SmartAlternatorSetEfficiency = New M0_5Impl(M0,
- auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
- alternatorMap,
- auxConfig.ElectricalUserInputsConfig.ResultCardIdle,
- auxConfig.ElectricalUserInputsConfig.ResultCardTraction,
- auxConfig.ElectricalUserInputsConfig.ResultCardOverrun, Signals)
+ auxConfig.ElectricalUserInputsConfig.
+ ElectricalConsumers,
+ alternatorMap,
+ auxConfig.ElectricalUserInputsConfig.
+ ResultCardIdle,
+ auxConfig.ElectricalUserInputsConfig.
+ ResultCardTraction,
+ auxConfig.ElectricalUserInputsConfig.
+ ResultCardOverrun, Signals)
M05 = M05tmp
M1 = New M01Impl(M0,
- auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
- auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency,
- auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI(Of Volt),
- Signals,
- ssmTool)
+ auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
+ auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency,
+ auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI (Of Volt),
+ Signals,
+ ssmTool)
M2 = New M02Impl(auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
- M0,
- auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
- auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI(Of Volt), Signals)
+ M0,
+ auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
+ auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI (Of Volt), Signals)
M3 = New M03Impl(auxConfig.PneumaticUserInputsConfig,
- auxConfig.PneumaticAuxillariesConfig,
- actuationsMap,
- compressorMap,
- VectoInputs.VehicleWeightKG,
- VectoInputs.Cycle,
- Signals)
+ auxConfig.PneumaticAuxillariesConfig,
+ actuationsMap,
+ compressorMap,
+ VectoInputs.VehicleWeightKG,
+ VectoInputs.Cycle,
+ Signals)
M4 = New M04Impl(compressorMap, auxConfig.PneumaticUserInputsConfig.CompressorGearRatio,
- auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency, Signals)
- M5 = New M05Impl(M05tmp, auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI(Of Volt),
- auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency)
+ auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency, Signals)
+ M5 = New M05Impl(M05tmp, auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI (Of Volt),
+ auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency)
M6 = New M06Impl(M1, M2, M3, M4, M5, Signals)
M7 = New M07Impl(M5, M6, Signals)
M8 = New M08Impl(M1, M6, M7, Signals)
@@ -295,7 +302,7 @@ Public Class AdvancedAuxiliaries
If Not M13 Is Nothing Then
Return M14.TotalCycleFCGrams
Else
- Return 0.SI(Of Kilogram)()
+ Return 0.SI (Of Kilogram)()
End If
End Get
End Property
@@ -305,7 +312,7 @@ Public Class AdvancedAuxiliaries
If Not M14 Is Nothing Then
Return M14.TotalCycleFCLitres
Else
- Return 0.SI(Of Liter)()
+ Return 0.SI (Of Liter)()
End If
End Get
End Property
@@ -328,14 +335,16 @@ Public Class AdvancedAuxiliaries
'Helpers
Private Function GetDoorActuationTimeFraction() As Single
- Dim actuationsMap As PneumaticActuationsMAP = New PneumaticActuationsMAP(FilePathUtils.ResolveFilePath(vectoDirectory,
- auxConfig.PneumaticUserInputsConfig.ActuationsMap))
+ Dim actuationsMap As PneumaticActuationsMAP =
+ New PneumaticActuationsMAP(FilePathUtils.ResolveFilePath(vectoDirectory,
+ auxConfig.PneumaticUserInputsConfig.
+ ActuationsMap))
Dim actuationsKey As ActuationsKey = New ActuationsKey("Park brake + 2 doors", VectoInputs.Cycle)
Dim numActuations As Single = actuationsMap.GetNumActuations(actuationsKey)
Dim secondsPerActuation As Single = auxConfig.ElectricalUserInputsConfig.DoorActuationTimeSecond
- Dim doorDutyCycleFraction As Single = (numActuations * secondsPerActuation) / Signals.TotalCycleTimeSeconds
+ Dim doorDutyCycleFraction As Single = (numActuations*secondsPerActuation)/Signals.TotalCycleTimeSeconds
Return doorDutyCycleFraction
End Function
@@ -420,7 +429,9 @@ Public Class AdvancedAuxiliaries
Return _
If _
- (Signals.EngineSpeed <= _Signals.EngineIdleSpeed AndAlso (Not Signals.ClutchEngaged OrElse Signals.InNeutral), 1, 0)
+ (
+ Signals.EngineSpeed <= _Signals.EngineIdleSpeed AndAlso
+ (Not Signals.ClutchEngaged OrElse Signals.InNeutral), 1, 0)
End Get
End Property
@@ -490,5 +501,4 @@ Public Class AdvancedAuxiliaries
Return M9.TotalCycleFuelConsumptionCompressorOnContinuously
End Get
End Property
-
End Class
diff --git a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
index 11fa30aeaf86cda91eac64bb423527924be7fefe..b79a10ba6e2c645f9b5800d939224c35c05b1cf8 100644
--- a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
@@ -14,13 +14,16 @@ Imports VectoAuxiliaries.Pneumatics
Imports VectoAuxiliaries.Hvac
Imports System.IO
Imports System.Windows.Forms
-Imports DownstreamModules.Electrics
-Imports DownstreamModules.HVAC
Imports Newtonsoft.Json
-Imports Pneumatics
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
+Imports TUGraz.VectoCore.BusAuxiliaries.Legacy
<Serializable()>
Public Class AuxiliaryConfig
diff --git a/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
index 4bb790cdf6a23a15a57310fd29f990d2253a6e02..4b0efbda20df4d8b31dece3587e3e26d6e90e8d5 100644
--- a/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
@@ -9,10 +9,10 @@
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports DownstreamModules.Electrics
-Imports DownstreamModules.HVAC
-Imports Pneumatics
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
Public Interface IAuxiliaryConfig
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index b046902f05c9a5725ef1a02bed53c7ad73b4a92a..8f603b7556f9a0c0c1bbf2cdf1f9470b60245782 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -7,7 +7,7 @@
<ProjectGuid>{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>VectoAuxiliaries</RootNamespace>
- <AssemblyName>BusAuxiliaries</AssemblyName>
+ <AssemblyName>BusAuxiliariesGUI</AssemblyName>
<FileAlignment>512</FileAlignment>
<MyType>Windows</MyType>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
@@ -27,7 +27,7 @@
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<OutputPath>bin\Debug\</OutputPath>
- <DocumentationFile>BusAuxiliaries.xml</DocumentationFile>
+ <DocumentationFile>BusAuxiliariesGUI.xml</DocumentationFile>
<NoWarn>
</NoWarn>
<WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
@@ -39,7 +39,7 @@
<DefineTrace>true</DefineTrace>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
- <DocumentationFile>BusAuxiliaries.xml</DocumentationFile>
+ <DocumentationFile>BusAuxiliariesGUI.xml</DocumentationFile>
<NoWarn>
</NoWarn>
<WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
@@ -90,9 +90,6 @@
<Import Include="System.Threading.Tasks" />
</ItemGroup>
<ItemGroup>
- <Compile Include="AuxiliaryConfig.vb" />
- <Compile Include="FilePathUtils.vb" />
- <Compile Include="IAuxiliaryConfig.vb" />
<Compile Include="My Project\AssemblyInfo.vb" />
<Compile Include="My Project\Application.Designer.vb">
<AutoGen>True</AutoGen>
diff --git a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
index 5ebd431a0798029f68e3d89441ed1d74ff16761b..6ae0157c8ac076fbcf3e42907c87d35e2656d816 100644
--- a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
+++ b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
@@ -4,7 +4,6 @@ Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Legacy
-Imports VectoAuxiliaries
Namespace IntegrationTests
<TestFixture>
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/AdvAuxTest.aaux b/VECTOAux/VectoAuxiliariesTests/TestFiles/AdvAuxTest.aaux
index 5e8e8ba738e7af19ca1838a86afaa7de8a4b6730..af74193dca3536190cf722465d2563e5b20201d8 100644
--- a/VECTOAux/VectoAuxiliariesTests/TestFiles/AdvAuxTest.aaux
+++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/AdvAuxTest.aaux
@@ -1,7 +1,7 @@
{
- "$type": "VectoAuxiliaries.AuxiliaryConfig, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.AuxiliaryConfig, BusAuxiliaries",
"VectoInputs": {
- "$type": "VectoAuxiliaries.VectoInputs, AdvancedAuxiliaryInterfaces",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.Interfaces.VectoInputs, AdvancedAuxiliaryInterfaces",
"Cycle": "Urban",
"VehicleWeightKG": 16500.0,
"PowerNetVoltage": 28.3,
@@ -9,16 +9,16 @@
"FuelDensity": 0.832
},
"ElectricalUserInputsConfig": {
- "$type": "VectoAuxiliaries.Electrics.ElectricsUserInputsConfig, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricsUserInputsConfig, BusAuxiliaries",
"PowerNetVoltage": 28.3,
"AlternatorMap": "testCombAlternatorMap_1Alt.AALT",
"AlternatorGearEfficiency": 0.92,
"ElectricalConsumers": {
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumerList, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumerList, BusAuxiliaries",
"DoorDutyCycleFraction": 0.096,
"Items": [
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Doors",
"ConsumerName": "Doors per Door",
@@ -29,7 +29,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": true,
"Category": "Veh Electronics &Engine",
"ConsumerName": "Controllers,Valves etc",
@@ -40,7 +40,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Radio City",
@@ -51,7 +51,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Radio Intercity",
@@ -62,7 +62,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Radio/Audio Tourism",
@@ -73,7 +73,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Fridge",
@@ -84,7 +84,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Kitchen Standard",
@@ -95,7 +95,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Interior lights City/ Intercity + Doorlights [1/m]",
@@ -106,7 +106,7 @@
"Info": "1 Per metre length of bus"
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "LED Interior lights ceiling city/ontercity + door [1/m]",
@@ -117,7 +117,7 @@
"Info": "1 Per metre length of bus"
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Interior lights Tourism + reading [1/m]",
@@ -128,7 +128,7 @@
"Info": "1 Per metre length of bus"
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "LED Interior lights ceiling Tourism + LED reading [1/m]",
@@ -139,7 +139,7 @@
"Info": "1 Per metre length of bus"
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Customer Specific Equipment",
"ConsumerName": "External Displays Font/Side/Rear",
@@ -150,7 +150,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Customer Specific Equipment",
"ConsumerName": "Internal display per unit ( front side rear)",
@@ -161,7 +161,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Customer Specific Equipment",
"ConsumerName": "CityBus Ref EBSF Table4 Devices ITS No Displays",
@@ -172,7 +172,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Lights",
"ConsumerName": "Exterior Lights BULB",
@@ -183,7 +183,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Lights",
"ConsumerName": "Day running lights LED bonus",
@@ -194,7 +194,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Lights",
"ConsumerName": "Antifog rear lights LED bonus",
@@ -205,7 +205,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Lights",
"ConsumerName": "Position lights LED bonus",
@@ -216,7 +216,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Lights",
"ConsumerName": "Direction lights LED bonus",
@@ -227,7 +227,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Lights",
"ConsumerName": "Brake Lights LED bonus",
@@ -241,21 +241,21 @@
},
"DoorActuationTimeSecond": 4,
"ResultCardIdle": {
- "$type": "VectoAuxiliaries.Electrics.ResultCard, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ResultCard, BusAuxiliaries",
"Results": []
},
"ResultCardTraction": {
- "$type": "VectoAuxiliaries.Electrics.ResultCard, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ResultCard, BusAuxiliaries",
"Results": []
},
"ResultCardOverrun": {
- "$type": "VectoAuxiliaries.Electrics.ResultCard, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ResultCard, BusAuxiliaries",
"Results": []
},
"SmartElectrical": false
},
"PneumaticUserInputsConfig": {
- "$type": "VectoAuxiliaries.Pneumatics.PneumaticUserInputsConfig, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics.PneumaticUserInputsConfig, BusAuxiliaries",
"CompressorMap": "DEFAULT_2-Cylinder_1-Stage_650ccm.ACMP",
"CompressorGearRatio": 1.0,
"CompressorGearEfficiency": 0.8,
@@ -269,7 +269,7 @@
"SmartRegeneration": true
},
"PneumaticAuxillariesConfig": {
- "$type": "VectoAuxiliaries.Pneumatics.PneumaticsAuxilliariesConfig, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics.PneumaticsAuxilliariesConfig, BusAuxiliaries",
"AdBlueNIperMinute": 21.25,
"AirControlledSuspensionNIperMinute": 15.0,
"BrakingNoRetarderNIperKG": 0.00081,
@@ -284,13 +284,13 @@
"SmartRegenFractionTotalAirDemand": 0.12
},
"HvacUserInputsConfig": {
- "$type": "VectoAuxiliaries.Hvac.HVACUserInputsConfig, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Hvac.HVACUserInputsConfig, BusAuxiliaries",
"SSMFilePath": "testHVACssm.AHSM",
"BusDatabasePath": "BusDatabase.abdb",
"SSMDisabled": false
},
"Signals": {
- "$type": "VectoAuxiliaries.Signals, AdvancedAuxiliaryInterfaces",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Signals, AdvancedAuxiliaryInterfaces",
"ClutchEngaged": false,
"EngineDrivelinePower": 0.0,
"EngineDrivelineTorque": 0.0,
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/AdvAuxTest.aaux b/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/AdvAuxTest.aaux
index 5e8e8ba738e7af19ca1838a86afaa7de8a4b6730..134d8d901c17358f2696ef08718a1e026429eadd 100644
--- a/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/AdvAuxTest.aaux
+++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/AdvAuxTest.aaux
@@ -1,7 +1,7 @@
{
- "$type": "VectoAuxiliaries.AuxiliaryConfig, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.AuxiliaryConfig, BusAuxiliaries",
"VectoInputs": {
- "$type": "VectoAuxiliaries.VectoInputs, AdvancedAuxiliaryInterfaces",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.Interfaces.VectoInputs, BusAuxiliaries",
"Cycle": "Urban",
"VehicleWeightKG": 16500.0,
"PowerNetVoltage": 28.3,
@@ -9,16 +9,16 @@
"FuelDensity": 0.832
},
"ElectricalUserInputsConfig": {
- "$type": "VectoAuxiliaries.Electrics.ElectricsUserInputsConfig, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricsUserInputsConfig, BusAuxiliaries",
"PowerNetVoltage": 28.3,
"AlternatorMap": "testCombAlternatorMap_1Alt.AALT",
"AlternatorGearEfficiency": 0.92,
"ElectricalConsumers": {
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumerList, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumerList, BusAuxiliaries",
"DoorDutyCycleFraction": 0.096,
"Items": [
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Doors",
"ConsumerName": "Doors per Door",
@@ -29,7 +29,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": true,
"Category": "Veh Electronics &Engine",
"ConsumerName": "Controllers,Valves etc",
@@ -40,7 +40,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Radio City",
@@ -51,7 +51,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Radio Intercity",
@@ -62,7 +62,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Radio/Audio Tourism",
@@ -73,7 +73,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Fridge",
@@ -84,7 +84,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Kitchen Standard",
@@ -95,7 +95,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Interior lights City/ Intercity + Doorlights [1/m]",
@@ -106,7 +106,7 @@
"Info": "1 Per metre length of bus"
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "LED Interior lights ceiling city/ontercity + door [1/m]",
@@ -117,7 +117,7 @@
"Info": "1 Per metre length of bus"
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "Interior lights Tourism + reading [1/m]",
@@ -128,7 +128,7 @@
"Info": "1 Per metre length of bus"
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Vehicle basic equipment",
"ConsumerName": "LED Interior lights ceiling Tourism + LED reading [1/m]",
@@ -139,7 +139,7 @@
"Info": "1 Per metre length of bus"
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Customer Specific Equipment",
"ConsumerName": "External Displays Font/Side/Rear",
@@ -150,7 +150,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Customer Specific Equipment",
"ConsumerName": "Internal display per unit ( front side rear)",
@@ -161,7 +161,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Customer Specific Equipment",
"ConsumerName": "CityBus Ref EBSF Table4 Devices ITS No Displays",
@@ -172,7 +172,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Lights",
"ConsumerName": "Exterior Lights BULB",
@@ -183,7 +183,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Lights",
"ConsumerName": "Day running lights LED bonus",
@@ -194,7 +194,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Lights",
"ConsumerName": "Antifog rear lights LED bonus",
@@ -205,7 +205,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Lights",
"ConsumerName": "Position lights LED bonus",
@@ -216,7 +216,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Lights",
"ConsumerName": "Direction lights LED bonus",
@@ -227,7 +227,7 @@
"Info": ""
},
{
- "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
"BaseVehicle": false,
"Category": "Lights",
"ConsumerName": "Brake Lights LED bonus",
@@ -241,21 +241,21 @@
},
"DoorActuationTimeSecond": 4,
"ResultCardIdle": {
- "$type": "VectoAuxiliaries.Electrics.ResultCard, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ResultCard, BusAuxiliaries",
"Results": []
},
"ResultCardTraction": {
- "$type": "VectoAuxiliaries.Electrics.ResultCard, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ResultCard, BusAuxiliaries",
"Results": []
},
"ResultCardOverrun": {
- "$type": "VectoAuxiliaries.Electrics.ResultCard, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ResultCard, BusAuxiliaries",
"Results": []
},
"SmartElectrical": false
},
"PneumaticUserInputsConfig": {
- "$type": "VectoAuxiliaries.Pneumatics.PneumaticUserInputsConfig, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics.PneumaticUserInputsConfig, BusAuxiliaries",
"CompressorMap": "DEFAULT_2-Cylinder_1-Stage_650ccm.ACMP",
"CompressorGearRatio": 1.0,
"CompressorGearEfficiency": 0.8,
@@ -269,7 +269,7 @@
"SmartRegeneration": true
},
"PneumaticAuxillariesConfig": {
- "$type": "VectoAuxiliaries.Pneumatics.PneumaticsAuxilliariesConfig, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics.PneumaticsAuxilliariesConfig, BusAuxiliaries",
"AdBlueNIperMinute": 21.25,
"AirControlledSuspensionNIperMinute": 15.0,
"BrakingNoRetarderNIperKG": 0.00081,
@@ -284,13 +284,13 @@
"SmartRegenFractionTotalAirDemand": 0.12
},
"HvacUserInputsConfig": {
- "$type": "VectoAuxiliaries.Hvac.HVACUserInputsConfig, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.HVACUserInputsConfig, BusAuxiliaries",
"SSMFilePath": "testHVACssm.AHSM",
"BusDatabasePath": "BusDatabase.abdb",
"SSMDisabled": false
},
"Signals": {
- "$type": "VectoAuxiliaries.Signals, AdvancedAuxiliaryInterfaces",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Signals, AdvancedAuxiliaryInterfaces",
"ClutchEngaged": false,
"EngineDrivelinePower": 0.0,
"EngineDrivelineTorque": 0.0,
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/testHVACssm.AHSM b/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/testHVACssm.AHSM
index 1b75fdccf61a231b57c06ef0c59738fd45ee3520..770ed286eaae206903b3ef3909f2573e24854e67 100644
--- a/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/testHVACssm.AHSM
+++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/testHVACssm.AHSM
@@ -1,7 +1,7 @@
{
- "$type": "VectoAuxiliaries.Hvac.SSMTOOL, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMTOOL, BusAuxiliaries",
"GenInputs": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "DummyBus",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -41,7 +41,7 @@
"EC_EnviromentalTemperature": 25.0,
"EC_Solar": 400.0,
"EC_EnvironmentalConditionsMap": {
- "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
},
"EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
"EC_EnviromentalConditions_BatchEnabled": true,
@@ -61,12 +61,12 @@
"AH_CoolantHeatTransferredToAirCabinHeater": 0.75
},
"TechList": {
- "$type": "VectoAuxiliaries.Hvac.SSMTechList, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMTechList, BusAuxiliaries",
"TechLines": [
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "DummyBus",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -106,7 +106,7 @@
"EC_EnviromentalTemperature": 25.0,
"EC_Solar": 400.0,
"EC_EnvironmentalConditionsMap": {
- "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
},
"EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
"EC_EnviromentalConditions_BatchEnabled": true,
@@ -149,9 +149,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "DummyBus",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -191,7 +191,7 @@
"EC_EnviromentalTemperature": 25.0,
"EC_Solar": 400.0,
"EC_EnvironmentalConditionsMap": {
- "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
},
"EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
"EC_EnviromentalConditions_BatchEnabled": true,
@@ -234,9 +234,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "DummyBus",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -276,7 +276,7 @@
"EC_EnviromentalTemperature": 25.0,
"EC_Solar": 400.0,
"EC_EnvironmentalConditionsMap": {
- "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
},
"EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
"EC_EnviromentalConditions_BatchEnabled": true,
@@ -319,9 +319,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "DummyBus",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -361,7 +361,7 @@
"EC_EnviromentalTemperature": 25.0,
"EC_Solar": 400.0,
"EC_EnvironmentalConditionsMap": {
- "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
},
"EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
"EC_EnviromentalConditions_BatchEnabled": true,
@@ -404,9 +404,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "DummyBus",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -446,7 +446,7 @@
"EC_EnviromentalTemperature": 25.0,
"EC_Solar": 400.0,
"EC_EnvironmentalConditionsMap": {
- "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
},
"EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
"EC_EnviromentalConditions_BatchEnabled": true,
@@ -489,9 +489,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "DummyBus",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -531,7 +531,7 @@
"EC_EnviromentalTemperature": 25.0,
"EC_Solar": 400.0,
"EC_EnvironmentalConditionsMap": {
- "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
},
"EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
"EC_EnviromentalConditions_BatchEnabled": true,
@@ -574,9 +574,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "DummyBus",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -616,7 +616,7 @@
"EC_EnviromentalTemperature": 25.0,
"EC_Solar": 400.0,
"EC_EnvironmentalConditionsMap": {
- "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
},
"EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
"EC_EnviromentalConditions_BatchEnabled": true,
@@ -659,9 +659,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "DummyBus",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -701,7 +701,7 @@
"EC_EnviromentalTemperature": 25.0,
"EC_Solar": 400.0,
"EC_EnvironmentalConditionsMap": {
- "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
},
"EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
"EC_EnviromentalConditions_BatchEnabled": true,
@@ -756,7 +756,7 @@
"VVValueVariationKW": 0.0
},
"Calculate": {
- "$type": "VectoAuxiliaries.Hvac.SSMCalculate, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMCalculate, BusAuxiliaries",
"ElectricalWBase": 692.2979,
"MechanicalWBase": 349.774,
"FuelLPerHBase": 0.151278213,
@@ -790,7 +790,7 @@
},
"SSMDisabled": false,
"HVACConstants": {
- "$type": "VectoAuxiliaries.Hvac.HVACConstants, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.HVACConstants, BusAuxiliaries",
"DieselGCVJperGram": 44800.0,
"FuelDensity": 0.832
},
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/ssm.Ahsm b/VECTOAux/VectoAuxiliariesTests/TestFiles/ssm.Ahsm
index 138a5abfef72318cd488c8ecd343b4e6e436f275..54e3c00b5286a0685630aeef7d78bcdee763c9df 100644
--- a/VECTOAux/VectoAuxiliariesTests/TestFiles/ssm.Ahsm
+++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/ssm.Ahsm
@@ -1,7 +1,7 @@
{
- "$type": "VectoAuxiliaries.Hvac.SSMTOOL, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMTOOL, BusAuxiliaries",
"GenInputs": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -52,12 +52,12 @@
"AH_FuelFiredHeaterkW": 10.0
},
"TechList": {
- "$type": "VectoAuxiliaries.Hvac.SSMTechList, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMTechList, BusAuxiliaries",
"TechLines": [
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -131,9 +131,9 @@
"C": 0.01
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -207,9 +207,9 @@
"C": 0.025
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -283,9 +283,9 @@
"C": 0.024
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -359,9 +359,9 @@
"C": -0.032
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -435,9 +435,9 @@
"C": 0.05
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -511,9 +511,9 @@
"C": 0.012
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -587,9 +587,9 @@
"C": 0.021
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -663,9 +663,9 @@
"C": 0.041
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -739,9 +739,9 @@
"C": 0.029
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -815,9 +815,9 @@
"C": 0.025
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -891,9 +891,9 @@
"C": 0.012
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -967,9 +967,9 @@
"C": 0.02
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -1043,9 +1043,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -1119,9 +1119,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -1195,9 +1195,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -1271,9 +1271,9 @@
"C": -0.032
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -1347,9 +1347,9 @@
"C": -0.032
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -1423,9 +1423,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -1499,9 +1499,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -1575,9 +1575,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -1651,9 +1651,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -1727,9 +1727,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -1803,9 +1803,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -1879,9 +1879,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -1955,9 +1955,9 @@
"C": 0.02
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -2031,9 +2031,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -2107,9 +2107,9 @@
"C": -0.2
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -2183,9 +2183,9 @@
"C": 0.0
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -2259,9 +2259,9 @@
"C": 0.012
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -2335,9 +2335,9 @@
"C": 0.021
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -2411,9 +2411,9 @@
"C": 0.012
},
{
- "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
"inputSheet": {
- "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
"BP_BusModel": "IVECO - Arway Intercity 10.6m",
"BP_NumberOfPassengers": 47.0,
"BP_BusFloorType": "raised floor",
@@ -2499,7 +2499,7 @@
"VVValueVariationKW": 0.0
},
"Calculate": {
- "$type": "VectoAuxiliaries.Hvac.SSMCalculate, BusAuxiliaries",
+ "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMCalculate, BusAuxiliaries",
"ElectricalWBase": 296.699127,
"MechanicalWBase": 1180.55444,
"FuelLPerHBase": 0.0,
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
index ba6e2dd27541bbd499f862158ecfe36f8880f459..87e07497cd7d1cb791db48bda2144db9fb813969 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
@@ -1,11 +1,11 @@
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
Imports VectoAuxiliariesTests.Mocks
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
-Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
+
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
index 1f65c5efdf41cb9d942ea2c3f1bdc648b5327bd5..54d5a03dd5273d11b2e072ef023a4853c9058984 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
@@ -1,5 +1,4 @@
Imports System.IO
-Imports VectoAuxiliaries.Electrics
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
index df1223445914298426f89a6986024bcc25c9b1ab..bca8b75ec5595abde65e0fe083f2dacbfd27862c 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
@@ -1,8 +1,8 @@

Imports NUnit.Framework
+Imports TUGraz.VectoCore.BusAuxiliaries
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
-Imports VectoAuxiliaries
-Imports AuxiliaryConfig = TUGraz.VectoCore.BusAuxiliaries.AuxiliaryConfig
+
Namespace UnitTests
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
index 000dab5df40014ca7d69ac39b96deba013e5016f..9fc040fe60e7f9c0b32249593529a69a39c96de8 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
@@ -1,7 +1,7 @@

Imports NUnit.Framework
-Imports VectoAuxiliaries
-Imports AuxiliaryConfig = TUGraz.VectoCore.BusAuxiliaries.AuxiliaryConfig
+Imports TUGraz.VectoCore.BusAuxiliaries
+
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
index e7e10954c7b8f01f01c9a927cbf1134eac1fcfa8..8fb626626647a7434209c867643affb7d99f719f 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
@@ -1,13 +1,10 @@

Imports System.IO
-Imports VectoAuxiliaries.Pneumatics
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
-Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
-
Namespace UnitTests
<TestFixture>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb
index d7744b6e422dbfc4f88a6c0980d1ec93fd7430d8..9ca701d372f1bde2771a83c56e682406f345c456 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb
@@ -1,7 +1,6 @@

Imports NUnit.Framework
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
-Imports VectoAuxiliaries.Hvac
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
index 495e54635d28f085041dec09344cef42ad994096..1dce66661c549810a14a9f04dbc7225d0933b022 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
@@ -2,9 +2,10 @@
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.Electrics
Imports System.IO
+Imports Newtonsoft.Json
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
index e540b2002a1d6d8b18a5c29c800635857711da00..917d3945b657f24d56bdf04b8ac0c6cbf20eeb23 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
@@ -2,7 +2,7 @@
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
-Imports VectoAuxiliaries.Pneumatics
+
Namespace UnitTests
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
index 2bd0b3ff3221614571900566b21afe96997f4c27..014e74c5ae01fc2b58492e394351f60b153c97a3 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
@@ -2,7 +2,7 @@
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
-Imports VectoAuxiliaries.Electrics
+
<TestFixture()>
Public Class ElectricalConsumerListTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
index 8c68ad96e3b5d8877a9d88728efd2ba50b016998..f7429fd830b4db22ce6140c8fda723f653eced91 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
@@ -1,5 +1,5 @@

-Imports VectoAuxiliaries.Electrics
+
Imports NUnit.Framework
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb
index 3671ce1525238f2cb9f1eb313cd0827a939cd78a..80506f039ba468ef4d245a7cb6d28738ac7d3401 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb
@@ -1,8 +1,8 @@

Imports NUnit.Framework
-Imports VectoAuxiliaries
-Imports FilePathUtils = TUGraz.VectoCore.BusAuxiliaries.Util.FilePathUtils
+Imports TUGraz.VectoCore.BusAuxiliaries.Util
+
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/HVACSSMMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/HVACSSMMapTests.vb
index d0179250dff9e0e10bf29d0a329ef9c2bf09f6e5..25e6d4860069d277e0743e3c047b7aa87b47bc5f 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/HVACSSMMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/HVACSSMMapTests.vb
@@ -1,7 +1,6 @@

Imports NUnit.Framework
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
-Imports VectoAuxiliaries.Hvac
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
index 1f584b94d8aceb8b337c072fa43d987583f76c7b..8c2ec0e6f98c49e5a61e87aba50ff9c6aeb3c6e9 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
@@ -1,6 +1,4 @@
Imports System.IO
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Hvac
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
@@ -134,6 +132,8 @@ Namespace UnitTests
Assert.AreEqual(expected, actual, 0.000001)
End Sub
+
+
End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
index 60fc60edfbb6b0d435170fc0d49e5318c18135a4..c4457aed1a5dbeac8564595b97f8f14c97d8d8b2 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
@@ -1,7 +1,5 @@
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Hvac
Imports System.IO
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
index 50c3809ac969220f6868f7d2aada77cf40ea19bc..c47d8994419025ef8c61a60940eed592a406433f 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
@@ -3,8 +3,9 @@ Imports NUnit.Framework
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
+
Namespace UnitTests
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
index d93e314ff22800622eb54b921b2b5f76f05420fa..9f4105f4e0c740d1a3c6ad641b6dfb921836342f 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
@@ -3,8 +3,9 @@ Imports NUnit.Framework
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
+
Namespace UnitTests
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
index f6eedbd9880ea085e46efd0bb790b35643a1eb36..99588d83ba1821d8eb1f4e7cfd0de502c963cf9d 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
@@ -3,8 +3,9 @@ Imports NUnit.Framework
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
+
Namespace UnitTests
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
index 497cdf5a9dfeaac64442e08a4a8559548c270171..c2fedc9abac07892947548f73661cf96e7332be3 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
@@ -5,8 +5,6 @@ Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
-
Namespace UnitTests
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
index c4502de3fa9b98caa3a396951a1e54088a07a373..8da2682fce90cf7a3ffdd64e6a7b3d8c1233c657 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
@@ -9,7 +9,6 @@ Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
index 25972824b5063d5e1a2e88d5c8d706033de909b5..0e2b0aae17d5ee9dc8dc2f9e98f5a83d5b526d36 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
@@ -1,16 +1,15 @@

+Imports System.IO
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Hvac
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
-Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
+
Namespace UnitTests
@@ -26,13 +25,14 @@ Namespace UnitTests
Private m0 As IM0_NonSmart_AlternatorsSetEfficiency
- Private alternatorMap As IAlternatorMap = New AlternatorMap(_GOODMAP)
+ Private alternatorMap As IAlternatorMap
Private alternatorGearEfficiency As Single = 0.8
Private compressorGrearEfficiency As Single = 0.8
-
- Public Sub New()
-
+
+ Public Sub New()
+ Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory)
+ alternatorMap = New AlternatorMap(_GOODMAP)
alternatorMap.Initialise()
ssm.Load(_SSMMAP)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
index f513519e81eca1cdda7e7ae4e181e1f0bae4486f..b0d038648805d22f0ade8725f82ad02886236c47 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
@@ -6,11 +6,11 @@ Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
-Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
+
Namespace UnitTests
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
index 9dc6dd493bc7ab24c39921b9a6a4c56acb9e1507..6a21a735f469941c40e1c254926151f6cebbe958 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
@@ -4,13 +4,10 @@ Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Hvac
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
-Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
Namespace UnitTests
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
index 84131872442406f33ea9c6a1521a35d5469f5b65..98577b8a27b23328e59370c115fdaccb83eebd76 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
@@ -2,8 +2,8 @@
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
index 1f613c71ce6ee9718544cc5792996949bc73b38b..67c209e30d745e388c97f3cd8adb6eca849a40e4 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
@@ -2,9 +2,8 @@
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
-Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
Namespace UnitTests
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
index cf0bc89d5485d445a651910f7a232d692379faf2..c3da60c0531df9a80de1a69f82a43a06a7367681 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
@@ -3,8 +3,8 @@ Imports NUnit.Framework
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
Namespace UnitTests
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
index c5623158a2a4ce1310c27b95376754fa296881a1..7c40d547f0c98dc2e810056f6d0ea572beadf21a 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
@@ -3,10 +3,11 @@ Imports NUnit.Framework
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
Imports IFuelConsumptionMap = TUGraz.VectoCore.BusAuxiliaries.Interfaces.IFuelConsumptionMap
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
+
Namespace UnitTests
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
index 61114dcfc5c346be9b56ecc866635e9ce8a4ca7a..2a9e89fc7b06cb9a885acebf62158755a64bc7d2 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
@@ -1,5 +1,4 @@

-Imports VectoAuxiliaries.Pneumatics
Imports NUnit.Framework
Imports System.IO
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
index 087391907279fbdc4975a2a77b820091bc18dfcb..607019ffdedee0e13e32714073a994a4c6385e66 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
@@ -3,7 +3,7 @@ Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
-Imports VectoAuxiliaries.Electrics
+
<TestFixture()>
Public Class ResultCardTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
index f124929498c897cde5eb504633da7e9b2875430a..d2fc56627e5708a861c7f8333117204a188c68b8 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
@@ -2,7 +2,7 @@
Imports NUnit.Framework
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
-Imports VectoAuxiliaries.Hvac
+
Namespace UnitTests
<TestFixture()>
@@ -47,10 +47,10 @@ Namespace UnitTests
Assert.IsTrue(src.TechList.Add(newItem, feedback))
End Sub
- <OneTimeSetUp>
- Sub RunBeforeAnyTests()
- Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory)
- end Sub
+ <OneTimeSetUp>
+ Sub RunBeforeAnyTests()
+ Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory)
+ end Sub
'SSMGenInputTests
<Test()> _
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index fbc4cc4b88b775650340596ff2ff1b500907c7e3..56cbca9581ff0d0e38548bf84e6912eb2b0d3217 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -399,10 +399,6 @@
<Project>{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}</Project>
<Name>BusAuxiliaries</Name>
</ProjectReference>
- <ProjectReference Include="..\VectoAuxiliaries\VectoAuxiliaries.vbproj">
- <Project>{fdeee460-0b8a-4ef6-8d9e-72f203a50f65}</Project>
- <Name>VectoAuxiliaries</Name>
- </ProjectReference>
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">