From 024a5ea0af5221aa67b8013b8ed2645f34c287db Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 10 Oct 2019 15:00:38 +0200
Subject: [PATCH] moving aaux interfaces to vectocommon
---
.../VectoCommon}/BusAuxiliaries/IAuxiliaryConfig.cs | 2 +-
.../BusAuxiliaries}/IElectricalConsumer.cs | 8 ++++----
.../BusAuxiliaries}/IElectricalConsumerList.cs | 0
.../BusAuxiliaries}/IElectricsUserInputsConfig.cs | 6 ++++--
.../BusAuxiliaries}/IFuelConsumptionMap.cs | 0
.../BusAuxiliaries}/IHVACUserInputsConfig.cs | 0
.../BusAuxiliaries}/IPneumaticUserInputsConfig.cs | 0
.../IPneumaticsAuxilliariesConfig.cs | 4 +++-
.../VectoCommon/BusAuxiliaries}/IResultCard.cs | 0
.../VectoCommon/BusAuxiliaries}/IVectoInputs.cs | 0
.../VectoCommon/BusAuxiliaries}/SmartResult.cs | 13 ++++++++-----
11 files changed, 20 insertions(+), 13 deletions(-)
rename {VECTOAux => VectoCommon/VectoCommon}/BusAuxiliaries/IAuxiliaryConfig.cs (96%)
rename {VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics => VectoCommon/VectoCommon/BusAuxiliaries}/IElectricalConsumer.cs (87%)
rename {VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics => VectoCommon/VectoCommon/BusAuxiliaries}/IElectricalConsumerList.cs (100%)
rename {VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics => VectoCommon/VectoCommon/BusAuxiliaries}/IElectricsUserInputsConfig.cs (95%)
rename {VECTOAux/BusAuxiliaries/Interfaces => VectoCommon/VectoCommon/BusAuxiliaries}/IFuelConsumptionMap.cs (100%)
rename {VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC => VectoCommon/VectoCommon/BusAuxiliaries}/IHVACUserInputsConfig.cs (100%)
rename {VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem => VectoCommon/VectoCommon/BusAuxiliaries}/IPneumaticUserInputsConfig.cs (100%)
rename {VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem => VectoCommon/VectoCommon/BusAuxiliaries}/IPneumaticsAuxilliariesConfig.cs (84%)
rename {VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics => VectoCommon/VectoCommon/BusAuxiliaries}/IResultCard.cs (100%)
rename {VECTOAux/BusAuxiliaries/Interfaces => VectoCommon/VectoCommon/BusAuxiliaries}/IVectoInputs.cs (100%)
rename {VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics => VectoCommon/VectoCommon/BusAuxiliaries}/SmartResult.cs (83%)
diff --git a/VECTOAux/BusAuxiliaries/IAuxiliaryConfig.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IAuxiliaryConfig.cs
similarity index 96%
rename from VECTOAux/BusAuxiliaries/IAuxiliaryConfig.cs
rename to VectoCommon/VectoCommon/BusAuxiliaries/IAuxiliaryConfig.cs
index bdf0eca6f6..b3f574a46f 100644
--- a/VECTOAux/BusAuxiliaries/IAuxiliaryConfig.cs
+++ b/VectoCommon/VectoCommon/BusAuxiliaries/IAuxiliaryConfig.cs
@@ -31,7 +31,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries {
// Hvac
IHVACUserInputsConfig HvacUserInputsConfig { get; set; }
- bool ConfigValuesAreTheSameAs(AuxiliaryConfig other);
+ bool ConfigValuesAreTheSameAs(IAuxiliaryConfig other);
// Persistance Functions
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricalConsumer.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IElectricalConsumer.cs
similarity index 87%
rename from VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricalConsumer.cs
rename to VectoCommon/VectoCommon/BusAuxiliaries/IElectricalConsumer.cs
index e6e91498d2..701472ffe0 100644
--- a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricalConsumer.cs
+++ b/VectoCommon/VectoCommon/BusAuxiliaries/IElectricalConsumer.cs
@@ -20,13 +20,13 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
string Category { get; set; }
string ConsumerName { get; set; }
bool BaseVehicle { get; set; }
- double NominalConsumptionAmps { get; set; }
+ Ampere NominalConsumptionAmps { get; set; }
double PhaseIdle_TractionOn { get; set; }
int NumberInActualVehicle { get; set; }
- double PowerNetVoltage { get; set; }
- double AvgConsumptionAmps { get; set; }
+ Volt PowerNetVoltage { get; set; }
+ Ampere AvgConsumptionAmps { get; set; }
string Info { get; set; }
- Ampere TotalAvgConumptionAmps(double PhaseIdle_TractionOnBasedOnCycle = default(Double));
+ Ampere TotalAvgConumptionAmps(double PhaseIdle_TractionOnBasedOnCycle = 0.0);
Watt TotalAvgConsumptionInWatts(double PhaseIdle_TractionOnBasedOnCycle = 0.0);
}
}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricalConsumerList.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IElectricalConsumerList.cs
similarity index 100%
rename from VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricalConsumerList.cs
rename to VectoCommon/VectoCommon/BusAuxiliaries/IElectricalConsumerList.cs
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricsUserInputsConfig.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IElectricsUserInputsConfig.cs
similarity index 95%
rename from VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricsUserInputsConfig.cs
rename to VectoCommon/VectoCommon/BusAuxiliaries/IElectricsUserInputsConfig.cs
index 29e63b70a1..f5ff505ded 100644
--- a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricsUserInputsConfig.cs
+++ b/VectoCommon/VectoCommon/BusAuxiliaries/IElectricsUserInputsConfig.cs
@@ -10,6 +10,8 @@
// See the LICENSE.txt for the specific language governing permissions and limitations.
+using TUGraz.VectoCommon.Utils;
+
namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
{
public interface IElectricsUserInputsConfig
@@ -20,7 +22,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
/// <value></value>
/// <returns></returns>
/// <remarks></remarks>
- double PowerNetVoltage { get; set; }
+ Volt PowerNetVoltage { get; set; }
/// <summary>
/// The Path for the Alternator map
@@ -52,7 +54,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
/// <value></value>
/// <returns></returns>
/// <remarks></remarks>
- int DoorActuationTimeSecond { get; set; }
+ double DoorActuationTimeSecond { get; set; }
/// <summary>
/// Result Card Taken During Idle.
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/IFuelConsumptionMap.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IFuelConsumptionMap.cs
similarity index 100%
rename from VECTOAux/BusAuxiliaries/Interfaces/IFuelConsumptionMap.cs
rename to VectoCommon/VectoCommon/BusAuxiliaries/IFuelConsumptionMap.cs
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACUserInputsConfig.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IHVACUserInputsConfig.cs
similarity index 100%
rename from VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACUserInputsConfig.cs
rename to VectoCommon/VectoCommon/BusAuxiliaries/IHVACUserInputsConfig.cs
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticUserInputsConfig.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IPneumaticUserInputsConfig.cs
similarity index 100%
rename from VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticUserInputsConfig.cs
rename to VectoCommon/VectoCommon/BusAuxiliaries/IPneumaticUserInputsConfig.cs
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticsAuxilliariesConfig.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IPneumaticsAuxilliariesConfig.cs
similarity index 84%
rename from VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticsAuxilliariesConfig.cs
rename to VectoCommon/VectoCommon/BusAuxiliaries/IPneumaticsAuxilliariesConfig.cs
index 833b9a255d..cc7570c7d5 100644
--- a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticsAuxilliariesConfig.cs
+++ b/VectoCommon/VectoCommon/BusAuxiliaries/IPneumaticsAuxilliariesConfig.cs
@@ -1,4 +1,6 @@
-namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem {
+using TUGraz.VectoCommon.Utils;
+
+namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem {
public interface IPneumaticsAuxilliariesConfig
{
double OverrunUtilisationForCompressionFraction { get; set; }
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IResultCard.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IResultCard.cs
similarity index 100%
rename from VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IResultCard.cs
rename to VectoCommon/VectoCommon/BusAuxiliaries/IResultCard.cs
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/IVectoInputs.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IVectoInputs.cs
similarity index 100%
rename from VECTOAux/BusAuxiliaries/Interfaces/IVectoInputs.cs
rename to VectoCommon/VectoCommon/BusAuxiliaries/IVectoInputs.cs
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/SmartResult.cs b/VectoCommon/VectoCommon/BusAuxiliaries/SmartResult.cs
similarity index 83%
rename from VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/SmartResult.cs
rename to VectoCommon/VectoCommon/BusAuxiliaries/SmartResult.cs
index b8ca2b37c7..f3a8f356e1 100644
--- a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/SmartResult.cs
+++ b/VectoCommon/VectoCommon/BusAuxiliaries/SmartResult.cs
@@ -10,20 +10,21 @@
// See the LICENSE.txt for the specific language governing permissions and limitations.
using System;
+using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
{
public class SmartResult : IComparable<SmartResult>
{
- public double Amps { get; set; }
- public double SmartAmps { get; set; }
+ public Ampere Amps { get; set; }
+ public Ampere SmartAmps { get; set; }
// Constructors
public SmartResult()
{
}
- public SmartResult(double amps, double smartAmps)
+ public SmartResult(Ampere amps, Ampere smartAmps)
{
Amps = amps;
SmartAmps = smartAmps;
@@ -32,10 +33,12 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
// Comparison
public int CompareTo(SmartResult other)
{
- if (other.Amps > Amps)
+ if (other.Amps > Amps) {
return -1;
- if (other.Amps == Amps)
+ }
+ if (other.Amps == Amps) {
return 0;
+ }
return 1;
}
--
GitLab