Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 024a5ea0 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

moving aaux interfaces to vectocommon

parent 8c8818ef
No related branches found
No related tags found
No related merge requests found
Showing
with 20 additions and 13 deletions
...@@ -31,7 +31,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries { ...@@ -31,7 +31,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries {
// Hvac // Hvac
IHVACUserInputsConfig HvacUserInputsConfig { get; set; } IHVACUserInputsConfig HvacUserInputsConfig { get; set; }
bool ConfigValuesAreTheSameAs(AuxiliaryConfig other); bool ConfigValuesAreTheSameAs(IAuxiliaryConfig other);
// Persistance Functions // Persistance Functions
......
...@@ -20,13 +20,13 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics ...@@ -20,13 +20,13 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
string Category { get; set; } string Category { get; set; }
string ConsumerName { get; set; } string ConsumerName { get; set; }
bool BaseVehicle { get; set; } bool BaseVehicle { get; set; }
double NominalConsumptionAmps { get; set; } Ampere NominalConsumptionAmps { get; set; }
double PhaseIdle_TractionOn { get; set; } double PhaseIdle_TractionOn { get; set; }
int NumberInActualVehicle { get; set; } int NumberInActualVehicle { get; set; }
double PowerNetVoltage { get; set; } Volt PowerNetVoltage { get; set; }
double AvgConsumptionAmps { get; set; } Ampere AvgConsumptionAmps { get; set; }
string Info { 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); Watt TotalAvgConsumptionInWatts(double PhaseIdle_TractionOnBasedOnCycle = 0.0);
} }
} }
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
// See the LICENSE.txt for the specific language governing permissions and limitations. // See the LICENSE.txt for the specific language governing permissions and limitations.
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
{ {
public interface IElectricsUserInputsConfig public interface IElectricsUserInputsConfig
...@@ -20,7 +22,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics ...@@ -20,7 +22,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
/// <value></value> /// <value></value>
/// <returns></returns> /// <returns></returns>
/// <remarks></remarks> /// <remarks></remarks>
double PowerNetVoltage { get; set; } Volt PowerNetVoltage { get; set; }
/// <summary> /// <summary>
/// The Path for the Alternator map /// The Path for the Alternator map
...@@ -52,7 +54,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics ...@@ -52,7 +54,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
/// <value></value> /// <value></value>
/// <returns></returns> /// <returns></returns>
/// <remarks></remarks> /// <remarks></remarks>
int DoorActuationTimeSecond { get; set; } double DoorActuationTimeSecond { get; set; }
/// <summary> /// <summary>
/// Result Card Taken During Idle. /// Result Card Taken During Idle.
......
namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem { using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem {
public interface IPneumaticsAuxilliariesConfig public interface IPneumaticsAuxilliariesConfig
{ {
double OverrunUtilisationForCompressionFraction { get; set; } double OverrunUtilisationForCompressionFraction { get; set; }
......
...@@ -10,20 +10,21 @@ ...@@ -10,20 +10,21 @@
// See the LICENSE.txt for the specific language governing permissions and limitations. // See the LICENSE.txt for the specific language governing permissions and limitations.
using System; using System;
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
{ {
public class SmartResult : IComparable<SmartResult> public class SmartResult : IComparable<SmartResult>
{ {
public double Amps { get; set; } public Ampere Amps { get; set; }
public double SmartAmps { get; set; } public Ampere SmartAmps { get; set; }
// Constructors // Constructors
public SmartResult() public SmartResult()
{ {
} }
public SmartResult(double amps, double smartAmps) public SmartResult(Ampere amps, Ampere smartAmps)
{ {
Amps = amps; Amps = amps;
SmartAmps = smartAmps; SmartAmps = smartAmps;
...@@ -32,10 +33,12 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics ...@@ -32,10 +33,12 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
// Comparison // Comparison
public int CompareTo(SmartResult other) public int CompareTo(SmartResult other)
{ {
if (other.Amps > Amps) if (other.Amps > Amps) {
return -1; return -1;
if (other.Amps == Amps) }
if (other.Amps == Amps) {
return 0; return 0;
}
return 1; return 1;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment