From 82b7c8f3bae9b2d7d76cedce4f3207409f1994bd Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 10 Oct 2019 15:10:46 +0200
Subject: [PATCH] update vecto core project due to moving around files/projects
---
.../FileIO/JSON/JSONInputDataFactory.cs | 16 +++
.../SimulationComponent/Data/VehicleData.cs | 14 +++
.../Impl/BusAuxiliariesAdapter.cs | 4 +-
.../VectoCore/Properties/AssemblyInfo.cs | 1 +
.../Declaration/HeavyBusSegmentationTable.csv | 42 +++----
VectoCore/VectoCore/VectoCore.csproj | 110 ++++++++++++++++--
VectoCore/VectoCore/packages.config | 1 +
7 files changed, 157 insertions(+), 31 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
index 2a94ca762c..f20fcac6d1 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
@@ -33,6 +33,8 @@ using System;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.IO;
+using System.Linq;
+using System.Text;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.Configuration;
@@ -42,6 +44,20 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
// ReSharper disable once InconsistentNaming
public static class JSONInputDataFactory
{
+ internal static void WriteFile(JToken content, string path)
+ {
+ if (!content.Any()) {
+ return;
+ }
+
+ try {
+ var str = JsonConvert.SerializeObject(content, Formatting.Indented);
+ File.WriteAllText(path, str, Encoding.UTF8);
+ } catch (Exception) {
+ return;
+ }
+ }
+
internal static JObject ReadFile(string fileName)
{
if (!File.Exists(fileName)) {
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
index 65bcb06ab1..e70f46d123 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
@@ -223,6 +223,20 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
public PredictiveCruiseControlType PredictiveCruiseControl { get; internal set; }
}
+#region "Bus Parameters"
+ public double PassengerCount { get; internal set; }
+
+ public FloorType FloorType { get; internal set; }
+
+ public bool DoubleDecker { get; internal set; }
+
+ public Meter Length { get;internal set; }
+
+ public Meter Width { get; internal set; }
+
+ public Meter Height { get; internal set; }
+
+#endregion
protected void ComputeRollResistanceAndReducedMassWheels()
{
if (TotalVehicleWeight == 0.SI<Kilogram>()) {
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
index 566210bfa5..9cbd7b4d4a 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
@@ -37,13 +37,15 @@ using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.BusAuxiliaries;
using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
using TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem;
+using TUGraz.VectoCore.Models.BusAuxiliaries;
+using TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces;
+using TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.OutputData;
-using VectoAuxiliaries;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
diff --git a/VectoCore/VectoCore/Properties/AssemblyInfo.cs b/VectoCore/VectoCore/Properties/AssemblyInfo.cs
index 4ef07debd6..8cb32b8283 100644
--- a/VectoCore/VectoCore/Properties/AssemblyInfo.cs
+++ b/VectoCore/VectoCore/Properties/AssemblyInfo.cs
@@ -52,3 +52,4 @@ using System.Runtime.InteropServices;
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VectoXML")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("XMLTest")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VECTO_GIT")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VectoAuxiliariesTests")]
diff --git a/VectoCore/VectoCore/Resources/Declaration/HeavyBusSegmentationTable.csv b/VectoCore/VectoCore/Resources/Declaration/HeavyBusSegmentationTable.csv
index 3ffc392003..ce46d6bcb4 100644
--- a/VectoCore/VectoCore/Resources/Declaration/HeavyBusSegmentationTable.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/HeavyBusSegmentationTable.csv
@@ -1,26 +1,26 @@
-HDV group , Production Stage , Vehicle Category , Articulated , Num Axles , TPMLM_Min , TPMLM_Max , Height , DesignSpeed , Body , .vacc file , Cross Wind Correction , AxlesWeights , Width , Length , Height , CdxA , Heavy Urban , Urban , Suburban , Interurban , Coach , External displays , Internal displays , Fridge , Kitchen Standard ,
+HDV group , Production Stage , Vehicle Category , Articulated , Num Axles , TPMLM_Min , TPMLM_Max , single/double deck , DesignSpeed , Body , .vacc file , Cross Wind Correction , AxlesWeights , Width , Length , Height , CdxA , Heavy Urban , Urban , Suburban , Interurban , Coach , External displays , Internal displays , Fridge , Kitchen Standard ,
## Heavy Bus Primary Vehicles
-P31SD , 1 , HeavyBus , - , 2 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 37.5/62/5 , 2.55 , 12 , ?? , ?? , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 ,
-P31DD , 1 , HeavyBus , - , 2 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 37.5/62/5 , 2.55 , 12 , ?? , ?? , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 ,
-P32SD , 1 , HeavyBus , - , 2 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 37.5/62/5 , 2.55 , 12 , ?? , ?? , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 ,
-P32SD , 1 , HeavyBus , - , 2 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 37.5/62/5 , 2.55 , 12 , ?? , ?? , , , , 3 , 2 , 1 , 2 , 1 , 1 ,
+P31SD , 1 , HeavyBus , - , 2 , 7.4 , 999 , single , ?? , , Bus.vacc , BusRigid , 37.5/62/5 , 2.55 , 12 , ?? , ?? , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 ,
+P31DD , 1 , HeavyBus , - , 2 , 7.4 , 999 , double , ?? , , Bus.vacc , BusRigid , 37.5/62/5 , 2.55 , 12 , ?? , ?? , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 ,
+P32SD , 1 , HeavyBus , - , 2 , 7.4 , 999 , single , ?? , , Bus.vacc , BusRigid , 37.5/62/5 , 2.55 , 12 , ?? , ?? , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 ,
+P32SD , 1 , HeavyBus , - , 2 , 7.4 , 999 , double , ?? , , Bus.vacc , BusRigid , 37.5/62/5 , 2.55 , 12 , ?? , ?? , , , , 3 , 2 , 1 , 2 , 1 , 1 ,
##
-P33SD , 1 , HeavyBus , 0 , 3 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 27.3/45.4/27.3 , 2.55 , 14 , ?? , ?? , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 ,
-P33DD , 1 , HeavyBus , 0 , 3 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 27.3/45.4/27.3 , 2.55 , 14 , ?? , ?? , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 ,
-P34SD , 1 , HeavyBus , 0 , 3 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 27.3/45.4/27.3 , 2.55 , 14 , ?? , ?? , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 ,
-P34SD , 1 , HeavyBus , 0 , 3 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 27.3/45.4/27.3 , 2.55 , 14 , ?? , ?? , , , , 3 , 2 , 1 , 4 , 1 , 1.0 ,
+P33SD , 1 , HeavyBus , 0 , 3 , 7.4 , 999 , single , ?? , , Bus.vacc , BusRigid , 27.3/45.4/27.3 , 2.55 , 14 , ?? , ?? , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 ,
+P33DD , 1 , HeavyBus , 0 , 3 , 7.4 , 999 , double , ?? , , Bus.vacc , BusRigid , 27.3/45.4/27.3 , 2.55 , 14 , ?? , ?? , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 ,
+P34SD , 1 , HeavyBus , 0 , 3 , 7.4 , 999 , single , ?? , , Bus.vacc , BusRigid , 27.3/45.4/27.3 , 2.55 , 14 , ?? , ?? , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 ,
+P34SD , 1 , HeavyBus , 0 , 3 , 7.4 , 999 , double , ?? , , Bus.vacc , BusRigid , 27.3/45.4/27.3 , 2.55 , 14 , ?? , ?? , , , , 3 , 2 , 1 , 4 , 1 , 1.0 ,
#
-P35SD , 1 , HeavyBus , 1 , 3 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 24.3/35.2/40.5 , 2.55 , 18 , ?? , ?? , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 ,
-P35DD , 1 , HeavyBus , 1 , 3 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 24.3/35.2/40.5 , 2.55 , 18 , ?? , ?? , 3.7 , 3.7 , 3.7 , , , , , , ,
-P36SD , 1 , HeavyBus , 1 , 3 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 24.3/35.2/40.5 , 2.55 , 18 , ?? , ?? , , , , 2.2 , 1.4 , , , , ,
-P36SD , 1 , HeavyBus , 1 , 3 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 24.3/35.2/40.5 , 2.55 , 18 , ?? , ?? , , , , 3 , 2 , , , , ,
+P35SD , 1 , HeavyBus , 1 , 3 , 7.4 , 999 , single , ?? , , Bus.vacc , BusRigid , 24.3/35.2/40.5 , 2.55 , 18 , ?? , ?? , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 ,
+P35DD , 1 , HeavyBus , 1 , 3 , 7.4 , 999 , double , ?? , , Bus.vacc , BusRigid , 24.3/35.2/40.5 , 2.55 , 18 , ?? , ?? , 3.7 , 3.7 , 3.7 , , , , , , ,
+P36SD , 1 , HeavyBus , 1 , 3 , 7.4 , 999 , single , ?? , , Bus.vacc , BusRigid , 24.3/35.2/40.5 , 2.55 , 18 , ?? , ?? , , , , 2.2 , 1.4 , , , , ,
+P36SD , 1 , HeavyBus , 1 , 3 , 7.4 , 999 , double , ?? , , Bus.vacc , BusRigid , 24.3/35.2/40.5 , 2.55 , 18 , ?? , ?? , , , , 3 , 2 , , , , ,
##
-P37SD , 1 , HeavyBus , 0 , 4 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 21.4/21.4/35.8/21.4 , 2.55 , 15 , ?? , ?? , 3 , 3 , 3 , , , , , , ,
-P37DD , 1 , HeavyBus , 0 , 4 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 21.4/21.4/35.8/21.4 , 2.55 , 15 , ?? , ?? , 3.7 , 3.7 , 3.7 , , , , , , ,
-P38SD , 1 , HeavyBus , 0 , 4 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 21.4/21.4/35.8/21.4 , 2.55 , 15 , ?? , ?? , , , , 2.2 , 1.4 , , , , ,
-P38SD , 1 , HeavyBus , 0 , 4 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 21.4/21.4/35.8/21.4 , 2.55 , 15 , ?? , ?? , , , , 3 , 2 , , , , ,
+P37SD , 1 , HeavyBus , 0 , 4 , 7.4 , 999 , single , ?? , , Bus.vacc , BusRigid , 21.4/21.4/35.8/21.4 , 2.55 , 15 , ?? , ?? , 3 , 3 , 3 , , , , , , ,
+P37DD , 1 , HeavyBus , 0 , 4 , 7.4 , 999 , double , ?? , , Bus.vacc , BusRigid , 21.4/21.4/35.8/21.4 , 2.55 , 15 , ?? , ?? , 3.7 , 3.7 , 3.7 , , , , , , ,
+P38SD , 1 , HeavyBus , 0 , 4 , 7.4 , 999 , single , ?? , , Bus.vacc , BusRigid , 21.4/21.4/35.8/21.4 , 2.55 , 15 , ?? , ?? , , , , 2.2 , 1.4 , , , , ,
+P38SD , 1 , HeavyBus , 0 , 4 , 7.4 , 999 , double , ?? , , Bus.vacc , BusRigid , 21.4/21.4/35.8/21.4 , 2.55 , 15 , ?? , ?? , , , , 3 , 2 , , , , ,
#
-P39SD , 1 , HeavyBus , 1 , 4 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 20.0/28.2/32.4/19.4 , 2.55 , 20 , ?? , ?? , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 ,
-P39DD , 1 , HeavyBus , 1 , 4 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 20.0/28.2/32.4/19.4 , 2.55 , 20 , ?? , ?? , 3.7 , 3.7 , 3.7 , , , , , , ,
-P40SD , 1 , HeavyBus , 1 , 4 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 20.0/28.2/32.4/19.4 , 2.55 , 20 , ?? , ?? , , , , 2.2 , 1.4 , , , , ,
-P40SD , 1 , HeavyBus , 1 , 4 , 7.4 , 999 , ?? , ?? , , Bus.vacc , BusRigid , 20.0/28.2/32.4/19.4 , 2.55 , 20 , ?? , ?? , , , , 3 , 2 , , , , ,
+P39SD , 1 , HeavyBus , 1 , 4 , 7.4 , 999 , single , ?? , , Bus.vacc , BusRigid , 20.0/28.2/32.4/19.4 , 2.55 , 20 , ?? , ?? , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 ,
+P39DD , 1 , HeavyBus , 1 , 4 , 7.4 , 999 , double , ?? , , Bus.vacc , BusRigid , 20.0/28.2/32.4/19.4 , 2.55 , 20 , ?? , ?? , 3.7 , 3.7 , 3.7 , , , , , , ,
+P40SD , 1 , HeavyBus , 1 , 4 , 7.4 , 999 , single , ?? , , Bus.vacc , BusRigid , 20.0/28.2/32.4/19.4 , 2.55 , 20 , ?? , ?? , , , , 2.2 , 1.4 , , , , ,
+P40SD , 1 , HeavyBus , 1 , 4 , 7.4 , 999 , double , ?? , , Bus.vacc , BusRigid , 20.0/28.2/32.4/19.4 , 2.55 , 20 , ?? , ?? , , , , 3 , 2 , , , , ,
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 95cd85ccd4..1e9a22e9dd 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -112,6 +112,10 @@
<HintPath>..\..\packages\NLog.4.5.11\lib\net45\NLog.dll</HintPath>
<Private>True</Private>
</Reference>
+ <Reference Include="Omu.ValueInjecter, Version=3.1.1.0, Culture=neutral, PublicKeyToken=c7694541b0ac80e4, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\ValueInjecter.3.1.1.5\lib\net40\Omu.ValueInjecter.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
@@ -257,6 +261,103 @@
<Compile Include="InputData\FileIO\XML\Declaration\IXMLDeclarationInputDataReader.cs" />
<Compile Include="InputData\FileIO\XML\IXMLInputDataReader.cs" />
<Compile Include="InputData\FileIO\XML\XMLInputDataNinjectModule.cs" />
+ <Compile Include="Models\BusAuxiliaries\AdvancedAuxiliaries.cs" />
+ <Compile Include="Models\BusAuxiliaries\AuxiliaryConfig.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\AbstractModule.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\AlternatorMap.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Electrics\Alternator.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Electrics\CombinedAlternator.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Electrics\CombinedAlternatorMapRow.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Electrics\CombinedAlternatorSignals.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Electrics\ElectricalConsumer.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Electrics\ElectricalConsumerList.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Electrics\ElectricsUserInputsConfig.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Electrics\M00Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Electrics\M02Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Electrics\M05Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Electrics\M0_5Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Electrics\ResultCard.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\Bus.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\BusDatabase.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\BusEngineType.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\EnvironmentalCondition.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\EnvironmentalConditionsMap.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\HVACConstants.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\HVACSteadyStateModel.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\HVACUserInputsConfig.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\IBus.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\IBusDatabase.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\M01Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\SSMCalculate.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\SSMGenInputs.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\SSMRun.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\SSMTechList.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\SSMTOOL.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\HVAC\TechListBenefitLine.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\M06Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\M07Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\M08Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\M09Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\M10Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\M11Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\M12Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\M13Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\M14Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Pneumatics\CompressorMap.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Pneumatics\M03Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Pneumatics\M04Impl.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Pneumatics\PneumaticActuationsMap.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Pneumatics\PneumaticsAuxilliariesConfig.cs" />
+ <Compile Include="Models\BusAuxiliaries\DownstreamModules\Impl\Pneumatics\PneumaticUserInputsConfig.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\Electrics\AlternatorMapValues.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\Electrics\AltUserInput.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\Electrics\ElectricConstants.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\Electrics\IAlternator.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\Electrics\IAlternatorMap.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\Electrics\ICombinedAlternator.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\Electrics\ICombinedAlternatorMapRow.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\Electrics\ICombinedAlternatorSignals.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\HVAC\Class1.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\HVAC\IEnvironmentalCondition.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\HVAC\IEnvironmentalConditionsMap.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\HVAC\IHVACConstants.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\HVAC\IHVACSteadyStateModel.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\HVAC\ISSMCalculate.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\HVAC\ISSMGenInputs.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\HVAC\ISSMRun.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\HVAC\ISSMTechList.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\HVAC\ISSMTOOL.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\HVAC\ITechListBenefitLine.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IAbstractModule.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM0_5_SmartAlternatorSetEfficiency.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM0_NonSmart_AlternatorsSetEfficiency.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM10.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM11.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM13.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM14.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM1_AverageHVACLoadDemand.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM2_AverageElectrialLoadDemand.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM3_AveragePneumaticLoadDemand.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM4_AirCompressor.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM5_SmartAlternatorSetGeneration.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM6.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM7.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM8.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\IM9.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\PneumaticSystem\ActuationsKey.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\PneumaticSystem\ICompressorMap.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\DownstreamModules\PneumaticSystem\IPneumaticActuationsMAP.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\Enumerations.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\IAdvancedAuxiliaries.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\IAuxiliaryEvent.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\IM12.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\ISignals.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\Signals.cs" />
+ <Compile Include="Models\BusAuxiliaries\Interfaces\VectoInputs.cs" />
+ <Compile Include="Models\BusAuxiliaries\Legacy\cFile_V3.cs" />
+ <Compile Include="Models\BusAuxiliaries\Legacy\cMAP.cs" />
+ <Compile Include="Models\BusAuxiliaries\Util\FilePathUtils.cs" />
+ <Compile Include="Models\Declaration\FloorType.cs" />
<Compile Include="Models\SimulationComponent\Data\Engine\WHRPowerMap.cs" />
<Compile Include="InputData\Reader\ComponentData\WHRPowerReader.cs" />
<Compile Include="Models\SimulationComponent\Impl\StopStartCombustionEngine.cs" />
@@ -719,14 +820,6 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\VECTOAux\BusAuxiliaries\BusAuxiliaries.csproj">
- <Project>{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}</Project>
- <Name>BusAuxiliaries</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj">
- <Project>{fdeee460-0b8a-4ef6-8d9e-72f203a50f65}</Project>
- <Name>VectoAuxiliaries</Name>
- </ProjectReference>
<ProjectReference Include="..\..\VectoCommon\VectoCommon\VectoCommon.csproj">
<Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
<Name>VectoCommon</Name>
@@ -736,7 +829,6 @@
<Name>VectoHashing</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/VectoCore/VectoCore/packages.config b/VectoCore/VectoCore/packages.config
index 1163adf7e4..097be5f314 100644
--- a/VectoCore/VectoCore/packages.config
+++ b/VectoCore/VectoCore/packages.config
@@ -8,4 +8,5 @@
<package id="Ninject.Extensions.NamedScope" version="3.3.0" targetFramework="net45" />
<package id="NLog" version="4.5.11" targetFramework="net45" />
<package id="System.Runtime" version="4.0.0" targetFramework="net45" />
+ <package id="ValueInjecter" version="3.1.1.5" targetFramework="net45" />
</packages>
\ No newline at end of file
--
GitLab