From 79fef4897bc48156f8a2535291ca258f7333684f Mon Sep 17 00:00:00 2001 From: Michael Krisper <michael.krisper@tugraz.at> Date: Thu, 17 Jun 2021 17:21:00 +0200 Subject: [PATCH] removed unneccessary imports --- VECTO/BusAuxiliaries/UI/frmAuxiliaryConfig.vb | 7 ------- VECTO/BusAuxiliaries/UI/frmHVACTool.vb | 3 --- VECTO/File Browser/FileBrowserDialog.vb | 1 - VECTO/GUI/AboutBox.Designer.vb | 1 - VECTO/GUI/BatteryForm.vb | 4 ---- VECTO/GUI/BusAuxiliariesEngParametersForm.vb | 10 +--------- VECTO/GUI/ElectricMotorForm.vb | 3 --- VECTO/GUI/GearboxGearDialog.vb | 1 - VECTO/GUI/GraphForm.vb | 1 - VECTO/GUI/HybridStrategyParamsForm.vb | 11 +---------- VECTO/GUI/MainForm.vb | 5 ----- VECTO/GUI/Settings.Designer.vb | 1 - VECTO/GUI/Settings.vb | 1 - VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb | 1 - VECTO/GUI/VehicleAuxiliariesDialog.vb | 1 - VECTO/GUI/VehicleAxleDialog.vb | 1 - VECTO/GUI/VehicleForm.vb | 2 -- VECTO/GUI/WelcomeDialog.vb | 1 - VECTO/Input Files/Battery.vb | 1 - VECTO/Input Files/ElectricMachine.vb | 3 --- VECTO/Input Files/Engine.vb | 1 - VECTO/Input Files/HybridStrategyParams.vb | 1 - VECTO/Input Files/VectoEPTPJob.vb | 3 --- VECTO/Input Files/VectoJob.vb | 1 - VECTO/Input Files/Vehicle.vb | 1 - VECTO/My Project/Resources.Designer.vb | 1 - .../IntegrationTests/AuxDemandTest.vb | 1 - .../VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb | 2 -- .../Mocks/ElectricalConsumerMock.vb | 4 +--- VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb | 1 - .../UnitTests/AlternatorMapTests.vb | 3 --- .../UnitTests/AuxiliaryEnvironmentComparisonTests.vb | 5 ----- .../UnitTests/AuxiliaryEnvironmentPersistanceTests.vb | 1 - .../UnitTests/AveragePneumaticLoadDemandTests.vb | 3 --- .../UnitTests/CombinedAlternatorTests.vb | 2 -- .../UnitTests/CompressorMapTests.vb | 1 - .../UnitTests/ElectricalConsumerListTests.vb | 5 ----- .../UnitTests/ElectricalConsumerTests.vb | 3 --- .../M0_5_SmartAlternatorSetEfficiencyTests.vb | 6 ------ .../M0_NonSmart_AlternatorsSetEfficiencyTests.vb | 1 - VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb | 1 - .../UnitTests/M1_AverageHVACLoadDemandTests.vb | 6 ------ .../UnitTests/M2_AverageElectricalLoadTests.vb | 5 ----- .../UnitTests/M5_SmartAlternatorSetGenerationTests.vb | 4 ---- VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb | 1 - .../UnitTests/PneumaticActuationsMapTests.vb | 2 -- .../VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb | 1 - VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb | 1 - 48 files changed, 3 insertions(+), 123 deletions(-) diff --git a/VECTO/BusAuxiliaries/UI/frmAuxiliaryConfig.vb b/VECTO/BusAuxiliaries/UI/frmAuxiliaryConfig.vb index 404ba55f17..0e491c3b08 100644 --- a/VECTO/BusAuxiliaries/UI/frmAuxiliaryConfig.vb +++ b/VECTO/BusAuxiliaries/UI/frmAuxiliaryConfig.vb @@ -14,18 +14,11 @@ Imports System.ComponentModel Imports System.Windows.Forms Imports System.Drawing Imports System.IO -Imports System.Linq Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.FileIO.JSON -Imports TUGraz.VectoCore.InputData.Impl Imports TUGraz.VectoCore.InputData.Reader.ComponentData -Imports TUGraz.VectoCore.Models.BusAuxiliaries -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Pneumatics -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.HVAC Imports TUGraz.VectoCore.Models.BusAuxiliaries.Util Imports TUGraz.VectoCore.OutputData.FileIO diff --git a/VECTO/BusAuxiliaries/UI/frmHVACTool.vb b/VECTO/BusAuxiliaries/UI/frmHVACTool.vb index db4e4d73ed..00718473b6 100644 --- a/VECTO/BusAuxiliaries/UI/frmHVACTool.vb +++ b/VECTO/BusAuxiliaries/UI/frmHVACTool.vb @@ -4,12 +4,9 @@ Imports System.ComponentModel Imports System.Drawing Imports System.Globalization Imports System.IO -Imports System.Linq -Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.FileIO.JSON Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.HVAC Imports TUGraz.VectoCore.Models.BusAuxiliaries.Util Imports TUGraz.VectoCore.Models.Declaration Imports TUGraz.VectoCore.OutputData.FileIO diff --git a/VECTO/File Browser/FileBrowserDialog.vb b/VECTO/File Browser/FileBrowserDialog.vb index dbc210f44c..97f21f9509 100644 --- a/VECTO/File Browser/FileBrowserDialog.vb +++ b/VECTO/File Browser/FileBrowserDialog.vb @@ -11,7 +11,6 @@ Option Infer On Imports System.IO -Imports System.Linq Imports System.Text Imports Microsoft.VisualBasic.FileIO Imports System.Runtime.InteropServices diff --git a/VECTO/GUI/AboutBox.Designer.vb b/VECTO/GUI/AboutBox.Designer.vb index e01ee360b7..b4d710c38e 100644 --- a/VECTO/GUI/AboutBox.Designer.vb +++ b/VECTO/GUI/AboutBox.Designer.vb @@ -10,7 +10,6 @@ ' See the LICENSE.txt for the specific language governing permissions and limitations. Imports System.ComponentModel Imports Microsoft.VisualBasic.CompilerServices -Imports TUGraz.VECTO.My.Resources <DesignerGenerated()> _ Partial Class AboutBox diff --git a/VECTO/GUI/BatteryForm.vb b/VECTO/GUI/BatteryForm.vb index 44e98bd13d..8928c68597 100644 --- a/VECTO/GUI/BatteryForm.vb +++ b/VECTO/GUI/BatteryForm.vb @@ -5,14 +5,10 @@ Imports System.IO Imports System.Linq Imports System.Windows.Forms.DataVisualization.Charting Imports TUGraz.VectoCommon.InputData -Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.FileIO.JSON Imports TUGraz.VectoCore.InputData.Reader.ComponentData -Imports TUGraz.VectoCore.Models.Declaration -Imports TUGraz.VectoCore.Models.SimulationComponent.Data Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Battery -Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Engine Imports TUGraz.VectoCore.Utils ' Copyright 2017 European Union. ' Licensed under the EUPL (the 'Licence'); diff --git a/VECTO/GUI/BusAuxiliariesEngParametersForm.vb b/VECTO/GUI/BusAuxiliariesEngParametersForm.vb index 422152ca1a..ce98a38f7b 100644 --- a/VECTO/GUI/BusAuxiliariesEngParametersForm.vb +++ b/VECTO/GUI/BusAuxiliariesEngParametersForm.vb @@ -1,19 +1,11 @@  -Imports System.Collections.Generic -Imports System.Drawing.Imaging + Imports System.IO Imports System.Linq -Imports System.Windows.Forms.DataVisualization.Charting Imports TUGraz.VectoCommon.InputData Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.FileIO.JSON -Imports TUGraz.VectoCore.InputData.Reader.ComponentData -Imports TUGraz.VectoCore.Models.Declaration -Imports TUGraz.VectoCore.Models.SimulationComponent.Data -Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Battery -Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Engine -Imports TUGraz.VectoCore.Utils ' Copyright 2017 European Union. ' Licensed under the EUPL (the 'Licence'); ' diff --git a/VECTO/GUI/ElectricMotorForm.vb b/VECTO/GUI/ElectricMotorForm.vb index bd8192f13b..fec9d7b4ca 100644 --- a/VECTO/GUI/ElectricMotorForm.vb +++ b/VECTO/GUI/ElectricMotorForm.vb @@ -4,14 +4,11 @@ Imports System.IO Imports System.Linq Imports System.Windows.Forms.DataVisualization.Charting Imports TUGraz.VectoCommon.InputData -Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.FileIO.JSON Imports TUGraz.VectoCore.InputData.Reader.ComponentData -Imports TUGraz.VectoCore.Models.Declaration Imports TUGraz.VectoCore.Models.SimulationComponent.Data Imports TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor -Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Engine Imports TUGraz.VectoCore.Utils ' Copyright 2017 European Union. ' Licensed under the EUPL (the 'Licence'); diff --git a/VECTO/GUI/GearboxGearDialog.vb b/VECTO/GUI/GearboxGearDialog.vb index 5a6537aa27..2506e64ff8 100644 --- a/VECTO/GUI/GearboxGearDialog.vb +++ b/VECTO/GUI/GearboxGearDialog.vb @@ -16,7 +16,6 @@ Imports System.Windows.Forms Imports TUGraz.VectoCommon.InputData Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils -Imports TUGraz.VectoCore.InputData.Reader Imports TUGraz.VectoCore.InputData.Reader.ComponentData Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox diff --git a/VECTO/GUI/GraphForm.vb b/VECTO/GUI/GraphForm.vb index fd5b658e2a..96ef7a8428 100644 --- a/VECTO/GUI/GraphForm.vb +++ b/VECTO/GUI/GraphForm.vb @@ -13,7 +13,6 @@ Imports System.Collections.Generic Imports System.Drawing.Imaging Imports System.IO Imports System.Linq -Imports System.Text.RegularExpressions Imports System.Windows.Forms.DataVisualization.Charting Imports TUGraz.VectoCommon.InputData Imports TUGraz.VectoCommon.Utils diff --git a/VECTO/GUI/HybridStrategyParamsForm.vb b/VECTO/GUI/HybridStrategyParamsForm.vb index f7f00c57e1..334ad55ca9 100644 --- a/VECTO/GUI/HybridStrategyParamsForm.vb +++ b/VECTO/GUI/HybridStrategyParamsForm.vb @@ -1,18 +1,9 @@  -Imports System.Drawing.Imaging + Imports System.IO -Imports System.Linq -Imports System.Windows.Forms.DataVisualization.Charting Imports TUGraz.VectoCommon.InputData -Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.FileIO.JSON -Imports TUGraz.VectoCore.InputData.Reader.ComponentData -Imports TUGraz.VectoCore.Models.Declaration -Imports TUGraz.VectoCore.Models.SimulationComponent.Data -Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Battery -Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Engine -Imports TUGraz.VectoCore.Utils ' Copyright 2017 European Union. ' Licensed under the EUPL (the 'Licence'); ' diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb index 62de88d518..f3510344a8 100644 --- a/VECTO/GUI/MainForm.vb +++ b/VECTO/GUI/MainForm.vb @@ -33,7 +33,6 @@ Imports System.Collections.Generic Imports System.ComponentModel Imports System.IO Imports System.Linq -Imports System.Reflection Imports TUGraz.VectoCore.Models.Simulation.Impl Imports TUGraz.VectoCore.InputData.FileIO.JSON Imports System.Text @@ -49,10 +48,6 @@ Imports TUGraz.VectoCommon.Resources Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore Imports TUGraz.VectoCore.InputData.FileIO.XML -Imports TUGraz.VectoCore.InputData.FileIO.XML.Declaration -Imports TUGraz.VectoCore.InputData.FileIO.XML.Engineering -Imports TUGraz.VectoCore.Models.Simulation -Imports TUGraz.VectoCore.Models.Declaration Imports TUGraz.VectoCore.Models.SimulationComponent.Data Imports TUGraz.VectoCore.OutputData Imports TUGraz.VectoCore.OutputData.FileIO diff --git a/VECTO/GUI/Settings.Designer.vb b/VECTO/GUI/Settings.Designer.vb index c524bbe190..730a54d262 100644 --- a/VECTO/GUI/Settings.Designer.vb +++ b/VECTO/GUI/Settings.Designer.vb @@ -1,6 +1,5 @@ Imports System.ComponentModel Imports Microsoft.VisualBasic.CompilerServices -Imports TUGraz.VECTO.My.Resources <DesignerGenerated()> _ Partial Class Settings diff --git a/VECTO/GUI/Settings.vb b/VECTO/GUI/Settings.vb index edd9fddb68..88bcbdbc27 100644 --- a/VECTO/GUI/Settings.vb +++ b/VECTO/GUI/Settings.vb @@ -9,7 +9,6 @@ ' ' See the LICENSE.txt for the specific language governing permissions and limitations. Imports System.IO -Imports System.Text.RegularExpressions Imports TUGraz.VectoCommon.Utils ''' <summary> diff --git a/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb b/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb index 62070078e0..5db90ec58a 100644 --- a/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb +++ b/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb @@ -10,7 +10,6 @@ ' See the LICENSE.txt for the specific language governing permissions and limitations. Imports System.ComponentModel Imports Microsoft.VisualBasic.CompilerServices -Imports TUGraz.VECTO.My.Resources <DesignerGenerated()> _ Partial Class VehicleAuxiliariesDialog diff --git a/VECTO/GUI/VehicleAuxiliariesDialog.vb b/VECTO/GUI/VehicleAuxiliariesDialog.vb index c9bc543bf0..86f073055b 100644 --- a/VECTO/GUI/VehicleAuxiliariesDialog.vb +++ b/VECTO/GUI/VehicleAuxiliariesDialog.vb @@ -13,7 +13,6 @@ Option Infer On Imports System.Linq Imports System.Windows.Forms Imports TUGraz.VectoCommon.Models -Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.Models.Declaration diff --git a/VECTO/GUI/VehicleAxleDialog.vb b/VECTO/GUI/VehicleAxleDialog.vb index f4d93b0e34..6be084378d 100644 --- a/VECTO/GUI/VehicleAxleDialog.vb +++ b/VECTO/GUI/VehicleAxleDialog.vb @@ -18,7 +18,6 @@ Imports System.Linq Imports TUGraz.VectoCommon.InputData Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils -Imports TUGraz.VectoCore.InputData.Impl Imports TUGraz.VectoCore.Models.Declaration diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb index 30cc6872ea..f4e3382273 100644 --- a/VECTO/GUI/VehicleForm.vb +++ b/VECTO/GUI/VehicleForm.vb @@ -13,14 +13,12 @@ Imports System.Collections.Generic Imports System.IO Imports System.Linq -Imports System.Text.RegularExpressions Imports TUGraz.VectoCommon.InputData Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.FileIO.JSON Imports TUGraz.VectoCore.InputData.Impl Imports TUGraz.VectoCore.Models.Declaration -Imports TUGraz.VectoCore.Models.SimulationComponent.Data ''' <summary> ''' Vehicle Editor. diff --git a/VECTO/GUI/WelcomeDialog.vb b/VECTO/GUI/WelcomeDialog.vb index 75a9ae4dc2..21758d9cde 100644 --- a/VECTO/GUI/WelcomeDialog.vb +++ b/VECTO/GUI/WelcomeDialog.vb @@ -9,7 +9,6 @@ ' ' See the LICENSE.txt for the specific language governing permissions and limitations. Imports System.IO -Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.Utils ''' <summary> diff --git a/VECTO/Input Files/Battery.vb b/VECTO/Input Files/Battery.vb index d44d9888c0..23c62cbc4f 100644 --- a/VECTO/Input Files/Battery.vb +++ b/VECTO/Input Files/Battery.vb @@ -8,7 +8,6 @@ Imports TUGraz.VectoCommon.Exceptions Imports TUGraz.VectoCommon.InputData Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils -Imports TUGraz.VectoCore.Models.SimulationComponent.Data Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Battery Imports TUGraz.VectoCore.Utils diff --git a/VECTO/Input Files/ElectricMachine.vb b/VECTO/Input Files/ElectricMachine.vb index d19172a978..d150072ff4 100644 --- a/VECTO/Input Files/ElectricMachine.vb +++ b/VECTO/Input Files/ElectricMachine.vb @@ -7,9 +7,6 @@ Imports TUGraz.VectoCommon.Exceptions Imports TUGraz.VectoCommon.InputData Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils -Imports TUGraz.VectoCore.InputData.Reader.DataObjectAdapter -Imports TUGraz.VectoCore.Models.Declaration -Imports TUGraz.VectoCore.Models.SimulationComponent Imports TUGraz.VectoCore.Models.SimulationComponent.Data Imports TUGraz.VectoCore.Utils diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb index 8d3fa15223..bb4bb6f496 100644 --- a/VECTO/Input Files/Engine.vb +++ b/VECTO/Input Files/Engine.vb @@ -13,7 +13,6 @@ Imports System.ComponentModel.DataAnnotations Imports System.IO Imports System.Linq Imports System.Xml -Imports Newtonsoft.Json.Linq Imports TUGraz.VECTO.Input_Files Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Exceptions diff --git a/VECTO/Input Files/HybridStrategyParams.vb b/VECTO/Input Files/HybridStrategyParams.vb index a7dae0588f..e2bac2b5b7 100644 --- a/VECTO/Input Files/HybridStrategyParams.vb +++ b/VECTO/Input Files/HybridStrategyParams.vb @@ -2,7 +2,6 @@ Imports System.ComponentModel.DataAnnotations Imports System.IO Imports System.Linq -Imports TUGraz.VECTO.Input_Files Imports TUGraz.VectoCommon.InputData Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils diff --git a/VECTO/Input Files/VectoEPTPJob.vb b/VECTO/Input Files/VectoEPTPJob.vb index b4de68efad..ebe6a62939 100644 --- a/VECTO/Input Files/VectoEPTPJob.vb +++ b/VECTO/Input Files/VectoEPTPJob.vb @@ -3,7 +3,6 @@ Imports System.Collections.Generic Imports System.ComponentModel.DataAnnotations Imports System.IO Imports System.Linq -Imports System.Xml Imports Ninject Imports TUGraz.VECTO.Input_Files Imports TUGraz.VectoCommon.Exceptions @@ -12,9 +11,7 @@ Imports TUGraz.VectoCommon.InputData Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore -Imports TUGraz.VectoCore.InputData.FileIO.JSON Imports TUGraz.VectoCore.InputData.FileIO.XML -Imports TUGraz.VectoCore.InputData.FileIO.XML.Declaration Imports TUGraz.VectoCore.InputData.Impl Imports TUGraz.VectoCore.Models.Declaration Imports TUGraz.VectoCore.Utils diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb index 4254f25dd2..654e6e209c 100644 --- a/VECTO/Input Files/VectoJob.vb +++ b/VECTO/Input Files/VectoJob.vb @@ -15,7 +15,6 @@ Imports System.Collections.Generic Imports System.ComponentModel.DataAnnotations Imports System.IO Imports System.Linq -Imports System.Text Imports System.Xml.Linq Imports TUGraz.VECTO.Input_Files Imports TUGraz.VectoCommon.Exceptions diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb index f501510b56..2f13141fd8 100644 --- a/VECTO/Input Files/Vehicle.vb +++ b/VECTO/Input Files/Vehicle.vb @@ -20,7 +20,6 @@ Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.InputData Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils -Imports TUGraz.VectoCore.InputData.FileIO.JSON Imports TUGraz.VectoCore.InputData.Impl Imports TUGraz.VectoCore.InputData.Reader.DataObjectAdapter Imports TUGraz.VectoCore.Models.Declaration diff --git a/VECTO/My Project/Resources.Designer.vb b/VECTO/My Project/Resources.Designer.vb index 18e818830c..ac8c679590 100644 --- a/VECTO/My Project/Resources.Designer.vb +++ b/VECTO/My Project/Resources.Designer.vb @@ -11,7 +11,6 @@ Option Strict On Option Explicit On -Imports System Namespace My.Resources diff --git a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb index 6183be0eeb..05de179604 100644 --- a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb +++ b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb @@ -5,7 +5,6 @@ Imports TUGraz.VectoCore.InputData.FileIO.JSON Imports TUGraz.VectoCore.InputData.Reader.ComponentData Imports TUGraz.VectoCore.Models.BusAuxiliaries Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces Namespace IntegrationTests <TestFixture> diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb index 03712ad620..e17a389cf2 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb @@ -1,8 +1,6 @@  Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Utils -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics Namespace Mocks diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb index 41f6053118..78ed9431f2 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb @@ -1,7 +1,5 @@  -Imports System.ComponentModel -Imports TUGraz.VectoCommon.BusAuxiliaries -Imports TUGraz.VectoCommon.Utils + Namespace Mocks 'Public Class ElectricalConsumerMock diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb index cf279b7bcf..0f064bb5a9 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb @@ -1,7 +1,6 @@  Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Utils -Imports TUGraz.VectoCore.Models.Declaration Public Class MockFuel50PC Implements IFuelConsumptionMap diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb index 2675bc3e2b..1a412cd89e 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb @@ -3,9 +3,6 @@ Imports NUnit.Framework Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.Reader.ComponentData -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics Namespace UnitTests diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb index 317f91ab48..c8acb0f2d1 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb @@ -3,13 +3,8 @@ Imports System.IO Imports NUnit.Framework Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Utils -Imports TUGraz.VectoCore.Configuration -Imports TUGraz.VectoCore.Models.BusAuxiliaries Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Pneumatics -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces -Imports TUGraz.VectoCore.Models.Declaration Namespace UnitTests diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb index 3bd686beaf..1f71a3b9d7 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb @@ -3,7 +3,6 @@ Imports System.IO Imports NUnit.Framework Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCore.InputData.FileIO.JSON -Imports TUGraz.VectoCore.Models.BusAuxiliaries Imports TUGraz.VectoCore.OutputData.FileIO diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb index 1284027f43..a997f9f13f 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb @@ -7,11 +7,8 @@ Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.Reader.ComponentData Imports TUGraz.VectoCore.InputData.Reader.DataObjectAdapter Imports TUGraz.VectoCore.Models.BusAuxiliaries -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Pneumatics Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces -Imports TUGraz.VectoCore.Models.Declaration -Imports TUGraz.VectoCore.Models.Simulation.Data Imports TUGraz.VectoCore.Models.SimulationComponent.Data Namespace UnitTests diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb index 595db1d73d..8cdba6dc62 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb @@ -3,11 +3,9 @@ Imports NUnit.Framework Imports TUGraz.VectoCommon.Utils Imports System.IO -Imports Newtonsoft.Json Imports TUGraz.VectoCore.InputData.Reader.ComponentData Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics -Imports TUGraz.VectoCore.Models.Declaration Namespace UnitTests diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb index f2a8cdc1af..bc542b6bff 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb @@ -4,7 +4,6 @@ Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Exceptions Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.Reader.ComponentData -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Pneumatics Namespace UnitTests diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb index 3127a6ddc3..2a23c7904d 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb @@ -1,11 +1,6 @@  Imports System.IO Imports NUnit.Framework -Imports TUGraz.VectoCommon.BusAuxiliaries -Imports TUGraz.VectoCommon.Utils -Imports TUGraz.VectoCore.Models.BusAuxiliaries -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics -Imports TUGraz.VectoCore.Models.Declaration <TestFixture()> diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb index b1c9d3c1fd..372e0a0aa2 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb @@ -1,9 +1,6 @@  Imports NUnit.Framework -Imports TUGraz.VectoCore.Configuration -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics Namespace UnitTests <TestFixture()> diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb index 738ccbab2a..650de6b3c1 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb @@ -1,20 +1,14 @@ Imports System.IO Imports NUnit.Framework Imports TUGraz.VectoCommon.BusAuxiliaries -Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.FileIO.JSON -Imports TUGraz.VectoCore.InputData.Reader.ComponentData -Imports TUGraz.VectoCore.Models.BusAuxiliaries -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Pneumatics Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.HVAC -Imports TUGraz.VectoCore.Models.SimulationComponent.Data Namespace UnitTests diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb index d105b72d97..cb275e66c2 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb @@ -6,7 +6,6 @@ Imports TUGraz.VectoCore.InputData.Reader.ComponentData Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.HVAC Imports Signals = TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.Signals diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb index 7d1f1d15ac..5d00a7e281 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb @@ -4,7 +4,6 @@ Imports Moq Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb index 242b1cfa23..09fa249606 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb @@ -5,17 +5,11 @@ Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.FileIO.JSON Imports TUGraz.VectoCore.InputData.Reader.ComponentData -Imports TUGraz.VectoCore.Models.BusAuxiliaries -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Pneumatics Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.HVAC -Imports TUGraz.VectoCore.Models.Declaration -Imports TUGraz.VectoCore.Models.SimulationComponent.Data Namespace UnitTests diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb index a70794170c..db3991edd8 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb @@ -5,16 +5,11 @@ Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.FileIO.JSON Imports TUGraz.VectoCore.InputData.Reader.ComponentData -Imports TUGraz.VectoCore.Models.BusAuxiliaries -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Pneumatics Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.HVAC -Imports TUGraz.VectoCore.Models.SimulationComponent.Data Namespace UnitTests diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb index 5df16ed012..1fbe62b3db 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb @@ -3,17 +3,13 @@ Imports System.IO Imports NUnit.Framework Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Utils -Imports TUGraz.VectoCore.InputData.FileIO.JSON Imports TUGraz.VectoCore.InputData.Reader.ComponentData -Imports TUGraz.VectoCore.Models.BusAuxiliaries -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.HVAC Imports TUGraz.VectoCore.Models.Declaration -Imports TUGraz.VectoCore.Models.SimulationComponent.Data Namespace UnitTests <TestFixture()> diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb index 807df02d17..cb891fb1ed 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb @@ -4,7 +4,6 @@ Imports Moq Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb index 4381f932ec..9c11434d35 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb @@ -1,10 +1,8 @@  Imports NUnit.Framework Imports System.IO -Imports TUGraz.VectoCommon.BusAuxiliaries Imports TUGraz.VectoCommon.Exceptions Imports TUGraz.VectoCore.InputData.Reader.ComponentData -Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Pneumatics Namespace Pneumatics <TestFixture()> diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb index a2c8195bc2..6246be2f4e 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb @@ -5,7 +5,6 @@ Imports TUGraz.VectoCommon.InputData Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.InputData.FileIO.JSON -Imports TUGraz.VectoCore.InputData.Reader.ComponentData Imports TUGraz.VectoCore.InputData.Reader.DataObjectAdapter Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.HVAC diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb index 9bcf3b9f81..1ac1af2911 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb @@ -7,7 +7,6 @@ Imports TUGraz.VectoCore.Models.BusAuxiliaries Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Pneumatics -Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces Imports TUGraz.VectoCore.Models.Declaration Imports TUGraz.VectoCore.Models.SimulationComponent.Data -- GitLab