diff --git a/HashingTool/ViewModel/ApplicationViewModel.cs b/HashingTool/ViewModel/ApplicationViewModel.cs
index 853602d021649472a7c41df99477573005fa7d07..500016b934d43ee023306f5fb01436db4ca23c80 100644
--- a/HashingTool/ViewModel/ApplicationViewModel.cs
+++ b/HashingTool/ViewModel/ApplicationViewModel.cs
@@ -75,14 +75,11 @@ namespace HashingTool.ViewModel
}
}
- public List<IMainView> MainViewModels
- {
- get { return AvailableViews ?? (AvailableViews = new List<IMainView>()); }
- }
+ public List<IMainView> MainViewModels => AvailableViews ?? (AvailableViews = new List<IMainView>());
public IMainView CurrentViewModel
{
- get { return _currentView; }
+ get => _currentView;
set {
if (_currentView == value) {
return;
@@ -92,15 +89,9 @@ namespace HashingTool.ViewModel
}
}
- public ICommand ChangeViewCommand
- {
- get { return _changeViewCommand ?? (_changeViewCommand = new RelayCommand<IMainView>(ChangeViewModel)); }
- }
+ public ICommand ChangeViewCommand => _changeViewCommand ?? (_changeViewCommand = new RelayCommand<IMainView>(ChangeViewModel));
- public ICommand ShowHomeViewCommand
- {
- get { return HomeView; }
- }
+ public ICommand ShowHomeViewCommand => HomeView;
private void ChangeViewModel(IMainView mainView)
@@ -112,9 +103,6 @@ namespace HashingTool.ViewModel
CurrentViewModel = MainViewModels.FirstOrDefault(mv => mv == mainView);
}
- public string VersionInformation
- {
- get { return string.Format("Vecto Hashing Tool {0} / Hashing Library {1}", _myVersion, _hashingLib); }
- }
+ public string VersionInformation => string.Format("Vecto Hashing Tool {0} / Hashing Library {1}", _myVersion, _hashingLib);
}
}
diff --git a/HashingTool/ViewModel/HashComponentDataViewModel.cs b/HashingTool/ViewModel/HashComponentDataViewModel.cs
index e65a6bb0f254f837f6b38b9d89ed0ba0ae1e1951..bc23aa2a9831b3b029943db37e349e6f9a9fd64b 100644
--- a/HashingTool/ViewModel/HashComponentDataViewModel.cs
+++ b/HashingTool/ViewModel/HashComponentDataViewModel.cs
@@ -69,14 +69,11 @@ namespace HashingTool.ViewModel
}
- public ICommand ShowHomeViewCommand
- {
- get { return ApplicationViewModel.HomeView; }
- }
+ public ICommand ShowHomeViewCommand => ApplicationViewModel.HomeView;
public string DigestValue
{
- get { return _digestValue; }
+ get => _digestValue;
set {
if (_digestValue == value) {
return;
@@ -86,10 +83,7 @@ namespace HashingTool.ViewModel
}
}
- public ICommand SaveHashedDocument
- {
- get { return _saveCommand; }
- }
+ public ICommand SaveHashedDocument => _saveCommand;
private void SourceChanged(object sender, PropertyChangedEventArgs e)
{
@@ -117,7 +111,7 @@ namespace HashingTool.ViewModel
public bool? ComponentDataValid
{
- get { return _componentDataValid; }
+ get => _componentDataValid;
private set {
if (_componentDataValid == value) {
return;
@@ -204,7 +198,7 @@ namespace HashingTool.ViewModel
public DateTime? Date
{
- get { return _date; }
+ get => _date;
set
{
if (_date == value) {
diff --git a/HashingTool/ViewModel/HomeViewModel.cs b/HashingTool/ViewModel/HomeViewModel.cs
index 13cfe588d2b565fd38b0d26f5e949e3826fb948f..8154fcdf3298c35b7d6fc692079a61657a8e810c 100644
--- a/HashingTool/ViewModel/HomeViewModel.cs
+++ b/HashingTool/ViewModel/HomeViewModel.cs
@@ -38,22 +38,11 @@ namespace HashingTool.ViewModel
{
- public string Name
- {
- get { return "Home"; }
- }
+ public string Name => "Home";
- public List<IMainView> MainViewModels
- {
- get { return ApplicationViewModel.AvailableViews; }
- }
+ public List<IMainView> MainViewModels => ApplicationViewModel.AvailableViews;
-
-
- public ICommand ShowHomeViewCommand
- {
- get { return ApplicationViewModel.HomeView; }
- }
+ public ICommand ShowHomeViewCommand => ApplicationViewModel.HomeView;
}
}
diff --git a/HashingTool/ViewModel/UserControl/CustomerReportXMLFile.cs b/HashingTool/ViewModel/UserControl/CustomerReportXMLFile.cs
index 22fc7ba3282ff7593154660ac6da2d17e513af28..73665e0bd4b32a69cb20e5c3b4532705fa6a6b56 100644
--- a/HashingTool/ViewModel/UserControl/CustomerReportXMLFile.cs
+++ b/HashingTool/ViewModel/UserControl/CustomerReportXMLFile.cs
@@ -57,7 +57,7 @@ namespace HashingTool.ViewModel.UserControl
public ManufacturerReportXMLFile ManufacturerReport
{
- get { return _manufacturerReport; }
+ get => _manufacturerReport;
set {
if (_manufacturerReport == value) {
return;
@@ -69,7 +69,7 @@ namespace HashingTool.ViewModel.UserControl
public string[] ManufacturerReportCanonicalizationMethodRead
{
- get { return _manufacturerReportCanonicalizationMethodRead; }
+ get => _manufacturerReportCanonicalizationMethodRead;
set
{
if (_manufacturerReportCanonicalizationMethodRead == value) {
@@ -82,7 +82,7 @@ namespace HashingTool.ViewModel.UserControl
public string ManufacturerReportDigestMethodRead
{
- get { return _manufacturerReportDigestMethodRead; }
+ get => _manufacturerReportDigestMethodRead;
set
{
if (_manufacturerReportDigestMethodRead == value) {
@@ -95,7 +95,7 @@ namespace HashingTool.ViewModel.UserControl
public string ManufacturerReportDigestValueRead
{
- get { return _manufacturerReportDigestValueRead; }
+ get => _manufacturerReportDigestValueRead;
set
{
if (_manufacturerReportDigestValueRead == value) {
@@ -108,7 +108,7 @@ namespace HashingTool.ViewModel.UserControl
public bool ManufacturerReportMatchesReport
{
- get { return _manufacturerReportMatchesReport; }
+ get => _manufacturerReportMatchesReport;
set
{
if (_manufacturerReportMatchesReport == value) {
@@ -121,7 +121,7 @@ namespace HashingTool.ViewModel.UserControl
public string ManufacturerReportDigestValueComputed
{
- get { return _manufacturerReportDigestValueComputed; }
+ get => _manufacturerReportDigestValueComputed;
set
{
if (_manufacturerReportDigestValueComputed == value) {
@@ -134,7 +134,7 @@ namespace HashingTool.ViewModel.UserControl
public bool ManufacturerReportDigestValid
{
- get { return _manufacturerReportDigestValid; }
+ get => _manufacturerReportDigestValid;
set {
if (_manufacturerReportDigestValid == value) {
return;
diff --git a/HashingTool/ViewModel/UserControl/HashedXMLFile.cs b/HashingTool/ViewModel/UserControl/HashedXMLFile.cs
index 08c3df85d1b966798f3c482cff0c6be48651d868..7eaba6870d6751ae044193c82cc701306c55da34 100644
--- a/HashingTool/ViewModel/UserControl/HashedXMLFile.cs
+++ b/HashingTool/ViewModel/UserControl/HashedXMLFile.cs
@@ -48,7 +48,7 @@ namespace HashingTool.ViewModel.UserControl
public string DigestValueRead
{
- get { return _digestValueRead; }
+ get => _digestValueRead;
internal set {
if (_digestValueRead == value) {
return;
@@ -78,7 +78,7 @@ namespace HashingTool.ViewModel.UserControl
public DateTime? Date
{
- get { return _date; }
+ get => _date;
internal set {
if (_date == value) {
return;
diff --git a/HashingTool/ViewModel/UserControl/ManufacturerReportXMLFile.cs b/HashingTool/ViewModel/UserControl/ManufacturerReportXMLFile.cs
index 9dc4b67f71d85a50e926e2c4d9aa57cba8b2da39..6661fe0a93bc42ee7533000e0fef6d0c01473bdb 100644
--- a/HashingTool/ViewModel/UserControl/ManufacturerReportXMLFile.cs
+++ b/HashingTool/ViewModel/UserControl/ManufacturerReportXMLFile.cs
@@ -155,7 +155,7 @@ namespace HashingTool.ViewModel.UserControl
public bool ManufacturerReportValid
{
- get { return _manufacturerReportValid; }
+ get => _manufacturerReportValid;
set {
if (_manufacturerReportValid == value) {
return;
diff --git a/HashingTool/ViewModel/UserControl/ReportXMLFile.cs b/HashingTool/ViewModel/UserControl/ReportXMLFile.cs
index 6e3ec84c19cba3603558173bb72c901615af194f..bf81ff1b85c08b615d1f6f3d881b3d8106ad08c5 100644
--- a/HashingTool/ViewModel/UserControl/ReportXMLFile.cs
+++ b/HashingTool/ViewModel/UserControl/ReportXMLFile.cs
@@ -57,10 +57,7 @@ namespace HashingTool.ViewModel.UserControl
_xmlFile.PropertyChanged += ReportChanged;
}
- public ObservableCollection<string> ValidationErrors
- {
- get { return _validationErrors; }
- }
+ public ObservableCollection<string> ValidationErrors => _validationErrors;
public VectoJobFile JobData
{
@@ -150,7 +147,7 @@ namespace HashingTool.ViewModel.UserControl
public string ReportVIN
{
- get { return _reportVin; }
+ get => _reportVin;
set {
if (_reportVin == value) {
return;
@@ -162,7 +159,7 @@ namespace HashingTool.ViewModel.UserControl
public string JobDigestMethodRead
{
- get { return _jobDigestMethodRead; }
+ get => _jobDigestMethodRead;
set {
if (_jobDigestMethodRead == value) {
return;
@@ -174,7 +171,7 @@ namespace HashingTool.ViewModel.UserControl
public string[] JobCanonicalizationMethodRead
{
- get { return _jobCanonicalizationMethodRead; }
+ get => _jobCanonicalizationMethodRead;
set {
if (_jobCanonicalizationMethodRead == value) {
return;
@@ -186,7 +183,7 @@ namespace HashingTool.ViewModel.UserControl
public string JobDigestValueRead
{
- get { return _jobDigestValueReadRead; }
+ get => _jobDigestValueReadRead;
internal set {
if (_jobDigestValueReadRead == value) {
return;
@@ -198,7 +195,7 @@ namespace HashingTool.ViewModel.UserControl
public string JobDigestValueComputed
{
- get { return _jobDigestComputed; }
+ get => _jobDigestComputed;
protected set {
if (_jobDigestComputed == value) {
return;
@@ -210,7 +207,7 @@ namespace HashingTool.ViewModel.UserControl
public bool JobDigestMatchesReport
{
- get { return _jobDigestMatchesReport; }
+ get => _jobDigestMatchesReport;
protected set {
if (_jobDigestMatchesReport == value) {
return;
diff --git a/HashingTool/ViewModel/UserControl/VectoJobFile.cs b/HashingTool/ViewModel/UserControl/VectoJobFile.cs
index 57fb7a4ae60b1418bc9acd0a2e9a9886eb2086df..4dd5eb4b9d0f6d804b6ae492964653ca8300210b 100644
--- a/HashingTool/ViewModel/UserControl/VectoJobFile.cs
+++ b/HashingTool/ViewModel/UserControl/VectoJobFile.cs
@@ -62,7 +62,7 @@ namespace HashingTool.ViewModel.UserControl
public bool? JobDataValid
{
- get { return _componentDataValid; }
+ get => _componentDataValid;
set {
if (_componentDataValid == value) {
return;
@@ -77,7 +77,7 @@ namespace HashingTool.ViewModel.UserControl
public string JobValidToolTip
{
- get { return _jobValidToolTip; }
+ get => _jobValidToolTip;
set {
if (_jobValidToolTip == value) {
return;
@@ -89,7 +89,7 @@ namespace HashingTool.ViewModel.UserControl
public string VehicleIdentificationNumber
{
- get { return _vin; }
+ get => _vin;
set {
if (_vin == value) {
return;
@@ -101,7 +101,7 @@ namespace HashingTool.ViewModel.UserControl
public DateTime? JobCreationDate
{
- get { return _jobDate; }
+ get => _jobDate;
set {
if (_jobDate == value) {
return;
diff --git a/HashingTool/ViewModel/UserControl/VectoXMLFile.cs b/HashingTool/ViewModel/UserControl/VectoXMLFile.cs
index 564582ca54b838b529c8412d9cf59ef0fd9d656b..04659ff390d74748b01462ad8a06ba26e80b43d8 100644
--- a/HashingTool/ViewModel/UserControl/VectoXMLFile.cs
+++ b/HashingTool/ViewModel/UserControl/VectoXMLFile.cs
@@ -79,14 +79,11 @@ namespace HashingTool.ViewModel.UserControl
}
- public XMLFileSelector XMLFile
- {
- get { return _xmlFile; }
- }
+ public XMLFileSelector XMLFile => _xmlFile;
public string Name
{
- get { return _name; }
+ get => _name;
private set {
if (_name == value) {
return;
@@ -109,7 +106,7 @@ namespace HashingTool.ViewModel.UserControl
public string DigestMethod
{
- get { return _digestMethod; }
+ get => _digestMethod;
set {
if (_digestMethod == value) {
return;
@@ -122,7 +119,7 @@ namespace HashingTool.ViewModel.UserControl
public string DigestValueComputed
{
- get { return _digestValueComputed; }
+ get => _digestValueComputed;
internal set {
if (_digestValueComputed == value) {
return;
@@ -135,7 +132,7 @@ namespace HashingTool.ViewModel.UserControl
public bool? FileIntegrityValid
{
- get { return _fileIntegrityValid; }
+ get => _fileIntegrityValid;
internal set {
if (_fileIntegrityValid == value) {
return;
@@ -147,7 +144,7 @@ namespace HashingTool.ViewModel.UserControl
public string FileIntegrityTooltip
{
- get { return _tooltip; }
+ get => _tooltip;
set {
if (_tooltip == value) {
return;
@@ -159,7 +156,7 @@ namespace HashingTool.ViewModel.UserControl
public string Component
{
- get { return _componentType; }
+ get => _componentType;
set {
if (_componentType == value) {
return;
diff --git a/HashingTool/ViewModel/UserControl/XMLFileSelector.cs b/HashingTool/ViewModel/UserControl/XMLFileSelector.cs
index cee9c493599fbaecc86a292104202672ab0cde57..4db604806c8c22e4af49340ffbbc4696e3e89032 100644
--- a/HashingTool/ViewModel/UserControl/XMLFileSelector.cs
+++ b/HashingTool/ViewModel/UserControl/XMLFileSelector.cs
@@ -90,7 +90,7 @@ namespace HashingTool.ViewModel.UserControl
public XmlDocument Document
{
- get { return _document; }
+ get => _document;
private set {
if (_document == value) {
return;
@@ -102,7 +102,7 @@ namespace HashingTool.ViewModel.UserControl
public string Source
{
- get { return _source; }
+ get => _source;
private set {
if (_source == value) {
return;
@@ -113,14 +113,11 @@ namespace HashingTool.ViewModel.UserControl
}
}
- public bool ValidateInput
- {
- get { return _validate; }
- }
+ public bool ValidateInput => _validate;
public XmlFileStatus IsValid
{
- get { return _isValid; }
+ get => _isValid;
private set {
if (_isValid == value) {
return;
@@ -162,10 +159,7 @@ namespace HashingTool.ViewModel.UserControl
public ObservableCollection<string> XMLValidationErrors { get; set; }
- public ICommand BrowseFileCommand
- {
- get { return _browseFileCommand; }
- }
+ public ICommand BrowseFileCommand => _browseFileCommand;
public ICommand SetXMLFileCommnd
{
@@ -265,7 +259,7 @@ namespace HashingTool.ViewModel.UserControl
public bool? ContentValid
{
- get { return _contentValid; }
+ get => _contentValid;
set {
if (_contentValid == value) {
return;
diff --git a/HashingTool/ViewModel/VerifyComponentInputDataViewModel.cs b/HashingTool/ViewModel/VerifyComponentInputDataViewModel.cs
index 5c7a86160fe55ea84581561571817d4228b17136..8e6e5fff620a051a7889cd9156c681592e971dba 100644
--- a/HashingTool/ViewModel/VerifyComponentInputDataViewModel.cs
+++ b/HashingTool/ViewModel/VerifyComponentInputDataViewModel.cs
@@ -54,14 +54,11 @@ namespace HashingTool.ViewModel
_xmlFile.PropertyChanged += ComponentFilechanged;
}
- public ICommand ShowHomeViewCommand
- {
- get { return ApplicationViewModel.HomeView; }
- }
+ public ICommand ShowHomeViewCommand => ApplicationViewModel.HomeView;
public string CertificationNumber
{
- get { return _certificationNumber; }
+ get => _certificationNumber;
private set {
if (_certificationNumber == value)
return;
diff --git a/HashingTool/ViewModel/VerifyJobInputDataViewModel.cs b/HashingTool/ViewModel/VerifyJobInputDataViewModel.cs
index 76f3e2cd47e2a0af55a66af1e11c9b717b584fad..cd93f29c03181ee3841b6524d50d2af49353eb62 100644
--- a/HashingTool/ViewModel/VerifyJobInputDataViewModel.cs
+++ b/HashingTool/ViewModel/VerifyJobInputDataViewModel.cs
@@ -40,14 +40,8 @@ namespace HashingTool.ViewModel
public VerifyJobInputDataViewModel() : base("Verify VECTO Job", HashingHelper.IsJobFile, HashingHelper.HashJobFile) {}
- public ICommand ShowHomeViewCommand
- {
- get { return ApplicationViewModel.HomeView; }
- }
+ public ICommand ShowHomeViewCommand => ApplicationViewModel.HomeView;
- public XMLFileSelector JobFile
- {
- get { return _xmlFile; }
- }
+ public XMLFileSelector JobFile => _xmlFile;
}
}
diff --git a/HashingTool/ViewModel/VerifyResultDataViewModel.cs b/HashingTool/ViewModel/VerifyResultDataViewModel.cs
index 3b438aaca0fea75f55e3d84933a3b20827b6acaa..cc36f19cb97d49f4c2ee9518e190dc8bc4639c07 100644
--- a/HashingTool/ViewModel/VerifyResultDataViewModel.cs
+++ b/HashingTool/ViewModel/VerifyResultDataViewModel.cs
@@ -87,31 +87,16 @@ namespace HashingTool.ViewModel
}
- public string Name
- {
- get { return "Verify Result Data"; }
- }
+ public string Name => "Verify Result Data";
- public ICommand ShowHomeViewCommand
- {
- get { return ApplicationViewModel.HomeView; }
- }
+ public ICommand ShowHomeViewCommand => ApplicationViewModel.HomeView;
- public VectoJobFile JobFile
- {
- get { return _jobFile; }
- }
+ public VectoJobFile JobFile => _jobFile;
- public CustomerReportXMLFile CustomerReport
- {
- get { return _customerReport; }
- }
+ public CustomerReportXMLFile CustomerReport => _customerReport;
- public ManufacturerReportXMLFile ManufacturerReport
- {
- get { return _manufacturerReport; }
- }
+ public ManufacturerReportXMLFile ManufacturerReport => _manufacturerReport;
public ObservableCollection<VectoXMLFile> Files { get; private set; }
diff --git a/HashingTool/Views/Dialog/XMLValidationErrorsDialog.xaml.cs b/HashingTool/Views/Dialog/XMLValidationErrorsDialog.xaml.cs
index be093a99198faedb633f7853ffc98c6a62f668db..144739de085eed25a5c391af50c2cab9d357b7f3 100644
--- a/HashingTool/Views/Dialog/XMLValidationErrorsDialog.xaml.cs
+++ b/HashingTool/Views/Dialog/XMLValidationErrorsDialog.xaml.cs
@@ -55,8 +55,8 @@ namespace HashingTool.Views
public ICollection XMLErrors
{
- get { return (ICollection)GetValue(XMLErrorsProperty); }
- set { SetValue(XMLErrorsProperty, value); }
+ get => (ICollection)GetValue(XMLErrorsProperty);
+ set => SetValue(XMLErrorsProperty, value);
}
public int ErrorCount
@@ -68,7 +68,7 @@ namespace HashingTool.Views
}
return 0;
}
- set { SetValue(ErrorCountProperty, value); }
+ set => SetValue(ErrorCountProperty, value);
}
private void btnCopy_Click(object sender, RoutedEventArgs e)
diff --git a/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml.cs b/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml.cs
index a560bda97f5fba11f76eca8db32d819a191dd88e..1b163bbdb75e0c37be2f08bb8981cfda72362152 100644
--- a/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml.cs
+++ b/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml.cs
@@ -52,8 +52,8 @@ namespace HashingTool.Views
public XMLFileSelector XMLFile
{
- get { return (XMLFileSelector)GetValue(XMLFileProperty); }
- set { SetValue(XMLFileProperty, value); }
+ get => (XMLFileSelector)GetValue(XMLFileProperty);
+ set => SetValue(XMLFileProperty, value);
}
private void btnDetails_Click(object sender, RoutedEventArgs e)
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index d9ba954aa970cf40a7b8f64bfd36b1b6552bb622..72ef3e502ea06abcd23770edd3a6537c9543bc9e 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -85,10 +85,7 @@ namespace TUGraz.VectoCommon.InputData
public string SourceVersion { get; set; }
- public string SourcePath
- {
- get { return SourceFile != null ? Path.GetDirectoryName(Path.GetFullPath(SourceFile)) : null; }
- }
+ public string SourcePath => SourceFile != null ? Path.GetDirectoryName(Path.GetFullPath(SourceFile)) : null;
}
public interface IVehicleDeclarationInputData : IComponentInputData
diff --git a/VectoCommon/VectoCommon/Models/GearshiftPosition.cs b/VectoCommon/VectoCommon/Models/GearshiftPosition.cs
index be262755f4401675da2efa43d35cefeebc203f25..2d8e6983f160c737608b267c9350d85f2a1a9ce6 100644
--- a/VectoCommon/VectoCommon/Models/GearshiftPosition.cs
+++ b/VectoCommon/VectoCommon/Models/GearshiftPosition.cs
@@ -24,17 +24,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return Name;
}
- public string Name
- {
- get {
- return $"{Gear}{(Gear == 0 ? "" : (TorqueConverterLocked.HasValue ? (TorqueConverterLocked.Value ? "L" : "C") : ""))}";
- }
- }
+ public string Name => $"{Gear}{(Gear == 0 ? "" : (TorqueConverterLocked.HasValue ? (TorqueConverterLocked.Value ? "L" : "C") : ""))}";
- public bool Engaged
- {
- get { return Gear != 0; }
- }
+ public bool Engaged => Gear != 0;
public override bool Equals(object x)
{
diff --git a/VectoCommon/VectoCommon/Models/HybridStrategyResponse.cs b/VectoCommon/VectoCommon/Models/HybridStrategyResponse.cs
index 7d508a59c2aaf810e2358b9b1df09c849187749b..b2a328ef07f269023ee673192327a9702ce807da 100644
--- a/VectoCommon/VectoCommon/Models/HybridStrategyResponse.cs
+++ b/VectoCommon/VectoCommon/Models/HybridStrategyResponse.cs
@@ -44,14 +44,9 @@ namespace TUGraz.VectoCommon.Models {
public IResponse Response { get; set; }
- public double Score
- {
- get
- {
- return (FuelCosts + EquivalenceFactor * (BatCosts + ICEStartPenalty1) * SoCPenalty + ICEStartPenalty2 +
- RampUpPenalty) / GearshiftPenalty;
- }
- }
+ public double Score =>
+ (FuelCosts + EquivalenceFactor * (BatCosts + ICEStartPenalty1) * SoCPenalty + ICEStartPenalty2 +
+ RampUpPenalty) / GearshiftPenalty;
public double FuelCosts { get; set; }
diff --git a/VectoCommon/VectoCommon/Models/LoggingObject.cs b/VectoCommon/VectoCommon/Models/LoggingObject.cs
index 671fdd5ceb4c5341ec9c927045fbd4032d130225..3792016149502efda3d321da952530ff9c50db8e 100644
--- a/VectoCommon/VectoCommon/Models/LoggingObject.cs
+++ b/VectoCommon/VectoCommon/Models/LoggingObject.cs
@@ -68,8 +68,8 @@ namespace TUGraz.VectoCommon.Models
public static bool LogEnabled
{
- get { return _logEnabled.Value; }
- set { _logEnabled.Value = value; }
+ get => _logEnabled.Value;
+ set => _logEnabled.Value = value;
}
private readonly Logger _log;
@@ -189,9 +189,6 @@ namespace TUGraz.VectoCommon.Models
}
}
- protected LoggingObject Log
- {
- get { return this; }
- }
+ protected LoggingObject Log => this;
}
}
\ No newline at end of file
diff --git a/VectoCommon/VectoCommon/Utils/SI.cs b/VectoCommon/VectoCommon/Utils/SI.cs
index 20f87411af63df03583ad3aa8359576c6c2c879f..915ddab15ce98f6ca9c8a0e9375ee90604431b33 100644
--- a/VectoCommon/VectoCommon/Utils/SI.cs
+++ b/VectoCommon/VectoCommon/Utils/SI.cs
@@ -106,7 +106,7 @@ namespace TUGraz.VectoCommon.Utils
[DebuggerHidden]
private Newton(double val) : base(val, Units) { }
- public override string UnitString { get { return "N"; } }
+ public override string UnitString => "N";
[DebuggerHidden]
public static NewtonMeter operator *(Newton newton, Meter meter)
@@ -261,7 +261,7 @@ namespace TUGraz.VectoCommon.Utils
[DebuggerHidden]
private KilogramPerMeter(double val) : base(val, Units) { }
- public override string UnitString { get { return "kg/m"; } }
+ public override string UnitString => "kg/m";
public static KilogramPerMeterMass operator /(KilogramPerMeter kpm, Kilogram kg)
{
@@ -283,7 +283,7 @@ namespace TUGraz.VectoCommon.Utils
private LiterPerSecond(double val) : base(val, 0.001, Units) { }
- public override string UnitString { get { return "l/s"; } }
+ public override string UnitString => "l/s";
[DebuggerHidden]
public static Liter operator *(LiterPerSecond l, Second second)
@@ -370,7 +370,7 @@ namespace TUGraz.VectoCommon.Utils
//[DebuggerHidden]
private Liter(double val) : base(val , 0.001, Units) { }
- public override string UnitString { get { return "l"; } }
+ public override string UnitString => "l";
public static Kilogram operator *(Liter liter, KilogramPerCubicMeter kilogramPerCubicMeter)
{
@@ -388,7 +388,7 @@ namespace TUGraz.VectoCommon.Utils
//[DebuggerHidden]
private NormLiter(double val) : base(val , 0.001, Units) { }
- public override string UnitString { get { return "Nl"; } }
+ public override string UnitString => "Nl";
public static NormLiterPerSecond operator /(NormLiter nl, Second s)
{
@@ -403,7 +403,7 @@ namespace TUGraz.VectoCommon.Utils
//[DebuggerHidden]
private NormLiterPerKilogram(double val) : base(val , 0.001, Units) { }
- public override string UnitString { get { return "Nl/kg"; } }
+ public override string UnitString => "Nl/kg";
public static NormLiter operator *(NormLiterPerKilogram nlpkg, Kilogram kg)
{
@@ -419,7 +419,7 @@ namespace TUGraz.VectoCommon.Utils
//[DebuggerHidden]
private NormLiterPerKilogramMeter(double val) : base(val , 0.001, Units) { }
- public override string UnitString { get { return "Nl/kgm"; } }
+ public override string UnitString => "Nl/kgm";
public static NormLiterPerKilogram operator *(NormLiterPerKilogramMeter nlpkgm, Meter m)
{
@@ -437,7 +437,7 @@ namespace TUGraz.VectoCommon.Utils
//[DebuggerHidden]
private NormLiterPerSecond(double val) : base(val, 0.001, Units) { }
- public override string UnitString { get { return "Nl/s"; } }
+ public override string UnitString => "Nl/s";
public static NormLiter operator *(NormLiterPerSecond nips, Second s)
{
@@ -557,7 +557,7 @@ namespace TUGraz.VectoCommon.Utils
[DebuggerHidden]
private KilogramPerCubicMeter(double value) : base(value, Units) { }
- public override string UnitString { get { return "kg/m^3"; } }
+ public override string UnitString => "kg/m^3";
[DebuggerHidden]
public static Kilogram operator *(KilogramPerCubicMeter kilogramPerCubicMeter, CubicMeter cubicMeter)
@@ -578,7 +578,7 @@ namespace TUGraz.VectoCommon.Utils
[DebuggerHidden]
private KilogramPerWattSecond(double val) : base(val, Units) { }
- public override string UnitString { get { return "kg/Ws"; } }
+ public override string UnitString => "kg/Ws";
public static Kilogram operator *(KilogramPerWattSecond kpws, WattSecond ws)
{
@@ -597,7 +597,7 @@ namespace TUGraz.VectoCommon.Utils
[DebuggerHidden]
private WattSecond(double val) : base(val, Units) { }
- public override string UnitString { get { return "Ws"; } }
+ public override string UnitString => "Ws";
[DebuggerHidden]
public static Watt operator /(WattSecond wattSecond, Second second)
@@ -632,7 +632,7 @@ namespace TUGraz.VectoCommon.Utils
private WattPerKelvinSquareMeter(double val) : base(val, Units)
{ }
- public override string UnitString { get { return "W/Km^2"; } }
+ public override string UnitString => "W/Km^2";
}
public class WattPerSquareMeter : SIBase<WattPerSquareMeter>
@@ -646,7 +646,7 @@ namespace TUGraz.VectoCommon.Utils
{
return SIBase<Watt>.Create(wpsqm.Val * sqm.Value());
}
- public override string UnitString { get { return "W/m^2"; } }
+ public override string UnitString => "W/m^2";
}
@@ -657,7 +657,7 @@ namespace TUGraz.VectoCommon.Utils
private WattPerCubicMeter(double val) : base(val, Units)
{ }
- public override string UnitString { get { return "W/m^3"; } }
+ public override string UnitString => "W/m^3";
public static Watt operator *(WattPerCubicMeter wpcm, CubicMeter cm)
{
@@ -675,7 +675,7 @@ namespace TUGraz.VectoCommon.Utils
[DebuggerHidden]
private Watt(double val) : base(val, Units) { }
- public override string UnitString { get { return "W"; } }
+ public override string UnitString => "W";
/// <summary>
/// Implements the operator /.
@@ -747,7 +747,7 @@ namespace TUGraz.VectoCommon.Utils
[DebuggerHidden]
private Joule(double val) : base(val, Units) { }
- public override string UnitString { get { return "J"; } }
+ public override string UnitString => "J";
public static implicit operator Joule(WattSecond self)
{
@@ -782,10 +782,7 @@ namespace TUGraz.VectoCommon.Utils
[DebuggerHidden]
private JoulePerNormLiter(double val) : base(val, Units) { }
- public override string UnitString
- {
- get { return "J/Nl"; }
- }
+ public override string UnitString => "J/Nl";
public static Watt operator *(JoulePerNormLiter jpnl, NormLiterPerSecond nlps)
{
@@ -802,7 +799,7 @@ namespace TUGraz.VectoCommon.Utils
private JoulePerKilogramm(double val) : base(val, Units) { }
- public override string UnitString { get { return "J/kg"; } }
+ public override string UnitString => "J/kg";
public static Joule operator *(Kilogram kg, JoulePerKilogramm jpg)
{
@@ -839,7 +836,7 @@ namespace TUGraz.VectoCommon.Utils
[DebuggerHidden]
private JoulePerMeter(double val) : base(val, Units) { }
- public override string UnitString { get { return "J/m"; } }
+ public override string UnitString => "J/m";
public static KilogramPerMeter operator /(JoulePerMeter jpm, JoulePerKilogramm jpkg)
{
@@ -869,10 +866,7 @@ namespace TUGraz.VectoCommon.Utils
return SIBase<MeterPerSecond>.Create(perSecond.Val * meter.Value());
}
- public double AsRPM
- {
- get { return Val * 60 / (2 * Math.PI); }
- }
+ public double AsRPM => Val * 60 / (2 * Math.PI);
}
/// <summary>
@@ -886,10 +880,7 @@ namespace TUGraz.VectoCommon.Utils
[DebuggerHidden]
private MeterPerSecond(double val) : base(val, Units) { }
- public double AsKmph
- {
- get { return Val * 3.6; }
- }
+ public double AsKmph => Val * 3.6;
/// <summary>
/// Implements the operator /.
@@ -957,7 +948,7 @@ namespace TUGraz.VectoCommon.Utils
[DebuggerHidden]
private NewtonMeter(double val) : base(val, Units) { }
- public override string UnitString { get { return "Nm"; } }
+ public override string UnitString => "Nm";
[DebuggerHidden]
public static Watt operator *(NewtonMeter newtonMeter, PerSecond perSecond)
@@ -1011,7 +1002,7 @@ namespace TUGraz.VectoCommon.Utils
private static readonly int[] Units = { 1, 2, -1, 0, 0, 0, 0 };
private NewtonMeterSecond(double val) : base(val, Units) { }
- public override string UnitString { get { return "Nms"; } }
+ public override string UnitString => "Nms";
}
public class Kelvin : SIBase<Kelvin>
@@ -1020,10 +1011,7 @@ namespace TUGraz.VectoCommon.Utils
private Kelvin(double val) : base(val, Units) { }
- public double AsDegCelsius
- {
- get { return Val - 273.16; }
- }
+ public double AsDegCelsius => Val - 273.16;
public static KelvinSquareMeter operator *(Kelvin k, SquareMeter sq)
{
@@ -1090,11 +1078,9 @@ namespace TUGraz.VectoCommon.Utils
private AmpereSecond(double val) : base(val, Units) { }
- public override string UnitString { get { return "As"; } }
- public double AsAmpHour
- {
- get { return Val / 3600.0; }
- }
+ public override string UnitString => "As";
+
+ public double AsAmpHour => Val / 3600.0;
public static Ampere operator /(AmpereSecond ampereSecond, Second t)
{
@@ -1120,7 +1106,7 @@ namespace TUGraz.VectoCommon.Utils
private static readonly int[] Units = { 1, 2, -3, -1, 0, 0, 0 };
private Volt(double val) : base(val, Units) { }
- public override string UnitString { get { return "V"; } }
+ public override string UnitString => "V";
public static Watt operator *(Volt volt, Ampere ampere)
{
@@ -1149,7 +1135,7 @@ namespace TUGraz.VectoCommon.Utils
private Ohm(double val) : base(val, Units) { }
- public override string UnitString { get { return "Ω"; } }
+ public override string UnitString => "Ω";
}
public class Farad : SIBase<Farad>
@@ -1158,10 +1144,7 @@ namespace TUGraz.VectoCommon.Utils
private Farad(double val) : base(val, Units) {}
- public override string UnitString
- {
- get { return "F"; }
- }
+ public override string UnitString => "F";
public static Volt operator /(AmpereSecond charge, Farad capacity)
{
@@ -1179,7 +1162,7 @@ namespace TUGraz.VectoCommon.Utils
private static readonly int[] Units = { 0, 2, 0, 0, 0, 0, 0 };
private VolumePerMeter(double val) : base(val, Units) { }
- public override string UnitString { get { return "m^3/m"; } }
+ public override string UnitString => "m^3/m";
public static VolumePerMeterMass operator /(VolumePerMeter vpm, Kilogram kg)
{
@@ -1199,7 +1182,7 @@ namespace TUGraz.VectoCommon.Utils
private VolumePerMeterMass(double val) : base (val, Units) { }
- public override string UnitString { get { return "m^3/kgm"; } }
+ public override string UnitString => "m^3/kgm";
}
public class VolumePerMeterVolume : SIBase<VolumePerMeterVolume>
@@ -1208,7 +1191,7 @@ namespace TUGraz.VectoCommon.Utils
private VolumePerMeterVolume(double val) : base (val, Units) { }
- public override string UnitString { get { return "m^3/kgm^3"; } }
+ public override string UnitString => "m^3/kgm^3";
}
public class KilogramPerMeterCubicMeter : SIBase<KilogramPerMeterCubicMeter>
@@ -1217,7 +1200,7 @@ namespace TUGraz.VectoCommon.Utils
private KilogramPerMeterCubicMeter(double val) : base(val, Units) { }
- public override string UnitString { get { return "kg/(m m^3)"; } }
+ public override string UnitString => "kg/(m m^3)";
}
@@ -1227,7 +1210,7 @@ namespace TUGraz.VectoCommon.Utils
private KilogramPerMeterMass(double val) : base(val, Units) { }
- public override string UnitString { get { return "kg/(m kg)"; } }
+ public override string UnitString => "kg/(m kg)";
}
public class SpecificFuelConsumption : SIBase<SpecificFuelConsumption>
@@ -1236,7 +1219,7 @@ namespace TUGraz.VectoCommon.Utils
private SpecificFuelConsumption(double val) : base(val, Units) { }
- public override string UnitString { get { return "kg/Ws"; } }
+ public override string UnitString => "kg/Ws";
}
/// <summary>
@@ -1517,10 +1500,7 @@ namespace TUGraz.VectoCommon.Utils
return new SI(Val * UnitFactor, _units);
}
- protected double AsBasicUnit
- {
- get { return Val * UnitFactor; }
- }
+ protected double AsBasicUnit => Val * UnitFactor;
/// <summary>
@@ -1774,16 +1754,10 @@ namespace TUGraz.VectoCommon.Utils
}
- public virtual string SerializedValue
- {
- get { return ToString(); }
- }
+ public virtual string SerializedValue => ToString();
[JsonIgnore]
- public virtual string UnitString
- {
- get { return GetUnitString(_units); }
- }
+ public virtual string UnitString => GetUnitString(_units);
private string ToString(string format)
{
diff --git a/VectoCommon/VectoCommon/Utils/SIConvertExtensionMethods.cs b/VectoCommon/VectoCommon/Utils/SIConvertExtensionMethods.cs
index f25905cc4fd67dcc7bd5f1ffd4df37d88b814a11..017b45e323fa91d95b05b698bd4d84a8fde9f644 100644
--- a/VectoCommon/VectoCommon/Utils/SIConvertExtensionMethods.cs
+++ b/VectoCommon/VectoCommon/Utils/SIConvertExtensionMethods.cs
@@ -50,7 +50,7 @@ namespace TUGraz.VectoCommon.Utils
return Units;
}
- public double Value { get { return _value; } }
+ public double Value => _value;
protected bool Equals(ConvertedSI other)
{
diff --git a/VectoCommon/VectoCommon/Utils/SIUtils.cs b/VectoCommon/VectoCommon/Utils/SIUtils.cs
index 51584d1c9025b6acb3f04851a9eca898efe85926..aa6fcf2944d5933dbd94579698d0f660870d147e 100644
--- a/VectoCommon/VectoCommon/Utils/SIUtils.cs
+++ b/VectoCommon/VectoCommon/Utils/SIUtils.cs
@@ -312,10 +312,7 @@ namespace TUGraz.VectoCommon.Utils
/// <summary>
/// [-]. Defines radian. Only virtual. Has no real SI unit.
/// </summary>
- public UnitInstance Radian
- {
- get { return this; }
- }
+ public UnitInstance Radian => this;
/// <summary>
/// [-]. Converts to/from Radiant. Internally everything is stored in radian.
diff --git a/VectoCommon/VectoCommon/Utils/VectoMath.cs b/VectoCommon/VectoCommon/Utils/VectoMath.cs
index c4e941db311fb3ae2f6e2eb38e3c6b906f3ba4ba..39e2cc008d16256bb949a31610d96e92890cb4fd 100644
--- a/VectoCommon/VectoCommon/Utils/VectoMath.cs
+++ b/VectoCommon/VectoCommon/Utils/VectoMath.cs
@@ -793,20 +793,11 @@ namespace TUGraz.VectoCommon.Utils
P2 = p2;
}
- public Point Vector
- {
- get { return _vector ?? (_vector = P2 - P1); }
- }
+ public Point Vector => _vector ?? (_vector = P2 - P1);
- public double SlopeXY
- {
- get { return Vector.Y / Vector.X; }
- }
+ public double SlopeXY => Vector.Y / Vector.X;
- public double OffsetXY
- {
- get { return P2.Y - SlopeXY * P2.X; }
- }
+ public double OffsetXY => P2.Y - SlopeXY * P2.X;
#region Equality members
diff --git a/VectoCommon/VectoHashing/Impl/XmlDsigVectoTransform.cs b/VectoCommon/VectoHashing/Impl/XmlDsigVectoTransform.cs
index 5c8f092738f3f162cdfa0dcbc1349e8cc7538a86..41117ad78647154879a780e6189be763d2ee5153 100644
--- a/VectoCommon/VectoHashing/Impl/XmlDsigVectoTransform.cs
+++ b/VectoCommon/VectoHashing/Impl/XmlDsigVectoTransform.cs
@@ -78,15 +78,9 @@ namespace TUGraz.VectoHashing
return _transform.GetOutput(type);
}
- public override Type[] InputTypes
- {
- get { return _transform.InputTypes; }
- }
+ public override Type[] InputTypes => _transform.InputTypes;
- public override Type[] OutputTypes
- {
- get { return _transform.OutputTypes; }
- }
+ public override Type[] OutputTypes => _transform.OutputTypes;
private static Stream ReadStream(string resourceName)
{
diff --git a/VectoCommon/VectoHashing/Impl/XmlHashProvider.cs b/VectoCommon/VectoHashing/Impl/XmlHashProvider.cs
index bdebe2e948617b5722226c020b22d171193a8972..6a7c781da008b5c301123a692d944000b408190e 100644
--- a/VectoCommon/VectoHashing/Impl/XmlHashProvider.cs
+++ b/VectoCommon/VectoHashing/Impl/XmlHashProvider.cs
@@ -55,10 +55,7 @@ namespace TUGraz.VectoHashing.Impl
}
}
- public static string DefaultDigestMethod
- {
- get { return DigestMethodSha256; }
- }
+ public static string DefaultDigestMethod => DigestMethodSha256;
public static ICollection<string> SupportedCanonicalizationMethods
{
diff --git a/VectoCommon/VectoHashing/VectoHash.cs b/VectoCommon/VectoHashing/VectoHash.cs
index f4d9e03b24aeb0ffa36f6b7147ff51b851c1a5ff..05d30012beb823de0e4b18026ef1dd42f776f11a 100644
--- a/VectoCommon/VectoHashing/VectoHash.cs
+++ b/VectoCommon/VectoHashing/VectoHash.cs
@@ -90,34 +90,22 @@ namespace TUGraz.VectoHashing
/// <summary>
/// Get a list of all supported digest methods
/// </summary>
- public static ICollection<string> SupportedDigestMehods
- {
- get { return XMLHashProvider.SupportedDigestMethods; }
- }
+ public static ICollection<string> SupportedDigestMehods => XMLHashProvider.SupportedDigestMethods;
/// <summary>
/// get the identifier of the default digest method
/// </summary>
- public static string DefaultDigestMethod
- {
- get { return XMLHashProvider.DefaultDigestMethod; }
- }
+ public static string DefaultDigestMethod => XMLHashProvider.DefaultDigestMethod;
/// <summary>
/// get a list of all supported canonicalization methods
/// </summary>
- public static ICollection<string> SupportedCanonicalizationMethods
- {
- get { return XMLHashProvider.SupportedCanonicalizationMethods; }
- }
+ public static ICollection<string> SupportedCanonicalizationMethods => XMLHashProvider.SupportedCanonicalizationMethods;
/// <summary>
/// get the sequence of the default canonicalization methods
/// </summary>
- public static IEnumerable<string> DefaultCanonicalizationMethod
- {
- get { return XMLHashProvider.DefaultCanonicalizationMethod; }
- }
+ public static IEnumerable<string> DefaultCanonicalizationMethod => XMLHashProvider.DefaultCanonicalizationMethod;
public IList<VectoComponents> GetContainigComponents()
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs
index 2f494bd06097f79c82cf4bbb8f29165ff45a50d6..17223a78524f49f3e28d18f4c6b345ff0431b3ef 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs
@@ -14,88 +14,34 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public JSONBatteryV1(JObject data, string filename, bool tolerateMissing = false) : base(data, filename,
tolerateMissing) { }
- public string Manufacturer
- {
- get { return Constants.NOT_AVailABLE; }
- }
+ public string Manufacturer => Constants.NOT_AVailABLE;
- public string Model
- {
- get { return Body.GetEx<string>("Model"); }
- }
+ public string Model => Body.GetEx<string>("Model");
- public DateTime Date
- {
- get { return DateTime.MinValue; }
- }
+ public DateTime Date => DateTime.MinValue;
- public CertificationMethod CertificationMethod
- {
- get { return CertificationMethod.NotCertified; }
- }
+ public CertificationMethod CertificationMethod => CertificationMethod.NotCertified;
- public string CertificationNumber
- {
- get { return Constants.NOT_AVailABLE; }
- }
+ public string CertificationNumber => Constants.NOT_AVailABLE;
- public DigestData DigestValue
- {
- get { return null; }
- }
+ public DigestData DigestValue => null;
- public double MinSOC
- {
- get { return Body.GetEx<double>("SOC_min") / 100.0; }
- }
+ public double MinSOC => Body.GetEx<double>("SOC_min") / 100.0;
- public double MaxSOC
- {
- get { return Body.GetEx<double>("SOC_max") / 100.0; }
- }
+ public double MaxSOC => Body.GetEx<double>("SOC_max") / 100.0;
- AmpereSecond IBatteryPackDeclarationInputData.Capacity
- {
- get { return Body.GetEx<double>("Capacity").SI(Unit.SI.Ampere.Hour).Cast<AmpereSecond>(); }
- }
+ AmpereSecond IBatteryPackDeclarationInputData.Capacity => Body.GetEx<double>("Capacity").SI(Unit.SI.Ampere.Hour).Cast<AmpereSecond>();
- Farad ISuperCapDeclarationInputData.Capacity
- {
- get
- {
- return Body.GetEx<double>("Capacity").SI<Farad>();
- }
- }
+ Farad ISuperCapDeclarationInputData.Capacity => Body.GetEx<double>("Capacity").SI<Farad>();
- public Ohm InternalResistance
- {
- get
- {
- return Body.GetEx<double>("InternalResistance").SI<Ohm>();
- }
- }
+ public Ohm InternalResistance => Body.GetEx<double>("InternalResistance").SI<Ohm>();
- public Volt MinVoltage
- {
- get
- {
- return Body.GetEx<double>("U_min").SI<Volt>();
- }
- }
+ public Volt MinVoltage => Body.GetEx<double>("U_min").SI<Volt>();
- public Volt MaxVoltage
- {
- get
- {
- return Body.GetEx<double>("U_max").SI<Volt>();
- }
- }
+ public Volt MaxVoltage => Body.GetEx<double>("U_max").SI<Volt>();
- public Ampere MaxCurrentCharge
- {
- get{ return Math.Abs(Body.GetEx<double>("I_maxCharge")).SI<Ampere>(); }
- }
- public Ampere MaxCurrentDischarge { get { return Math.Abs(Body.GetEx<double>("I_maxDischarge")).SI<Ampere>(); } }
+ public Ampere MaxCurrentCharge => Math.Abs(Body.GetEx<double>("I_maxCharge")).SI<Ampere>();
+ public Ampere MaxCurrentDischarge => Math.Abs(Body.GetEx<double>("I_maxDischarge")).SI<Ampere>();
public TableData InternalResistanceCurve
{
@@ -155,12 +101,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
- public REESSType StorageType
- {
- get
- {
- return Body["REESSType"] == null ? REESSType.Battery : Body.GetEx<string>("REESSType").ParseEnum<REESSType>();
- }
- }
+ public REESSType StorageType => Body["REESSType"] == null ? REESSType.Battery : Body.GetEx<string>("REESSType").ParseEnum<REESSType>();
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBusAuxiliariesEngineeringData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBusAuxiliariesEngineeringData.cs
index 698c705fb38092f84b7de81ae3ae66891c93a5d9..c3d651cefb23c9d5214325bd6ff3c238c4044ed6 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBusAuxiliariesEngineeringData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBusAuxiliariesEngineeringData.cs
@@ -23,74 +23,38 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
_hvac = Body["HVAC"];
}
- public IBusAuxPneumaticSystemEngineeringData PneumaticSystem
- {
- get { return this; }
- }
-
- public IBusAuxElectricSystemEngineeringData ElectricSystem
- {
- get { return this; }
- }
-
- public IBusAuxHVACData HVACData { get { return this; } }
+ public IBusAuxPneumaticSystemEngineeringData PneumaticSystem => this;
+
+ public IBusAuxElectricSystemEngineeringData ElectricSystem => this;
+
+ public IBusAuxHVACData HVACData => this;
#region Implementation of IBusAuxPneumaticSystemEngineeringData
- public TableData CompressorMap
- {
- get { return VectoCSVFile.Read(Path.Combine(BasePath, _pneumatic.GetEx<string>("CompressorMap"))); }
- }
+ public TableData CompressorMap => VectoCSVFile.Read(Path.Combine(BasePath, _pneumatic.GetEx<string>("CompressorMap")));
- public NormLiterPerSecond AverageAirConsumed
- {
- get { return _pneumatic.GetEx<double>("AverageAirDemand").SI<NormLiterPerSecond>(); }
- }
+ public NormLiterPerSecond AverageAirConsumed => _pneumatic.GetEx<double>("AverageAirDemand").SI<NormLiterPerSecond>();
- public bool SmartAirCompression
- {
- get { return _pneumatic.GetEx<bool>("SmartAirCompression"); }
- }
+ public bool SmartAirCompression => _pneumatic.GetEx<bool>("SmartAirCompression");
- public double GearRatio
- {
- get { return _pneumatic.GetEx<double>("GearRatio"); }
- }
+ public double GearRatio => _pneumatic.GetEx<double>("GearRatio");
#endregion
#region Implementation of IBusAuxElectricSystemEngineeringData
- public double AlternatorEfficiency
- {
- get { return _electric.GetEx<double>("AlternatorEfficiency"); }
- }
+ public double AlternatorEfficiency => _electric.GetEx<double>("AlternatorEfficiency");
- public double DCDCConverterEfficiency
- {
- get
- {
- return _electric["DCDCConverterEfficiency"] == null ? 1 : _electric.GetEx<double>("DCDCConverterEfficiency");
- }
- }
+ public double DCDCConverterEfficiency => _electric["DCDCConverterEfficiency"] == null ? 1 : _electric.GetEx<double>("DCDCConverterEfficiency");
- public Ampere CurrentDemand
- {
- get { return _electric.GetEx<double>("CurrentDemand").SI<Ampere>(); }
- }
+ public Ampere CurrentDemand => _electric.GetEx<double>("CurrentDemand").SI<Ampere>();
- public Ampere CurrentDemandEngineOffDriving { get { return _electric.GetEx<double>("CurrentDemandEngineOffDriving").SI<Ampere>(); } }
+ public Ampere CurrentDemandEngineOffDriving => _electric.GetEx<double>("CurrentDemandEngineOffDriving").SI<Ampere>();
- public Ampere CurrentDemandEngineOffStandstill { get { return _electric.GetEx<double>("CurrentDemandEngineOffStandstill").SI<Ampere>(); } }
+ public Ampere CurrentDemandEngineOffStandstill => _electric.GetEx<double>("CurrentDemandEngineOffStandstill").SI<Ampere>();
- public AlternatorType AlternatorType
- {
- get
- {
- return _electric["AlternatorType"] == null ? AlternatorType.Conventional : _electric.GetEx<string>("AlternatorType").ParseEnum<AlternatorType>();
- }
- }
+ public AlternatorType AlternatorType => _electric["AlternatorType"] == null ? AlternatorType.Conventional : _electric.GetEx<string>("AlternatorType").ParseEnum<AlternatorType>();
public WattSecond ElectricStorageCapacity
{
@@ -104,53 +68,23 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public Watt MaxAlternatorPower
- {
- get { return _electric.GetEx<double>("MaxAlternatorPower").SI<Watt>(); }
- }
+ public Watt MaxAlternatorPower => _electric.GetEx<double>("MaxAlternatorPower").SI<Watt>();
- public bool ESSupplyFromHEVREESS
- {
- get
- {
- return _electric["ESSupplyFromHEVREESS"] == null ? false : _electric.GetEx<bool>("ESSupplyFromHEVREESS");
- }
- }
+ public bool ESSupplyFromHEVREESS => _electric["ESSupplyFromHEVREESS"] == null ? false : _electric.GetEx<bool>("ESSupplyFromHEVREESS");
- public double ElectricStorageEfficiency
- {
- get
- {
- return _electric["BatteryEfficiency"] == null ? 1 : _electric.GetEx<double>("BatteryEfficiency");
- }
- }
+ public double ElectricStorageEfficiency => _electric["BatteryEfficiency"] == null ? 1 : _electric.GetEx<double>("BatteryEfficiency");
#endregion
#region Implementation of IBusAuxHVACData
- public Watt ElectricalPowerDemand
- {
- get { return _hvac.GetEx<double>("ElectricPowerDemand").SI<Watt>(); }
- }
+ public Watt ElectricalPowerDemand => _hvac.GetEx<double>("ElectricPowerDemand").SI<Watt>();
- public Watt MechanicalPowerDemand
- {
- get { return _hvac.GetEx<double>("MechanicalPowerDemand").SI<Watt>(); }
- }
+ public Watt MechanicalPowerDemand => _hvac.GetEx<double>("MechanicalPowerDemand").SI<Watt>();
- public Joule AverageHeatingDemand
- {
- get { return _hvac.GetEx<double>("AverageHeatingDemand").SI(Unit.SI.Mega.Joule).Cast<Joule>(); }
- }
+ public Joule AverageHeatingDemand => _hvac.GetEx<double>("AverageHeatingDemand").SI(Unit.SI.Mega.Joule).Cast<Joule>();
- public Watt AuxHeaterPower
- {
- get
- {
- return _hvac.GetEx<double>("AuxHeaterPower").SI<Watt>();
- }
- }
+ public Watt AuxHeaterPower => _hvac.GetEx<double>("AuxHeaterPower").SI<Watt>();
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index ff5e6e28ae1ae2eee2c9bcd529a70edd6ba7c215..7ef86cb640e3889dbfd72a22719e52084bc7a3f2 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -124,60 +124,32 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
- public IEngineeringJobInputData JobInputData
- {
- get { return this; }
- }
+ public IEngineeringJobInputData JobInputData => this;
- public virtual IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData
- {
- get { return null; }
- }
+ public virtual IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData => null;
- public XElement XMLHash
- {
- get { return new XElement(XMLNames.DI_Signature); }
- }
+ public XElement XMLHash => new XElement(XMLNames.DI_Signature);
- IDeclarationJobInputData IDeclarationInputDataProvider.JobInputData
- {
- get { return this; }
- }
+ IDeclarationJobInputData IDeclarationInputDataProvider.JobInputData => this;
- public IDriverEngineeringInputData DriverInputData
- {
- get { return this; }
- }
+ public IDriverEngineeringInputData DriverInputData => this;
public IOverSpeedEngineeringInputData OverSpeedData { get; }
public IDriverAccelerationData AccelerationCurve { get; }
public ILookaheadCoastingInputData Lookahead { get; }
- public IGearshiftEngineeringInputData GearshiftInputData
- {
- get { return GearshiftData; }
- }
+ public IGearshiftEngineeringInputData GearshiftInputData => GearshiftData;
public IEngineStopStartEngineeringInputData EngineStopStartData { get; }
public IEcoRollEngineeringInputData EcoRollData { get; }
public IPCCEngineeringInputData PCCData { get; }
- public DataSource DataSource
+ public DataSource DataSource => new DataSource { SourceType = DataSourceType.JSONFile, SourceFile = _filename };
- {
- get { return new DataSource { SourceType = DataSourceType.JSONFile, SourceFile = _filename }; }
- }
-
- public string AppVersion
- {
- get { return "VECTO-JSON"; }
- }
+ public string AppVersion => "VECTO-JSON";
- public string Source
- {
- get { return _filename; }
- }
+ public string Source => _filename;
public bool SavedInDeclarationMode { get; private set; }
public string Manufacturer { get; private set; }
@@ -187,17 +159,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public string CertificationNumber { get; private set; }
public DigestData DigestValue { get; private set; }
- IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle
- {
- get { return Vehicle; }
- }
+ IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle => Vehicle;
public IHybridStrategyParameters HybridStrategyParameters { get; set; }
- public IVehicleEngineeringInputData Vehicle
- {
- get { return VehicleData ?? this; }
- }
+ public IVehicleEngineeringInputData Vehicle => VehicleData ?? this;
public IList<ICycleData> Cycles { get; private set; }
@@ -207,86 +173,39 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public TableData PTOCycleWhileDrive { get; private set; }
- public string JobName
- {
- get { return ""; }
- }
+ public string JobName => "";
- public string ShiftStrategy
- {
- get { return ""; }
- }
+ public string ShiftStrategy => "";
- public string Identifier
- {
- get { return Vehicle.Identifier; }
- }
+ public string Identifier => Vehicle.Identifier;
- public bool ExemptedVehicle
- {
- get { return false; }
- }
+ public bool ExemptedVehicle => false;
- public string VIN
- {
- get { return VehicleData.VIN; }
- }
+ public string VIN => VehicleData.VIN;
- public string LegislativeCategory
- {
- get { return null; }
- }
+ public string LegislativeCategory => null;
- public LegislativeClass? LegislativeClass
- {
- get { return VehicleData.LegislativeClass; }
- }
+ public LegislativeClass? LegislativeClass => VehicleData.LegislativeClass;
- public VehicleCategory VehicleCategory
- {
- get { return VehicleData.VehicleCategory; }
- }
+ public VehicleCategory VehicleCategory => VehicleData.VehicleCategory;
- public AxleConfiguration AxleConfiguration
- {
- get { return VehicleData.AxleConfiguration; }
- }
+ public AxleConfiguration AxleConfiguration => VehicleData.AxleConfiguration;
- public Kilogram CurbMassChassis
- {
- get { return VehicleData.CurbMassChassis; }
- }
+ public Kilogram CurbMassChassis => VehicleData.CurbMassChassis;
- public Kilogram GrossVehicleMassRating
- {
- get { return VehicleData.GrossVehicleMassRating; }
- }
+ public Kilogram GrossVehicleMassRating => VehicleData.GrossVehicleMassRating;
- public IList<ITorqueLimitInputData> TorqueLimits
- {
- get { return VehicleData.TorqueLimits; }
- }
+ public IList<ITorqueLimitInputData> TorqueLimits => VehicleData.TorqueLimits;
- IAxlesDeclarationInputData IVehicleComponentsDeclaration.AxleWheels
- {
- get { return _axleWheelsDecl; }
- }
+ IAxlesDeclarationInputData IVehicleComponentsDeclaration.AxleWheels => _axleWheelsDecl;
- public IBusAuxiliariesDeclarationData BusAuxiliaries
- {
- get { return null; }
- }
+ public IBusAuxiliariesDeclarationData BusAuxiliaries => null;
- public IElectricStorageEngineeringInputData ElectricStorage
- {
- get
- {
- return new JSONElectricStorageEngineeringInputData {
- REESSPack = Battery,
- Count = 1
- };
- }
- }
+ public IElectricStorageEngineeringInputData ElectricStorage =>
+ new JSONElectricStorageEngineeringInputData {
+ REESSPack = Battery,
+ Count = 1
+ };
public IElectricMachinesEngineeringInputData ElectricMachines { get
{
@@ -299,357 +218,153 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
});
} }
- IElectricStorageDeclarationInputData IVehicleComponentsDeclaration.ElectricStorage
- {
- get { return ElectricStorage; }
- }
+ IElectricStorageDeclarationInputData IVehicleComponentsDeclaration.ElectricStorage => ElectricStorage;
- IElectricMachinesDeclarationInputData IVehicleComponentsDeclaration.ElectricMachines
- {
- get { return ElectricMachines; }
- }
+ IElectricMachinesDeclarationInputData IVehicleComponentsDeclaration.ElectricMachines => ElectricMachines;
- public Meter DynamicTyreRadius
- {
- get { return VehicleData.DynamicTyreRadius; }
- }
+ public Meter DynamicTyreRadius => VehicleData.DynamicTyreRadius;
- public bool Articulated
- {
- get { return VehicleData.Articulated; }
- }
+ public bool Articulated => VehicleData.Articulated;
- public Meter Height
- {
- get { return VehicleData.Height; }
- }
+ public Meter Height => VehicleData.Height;
- public TableData ElectricMotorTorqueLimits
- {
- get
- {
- return Vehicle.ElectricMotorTorqueLimits;
- }
- }
+ public TableData ElectricMotorTorqueLimits => Vehicle.ElectricMotorTorqueLimits;
- public TableData MaxPropulsionTorque
- {
- get
- {
- return Vehicle.ElectricMotorTorqueLimits;
- }
- }
+ public TableData MaxPropulsionTorque => Vehicle.ElectricMotorTorqueLimits;
- public bool? ATEcoRollReleaseLockupClutch
- {
- get { return VehicleData.ADAS.ATEcoRollReleaseLockupClutch; }
- }
+ public bool? ATEcoRollReleaseLockupClutch => VehicleData.ADAS.ATEcoRollReleaseLockupClutch;
- public XmlNode XMLSource
- {
- get { return null; }
- }
+ public XmlNode XMLSource => null;
- public Meter Length
- {
- get { return VehicleData.Length; }
- }
+ public Meter Length => VehicleData.Length;
- public Meter Width
- {
- get { return VehicleData.Width; }
- }
+ public Meter Width => VehicleData.Width;
- public Meter EntranceHeight
- {
- get { return null; }
- }
+ public Meter EntranceHeight => null;
- public ConsumerTechnology? DoorDriveTechnology
- {
- get { return VehicleData.DoorDriveTechnology; }
- }
+ public ConsumerTechnology? DoorDriveTechnology => VehicleData.DoorDriveTechnology;
public VehicleDeclarationType VehicleDeclarationType { get; }
- IVehicleComponentsEngineering IVehicleEngineeringInputData.Components
- {
- get { return this; }
- }
+ IVehicleComponentsEngineering IVehicleEngineeringInputData.Components => this;
- XmlNode IVehicleDeclarationInputData.XMLSource
- {
- get { return null; }
- }
+ XmlNode IVehicleDeclarationInputData.XMLSource => null;
- IAdvancedDriverAssistantSystemsEngineering IVehicleEngineeringInputData.ADAS
- {
- get { return this; }
- }
+ IAdvancedDriverAssistantSystemsEngineering IVehicleEngineeringInputData.ADAS => this;
- public GearshiftPosition PTO_DriveGear
- {
- get { return VehicleData.PTO_DriveGear; }
- }
+ public GearshiftPosition PTO_DriveGear => VehicleData.PTO_DriveGear;
- public PerSecond PTO_DriveEngineSpeed
- {
- get { return VehicleData.PTO_DriveEngineSpeed; }
- }
+ public PerSecond PTO_DriveEngineSpeed => VehicleData.PTO_DriveEngineSpeed;
- public double InitialSOC
- {
- get { return VehicleData.InitialSOC; }
- }
+ public double InitialSOC => VehicleData.InitialSOC;
- public VectoSimulationJobType VehicleType
- {
- get { return VehicleData.VehicleType; }
- }
+ public VectoSimulationJobType VehicleType => VehicleData.VehicleType;
- public IAirdragEngineeringInputData AirdragInputData
- {
- get { return AirdragData; }
- }
+ public IAirdragEngineeringInputData AirdragInputData => AirdragData;
- public IGearboxEngineeringInputData GearboxInputData
- {
- get { return Gearbox; }
- }
+ public IGearboxEngineeringInputData GearboxInputData => Gearbox;
- public ITorqueConverterDeclarationInputData TorqueConverter
- {
- get { return TorqueConverterData; }
- }
+ public ITorqueConverterDeclarationInputData TorqueConverter => TorqueConverterData;
- public ITorqueConverterEngineeringInputData TorqueConverterInputData
- {
- get { return TorqueConverterData; }
- }
+ public ITorqueConverterEngineeringInputData TorqueConverterInputData => TorqueConverterData;
- IAxleGearInputData IVehicleComponentsDeclaration.AxleGearInputData
- {
- get { return AxleGear; }
- }
+ IAxleGearInputData IVehicleComponentsDeclaration.AxleGearInputData => AxleGear;
- IAngledriveInputData IVehicleComponentsDeclaration.AngledriveInputData
- {
- get { return Angledrive; }
- }
+ IAngledriveInputData IVehicleComponentsDeclaration.AngledriveInputData => Angledrive;
- public Kilogram CurbMassExtra
- {
- get { return Vehicle.CurbMassExtra; }
- }
+ public Kilogram CurbMassExtra => Vehicle.CurbMassExtra;
- public Kilogram Loading
- {
- get { return Vehicle.Loading; }
- }
+ public Kilogram Loading => Vehicle.Loading;
- IAxlesEngineeringInputData IVehicleComponentsEngineering.AxleWheels
- {
- get { return _axleWheelsEng; }
- }
+ IAxlesEngineeringInputData IVehicleComponentsEngineering.AxleWheels => _axleWheelsEng;
- public string ManufacturerAddress
- {
- get { return VehicleData.ManufacturerAddress; }
- }
+ public string ManufacturerAddress => VehicleData.ManufacturerAddress;
- public PerSecond EngineIdleSpeed
- {
- get { return VehicleData.EngineIdleSpeed; }
- }
+ public PerSecond EngineIdleSpeed => VehicleData.EngineIdleSpeed;
- IAirdragDeclarationInputData IVehicleComponentsDeclaration.AirdragInputData
- {
- get { return AirdragInputData; }
- }
+ IAirdragDeclarationInputData IVehicleComponentsDeclaration.AirdragInputData => AirdragInputData;
- IGearboxDeclarationInputData IVehicleComponentsDeclaration.GearboxInputData
- {
- get { return GearboxInputData; }
- }
+ IGearboxDeclarationInputData IVehicleComponentsDeclaration.GearboxInputData => GearboxInputData;
- ITorqueConverterDeclarationInputData IVehicleComponentsDeclaration.TorqueConverterInputData
- {
- get { return TorqueConverterInputData; }
- }
+ ITorqueConverterDeclarationInputData IVehicleComponentsDeclaration.TorqueConverterInputData => TorqueConverterInputData;
- IAxleGearInputData IVehicleComponentsEngineering.AxleGearInputData
- {
- get { return AxleGear; }
- }
+ IAxleGearInputData IVehicleComponentsEngineering.AxleGearInputData => AxleGear;
- IAngledriveInputData IVehicleComponentsEngineering.AngledriveInputData
- {
- get { return Angledrive; }
- }
+ IAngledriveInputData IVehicleComponentsEngineering.AngledriveInputData => Angledrive;
- public IEngineEngineeringInputData EngineInputData
- {
- get { return Engine; }
- }
+ public IEngineEngineeringInputData EngineInputData => Engine;
- IEngineDeclarationInputData IVehicleComponentsDeclaration.EngineInputData
- {
- get { return Engine; }
- }
+ IEngineDeclarationInputData IVehicleComponentsDeclaration.EngineInputData => Engine;
- IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData
- {
- get { throw new NotImplementedException(); }
- }
+ IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData => throw new NotImplementedException();
- IRetarderInputData IVehicleComponentsEngineering.RetarderInputData
- {
- get { return Retarder; }
- }
+ IRetarderInputData IVehicleComponentsEngineering.RetarderInputData => Retarder;
- IPTOTransmissionInputData IVehicleComponentsEngineering.PTOTransmissionInputData
- {
- get { return PTOTransmission; }
- }
+ IPTOTransmissionInputData IVehicleComponentsEngineering.PTOTransmissionInputData => PTOTransmission;
- public bool VocationalVehicle
- {
- get { return DeclarationData.Vehicle.VocationalVehicleDefault; }
- }
+ public bool VocationalVehicle => DeclarationData.Vehicle.VocationalVehicleDefault;
- public bool SleeperCab
- {
- get { return DeclarationData.Vehicle.SleeperCabDefault; }
- }
+ public bool SleeperCab => DeclarationData.Vehicle.SleeperCabDefault;
public bool? AirdragModifiedMultistage { get; }
- public TankSystem? TankSystem
- {
- get { return DeclarationData.Vehicle.TankSystemDefault; }
- }
+ public TankSystem? TankSystem => DeclarationData.Vehicle.TankSystemDefault;
- public IAdvancedDriverAssistantSystemDeclarationInputData ADAS
- {
- get { return this; }
- }
+ public IAdvancedDriverAssistantSystemDeclarationInputData ADAS => this;
- public bool ZeroEmissionVehicle
- {
- get { return DeclarationData.Vehicle.ZeroEmissionVehicleDefault; }
- }
+ public bool ZeroEmissionVehicle => DeclarationData.Vehicle.ZeroEmissionVehicleDefault;
- public bool HybridElectricHDV
- {
- get { return DeclarationData.Vehicle.HybridElectricHDVDefault; }
- }
+ public bool HybridElectricHDV => DeclarationData.Vehicle.HybridElectricHDVDefault;
- public bool DualFuelVehicle
- {
- get { return DeclarationData.Vehicle.DualFuelVehicleDefault; }
- }
+ public bool DualFuelVehicle => DeclarationData.Vehicle.DualFuelVehicleDefault;
- public Watt MaxNetPower1
- {
- get { return null; }
- }
+ public Watt MaxNetPower1 => null;
- public Watt MaxNetPower2
- {
- get { return null; }
- }
+ public Watt MaxNetPower2 => null;
- public RegistrationClass? RegisteredClass
- {
- get { return RegistrationClass.unknown; }
- }
+ public RegistrationClass? RegisteredClass => RegistrationClass.unknown;
- public int? NumberPassengerSeatsUpperDeck
- {
- get { return 0; }
- }
+ public int? NumberPassengerSeatsUpperDeck => 0;
- public int? NumberPassengerSeatsLowerDeck
- {
- get { return 0; }
- }
+ public int? NumberPassengerSeatsLowerDeck => 0;
- public int? NumberPassengersStandingLowerDeck
- {
- get { return 0; }
- }
- public int? NumberPassengersStandingUpperDeck
- {
- get { return 0; }
- }
+ public int? NumberPassengersStandingLowerDeck => 0;
- public CubicMeter CargoVolume
- {
- get { return VehicleData.CargoVolume; }
- }
+ public int? NumberPassengersStandingUpperDeck => 0;
- public VehicleCode? VehicleCode
- {
- get { return VectoCommon.Models.VehicleCode.NOT_APPLICABLE; }
- }
+ public CubicMeter CargoVolume => VehicleData.CargoVolume;
- public bool? LowEntry
- {
- get { return VehicleData.LowEntry; }
- }
+ public VehicleCode? VehicleCode => VectoCommon.Models.VehicleCode.NOT_APPLICABLE;
- IVehicleComponentsDeclaration IVehicleDeclarationInputData.Components
- {
- get { return this; }
- }
+ public bool? LowEntry => VehicleData.LowEntry;
- IAuxiliariesEngineeringInputData IVehicleComponentsEngineering.AuxiliaryInputData
- {
- get { return this; }
- }
+ IVehicleComponentsDeclaration IVehicleDeclarationInputData.Components => this;
- IRetarderInputData IVehicleComponentsDeclaration.RetarderInputData
- {
- get { return Retarder; }
- }
+ IAuxiliariesEngineeringInputData IVehicleComponentsEngineering.AuxiliaryInputData => this;
- IPTOTransmissionInputData IVehicleComponentsDeclaration.PTOTransmissionInputData
- {
- get { return PTOTransmission; }
- }
+ IRetarderInputData IVehicleComponentsDeclaration.RetarderInputData => Retarder;
+
+ IPTOTransmissionInputData IVehicleComponentsDeclaration.PTOTransmissionInputData => PTOTransmission;
#region Implementation of IAdvancedDriverAssistantSystemDeclarationInputData
- public bool EngineStopStart
- {
- get { return DeclarationData.Vehicle.ADAS.EngineStopStartDefault; }
- }
+ public bool EngineStopStart => DeclarationData.Vehicle.ADAS.EngineStopStartDefault;
- public EcoRollType EcoRoll
- {
- get { return DeclarationData.Vehicle.ADAS.EcoRoll; }
- }
+ public EcoRollType EcoRoll => DeclarationData.Vehicle.ADAS.EcoRoll;
- public PredictiveCruiseControlType PredictiveCruiseControl
- {
- get { return DeclarationData.Vehicle.ADAS.PredictiveCruiseControlDefault; }
- }
+ public PredictiveCruiseControlType PredictiveCruiseControl => DeclarationData.Vehicle.ADAS.PredictiveCruiseControlDefault;
#endregion
#region Implementation of IAuxiliariesEngineeringInputData
- public IAuxiliaryEngineeringInputData Auxiliaries { get { return new EngineeringAuxiliaryDataInputData();} }
- public IBusAuxiliariesEngineeringData BusAuxiliariesData
- {
- get { return BusAux; }
- }
- public Watt ElectricAuxPower
- {
- get { return 0.SI<Watt>(); }
- }
+ public IAuxiliaryEngineeringInputData Auxiliaries => new EngineeringAuxiliaryDataInputData();
+
+ public IBusAuxiliariesEngineeringData BusAuxiliariesData => BusAux;
+
+ public Watt ElectricAuxPower => 0.SI<Watt>();
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
index 91d04d538134f578cb748922973bbfbbeded4b7d..702ddc98fb3140fcd945676e66096c538ee95086 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
@@ -11,105 +11,50 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON {
{
public JSONElectricMotorV2(JObject data, string filename, bool tolerateMissing = false) : base(data, filename, tolerateMissing) { }
- public override NewtonMeter ContinuousTorque {
- get { return Body.GetEx<double>("ContinuousTorque").SI<NewtonMeter>(); }
- }
+ public override NewtonMeter ContinuousTorque => Body.GetEx<double>("ContinuousTorque").SI<NewtonMeter>();
- public override PerSecond ContinuousTorqueSpeed {
- get { return Body.GetEx<double>("ContinuousTorqueSpeed").RPMtoRad(); }
- }
+ public override PerSecond ContinuousTorqueSpeed => Body.GetEx<double>("ContinuousTorqueSpeed").RPMtoRad();
- public override NewtonMeter OverloadTorque {
- get { return Body.GetEx<double>("OverloadTorque").SI<NewtonMeter>(); }
- }
+ public override NewtonMeter OverloadTorque => Body.GetEx<double>("OverloadTorque").SI<NewtonMeter>();
- public override PerSecond OverloadTestSpeed {
- get { return Body.GetEx<double>("OverloadTorqueSpeed").RPMtoRad(); }
- }
+ public override PerSecond OverloadTestSpeed => Body.GetEx<double>("OverloadTorqueSpeed").RPMtoRad();
}
public class JSONElectricMotorV1 : JSONFile, IElectricMotorEngineeringInputData
{
public JSONElectricMotorV1(JObject data, string filename, bool tolerateMissing = false) : base(data, filename, tolerateMissing) { }
- public virtual string Manufacturer
- {
- get { return Constants.NOT_AVailABLE; }
- }
- public virtual string Model
- {
- get { return Body.GetEx<string>("Model"); }
- }
- public virtual DateTime Date { get { return DateTime.MinValue; } }
- public virtual CertificationMethod CertificationMethod
- {
- get { return CertificationMethod.NotCertified; }
- }
- public string CertificationNumber
- {
- get { return Constants.NOT_AVailABLE; }
- }
- public DigestData DigestValue
- {
- get { return null; }
- }
-
- public virtual TableData FullLoadCurve
- {
- get { return ReadTableData(Body.GetEx<string>("FullLoadCurve"), "ElectricMotor FullLoadCurve"); }
- }
-
- public virtual TableData DragCurve
- {
- get { return ReadTableData(Body.GetEx<string>("DragCurve"), "ElectricMotor DragCurve"); }
- }
-
- public virtual TableData EfficiencyMap
- {
- get { return ReadTableData(Body.GetEx<string>("EfficiencyMap"), "ElectricMotor Map"); }
- }
-
- public virtual KilogramSquareMeter Inertia
- {
- get { return Body.GetEx<double>("Inertia").SI<KilogramSquareMeter>(); }
- }
-
- public virtual Joule OverloadBuffer
- {
- get { return Body.GetValueOrDefault<double>("ThermalOverloadBuffer")?.SI(Unit.SI.Mega.Joule).Cast<Joule>() ?? 1e18.SI<Joule>(); }
- }
-
- public virtual double OverloadRecoveryFactor
- {
- get
- {
- return Body.GetValueOrDefault<double>("ThermalOverloadRecoveryFactor") ?? 0.9;
- }
- }
-
- public virtual NewtonMeter ContinuousTorque
- {
- get { return (Body.GetValueOrDefault<double>("ContinuousPower")?.SI<Watt>() ?? 1e12.SI<Watt>()) / (Body.GetValueOrDefault<double>("ContinuousPowerSpeed")?.RPMtoRad() ?? 1.SI<PerSecond>()) ; }
- }
-
- public virtual PerSecond ContinuousTorqueSpeed
- {
- get { return Body.GetValueOrDefault<double>("ContinuousPowerSpeed")?.RPMtoRad() ?? 0.RPMtoRad(); }
- }
-
- public virtual NewtonMeter OverloadTorque {
- get { return null; }
- }
-
- public virtual PerSecond OverloadTestSpeed
- {
- get { return null; }
- }
-
- public virtual Second OverloadTime
- {
- get { return Body.GetValueOrDefault<double>("OverloadTime")?.SI<Second>() ?? 0.SI<Second>(); }
- }
+ public virtual string Manufacturer => Constants.NOT_AVailABLE;
+ public virtual string Model => Body.GetEx<string>("Model");
+ public virtual DateTime Date => DateTime.MinValue;
+
+ public virtual CertificationMethod CertificationMethod => CertificationMethod.NotCertified;
+
+ public string CertificationNumber => Constants.NOT_AVailABLE;
+
+ public DigestData DigestValue => null;
+
+ public virtual TableData FullLoadCurve => ReadTableData(Body.GetEx<string>("FullLoadCurve"), "ElectricMotor FullLoadCurve");
+
+ public virtual TableData DragCurve => ReadTableData(Body.GetEx<string>("DragCurve"), "ElectricMotor DragCurve");
+
+ public virtual TableData EfficiencyMap => ReadTableData(Body.GetEx<string>("EfficiencyMap"), "ElectricMotor Map");
+
+ public virtual KilogramSquareMeter Inertia => Body.GetEx<double>("Inertia").SI<KilogramSquareMeter>();
+
+ public virtual Joule OverloadBuffer => Body.GetValueOrDefault<double>("ThermalOverloadBuffer")?.SI(Unit.SI.Mega.Joule).Cast<Joule>() ?? 1e18.SI<Joule>();
+
+ public virtual double OverloadRecoveryFactor => Body.GetValueOrDefault<double>("ThermalOverloadRecoveryFactor") ?? 0.9;
+
+ public virtual NewtonMeter ContinuousTorque => (Body.GetValueOrDefault<double>("ContinuousPower")?.SI<Watt>() ?? 1e12.SI<Watt>()) / (Body.GetValueOrDefault<double>("ContinuousPowerSpeed")?.RPMtoRad() ?? 1.SI<PerSecond>());
+
+ public virtual PerSecond ContinuousTorqueSpeed => Body.GetValueOrDefault<double>("ContinuousPowerSpeed")?.RPMtoRad() ?? 0.RPMtoRad();
+
+ public virtual NewtonMeter OverloadTorque => null;
+
+ public virtual PerSecond OverloadTestSpeed => null;
+
+ public virtual Second OverloadTime => Body.GetValueOrDefault<double>("OverloadTime")?.SI<Second>() ?? 0.SI<Second>();
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
index 277c6edb47bf522870fde73cd6a263affd18bdb6..e319c443e8932a7f8a3df44a46528320d46b0d5c 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
@@ -83,16 +83,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Overrides of JSONEngineDataV3
- public override IWHRData WasteHeatRecoveryDataElectrical
- {
- get { return _elWHRData ?? (_elWHRData = ReadWHRData(Body["WHRCorrectionFactors"]?["Electrical"])); }
- }
+ public override IWHRData WasteHeatRecoveryDataElectrical => _elWHRData ?? (_elWHRData = ReadWHRData(Body["WHRCorrectionFactors"]?["Electrical"]));
- public override IWHRData WasteHeatRecoveryDataMechanical
- {
- get { return _mechWHRData ?? (_mechWHRData = ReadWHRData(Body["WHRCorrectionFactors"]?["Mechanical"])); }
- }
+ public override IWHRData WasteHeatRecoveryDataMechanical => _mechWHRData ?? (_mechWHRData = ReadWHRData(Body["WHRCorrectionFactors"]?["Mechanical"]));
public override WHRType WHRType
{
@@ -197,40 +191,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Implementation of IWHRData
- public double UrbanCorrectionFactor
- {
- get { return CorrectionFactors?["Urban"]?.ToString().ToDouble() ?? 1.0; }
- }
+ public double UrbanCorrectionFactor => CorrectionFactors?["Urban"]?.ToString().ToDouble() ?? 1.0;
- public double RuralCorrectionFactor
- {
- get { return CorrectionFactors?["Rural"]?.ToString().ToDouble() ?? 1.0; }
- }
+ public double RuralCorrectionFactor => CorrectionFactors?["Rural"]?.ToString().ToDouble() ?? 1.0;
- public double MotorwayCorrectionFactor
- {
- get { return CorrectionFactors?["Motorway"]?.ToString().ToDouble() ?? 1.0; }
- }
+ public double MotorwayCorrectionFactor => CorrectionFactors?["Motorway"]?.ToString().ToDouble() ?? 1.0;
- public double BFColdHot
- {
- get { return CorrectionFactors?["ColdHotBalancingFactor"]?.ToString().ToDouble() ?? 1.0; }
- }
+ public double BFColdHot => CorrectionFactors?["ColdHotBalancingFactor"]?.ToString().ToDouble() ?? 1.0;
- public double CFRegPer
- {
- get { return CorrectionFactors?["CFRegPer"]?.ToString().ToDouble() ?? 1.0; }
- }
+ public double CFRegPer => CorrectionFactors?["CFRegPer"]?.ToString().ToDouble() ?? 1.0;
- public double EngineeringCorrectionFactor
- {
- get { return CorrectionFactors?["EngineeringCorrectionFactor"]?.ToString().ToDouble() ?? 1.0; }
- }
+ public double EngineeringCorrectionFactor => CorrectionFactors?["EngineeringCorrectionFactor"]?.ToString().ToDouble() ?? 1.0;
- public TableData GeneratedPower
- {
- get { return WHRMap; }
- }
+ public TableData GeneratedPower => WHRMap;
#endregion
}
@@ -245,31 +218,16 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public JSONEngineDataV4(JObject data, string fileName, bool tolerateMissing = false)
: base(data, fileName, tolerateMissing) { }
- public override Watt RatedPowerDeclared
- {
- get { return Body.GetEx<double>("RatedPower").SI<Watt>(); }
- }
+ public override Watt RatedPowerDeclared => Body.GetEx<double>("RatedPower").SI<Watt>();
- public override PerSecond RatedSpeedDeclared
- {
- get { return Body.GetEx<double>("RatedSpeed").RPMtoRad(); }
- }
+ public override PerSecond RatedSpeedDeclared => Body.GetEx<double>("RatedSpeed").RPMtoRad();
- public override NewtonMeter MaxTorqueDeclared
- {
- get { return Body.GetEx<double>("MaxTorque").SI<NewtonMeter>(); }
- }
+ public override NewtonMeter MaxTorqueDeclared => Body.GetEx<double>("MaxTorque").SI<NewtonMeter>();
- public override double CorrectionFactorRegPer
- {
- get { return Body.GetEx<double>("CFRegPer"); }
- }
+ public override double CorrectionFactorRegPer => Body.GetEx<double>("CFRegPer");
- public override FuelType FuelType
- {
- get { return Body.GetEx<string>("FuelType").ParseEnum<FuelType>(); }
- }
+ public override FuelType FuelType => Body.GetEx<string>("FuelType").ParseEnum<FuelType>();
}
@@ -281,23 +239,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public JSONEngineDataV3(JObject data, string fileName, bool tolerateMissing = false)
: base(data, fileName, tolerateMissing) { }
- public virtual CubicMeter Displacement
- {
- get { return Body.GetEx<double>(JsonKeys.Engine_Displacement).SI(Unit.SI.Cubic.Centi.Meter).Cast<CubicMeter>(); }
+ public virtual CubicMeter Displacement => Body.GetEx<double>(JsonKeys.Engine_Displacement).SI(Unit.SI.Cubic.Centi.Meter).Cast<CubicMeter>();
- // convert vom ccm to m^3}
- }
+ // convert vom ccm to m^3}
+ public virtual PerSecond IdleSpeed => Body.GetEx<double>(JsonKeys.Engine_IdleSpeed).RPMtoRad();
- public virtual PerSecond IdleSpeed
- {
- get { return Body.GetEx<double>(JsonKeys.Engine_IdleSpeed).RPMtoRad(); }
- }
-
- public virtual FuelType FuelType
- {
- get { return FuelType.DieselCI; }
- }
+ public virtual FuelType FuelType => FuelType.DieselCI;
public virtual TableData FuelConsumptionMap
{
@@ -334,45 +282,24 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- IList<IEngineFuelEngineeringInputData> IEngineModeEngineeringInputData.Fuels
- {
- get { return _fuels ?? (_fuels = ReadFuels()); }
- }
+ IList<IEngineFuelEngineeringInputData> IEngineModeEngineeringInputData.Fuels => _fuels ?? (_fuels = ReadFuels());
- public virtual IList<IEngineFuelDeclarationInputData> Fuels
- {
- get { return (_fuels ?? (_fuels = ReadFuels())).Cast<IEngineFuelDeclarationInputData>().ToList(); }
- }
+ public virtual IList<IEngineFuelDeclarationInputData> Fuels => (_fuels ?? (_fuels = ReadFuels())).Cast<IEngineFuelDeclarationInputData>().ToList();
protected virtual IList<IEngineFuelEngineeringInputData> ReadFuels()
{
return new IEngineFuelEngineeringInputData[] { this };
}
- public virtual IWHRData WasteHeatRecoveryDataElectrical
- {
- get { return null; }
- }
+ public virtual IWHRData WasteHeatRecoveryDataElectrical => null;
- public virtual IWHRData WasteHeatRecoveryDataMechanical
- {
- get { return null; }
- }
+ public virtual IWHRData WasteHeatRecoveryDataMechanical => null;
- public virtual Watt RatedPowerDeclared
- {
- get { return 0.SI<Watt>(); }
- }
+ public virtual Watt RatedPowerDeclared => 0.SI<Watt>();
- public virtual PerSecond RatedSpeedDeclared
- {
- get { return 0.RPMtoRad(); }
- }
+ public virtual PerSecond RatedSpeedDeclared => 0.RPMtoRad();
- public virtual NewtonMeter MaxTorqueDeclared
- {
- get { return 0.SI<NewtonMeter>(); }
- }
+ public virtual NewtonMeter MaxTorqueDeclared => 0.SI<NewtonMeter>();
IList<IEngineModeEngineeringInputData> IEngineEngineeringInputData.EngineModes
{
@@ -384,15 +311,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return new IEngineModeDeclarationInputData[] { this }; }
}
- public virtual WHRType WHRType
- {
- get { return WHRType.None; }
- }
+ public virtual WHRType WHRType => WHRType.None;
- public virtual KilogramSquareMeter Inertia
- {
- get { return Body.GetEx<double>(JsonKeys.Engine_Inertia).SI<KilogramSquareMeter>(); }
- }
+ public virtual KilogramSquareMeter Inertia => Body.GetEx<double>(JsonKeys.Engine_Inertia).SI<KilogramSquareMeter>();
public virtual double WHTCEngineering
{
@@ -405,25 +326,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public virtual Second EngineStartTime
- {
- get { return null; }
- }
+ public virtual Second EngineStartTime => null;
- public virtual double WHTCMotorway
- {
- get { return Body.GetEx<double>(JsonKeys.Engine_WHTC_Motorway); }
- }
+ public virtual double WHTCMotorway => Body.GetEx<double>(JsonKeys.Engine_WHTC_Motorway);
- public virtual double WHTCRural
- {
- get { return Body.GetEx<double>(JsonKeys.Engine_WHTC_Rural); }
- }
+ public virtual double WHTCRural => Body.GetEx<double>(JsonKeys.Engine_WHTC_Rural);
- public virtual double WHTCUrban
- {
- get { return Body.GetEx<double>(JsonKeys.Engine_WHTC_Urban); }
- }
+ public virtual double WHTCUrban => Body.GetEx<double>(JsonKeys.Engine_WHTC_Urban);
public double ColdHotBalancingFactor
{
@@ -436,41 +345,20 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public virtual double CorrectionFactorRegPer
- {
- get { return 1; }
- }
+ public virtual double CorrectionFactorRegPer => 1;
- public virtual string Manufacturer
- {
- get { return Constants.NOT_AVailABLE; }
- }
+ public virtual string Manufacturer => Constants.NOT_AVailABLE;
- public virtual string Model
- {
- get { return Body.GetEx<string>(JsonKeys.Engine_ModelName); }
- }
+ public virtual string Model => Body.GetEx<string>(JsonKeys.Engine_ModelName);
- public virtual DateTime Date
- {
- get { return DateTime.MinValue; }
- }
+ public virtual DateTime Date => DateTime.MinValue;
- public virtual CertificationMethod CertificationMethod
- {
- get { return CertificationMethod.NotCertified; }
- }
+ public virtual CertificationMethod CertificationMethod => CertificationMethod.NotCertified;
- public virtual string CertificationNumber
- {
- get { return Constants.NOT_AVailABLE; }
- }
+ public virtual string CertificationNumber => Constants.NOT_AVailABLE;
- public virtual DigestData DigestValue
- {
- get { return null; }
- }
+ public virtual DigestData DigestValue => null;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
index 9c653b1ac25ff427a819f0fce811c53553c0115f..aa76ff09b5d034ca644a8061916ac3a752d82d0b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
@@ -49,10 +49,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public JSONGearboxDataV6(JObject data, string filename, bool tolerateMissing = false)
: base(data, filename, tolerateMissing) {}
- public override GearboxType Type
- {
- get { return Body.GetEx<string>(JsonKeys.Gearbox_GearboxType).ParseEnum<GearboxType>(); }
- }
+ public override GearboxType Type => Body.GetEx<string>(JsonKeys.Gearbox_GearboxType).ParseEnum<GearboxType>();
public override IList<ITransmissionInputData> Gears
{
@@ -87,7 +84,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public override double AxlegearRatio { get { return Ratio; } }
+ public override double AxlegearRatio => Ratio;
}
/// <summary>
@@ -176,10 +173,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public AxleLineType LineType
- {
- get { return AxleLineType.SingleReductionAxle; }
- }
+ public AxleLineType LineType => AxleLineType.SingleReductionAxle;
#endregion
@@ -202,10 +196,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public virtual KilogramSquareMeter Inertia
- {
- get { return Body.GetEx<double>(JsonKeys.Gearbox_Inertia).SI<KilogramSquareMeter>(); }
- }
+ public virtual KilogramSquareMeter Inertia => Body.GetEx<double>(JsonKeys.Gearbox_Inertia).SI<KilogramSquareMeter>();
public virtual TableData ShiftPolygon
{
@@ -224,10 +215,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public Second TractionInterruption
- {
- get { return Body.GetEx<double>(JsonKeys.Gearbox_TractionInterruption).SI<Second>(); }
- }
+ public Second TractionInterruption => Body.GetEx<double>(JsonKeys.Gearbox_TractionInterruption).SI<Second>();
public virtual IList<ITransmissionInputData> Gears
{
@@ -251,8 +239,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public bool DifferentialIncluded { get { return false; } }
- public virtual double AxlegearRatio { get { return double.NaN; } }
+ public bool DifferentialIncluded => false;
+ public virtual double AxlegearRatio => double.NaN;
private TransmissionInputData CreateTorqueConverterGear(int gearNr, JToken gear, JToken nextGear)
{
@@ -330,158 +318,102 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
return retVal;
}
- public virtual Second MinTimeBetweenGearshift
- {
- get { return Body.GetEx<double>(JsonKeys.Gearbox_ShiftTime).SI<Second>(); }
- }
+ public virtual Second MinTimeBetweenGearshift => Body.GetEx<double>(JsonKeys.Gearbox_ShiftTime).SI<Second>();
- public virtual double TorqueReserve
- {
- get { return Body.GetEx<double>(JsonKeys.Gearbox_TorqueReserve) / 100.0; }
- }
+ public virtual double TorqueReserve => Body.GetEx<double>(JsonKeys.Gearbox_TorqueReserve) / 100.0;
- public virtual MeterPerSecond StartSpeed
- {
- get { return Body.GetEx<double>(JsonKeys.Gearbox_StartSpeed).SI<MeterPerSecond>(); }
- }
+ public virtual MeterPerSecond StartSpeed => Body.GetEx<double>(JsonKeys.Gearbox_StartSpeed).SI<MeterPerSecond>();
- public virtual MeterPerSquareSecond StartAcceleration
- {
- get { return Body.GetEx<double>(JsonKeys.Gearbox_StartAcceleration).SI<MeterPerSquareSecond>(); }
- }
+ public virtual MeterPerSquareSecond StartAcceleration => Body.GetEx<double>(JsonKeys.Gearbox_StartAcceleration).SI<MeterPerSquareSecond>();
- public virtual double StartTorqueReserve
- {
- get { return Body.GetEx<double>(JsonKeys.Gearbox_StartTorqueReserve) / 100.0; }
- }
+ public virtual double StartTorqueReserve => Body.GetEx<double>(JsonKeys.Gearbox_StartTorqueReserve) / 100.0;
-
- public virtual ITorqueConverterEngineeringInputData TorqueConverter
- {
- get { return this; }
- }
- public Second DownshiftAfterUpshiftDelay
- {
- get {
- return Body["DownshiftAfterUpshiftDelay"] == null
- ? DeclarationData.Gearbox.DownshiftAfterUpshiftDelay
- : Body.GetEx<double>("DownshiftAfterUpshiftDelay").SI<Second>();
- }
- }
+ public virtual ITorqueConverterEngineeringInputData TorqueConverter => this;
- public Second UpshiftAfterDownshiftDelay
- {
- get {
- return Body["UpshiftAfterDownshiftDelay"] == null
- ? DeclarationData.Gearbox.UpshiftAfterDownshiftDelay
- : Body.GetEx<double>("UpshiftAfterDownshiftDelay").SI<Second>();
- }
- }
+ public Second DownshiftAfterUpshiftDelay =>
+ Body["DownshiftAfterUpshiftDelay"] == null
+ ? DeclarationData.Gearbox.DownshiftAfterUpshiftDelay
+ : Body.GetEx<double>("DownshiftAfterUpshiftDelay").SI<Second>();
- public MeterPerSquareSecond UpshiftMinAcceleration
- {
- get {
- return Body["UpshiftMinAcceleration"] == null
- ? DeclarationData.Gearbox.UpshiftMinAcceleration
- : Body.GetEx<double>("UpshiftMinAcceleration").SI<MeterPerSquareSecond>();
- }
- }
+ public Second UpshiftAfterDownshiftDelay =>
+ Body["UpshiftAfterDownshiftDelay"] == null
+ ? DeclarationData.Gearbox.UpshiftAfterDownshiftDelay
+ : Body.GetEx<double>("UpshiftAfterDownshiftDelay").SI<Second>();
- public Second GearResidenceTime { get { return null; } }
- public double? DnT99LHMin1 { get { return null; } }
- public double? DnT99LHMin2 { get { return null; } }
- public int? AllowedGearRangeUp { get { return null; } }
- public int? AllowedGearRangeDown { get { return null; } }
- public Second LookBackInterval { get { return null; } }
- public Watt AvgCardanPowerThresholdPropulsion { get { return null; } }
- public Watt CurrCardanPowerThresholdPropulsion { get { return null; } }
- public double? TargetSpeedDeviationFactor { get { return null; } }
- public double? EngineSpeedHighDriveOffFactor { get { return null; } }
- public double? RatingFactorCurrentGear { get { return null; } }
- public TableData AccelerationReserveLookup { get { return null; } }
- public TableData ShareTorque99L { get { return null; } }
- public TableData PredictionDurationLookup { get { return null; } }
- public TableData ShareIdleLow { get { return null; } }
- public TableData ShareEngineHigh { get { return null; } }
- public Second DriverAccelerationLookBackInterval { get { return null; } }
- public MeterPerSquareSecond DriverAccelerationThresholdLow { get { return null; } }
- public double? RatioEarlyUpshiftFC { get { return null; } }
- public double? RatioEarlyDownshiftFC { get { return null; } }
- public int? AllowedGearRangeFC { get { return null; } }
-
- public PerSecond MinEngineSpeedPostUpshift { get { return null; } }
- public Second ATLookAheadTime { get { return null; } }
- public double[][] ShiftSpeedsTCToLocked { get { return null; } }
-
- public double? VeloictyDropFactor
- {
- get { return null; }
- }
+ public MeterPerSquareSecond UpshiftMinAcceleration =>
+ Body["UpshiftMinAcceleration"] == null
+ ? DeclarationData.Gearbox.UpshiftMinAcceleration
+ : Body.GetEx<double>("UpshiftMinAcceleration").SI<MeterPerSquareSecond>();
- public double? AccelerationFactor
- {
- get { return null; }
- }
+ public Second GearResidenceTime => null;
+ public double? DnT99LHMin1 => null;
+ public double? DnT99LHMin2 => null;
+ public int? AllowedGearRangeUp => null;
+ public int? AllowedGearRangeDown => null;
+ public Second LookBackInterval => null;
+ public Watt AvgCardanPowerThresholdPropulsion => null;
+ public Watt CurrCardanPowerThresholdPropulsion => null;
+ public double? TargetSpeedDeviationFactor => null;
+ public double? EngineSpeedHighDriveOffFactor => null;
+ public double? RatingFactorCurrentGear => null;
+ public TableData AccelerationReserveLookup => null;
+ public TableData ShareTorque99L => null;
+ public TableData PredictionDurationLookup => null;
+ public TableData ShareIdleLow => null;
+ public TableData ShareEngineHigh => null;
+ public Second DriverAccelerationLookBackInterval => null;
+ public MeterPerSquareSecond DriverAccelerationThresholdLow => null;
+ public double? RatioEarlyUpshiftFC => null;
+ public double? RatioEarlyDownshiftFC => null;
+ public int? AllowedGearRangeFC => null;
- public TableData LoadStageShiftLines { get { return null; } }
- public IList<double> LoadStageThresholdsUp { get { return null; } }
- public IList<double> LoadStageThresholdsDown { get { return null; } }
+ public PerSecond MinEngineSpeedPostUpshift => null;
+ public Second ATLookAheadTime => null;
+ public double[][] ShiftSpeedsTCToLocked => null;
- public Second PowershiftShiftTime
- {
- get {
- return Body["PowershiftShiftTime"] == null
- ? Constants.DefaultPowerShiftTime
- : Body.GetEx<double>("PowershiftShiftTime").SI<Second>();
- }
- }
+ public double? VeloictyDropFactor => null;
- #endregion
+ public double? AccelerationFactor => null;
- #region ITorqueConverterInputData
+ public TableData LoadStageShiftLines => null;
+ public IList<double> LoadStageThresholdsUp => null;
+ public IList<double> LoadStageThresholdsDown => null;
- public MeterPerSquareSecond CLUpshiftMinAcceleration
- {
- get {
- return Body[JsonKeys.Gearbox_TorqueConverter] != null &&
- Body[JsonKeys.Gearbox_TorqueConverter]["CLUpshiftMinAcceleration"] != null
- ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter).GetEx<double>("CLUpshiftMinAcceleration").SI<MeterPerSquareSecond>()
- : UpshiftMinAcceleration;
- }
- }
+ public Second PowershiftShiftTime =>
+ Body["PowershiftShiftTime"] == null
+ ? Constants.DefaultPowerShiftTime
+ : Body.GetEx<double>("PowershiftShiftTime").SI<Second>();
- public MeterPerSquareSecond CCUpshiftMinAcceleration
- {
- get {
- return Body[JsonKeys.Gearbox_TorqueConverter] != null &&
- Body[JsonKeys.Gearbox_TorqueConverter]["CCUpshiftMinAcceleration"] != null
- ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter).GetEx<double>("CCUpshiftMinAcceleration").SI<MeterPerSquareSecond>()
- : UpshiftMinAcceleration;
- }
- }
+ #endregion
- public virtual PerSecond ReferenceRPM
- {
- get {
- return Body[JsonKeys.Gearbox_TorqueConverter] != null &&
- Body[JsonKeys.Gearbox_TorqueConverter][JsonKeys.Gearbox_TorqueConverter_ReferenceRPM] != null
- ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter)
- .GetEx<double>(JsonKeys.Gearbox_TorqueConverter_ReferenceRPM)
- .RPMtoRad()
- : null;
- }
- }
+ #region ITorqueConverterInputData
- public PerSecond MaxInputSpeed
- {
- get {
- return Body[JsonKeys.Gearbox_TorqueConverter] != null &&
- Body[JsonKeys.Gearbox_TorqueConverter]["MaxTCSpeed"] != null
- ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter).GetEx<double>("MaxTCSpeed").RPMtoRad()
- : 5000.RPMtoRad();
- }
- }
+ public MeterPerSquareSecond CLUpshiftMinAcceleration =>
+ Body[JsonKeys.Gearbox_TorqueConverter] != null &&
+ Body[JsonKeys.Gearbox_TorqueConverter]["CLUpshiftMinAcceleration"] != null
+ ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter).GetEx<double>("CLUpshiftMinAcceleration").SI<MeterPerSquareSecond>()
+ : UpshiftMinAcceleration;
+
+ public MeterPerSquareSecond CCUpshiftMinAcceleration =>
+ Body[JsonKeys.Gearbox_TorqueConverter] != null &&
+ Body[JsonKeys.Gearbox_TorqueConverter]["CCUpshiftMinAcceleration"] != null
+ ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter).GetEx<double>("CCUpshiftMinAcceleration").SI<MeterPerSquareSecond>()
+ : UpshiftMinAcceleration;
+
+ public virtual PerSecond ReferenceRPM =>
+ Body[JsonKeys.Gearbox_TorqueConverter] != null &&
+ Body[JsonKeys.Gearbox_TorqueConverter][JsonKeys.Gearbox_TorqueConverter_ReferenceRPM] != null
+ ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter)
+ .GetEx<double>(JsonKeys.Gearbox_TorqueConverter_ReferenceRPM)
+ .RPMtoRad()
+ : null;
+
+ public PerSecond MaxInputSpeed =>
+ Body[JsonKeys.Gearbox_TorqueConverter] != null &&
+ Body[JsonKeys.Gearbox_TorqueConverter]["MaxTCSpeed"] != null
+ ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter).GetEx<double>("MaxTCSpeed").RPMtoRad()
+ : 5000.RPMtoRad();
public virtual TableData TCData
{
@@ -503,48 +435,26 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- KilogramSquareMeter ITorqueConverterEngineeringInputData.Inertia
- {
- get {
- return Body[JsonKeys.Gearbox_TorqueConverter] != null &&
- Body[JsonKeys.Gearbox_TorqueConverter][JsonKeys.Gearbox_TorqueConverter_Inertia] != null
- ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter)
- .GetEx<double>(JsonKeys.Gearbox_TorqueConverter_Inertia)
- .SI<KilogramSquareMeter>()
- : null;
- }
- }
+ KilogramSquareMeter ITorqueConverterEngineeringInputData.Inertia =>
+ Body[JsonKeys.Gearbox_TorqueConverter] != null &&
+ Body[JsonKeys.Gearbox_TorqueConverter][JsonKeys.Gearbox_TorqueConverter_Inertia] != null
+ ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter)
+ .GetEx<double>(JsonKeys.Gearbox_TorqueConverter_Inertia)
+ .SI<KilogramSquareMeter>()
+ : null;
#endregion
- public string Manufacturer
- {
- get { return Constants.NOT_AVailABLE; }
- }
+ public string Manufacturer => Constants.NOT_AVailABLE;
- public string Model
- {
- get { return Body.GetEx<string>(JsonKeys.Gearbox_ModelName); }
- }
+ public string Model => Body.GetEx<string>(JsonKeys.Gearbox_ModelName);
- public DateTime Date
- {
- get { return DateTime.MinValue; }
- }
+ public DateTime Date => DateTime.MinValue;
- public CertificationMethod CertificationMethod
- {
- get { return CertificationMethod.NotCertified; }
- }
+ public CertificationMethod CertificationMethod => CertificationMethod.NotCertified;
- public string CertificationNumber
- {
- get { return Constants.NOT_AVailABLE; }
- }
+ public string CertificationNumber => Constants.NOT_AVailABLE;
- public DigestData DigestValue
- {
- get { return null; }
- }
+ public DigestData DigestValue => null;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONHybridStrategyParameters.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONHybridStrategyParameters.cs
index a6becdc4b968c17c33f7fa1ccb39e1d4de0db104..88d689d7812466f37baf1bc36479ce8778e3f1c1 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONHybridStrategyParameters.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONHybridStrategyParameters.cs
@@ -9,75 +9,28 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public JSONHybridStrategyParameters(JObject json, string filename, bool tolerateMissing) : base(json, filename, tolerateMissing)
{ }
- public double EquivalenceFactorDischarge
- {
- get
- {
- return Body["EquivalenceFactor"] == null ? Body.GetEx<double>("EquivalenceFactorDischarge") :
- Body.GetEx<double>("EquivalenceFactor");
- }
- }
+ public double EquivalenceFactorDischarge =>
+ Body["EquivalenceFactor"] == null ? Body.GetEx<double>("EquivalenceFactorDischarge") :
+ Body.GetEx<double>("EquivalenceFactor");
- public double EquivalenceFactorCharge {
- get {
- return Body["EquivalenceFactor"] == null ? Body.GetEx<double>("EquivalenceFactorCharge") :
- Body.GetEx<double>("EquivalenceFactor");
- }
- }
+ public double EquivalenceFactorCharge =>
+ Body["EquivalenceFactor"] == null ? Body.GetEx<double>("EquivalenceFactorCharge") :
+ Body.GetEx<double>("EquivalenceFactor");
- public double MinSoC
- {
- get
- {
- return Body.GetEx<double>("MinSoC") / 100.0;
- }
- }
+ public double MinSoC => Body.GetEx<double>("MinSoC") / 100.0;
- public double MaxSoC
- {
- get
- {
- return Body.GetEx<double>("MaxSoC") / 100.0;
- }
- }
+ public double MaxSoC => Body.GetEx<double>("MaxSoC") / 100.0;
- public double TargetSoC
- {
- get
- {
- return Body.GetEx<double>("TargetSoC") / 100.0;
- }
- }
+ public double TargetSoC => Body.GetEx<double>("TargetSoC") / 100.0;
- public Second MinimumICEOnTime
- {
- get { return Body.GetEx<double>("MinICEOnTime").SI<Second>(); }
- }
+ public Second MinimumICEOnTime => Body.GetEx<double>("MinICEOnTime").SI<Second>();
- public Second AuxBufferTime
- {
- get { return Body.GetEx<double>("AuxBufferTime").SI<Second>(); }
- }
+ public Second AuxBufferTime => Body.GetEx<double>("AuxBufferTime").SI<Second>();
- public Second AuxBufferChargeTime
- {
- get { return Body.GetEx<double>("AuxBufferChgTime").SI<Second>(); }
- }
+ public Second AuxBufferChargeTime => Body.GetEx<double>("AuxBufferChgTime").SI<Second>();
- public double ICEStartPenaltyFactor
- {
- get
- {
- return Body["ICEStartPenaltyFactor"] == null ? 0 : Body.GetEx<double>("ICEStartPenaltyFactor");
- }
- }
+ public double ICEStartPenaltyFactor => Body["ICEStartPenaltyFactor"] == null ? 0 : Body.GetEx<double>("ICEStartPenaltyFactor");
- public double CostFactorSOCExpponent
- {
- get
- {
- return Body["CostFactorSOCExponent"] == null ? double.NaN : Body.GetEx<double>("CostFactorSOCExponent");
- }
- }
+ public double CostFactorSOCExpponent => Body["CostFactorSOCExponent"] == null ? double.NaN : Body.GetEx<double>("CostFactorSOCExponent");
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 9423f90afb9cab310a78fcb09c6af0f7a29e1f40..94467ad7bd9f8f5f05759f62cee7680926244a30 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -78,29 +78,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
protected internal bool TolerateMissing { get; set; }
- public DataSource DataSource
- {
- get {
- return new DataSource { SourceType = DataSourceType.JSONFile, SourceFile = _sourceFile, SourceVersion = Version };
- }
- }
+ public DataSource DataSource => new DataSource { SourceType = DataSourceType.JSONFile, SourceFile = _sourceFile, SourceVersion = Version };
- public string Source
- {
- get { return _sourceFile; }
- }
+ public string Source => _sourceFile;
- public virtual bool SavedInDeclarationMode
- {
- get { return Body.GetEx(JsonKeys.SavedInDeclMode).Value<bool>(); }
- }
+ public virtual bool SavedInDeclarationMode => Body.GetEx(JsonKeys.SavedInDeclMode).Value<bool>();
- public virtual string AppVersion { get { return "VECTO-JSON"; } }
+ public virtual string AppVersion => "VECTO-JSON";
- internal string BasePath
- {
- get { return Path.GetDirectoryName(_sourceFile); }
- }
+ internal string BasePath => Path.GetDirectoryName(_sourceFile);
protected internal TableData ReadTableData(string filename, string tableType, bool required = true)
{
@@ -156,20 +142,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public virtual IGearshiftEngineeringInputData GearshiftInputData { get; internal set; }
- public virtual IEngineStopStartEngineeringInputData EngineStopStartData
- {
- get { return null; }
- }
+ public virtual IEngineStopStartEngineeringInputData EngineStopStartData => null;
- public virtual IEcoRollEngineeringInputData EcoRollData
- {
- get { return null; }
- }
+ public virtual IEcoRollEngineeringInputData EcoRollData => null;
- public virtual IPCCEngineeringInputData PCCData
- {
- get { return null; }
- }
+ public virtual IPCCEngineeringInputData PCCData => null;
public IAxleGearInputData AxleGear { get; internal set; }
@@ -183,15 +160,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
private IBusAuxiliariesEngineeringData _busAux;
- public IAuxiliariesEngineeringInputData EngineeringAuxiliaries
- {
- get { return this; }
- }
+ public IAuxiliariesEngineeringInputData EngineeringAuxiliaries => this;
- public IAuxiliariesDeclarationInputData DeclarationAuxiliaries
- {
- get { return this; }
- }
+ public IAuxiliariesDeclarationInputData DeclarationAuxiliaries => this;
protected IVehicleEngineeringInputData ReadVehicle()
{
@@ -258,34 +229,17 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region IInputDataProvider
- IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle
- {
- get { return VehicleInputData; }
- }
+ IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle => VehicleInputData;
- public virtual IHybridStrategyParameters HybridStrategyParameters
- {
- get { return null; }
- }
+ public virtual IHybridStrategyParameters HybridStrategyParameters => null;
- public virtual IEngineeringJobInputData JobInputData
- {
- get { return this; }
- }
+ public virtual IEngineeringJobInputData JobInputData => this;
- public virtual IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData {
- get { return null; }
- }
+ public virtual IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData => null;
- public XElement XMLHash
- {
- get { return new XElement(XMLNames.DI_Signature); }
- }
+ public XElement XMLHash => new XElement(XMLNames.DI_Signature);
- IDeclarationJobInputData IDeclarationInputDataProvider.JobInputData
- {
- get { return this; }
- }
+ IDeclarationJobInputData IDeclarationInputDataProvider.JobInputData => this;
public virtual IVehicleEngineeringInputData VehicleInputData
{
@@ -315,25 +269,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public virtual TableData PTOCycleWhileDrive
- {
- get { return null; }
- }
+ public virtual TableData PTOCycleWhileDrive => null;
- IDriverEngineeringInputData IEngineeringInputDataProvider.DriverInputData
- {
- get { return this; }
- }
+ IDriverEngineeringInputData IEngineeringInputDataProvider.DriverInputData => this;
-
#endregion
#region IJobInputData
- public virtual IVehicleEngineeringInputData Vehicle
- {
- get { return VehicleData; }
- }
+ public virtual IVehicleEngineeringInputData Vehicle => VehicleData;
public virtual IList<ICycleData> Cycles
{
@@ -380,15 +324,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public virtual VectoSimulationJobType JobType
- {
- get { return Body.GetEx(JsonKeys.Job_EngineOnlyMode).Value<bool>() ? VectoSimulationJobType.EngineOnlySimulation : VectoSimulationJobType.ConventionalVehicle; }
- }
+ public virtual VectoSimulationJobType JobType => Body.GetEx(JsonKeys.Job_EngineOnlyMode).Value<bool>() ? VectoSimulationJobType.EngineOnlySimulation : VectoSimulationJobType.ConventionalVehicle;
- public virtual string JobName
- {
- get { return _jobname; }
- }
+ public virtual string JobName => _jobname;
public string ShiftStrategy
{
@@ -547,15 +485,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region IAuxiliariesEngineeringInputData
- IAuxiliaryEngineeringInputData IAuxiliariesEngineeringInputData.Auxiliaries
- {
- get { return new EngineeringAuxiliaryDataInputData() {
+ IAuxiliaryEngineeringInputData IAuxiliariesEngineeringInputData.Auxiliaries =>
+ new EngineeringAuxiliaryDataInputData() {
ElectricPowerDemand = Body["Padd_electric"] != null ? Body.GetEx<double>("Padd_electric").SI<Watt>() : 0.SI<Watt>(),
ConstantPowerDemand = Body["Padd"] != null ? Body.GetEx<double>("Padd").SI<Watt>() : 0.SI<Watt>(),
PowerDemandICEOffDriving = Body["Paux_ICEOff_Driving"] != null ? Body.GetEx<double>("Paux_ICEOff_Driving").SI<Watt>() : 0.SI<Watt>(),
PowerDemandICEOffStandstill = Body["Paux_ICEOff_Standstill"] != null ? Body.GetEx<double>("Paux_ICEOff_Standstill").SI<Watt>() : 0.SI<Watt>()
- }; }
- }
+ };
public IBusAuxiliariesEngineeringData BusAuxiliariesData
{
@@ -569,10 +505,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- IList<IAuxiliaryDeclarationInputData> IAuxiliariesDeclarationInputData.Auxiliaries
- {
- get { return AuxData().Cast<IAuxiliaryDeclarationInputData>().ToList(); }
- }
+ IList<IAuxiliaryDeclarationInputData> IAuxiliariesDeclarationInputData.Auxiliaries => AuxData().Cast<IAuxiliaryDeclarationInputData>().ToList();
protected virtual IList<IAuxiliaryDeclarationInputData> AuxData()
{
@@ -696,15 +629,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public JSONInputDataV4(JObject data, string filename, bool tolerateMissing = false)
: base(data, filename, tolerateMissing) { }
- public override TableData PTOCycleWhileDrive
- {
- get { return Body["PTOCycleDuringDrive"] != null ? VectoCSVFile.Read(Path.Combine(BasePath, Body.GetEx<string>("PTOCycleDuringDrive"))) : null; }
- }
- public override IGearshiftEngineeringInputData GearshiftInputData { get {
- return Body["TCU"] == null
+ public override TableData PTOCycleWhileDrive => Body["PTOCycleDuringDrive"] != null ? VectoCSVFile.Read(Path.Combine(BasePath, Body.GetEx<string>("PTOCycleDuringDrive"))) : null;
+
+ public override IGearshiftEngineeringInputData GearshiftInputData =>
+ Body["TCU"] == null
? null
: JSONInputDataFactory.ReadShiftParameters(Path.Combine(BasePath, Body.GetEx<string>("TCU")), false);
- } }
}
public class JSONVTPInputDataV4 : JSONFile, IVTPEngineeringInputDataProvider, IVTPEngineeringJobInputData,
@@ -732,37 +662,21 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
_inputReader = kernel.Get<IXMLInputDataReader>();
}
- public IVTPEngineeringJobInputData JobInputData
- {
- get { return this; }
- }
+ public IVTPEngineeringJobInputData JobInputData => this;
- public IManufacturerReport ManufacturerReportInputData
- {
- get { return this; }
- }
+ public IManufacturerReport ManufacturerReportInputData => this;
- public IVehicleDeclarationInputData Vehicle
- {
- get {
- return _inputReader.CreateDeclaration(
- Path.Combine(Path.GetFullPath(BasePath), Body["DeclarationVehicle"].Value<string>())).JobInputData.Vehicle;
- }
- }
+ public IVehicleDeclarationInputData Vehicle =>
+ _inputReader.CreateDeclaration(
+ Path.Combine(Path.GetFullPath(BasePath), Body["DeclarationVehicle"].Value<string>())).JobInputData.Vehicle;
public IVectoHash VectoJobHash { get; }
public IVectoHash VectoManufacturerReportHash { get; }
- public Meter Mileage
- {
- get { return Body.GetEx<double>("Mileage").SI(Unit.SI.Kilo.Meter).Cast<Meter>(); }
- }
+ public Meter Mileage => Body.GetEx<double>("Mileage").SI(Unit.SI.Kilo.Meter).Cast<Meter>();
- string IManufacturerReport.Source
- {
- get { return Body["ManufacturerRecord"].Value<string>(); }
- }
+ string IManufacturerReport.Source => Body["ManufacturerRecord"].Value<string>();
public IResultsInputData Results
{
@@ -803,17 +717,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return Body.GetEx("FanPowerCoefficients").Select(entry => entry.ToString().ToDouble()).ToList(); }
}
- public Meter FanDiameter
- {
- get { return Body.GetEx<double>("FanDiameter").SI<Meter>(); }
- }
+ public Meter FanDiameter => Body.GetEx<double>("FanDiameter").SI<Meter>();
#region Implementation of IVTPDeclarationInputDataProvider
- IVTPDeclarationJobInputData IVTPDeclarationInputDataProvider.JobInputData
- {
- get { return JobInputData; }
- }
+ IVTPDeclarationJobInputData IVTPDeclarationInputDataProvider.JobInputData => JobInputData;
#endregion
@@ -970,58 +878,48 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Overrides of JSONInputDataV2
- public override IEngineStopStartEngineeringInputData EngineStopStartData
- {
- get {
- return engineStopStartData ?? (engineStopStartData = new EngineStopStartInputData {
- MaxEngineOffTimespan = Body["EngineStopStartMaxOffTimespan"] == null
- ? null
- : Body.GetEx<double>("EngineStopStartMaxOffTimespan").SI<Second>(),
- UtilityFactorStandstill = Body["EngineStopStartUtilityFactor"] == null
+ public override IEngineStopStartEngineeringInputData EngineStopStartData =>
+ engineStopStartData ?? (engineStopStartData = new EngineStopStartInputData {
+ MaxEngineOffTimespan = Body["EngineStopStartMaxOffTimespan"] == null
+ ? null
+ : Body.GetEx<double>("EngineStopStartMaxOffTimespan").SI<Second>(),
+ UtilityFactorStandstill = Body["EngineStopStartUtilityFactor"] == null
+ ? DeclarationData.Driver.EngineStopStart.UtilityFactor
+ : Body.GetEx<double>("EngineStopStartUtilityFactor"),
+ UtilityFactorDriving = Body["EngineStopStartUtilityFactorDriving"] == null
+ ? (Body["EngineStopStartUtilityFactor"] == null
? DeclarationData.Driver.EngineStopStart.UtilityFactor
- : Body.GetEx<double>("EngineStopStartUtilityFactor"),
- UtilityFactorDriving = Body["EngineStopStartUtilityFactorDriving"] == null
- ? (Body["EngineStopStartUtilityFactor"] == null
- ? DeclarationData.Driver.EngineStopStart.UtilityFactor
- : Body.GetEx<double>("EngineStopStartUtilityFactor"))
- : Body.GetEx<double>("EngineStopStartUtilityFactorDriving"),
- ActivationDelay = Body["EngineStopStartAtVehicleStopThreshold"] == null
- ? null
- : Body.GetEx<double>("EngineStopStartAtVehicleStopThreshold").SI<Second>()
- });
- }
- }
+ : Body.GetEx<double>("EngineStopStartUtilityFactor"))
+ : Body.GetEx<double>("EngineStopStartUtilityFactorDriving"),
+ ActivationDelay = Body["EngineStopStartAtVehicleStopThreshold"] == null
+ ? null
+ : Body.GetEx<double>("EngineStopStartAtVehicleStopThreshold").SI<Second>()
+ });
- public override IEcoRollEngineeringInputData EcoRollData
- {
- get {
- return ecoRollData ?? (ecoRollData = new EcoRollInputData {
- UnderspeedThreshold = Body["EcoRollUnderspeedThreshold"] == null
- ? null
- : Body.GetEx<double>("EcoRollUnderspeedThreshold").KMPHtoMeterPerSecond(),
- MinSpeed = Body["EcoRollMinSpeed"] == null
- ? null
- : Body.GetEx<double>("EcoRollMinSpeed").KMPHtoMeterPerSecond(),
- ActivationDelay = Body["EcoRollActivationDelay"] == null
- ? null
- : Body.GetEx<double>("EcoRollActivationDelay").SI<Second>(),
- AccelerationUpperLimit = Body["EcoRollMaxAcceleration"] == null? null : Body.GetEx<double>("EcoRollMaxAcceleration").SI<MeterPerSquareSecond>()
- });
- }
- }
+ public override IEcoRollEngineeringInputData EcoRollData =>
+ ecoRollData ?? (ecoRollData = new EcoRollInputData {
+ UnderspeedThreshold = Body["EcoRollUnderspeedThreshold"] == null
+ ? null
+ : Body.GetEx<double>("EcoRollUnderspeedThreshold").KMPHtoMeterPerSecond(),
+ MinSpeed = Body["EcoRollMinSpeed"] == null
+ ? null
+ : Body.GetEx<double>("EcoRollMinSpeed").KMPHtoMeterPerSecond(),
+ ActivationDelay = Body["EcoRollActivationDelay"] == null
+ ? null
+ : Body.GetEx<double>("EcoRollActivationDelay").SI<Second>(),
+ AccelerationUpperLimit = Body["EcoRollMaxAcceleration"] == null? null : Body.GetEx<double>("EcoRollMaxAcceleration").SI<MeterPerSquareSecond>()
+ });
- public override IPCCEngineeringInputData PCCData
- {
- get { return pccData ?? (pccData = new PCCInputData() {
+ public override IPCCEngineeringInputData PCCData =>
+ pccData ?? (pccData = new PCCInputData() {
PCCEnabledSpeed = Body["PCCEnableSpeed"] == null ? null : Body.GetEx<double>("PCCEnableSpeed").KMPHtoMeterPerSecond(),
MinSpeed = Body["PCCMinSpeed"] == null ? null : Body.GetEx<double>("PCCMinSpeed").KMPHtoMeterPerSecond(),
Underspeed = Body["PCCUnderspeed"] == null ? null : Body.GetEx<double>("PCCUnderspeed").KMPHtoMeterPerSecond(),
OverspeedUseCase3 = Body["PCCOverspeed"] == null ? null : Body.GetEx<double>("PCCOverspeed").KMPHtoMeterPerSecond(),
PreviewDistanceUseCase1 = Body["PCCPreviewDistanceUC1"] == null ? null : Body.GetEx<double>("PCCPreviewDistanceUC1").SI<Meter>(),
PreviewDistanceUseCase2 = Body["PCCPreviewDistanceUC2"] == null ? null : Body.GetEx<double>("PCCPreviewDistanceUC2").SI<Meter>()
- }); }
- }
+ });
#endregion
}
@@ -1101,7 +999,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Overrides of JSONFile
- public override bool SavedInDeclarationMode { get { return true; } }
+ public override bool SavedInDeclarationMode => true;
#endregion
@@ -1114,21 +1012,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Implementation of IDeclarationInputDataProvider
- public IDeclarationJobInputData JobInputData { get { return this; } }
- public virtual IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData { get { return null; } }
- public XElement XMLHash { get { return new XElement(XMLNames.DI_Signature); } }
+ public IDeclarationJobInputData JobInputData => this;
+ public virtual IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData => null;
+ public XElement XMLHash => new XElement(XMLNames.DI_Signature);
#endregion
#region Implementation of IDeclarationJobInputData
- public IVehicleDeclarationInputData Vehicle { get { return PrimaryVehicle; } }
+ public IVehicleDeclarationInputData Vehicle => PrimaryVehicle;
public string JobName { get; }
- public string ShiftStrategy { get { return ""; } }
- public VectoSimulationJobType JobType
- {
- get { return VectoSimulationJobType.ConventionalVehicle; }
- }
+ public string ShiftStrategy => "";
+
+ public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
#endregion
}
@@ -1168,13 +1064,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Overrides of JSONFile
- public override bool SavedInDeclarationMode { get { return true; } }
+ public override bool SavedInDeclarationMode => true;
#endregion
#region Implementation of IDeclarationInputDataProvider
- public IDeclarationJobInputData JobInputData { get { return this; } }
+ public IDeclarationJobInputData JobInputData => this;
public IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData { get; }
public XElement XMLHash { get; }
@@ -1184,11 +1080,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public IVehicleDeclarationInputData Vehicle { get; }
public string JobName { get; }
- public string ShiftStrategy { get { return ""; } }
- public VectoSimulationJobType JobType
- {
- get { return VectoSimulationJobType.ConventionalVehicle; }
- }
+ public string ShiftStrategy => "";
+
+ public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
#endregion
}
@@ -1197,24 +1091,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
public JSONInputDataV8_Hybrid(JObject data, string filename, bool tolerateMissing = false) : base(data, filename, tolerateMissing) { }
- public override VectoSimulationJobType JobType
- {
- get
- {
- return VectoSimulationJobType.ParallelHybridVehicle;
- }
- }
-
- public override IHybridStrategyParameters HybridStrategyParameters
- {
- get
- {
- return Body["HybridStrategyParams"] == null
- ? null : JSONInputDataFactory.ReadHybridStrategyParameters(
- Path.Combine(BasePath, Body.GetEx<string>("HybridStrategyParams")), false);
- }
- }
+ public override VectoSimulationJobType JobType => VectoSimulationJobType.ParallelHybridVehicle;
+ public override IHybridStrategyParameters HybridStrategyParameters =>
+ Body["HybridStrategyParams"] == null
+ ? null : JSONInputDataFactory.ReadHybridStrategyParameters(
+ Path.Combine(BasePath, Body.GetEx<string>("HybridStrategyParams")), false);
}
public class JSONInputDataV9_BEV : AbstractJSONInputData
@@ -1233,17 +1115,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public override VectoSimulationJobType JobType
- {
- get { return VectoSimulationJobType.BatteryElectricVehicle; }
- }
+ public override VectoSimulationJobType JobType => VectoSimulationJobType.BatteryElectricVehicle;
- public override IGearshiftEngineeringInputData GearshiftInputData {
- get {
- return Body["TCU"] == null
- ? null
- : JSONInputDataFactory.ReadShiftParameters(Path.Combine(BasePath, Body.GetEx<string>("TCU")), false);
- }
- }
+ public override IGearshiftEngineeringInputData GearshiftInputData =>
+ Body["TCU"] == null
+ ? null
+ : JSONInputDataFactory.ReadShiftParameters(Path.Combine(BasePath, Body.GetEx<string>("TCU")), false);
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
index d3c28e7c63f292e7115c79a8c222f3b4c3c7eb94..592b5b345969242f525accddfd16a8365d490540 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
@@ -22,63 +22,36 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
Base = jsonFile;
}
- protected JObject Body
- {
- get { return Base.Body; }
- }
+ protected JObject Body => Base.Body;
protected TableData ReadTableData(string filename, string tableType, bool required = true)
{
return Base.ReadTableData(filename, tableType, required);
}
- protected string BasePath
- {
- get { return Base.BasePath; }
- }
- protected bool TolerateMissing
- {
- get { return Base.TolerateMissing; }
- }
+ protected string BasePath => Base.BasePath;
- public DataSource DataSource
- {
- get { return Base.DataSource; }
- }
- public bool SavedInDeclarationMode
- {
- get { return Base.SavedInDeclarationMode; }
- }
- public string Manufacturer
- {
- get { return Base.Manufacturer; }
- }
- public string Model
- {
- get { return Base.Model; }
- }
- public DateTime Date
- {
- get { return Base.Date; }
- }
- public string AppVersion
- {
- get { return Base.AppVersion; }
- }
- public CertificationMethod CertificationMethod
- {
- get { return Base.CertificationMethod; }
- }
- public string CertificationNumber
- {
- get { return Base.CertificationNumber; }
- }
- public DigestData DigestValue
- {
- get { return Base.DigestValue; }
- }
+ protected bool TolerateMissing => Base.TolerateMissing;
+
+ public DataSource DataSource => Base.DataSource;
+
+ public bool SavedInDeclarationMode => Base.SavedInDeclarationMode;
+
+ public string Manufacturer => Base.Manufacturer;
+
+ public string Model => Base.Model;
+
+ public DateTime Date => Base.Date;
+
+ public string AppVersion => Base.AppVersion;
+
+ public CertificationMethod CertificationMethod => Base.CertificationMethod;
+
+ public string CertificationNumber => Base.CertificationNumber;
+
+ public DigestData DigestValue => Base.DigestValue;
- public virtual XmlNode XMLSource { get { return Base.XMLSource; } }
+ public virtual XmlNode XMLSource => Base.XMLSource;
}
// ###################################################################
@@ -100,10 +73,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public virtual double Ratio
- {
- get { return Body.GetEx(JsonKeys.Vehicle_Retarder).GetEx<double>(JsonKeys.Vehicle_Retarder_Ratio); }
- }
+ public virtual double Ratio => Body.GetEx(JsonKeys.Vehicle_Retarder).GetEx<double>(JsonKeys.Vehicle_Retarder_Ratio);
public virtual TableData LossMap
{
@@ -246,10 +216,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public virtual double Efficiency
- {
- get { return Body.GetEx(JsonKeys.Vehicle_Angledrive).GetEx<double>(JsonKeys.Vehicle_Angledrive_Efficiency); }
- }
+ public virtual double Efficiency => Body.GetEx(JsonKeys.Vehicle_Angledrive).GetEx<double>(JsonKeys.Vehicle_Angledrive_Efficiency);
#endregion
}
@@ -263,36 +230,16 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Airdrag
- public virtual SquareMeter AirDragArea
- {
- get
- {
- return Body[JsonKeys.Vehicle_DragCoefficient] == null
- ? null
- : Body.GetEx<double>(JsonKeys.Vehicle_DragCoefficient).SI<SquareMeter>();
- }
- }
+ public virtual SquareMeter AirDragArea =>
+ Body[JsonKeys.Vehicle_DragCoefficient] == null
+ ? null
+ : Body.GetEx<double>(JsonKeys.Vehicle_DragCoefficient).SI<SquareMeter>();
- public SquareMeter TransferredAirDragArea
- {
- get
- {
- return AirDragArea;
- }
- }
+ public SquareMeter TransferredAirDragArea => AirDragArea;
- public SquareMeter AirDragArea_0
- {
- get
- {
- return AirDragArea;
- }
- }
+ public SquareMeter AirDragArea_0 => AirDragArea;
- public virtual CrossWindCorrectionMode CrossWindCorrectionMode
- {
- get { return CrossWindCorrectionModeHelper.Parse(Body.GetEx<string>("CdCorrMode")); }
- }
+ public virtual CrossWindCorrectionMode CrossWindCorrectionMode => CrossWindCorrectionModeHelper.Parse(Body.GetEx<string>("CdCorrMode"));
public virtual TableData CrosswindCorrectionMap
{
@@ -462,25 +409,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Implementation of IAdvancedDriverAssistantSystemDeclarationInputData
- public virtual bool EngineStopStart
- {
- get { return DeclarationData.Vehicle.ADAS.EngineStopStartDefault; }
- }
+ public virtual bool EngineStopStart => DeclarationData.Vehicle.ADAS.EngineStopStartDefault;
- public virtual EcoRollType EcoRoll
- {
- get { return DeclarationData.Vehicle.ADAS.EcoRoll; }
- }
+ public virtual EcoRollType EcoRoll => DeclarationData.Vehicle.ADAS.EcoRoll;
- public virtual PredictiveCruiseControlType PredictiveCruiseControl
- {
- get { return DeclarationData.Vehicle.ADAS.PredictiveCruiseControlDefault; }
- }
+ public virtual PredictiveCruiseControlType PredictiveCruiseControl => DeclarationData.Vehicle.ADAS.PredictiveCruiseControlDefault;
- public virtual bool? ATEcoRollReleaseLockupClutch
- {
- get { return null; }
- }
+ public virtual bool? ATEcoRollReleaseLockupClutch => null;
#endregion
@@ -494,20 +429,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Overrides of JSONADASInputDataV7
- public override bool EngineStopStart
- {
- get { return Body.GetEx<bool>("EngineStopStart"); }
- }
+ public override bool EngineStopStart => Body.GetEx<bool>("EngineStopStart");
- public override EcoRollType EcoRoll
- {
- get { return EcorollTypeHelper.Parse(Body.GetEx<string>("EcoRoll")); }
- }
+ public override EcoRollType EcoRoll => EcorollTypeHelper.Parse(Body.GetEx<string>("EcoRoll"));
- public override PredictiveCruiseControlType PredictiveCruiseControl
- {
- get { return Body.GetEx<string>("PredictiveCruiseControl").ParseEnum<PredictiveCruiseControlType>(); }
- }
+ public override PredictiveCruiseControlType PredictiveCruiseControl => Body.GetEx<string>("PredictiveCruiseControl").ParseEnum<PredictiveCruiseControlType>();
#endregion
}
@@ -518,10 +444,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
public JSONADASInputDataV9(JSONVehicleDataV7 vehicle) : base(vehicle) { }
- public override bool? ATEcoRollReleaseLockupClutch
- {
- get { return Body["ATEcoRollReleaseLockupClutch"]?.Value<bool>(); }
- }
+ public override bool? ATEcoRollReleaseLockupClutch => Body["ATEcoRollReleaseLockupClutch"]?.Value<bool>();
}
// -------------------------------------------------------------------
@@ -530,15 +453,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
public JSONADASInputDataV10BEV(JSONVehicleDataV7 vehicle) : base(vehicle) { }
- public override bool EngineStopStart
- {
- get { return false; }
- }
+ public override bool EngineStopStart => false;
- public override EcoRollType EcoRoll
- {
- get { return EcoRollType.None; }
- }
+ public override EcoRollType EcoRoll => EcoRollType.None;
}
// ###################################################################
@@ -552,52 +469,28 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Implementation of IBusAuxiliariesDeclarationData
- public virtual string FanTechnology
- {
- get { return Body["Aux"]?.Value<string>("FanTechnology"); }
- }
+ public virtual string FanTechnology => Body["Aux"]?.Value<string>("FanTechnology");
public virtual IList<string> SteeringPumpTechnology
{
get { return Body["Aux"]?["SteeringPumpTechnology"].Select(x => x.Value<string>()).ToList(); }
}
- public virtual IElectricSupplyDeclarationData ElectricSupply
- {
- get { return this; }
- }
+ public virtual IElectricSupplyDeclarationData ElectricSupply => this;
- public virtual IElectricConsumersDeclarationData ElectricConsumers
- {
- get { return this; }
- }
+ public virtual IElectricConsumersDeclarationData ElectricConsumers => this;
- public virtual IPneumaticSupplyDeclarationData PneumaticSupply
- {
- get { return this; }
- }
+ public virtual IPneumaticSupplyDeclarationData PneumaticSupply => this;
- public virtual IPneumaticConsumersDeclarationData PneumaticConsumers
- {
- get { return this; }
- }
+ public virtual IPneumaticConsumersDeclarationData PneumaticConsumers => this;
- public virtual IHVACBusAuxiliariesDeclarationData HVACAux
- {
- get { return this; }
- }
+ public virtual IHVACBusAuxiliariesDeclarationData HVACAux => this;
#endregion
#region Implementation of IElectricSupplyDeclarationData
- public virtual AlternatorType AlternatorTechnology
- {
- get
- {
- return Body["Aux"]?["ElectricSupply"]?.GetEx<string>("Technology").ParseEnum<AlternatorType>() ?? AlternatorType.Conventional;
- }
- }
+ public virtual AlternatorType AlternatorTechnology => Body["Aux"]?["ElectricSupply"]?.GetEx<string>("Technology").ParseEnum<AlternatorType>() ?? AlternatorType.Conventional;
public virtual IList<IAlternatorDeclarationInputData> Alternators
{
@@ -633,40 +526,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Implementation of IElectricConsumersDeclarationData
- public virtual bool? InteriorLightsLED
- {
- get { return false; }
- }
+ public virtual bool? InteriorLightsLED => false;
- public virtual bool? DayrunninglightsLED
- {
- get { return false; }
- }
+ public virtual bool? DayrunninglightsLED => false;
- public virtual bool? PositionlightsLED
- {
- get { return false; }
- }
+ public virtual bool? PositionlightsLED => false;
- public virtual bool? HeadlightsLED
- {
- get { return false; }
- }
+ public virtual bool? HeadlightsLED => false;
- public virtual bool? BrakelightsLED
- {
- get { return false; }
- }
+ public virtual bool? BrakelightsLED => false;
- public virtual bool SmartElectrics
- {
- get { return Body["Aux"]?["ElectricSupply"]?.GetEx<bool>("SmartElectrics") ?? false; }
- }
+ public virtual bool SmartElectrics => Body["Aux"]?["ElectricSupply"]?.GetEx<bool>("SmartElectrics") ?? false;
- public WattSecond ElectricStorageCapacity
- {
- get { return Body["Aux"]?["ElectricSupply"]?.GetEx<double>("ElectricStorageCapacity").SI(Unit.SI.Watt.Hour).Cast<WattSecond>() ?? null; }
- }
+ public WattSecond ElectricStorageCapacity => Body["Aux"]?["ElectricSupply"]?.GetEx<double>("ElectricStorageCapacity").SI(Unit.SI.Watt.Hour).Cast<WattSecond>() ?? null;
#endregion
@@ -674,14 +546,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public CompressorDrive CompressorDrive { get; }
public string Clutch { get; }
- public virtual double Ratio { get { return Body["Aux"]?["PneumaticSupply"]?.GetEx<double>("Ratio") ?? 0.0; } }
- public virtual string CompressorSize
- {
- get
- {
- return Body["Aux"]?["PneumaticSupply"]?.GetEx<string>("CompressorSize");
- }
- }
+ public virtual double Ratio => Body["Aux"]?["PneumaticSupply"]?.GetEx<double>("Ratio") ?? 0.0;
+
+ public virtual string CompressorSize => Body["Aux"]?["PneumaticSupply"]?.GetEx<string>("CompressorSize");
public bool SmartAirCompression { get; }
public bool SmartRegeneration { get; }
@@ -690,42 +557,31 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Implementation of IPneumaticConsumersDeclarationData
- public virtual ConsumerTechnology AirsuspensionControl
- {
- get
- {
- return Body["Aux"]?["PneumaticConsumers"]?.GetEx<string>("AirsuspensionControl").ParseEnum<ConsumerTechnology>() ??
- ConsumerTechnology.Unknown;
- }
- }
- public virtual ConsumerTechnology AdBlueDosing
- {
- get
- {
- return Body["Aux"]?["PneumaticConsumers"]?.GetEx<string>("AdBlueDosing").ParseEnum<ConsumerTechnology>() ??
- ConsumerTechnology.Unknown;
- }
- }
+ public virtual ConsumerTechnology AirsuspensionControl =>
+ Body["Aux"]?["PneumaticConsumers"]?.GetEx<string>("AirsuspensionControl").ParseEnum<ConsumerTechnology>() ??
+ ConsumerTechnology.Unknown;
+
+ public virtual ConsumerTechnology AdBlueDosing =>
+ Body["Aux"]?["PneumaticConsumers"]?.GetEx<string>("AdBlueDosing").ParseEnum<ConsumerTechnology>() ??
+ ConsumerTechnology.Unknown;
#endregion
#region Implementation of IHVACBusAuxiliariesDeclarationData
public virtual BusHVACSystemConfiguration? SystemConfiguration { get; set; }
- public virtual HeatPumpType? HeatPumpTypeDriverCompartment { get { return null; } }
- public virtual HeatPumpMode? HeatPumpModeDriverCompartment { get { return null; } }
- public virtual IList<Tuple<HeatPumpType, HeatPumpMode>> HeatPumpPassengerCompartments
- {
- get { return null; }
- }
- public virtual Watt AuxHeaterPower { get { return null; } }
- public virtual bool? DoubleGlazing { get { return false; } }
- public virtual bool HeatPump { get { return false; } }
+ public virtual HeatPumpType? HeatPumpTypeDriverCompartment => null;
+ public virtual HeatPumpMode? HeatPumpModeDriverCompartment => null;
+
+ public virtual IList<Tuple<HeatPumpType, HeatPumpMode>> HeatPumpPassengerCompartments => null;
+ public virtual Watt AuxHeaterPower => null;
+ public virtual bool? DoubleGlazing => false;
+ public virtual bool HeatPump => false;
public bool? OtherHeatingTechnology { get; }
- public virtual bool? AdjustableCoolantThermostat { get { return Body["Aux"]?["HVAC"]?.GetEx<bool>("AdjustableCoolantThermostat") ?? false; } }
- public virtual bool? AdjustableAuxiliaryHeater { get { return false; } }
- public virtual bool EngineWasteGasHeatExchanger { get { return Body["Aux"]?["HVAC"]?.GetEx<bool>("EngineWasteGasHeatExchanger") ?? false; } }
- public virtual bool? SeparateAirDistributionDucts { get { return false; } }
+ public virtual bool? AdjustableCoolantThermostat => Body["Aux"]?["HVAC"]?.GetEx<bool>("AdjustableCoolantThermostat") ?? false;
+ public virtual bool? AdjustableAuxiliaryHeater => false;
+ public virtual bool EngineWasteGasHeatExchanger => Body["Aux"]?["HVAC"]?.GetEx<bool>("EngineWasteGasHeatExchanger") ?? false;
+ public virtual bool? SeparateAirDistributionDucts => false;
public virtual bool? WaterElectricHeater { get; }
public virtual bool? AirElectricHeater { get; }
@@ -745,15 +601,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
_entries = entries;
}
- IList<ElectricMachineEntry<IElectricMotorDeclarationInputData>> IElectricMachinesDeclarationInputData.Entries
- {
- get { return _entries.Cast<ElectricMachineEntry<IElectricMotorDeclarationInputData>>().ToList(); }
- }
+ IList<ElectricMachineEntry<IElectricMotorDeclarationInputData>> IElectricMachinesDeclarationInputData.Entries => _entries.Cast<ElectricMachineEntry<IElectricMotorDeclarationInputData>>().ToList();
- public virtual IList<ElectricMachineEntry<IElectricMotorEngineeringInputData>> Entries
- {
- get { return _entries; }
- }
+ public virtual IList<ElectricMachineEntry<IElectricMotorEngineeringInputData>> Entries => _entries;
}
// ###################################################################
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONTCUData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONTCUData.cs
index d10534f4a0f4183d32f242e9a657bd1e4e8f5aaa..7339282b3a2313174cd02a63b0d3bdd938108f5e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONTCUData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONTCUData.cs
@@ -18,142 +18,73 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Implementation of IGearshiftEngineeringInputData
- public virtual Second MinTimeBetweenGearshift
- {
- get {
- return Body[JsonKeys.Gearbox_ShiftTime] == null
- ? DeclarationData.Gearbox.MinTimeBetweenGearshifts
- : Body.GetEx<double>(JsonKeys.Gearbox_ShiftTime).SI<Second>();
- }
- }
+ public virtual Second MinTimeBetweenGearshift =>
+ Body[JsonKeys.Gearbox_ShiftTime] == null
+ ? DeclarationData.Gearbox.MinTimeBetweenGearshifts
+ : Body.GetEx<double>(JsonKeys.Gearbox_ShiftTime).SI<Second>();
- public virtual double TorqueReserve
- {
- get { return Body[JsonKeys.Gearbox_TorqueReserve] == null ?
- DeclarationData.GearboxTCU.TorqueReserve
- :Body.GetEx<double>(JsonKeys.Gearbox_TorqueReserve) / 100.0; }
- }
+ public virtual double TorqueReserve =>
+ Body[JsonKeys.Gearbox_TorqueReserve] == null ?
+ DeclarationData.GearboxTCU.TorqueReserve
+ :Body.GetEx<double>(JsonKeys.Gearbox_TorqueReserve) / 100.0;
- public Second DownshiftAfterUpshiftDelay
- {
- get {
- return Body["DownshiftAfterUpshiftDelay"] == null
- ? DeclarationData.Gearbox.DownshiftAfterUpshiftDelay
- : Body.GetEx<double>("DownshiftAfterUpshiftDelay").SI<Second>();
- }
- }
+ public Second DownshiftAfterUpshiftDelay =>
+ Body["DownshiftAfterUpshiftDelay"] == null
+ ? DeclarationData.Gearbox.DownshiftAfterUpshiftDelay
+ : Body.GetEx<double>("DownshiftAfterUpshiftDelay").SI<Second>();
- public Second UpshiftAfterDownshiftDelay
- {
- get {
- return Body["UpshiftAfterDownshiftDelay"] == null
- ? DeclarationData.Gearbox.UpshiftAfterDownshiftDelay
- : Body.GetEx<double>("UpshiftAfterDownshiftDelay").SI<Second>();
- }
- }
+ public Second UpshiftAfterDownshiftDelay =>
+ Body["UpshiftAfterDownshiftDelay"] == null
+ ? DeclarationData.Gearbox.UpshiftAfterDownshiftDelay
+ : Body.GetEx<double>("UpshiftAfterDownshiftDelay").SI<Second>();
- public MeterPerSquareSecond UpshiftMinAcceleration
- {
- get {
- return Body["UpshiftMinAcceleration"] == null
- ? DeclarationData.Gearbox.UpshiftMinAcceleration
- : Body.GetEx<double>("UpshiftMinAcceleration").SI<MeterPerSquareSecond>();
- }
- }
+ public MeterPerSquareSecond UpshiftMinAcceleration =>
+ Body["UpshiftMinAcceleration"] == null
+ ? DeclarationData.Gearbox.UpshiftMinAcceleration
+ : Body.GetEx<double>("UpshiftMinAcceleration").SI<MeterPerSquareSecond>();
- public MeterPerSquareSecond CLUpshiftMinAcceleration
- {
- get {
- return Body[JsonKeys.Gearbox_TorqueConverter] != null &&
- Body[JsonKeys.Gearbox_TorqueConverter]["CLUpshiftMinAcceleration"] != null
- ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter).GetEx<double>("CLUpshiftMinAcceleration").SI<MeterPerSquareSecond>()
- : UpshiftMinAcceleration;
- }
- }
+ public MeterPerSquareSecond CLUpshiftMinAcceleration =>
+ Body[JsonKeys.Gearbox_TorqueConverter] != null &&
+ Body[JsonKeys.Gearbox_TorqueConverter]["CLUpshiftMinAcceleration"] != null
+ ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter).GetEx<double>("CLUpshiftMinAcceleration").SI<MeterPerSquareSecond>()
+ : UpshiftMinAcceleration;
- public MeterPerSquareSecond CCUpshiftMinAcceleration
- {
- get {
- return Body[JsonKeys.Gearbox_TorqueConverter] != null &&
- Body[JsonKeys.Gearbox_TorqueConverter]["CCUpshiftMinAcceleration"] != null
- ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter).GetEx<double>("CCUpshiftMinAcceleration").SI<MeterPerSquareSecond>()
- : UpshiftMinAcceleration;
- }
- }
+ public MeterPerSquareSecond CCUpshiftMinAcceleration =>
+ Body[JsonKeys.Gearbox_TorqueConverter] != null &&
+ Body[JsonKeys.Gearbox_TorqueConverter]["CCUpshiftMinAcceleration"] != null
+ ? Body.GetEx(JsonKeys.Gearbox_TorqueConverter).GetEx<double>("CCUpshiftMinAcceleration").SI<MeterPerSquareSecond>()
+ : UpshiftMinAcceleration;
- public virtual double StartTorqueReserve
- {
- get {
- return Body[JsonKeys.Gearbox_StartTorqueReserve] == null
- ? DeclarationData.GearboxTCU.TorqueReserveStart
- : Body.GetEx<double>(JsonKeys.Gearbox_StartTorqueReserve) / 100.0;
- }
- }
+ public virtual double StartTorqueReserve =>
+ Body[JsonKeys.Gearbox_StartTorqueReserve] == null
+ ? DeclarationData.GearboxTCU.TorqueReserveStart
+ : Body.GetEx<double>(JsonKeys.Gearbox_StartTorqueReserve) / 100.0;
- public MeterPerSecond StartSpeed
- {
- get { return Body.GetValueOrDefault<double>(JsonKeys.Gearbox_StartSpeed)?.KMPHtoMeterPerSecond() ?? DeclarationData.GearboxTCU.StartSpeed; }
- }
+ public MeterPerSecond StartSpeed => Body.GetValueOrDefault<double>(JsonKeys.Gearbox_StartSpeed)?.KMPHtoMeterPerSecond() ?? DeclarationData.GearboxTCU.StartSpeed;
- public MeterPerSquareSecond StartAcceleration
- {
- get { return Body.GetValueOrDefault<double>(JsonKeys.Gearbox_StartAcceleration)?.SI<MeterPerSquareSecond>() ?? DeclarationData.GearboxTCU.StartAcceleration; }
- }
+ public MeterPerSquareSecond StartAcceleration => Body.GetValueOrDefault<double>(JsonKeys.Gearbox_StartAcceleration)?.SI<MeterPerSquareSecond>() ?? DeclarationData.GearboxTCU.StartAcceleration;
- public Second GearResidenceTime
- {
- get { return Body.GetValueOrDefault<double>("GearResidenceTime")?.SI<Second>(); }
- }
+ public Second GearResidenceTime => Body.GetValueOrDefault<double>("GearResidenceTime")?.SI<Second>();
- public double? DnT99LHMin1
- {
- get { return Body.GetValueOrDefault<double>("Dn_Tq99L_high_min_1"); }
- }
+ public double? DnT99LHMin1 => Body.GetValueOrDefault<double>("Dn_Tq99L_high_min_1");
- public double? DnT99LHMin2
- {
- get { return Body.GetValueOrDefault<double>("Dn_Tq99L_high_min_2"); }
- }
+ public double? DnT99LHMin2 => Body.GetValueOrDefault<double>("Dn_Tq99L_high_min_2");
- public int? AllowedGearRangeUp
- {
- get { return Body.GetValueOrDefault<int>("GearRangeUp"); }
- }
+ public int? AllowedGearRangeUp => Body.GetValueOrDefault<int>("GearRangeUp");
- public int? AllowedGearRangeDown
- {
- get { return Body.GetValueOrDefault<int>("GearRangeDown"); }
- }
+ public int? AllowedGearRangeDown => Body.GetValueOrDefault<int>("GearRangeDown");
- public Second LookBackInterval
- {
- get { return Body.GetValueOrDefault<double>("LookBackDriver")?.SI<Second>(); }
- }
+ public Second LookBackInterval => Body.GetValueOrDefault<double>("LookBackDriver")?.SI<Second>();
- public Watt AvgCardanPowerThresholdPropulsion
- {
- get { return Body.GetValueOrDefault<double>("P_card_avg_threshold")?.SI<Watt>(); }
- }
+ public Watt AvgCardanPowerThresholdPropulsion => Body.GetValueOrDefault<double>("P_card_avg_threshold")?.SI<Watt>();
- public Watt CurrCardanPowerThresholdPropulsion
- {
- get { return Body.GetValueOrDefault<double>("P_card_curr_threshold")?.SI<Watt>(); }
- }
+ public Watt CurrCardanPowerThresholdPropulsion => Body.GetValueOrDefault<double>("P_card_curr_threshold")?.SI<Watt>();
- public double? TargetSpeedDeviationFactor
- {
- get { return Body.GetValueOrDefault<double>("Diff_curr_targ_vel"); }
- }
+ public double? TargetSpeedDeviationFactor => Body.GetValueOrDefault<double>("Diff_curr_targ_vel");
- public double? EngineSpeedHighDriveOffFactor
- {
- get { return Body.GetValueOrDefault<double>("EngineSpeedHighDriveOffFactor"); }
- }
+ public double? EngineSpeedHighDriveOffFactor => Body.GetValueOrDefault<double>("EngineSpeedHighDriveOffFactor");
- public double? RatingFactorCurrentGear
- {
- get { return Body.GetValueOrDefault<double>("Rating_current_gear"); }
- }
+ public double? RatingFactorCurrentGear => Body.GetValueOrDefault<double>("Rating_current_gear");
public TableData AccelerationReserveLookup
{
@@ -240,22 +171,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public Second DriverAccelerationLookBackInterval { get {return Body.GetValueOrDefault<double>("DriverAccelerationLookBackInterval")?.SI<Second>();} }
- public MeterPerSquareSecond DriverAccelerationThresholdLow { get { return Body.GetValueOrDefault<double>("DriverAccelerationThresholdLow")?.SI<MeterPerSquareSecond>(); } }
+ public Second DriverAccelerationLookBackInterval => Body.GetValueOrDefault<double>("DriverAccelerationLookBackInterval")?.SI<Second>();
+ public MeterPerSquareSecond DriverAccelerationThresholdLow => Body.GetValueOrDefault<double>("DriverAccelerationThresholdLow")?.SI<MeterPerSquareSecond>();
- public double? RatioEarlyUpshiftFC
- {
- get {
- return Body.GetValueOrDefault<double>("RatioEarlyUpshiftFC");
- }
- }
+ public double? RatioEarlyUpshiftFC => Body.GetValueOrDefault<double>("RatioEarlyUpshiftFC");
- public double? RatioEarlyDownshiftFC
- {
- get {
- return Body.GetValueOrDefault<double>("RatioEarlyDownshiftFC");
- }
- }
+ public double? RatioEarlyDownshiftFC => Body.GetValueOrDefault<double>("RatioEarlyDownshiftFC");
public int? AllowedGearRangeFC
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index cd231ad39666df421a3091944a5d571dde2b6170..6bb6cdf3697420417783b899688174ee037848c1 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -60,18 +60,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Overrides of JSONVehicleDataV7
- public override double InitialSOC
- {
- get { return Body.GetEx<double>("InitialSoC") / 100.0; }
- }
+ public override double InitialSOC => Body.GetEx<double>("InitialSoC") / 100.0;
- protected override IRetarderInputData GetRetarder
- {
- get
- {
- return _retarderInputData ?? (_retarderInputData = new JSONRetarderInputDataBEV(this));
- }
- }
+ protected override IRetarderInputData GetRetarder => _retarderInputData ?? (_retarderInputData = new JSONRetarderInputDataBEV(this));
protected override IElectricMachinesEngineeringInputData GetElectricMachines()
{
@@ -139,27 +130,17 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
};
}
- public override TableData ElectricMotorTorqueLimits
- {
- get
- {
- return Body["EMTorqueLimits"] == null
- ? null
- : ReadTableData(Path.Combine(BasePath, Body.GetEx<string>("EMTorqueLimits")),
- "ElectricMotorTorqueLimits");
- }
- }
+ public override TableData ElectricMotorTorqueLimits =>
+ Body["EMTorqueLimits"] == null
+ ? null
+ : ReadTableData(Path.Combine(BasePath, Body.GetEx<string>("EMTorqueLimits")),
+ "ElectricMotorTorqueLimits");
- public override TableData MaxPropulsionTorque
- {
- get
- {
- return Body["MaxPropulsionTorque"] == null
- ? null
- : ReadTableData(Path.Combine(BasePath, Body.GetEx<string>("MaxPropulsionTorque")),
- "MaxPropulsionTorque");
- }
- }
+ public override TableData MaxPropulsionTorque =>
+ Body["MaxPropulsionTorque"] == null
+ ? null
+ : ReadTableData(Path.Combine(BasePath, Body.GetEx<string>("MaxPropulsionTorque")),
+ "MaxPropulsionTorque");
#endregion
}
@@ -177,17 +158,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Overrides of JSONVehicleDataV7
- public override IBusAuxiliariesDeclarationData BusAuxiliaries
- {
- get { return _busAuxiliariesData ?? (_busAuxiliariesData = new JSONBusAuxiliariesData(this)); }
- }
+ public override IBusAuxiliariesDeclarationData BusAuxiliaries => _busAuxiliariesData ?? (_busAuxiliariesData = new JSONBusAuxiliariesData(this));
#region Overrides of JSONVehicleDataV7
- public override bool Articulated
- {
- get { return Body.GetEx<bool>("Articulated"); }
- }
+ public override bool Articulated => Body.GetEx<bool>("Articulated");
protected override IAdvancedDriverAssistantSystemsEngineering GetADS()
{
@@ -209,10 +184,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
- public override TankSystem? TankSystem
- {
- get { return Body["TankSystem"]?.ToString().ParseEnum<TankSystem>(); }
- }
+ public override TankSystem? TankSystem => Body["TankSystem"]?.ToString().ParseEnum<TankSystem>();
protected override IAdvancedDriverAssistantSystemsEngineering GetADS()
{
@@ -244,57 +216,26 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region IVehicleInputData
- public virtual string Identifier
- {
- get { return Path.GetFileNameWithoutExtension(_sourceFile); }
- }
+ public virtual string Identifier => Path.GetFileNameWithoutExtension(_sourceFile);
- public virtual bool ExemptedVehicle
- {
- get { return false; }
- }
+ public virtual bool ExemptedVehicle => false;
- public virtual string VIN
- {
- get { return Constants.NOT_AVailABLE; }
- }
+ public virtual string VIN => Constants.NOT_AVailABLE;
- public string LegislativeCategory
- {
- get { return null; }
- }
+ public string LegislativeCategory => null;
- public virtual LegislativeClass? LegislativeClass
- {
- get {
- return Body["LegislativeClass"] != null
- ? Body["LegislativeClass"].Value<string>().ParseEnum<LegislativeClass>()
- : VectoCommon.Models.LegislativeClass.Unknown;
- }
- }
+ public virtual LegislativeClass? LegislativeClass =>
+ Body["LegislativeClass"] != null
+ ? Body["LegislativeClass"].Value<string>().ParseEnum<LegislativeClass>()
+ : VectoCommon.Models.LegislativeClass.Unknown;
- public virtual VehicleCategory VehicleCategory
- {
- get {
- return
- (VehicleCategory)Enum.Parse(typeof(VehicleCategory), Body[JsonKeys.Vehicle_VehicleCategory].Value<string>(), true);
- }
- }
+ public virtual VehicleCategory VehicleCategory => (VehicleCategory)Enum.Parse(typeof(VehicleCategory), Body[JsonKeys.Vehicle_VehicleCategory].Value<string>(), true);
- public virtual Kilogram CurbMassChassis
- {
- get { return Body.GetEx<double>(JsonKeys.Vehicle_CurbWeight).SI<Kilogram>(); }
- }
+ public virtual Kilogram CurbMassChassis => Body.GetEx<double>(JsonKeys.Vehicle_CurbWeight).SI<Kilogram>();
- public virtual Kilogram CurbMassExtra
- {
- get { return Body.GetEx<double>(JsonKeys.Vehicle_CurbWeightExtra).SI<Kilogram>(); }
- }
+ public virtual Kilogram CurbMassExtra => Body.GetEx<double>(JsonKeys.Vehicle_CurbWeightExtra).SI<Kilogram>();
- public virtual Kilogram GrossVehicleMassRating
- {
- get { return Body.GetEx<double>(JsonKeys.Vehicle_GrossVehicleMassRating).SI(Unit.SI.Ton).Cast<Kilogram>(); }
- }
+ public virtual Kilogram GrossVehicleMassRating => Body.GetEx<double>(JsonKeys.Vehicle_GrossVehicleMassRating).SI(Unit.SI.Ton).Cast<Kilogram>();
public virtual IList<ITorqueLimitInputData> TorqueLimits
{
@@ -316,120 +257,60 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public virtual Kilogram Loading
- {
- get { return Body.GetEx<double>(JsonKeys.Vehicle_Loading).SI<Kilogram>(); }
- }
+ public virtual Kilogram Loading => Body.GetEx<double>(JsonKeys.Vehicle_Loading).SI<Kilogram>();
- public virtual Meter DynamicTyreRadius
- {
- get { return Body.GetEx<double>(JsonKeys.Vehicle_DynamicTyreRadius).SI(Unit.SI.Milli.Meter).Cast<Meter>(); }
- }
+ public virtual Meter DynamicTyreRadius => Body.GetEx<double>(JsonKeys.Vehicle_DynamicTyreRadius).SI(Unit.SI.Milli.Meter).Cast<Meter>();
- public virtual bool Articulated { get { return false; } }
+ public virtual bool Articulated => false;
- public virtual Meter Height
- {
- get { return Body["VehicleHeight"] == null ? null : Body.GetEx<double>("VehicleHeight").SI<Meter>(); }
- }
+ public virtual Meter Height => Body["VehicleHeight"] == null ? null : Body.GetEx<double>("VehicleHeight").SI<Meter>();
- public virtual TableData ElectricMotorTorqueLimits
- {
- get { return null; }
- }
+ public virtual TableData ElectricMotorTorqueLimits => null;
- public virtual TableData MaxPropulsionTorque
- {
- get { return null; }
- }
+ public virtual TableData MaxPropulsionTorque => null;
- public virtual Meter Length
- {
- get { return null; }
- }
+ public virtual Meter Length => null;
- public virtual Meter Width
- {
- get { return null; }
- }
+ public virtual Meter Width => null;
- public virtual Meter EntranceHeight { get { return null; } }
- public virtual ConsumerTechnology? DoorDriveTechnology { get { return ConsumerTechnology.Unknown; } }
+ public virtual Meter EntranceHeight => null;
+ public virtual ConsumerTechnology? DoorDriveTechnology => ConsumerTechnology.Unknown;
public virtual VehicleDeclarationType VehicleDeclarationType { get; }
- IVehicleComponentsEngineering IVehicleEngineeringInputData.Components
- {
- get { return this; }
- }
+ IVehicleComponentsEngineering IVehicleEngineeringInputData.Components => this;
- XmlNode IVehicleDeclarationInputData.XMLSource
- {
- get { return null; }
- }
+ XmlNode IVehicleDeclarationInputData.XMLSource => null;
- public GearshiftPosition PTO_DriveGear { get {
- return Body["GearDuringPTODrive"] != null ? new GearshiftPosition(Body["GearDuringPTODrive"].Value<uint>()) : null;
- } }
+ public GearshiftPosition PTO_DriveGear => Body["GearDuringPTODrive"] != null ? new GearshiftPosition(Body["GearDuringPTODrive"].Value<uint>()) : null;
- public PerSecond PTO_DriveEngineSpeed { get {
- return Body["EngineSpeedDuringPTODrive"] != null ? Body.GetEx<double>("EngineSpeedDuringPTODrive").RPMtoRad() : null;
- } }
+ public PerSecond PTO_DriveEngineSpeed => Body["EngineSpeedDuringPTODrive"] != null ? Body.GetEx<double>("EngineSpeedDuringPTODrive").RPMtoRad() : null;
- IAdvancedDriverAssistantSystemsEngineering IVehicleEngineeringInputData.ADAS
- {
- get { return GetADS(); }
- }
+ IAdvancedDriverAssistantSystemsEngineering IVehicleEngineeringInputData.ADAS => GetADS();
- public virtual IAdvancedDriverAssistantSystemDeclarationInputData ADAS
- {
- get { return GetADS(); }
- }
+ public virtual IAdvancedDriverAssistantSystemDeclarationInputData ADAS => GetADS();
protected virtual IAdvancedDriverAssistantSystemsEngineering GetADS()
{
return _adasInputData ?? (_adasInputData = new JSONADASInputDataV7(this));
}
- public virtual double InitialSOC
- {
- get { return double.NaN; }
- }
+ public virtual double InitialSOC => double.NaN;
- public virtual VectoSimulationJobType VehicleType
- {
- get { return VectoSimulationJobType.ConventionalVehicle; }
- }
+ public virtual VectoSimulationJobType VehicleType => VectoSimulationJobType.ConventionalVehicle;
- public virtual AxleConfiguration AxleConfiguration
- {
- get {
- return
- AxleConfigurationHelper.Parse(
- Body.GetEx(JsonKeys.Vehicle_AxleConfiguration).GetEx<string>(JsonKeys.Vehicle_AxleConfiguration_Type));
- }
- }
+ public virtual AxleConfiguration AxleConfiguration =>
+ AxleConfigurationHelper.Parse(
+ Body.GetEx(JsonKeys.Vehicle_AxleConfiguration).GetEx<string>(JsonKeys.Vehicle_AxleConfiguration_Type));
- public virtual IList<IAxleEngineeringInputData> AxlesEngineering
- {
- get { return AxleWheels().Cast<IAxleEngineeringInputData>().ToList(); }
- }
+ public virtual IList<IAxleEngineeringInputData> AxlesEngineering => AxleWheels().Cast<IAxleEngineeringInputData>().ToList();
- public virtual string ManufacturerAddress
- {
- get { return Constants.NOT_AVailABLE; }
- }
+ public virtual string ManufacturerAddress => Constants.NOT_AVailABLE;
- public virtual PerSecond EngineIdleSpeed
- {
- get { return Body["IdlingSpeed"] != null ? Body.GetEx<double>("IdlingSpeed").RPMtoRad() : null; }
- }
+ public virtual PerSecond EngineIdleSpeed => Body["IdlingSpeed"] != null ? Body.GetEx<double>("IdlingSpeed").RPMtoRad() : null;
- IList<IAxleDeclarationInputData> IAxlesDeclarationInputData.AxlesDeclaration
- {
- get { return AxleWheels().Cast<IAxleDeclarationInputData>().ToList(); }
- }
+ IList<IAxleDeclarationInputData> IAxlesDeclarationInputData.AxlesDeclaration => AxleWheels().Cast<IAxleDeclarationInputData>().ToList();
private IEnumerable<AxleInputData> AxleWheels()
{
@@ -461,219 +342,99 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region "VehicleComponents"
- IAirdragDeclarationInputData IVehicleComponentsDeclaration.AirdragInputData
- {
- get { return _airdragInputData ?? (_airdragInputData = new JSONAirdragInputData(this)); }
- }
+ IAirdragDeclarationInputData IVehicleComponentsDeclaration.AirdragInputData => _airdragInputData ?? (_airdragInputData = new JSONAirdragInputData(this));
- IAirdragEngineeringInputData IVehicleComponentsEngineering.AirdragInputData
- {
- get { return _airdragInputData ?? (_airdragInputData = new JSONAirdragInputData(this)); }
- }
+ IAirdragEngineeringInputData IVehicleComponentsEngineering.AirdragInputData => _airdragInputData ?? (_airdragInputData = new JSONAirdragInputData(this));
- IGearboxDeclarationInputData IVehicleComponentsDeclaration.GearboxInputData
- {
- get { return Job.Gearbox; }
- }
+ IGearboxDeclarationInputData IVehicleComponentsDeclaration.GearboxInputData => Job.Gearbox;
- public virtual ITorqueConverterDeclarationInputData TorqueConverter
- {
- get { return Job.TorqueConverter; }
- }
+ public virtual ITorqueConverterDeclarationInputData TorqueConverter => Job.TorqueConverter;
- IGearboxEngineeringInputData IVehicleComponentsEngineering.GearboxInputData
- {
- get { return Job.Gearbox; }
- }
+ IGearboxEngineeringInputData IVehicleComponentsEngineering.GearboxInputData => Job.Gearbox;
- ITorqueConverterDeclarationInputData IVehicleComponentsDeclaration.TorqueConverterInputData
- {
- get { return Job.TorqueConverter; }
- }
+ ITorqueConverterDeclarationInputData IVehicleComponentsDeclaration.TorqueConverterInputData => Job.TorqueConverter;
- ITorqueConverterEngineeringInputData IVehicleComponentsEngineering.TorqueConverterInputData
- {
- get { return Job.TorqueConverter; }
- }
+ ITorqueConverterEngineeringInputData IVehicleComponentsEngineering.TorqueConverterInputData => Job.TorqueConverter;
- IAxleGearInputData IVehicleComponentsEngineering.AxleGearInputData
- {
- get { return Job.AxleGear; }
- }
+ IAxleGearInputData IVehicleComponentsEngineering.AxleGearInputData => Job.AxleGear;
- IAngledriveInputData IVehicleComponentsEngineering.AngledriveInputData
- {
- get { return _angledriveData ?? (_angledriveData = new JSONAngledriveInputData(this)); }
- }
+ IAngledriveInputData IVehicleComponentsEngineering.AngledriveInputData => _angledriveData ?? (_angledriveData = new JSONAngledriveInputData(this));
- public virtual IEngineEngineeringInputData EngineInputData
- {
- get { return Job.Engine; }
- }
+ public virtual IEngineEngineeringInputData EngineInputData => Job.Engine;
- IAxleGearInputData IVehicleComponentsDeclaration.AxleGearInputData
- {
- get { return Job.AxleGear; }
- }
+ IAxleGearInputData IVehicleComponentsDeclaration.AxleGearInputData => Job.AxleGear;
- IAngledriveInputData IVehicleComponentsDeclaration.AngledriveInputData
- {
- get { return _angledriveData ?? (_angledriveData = new JSONAngledriveInputData(this)); }
- }
+ IAngledriveInputData IVehicleComponentsDeclaration.AngledriveInputData => _angledriveData ?? (_angledriveData = new JSONAngledriveInputData(this));
- IEngineDeclarationInputData IVehicleComponentsDeclaration.EngineInputData
- {
- get { return Job.Engine; }
- }
+ IEngineDeclarationInputData IVehicleComponentsDeclaration.EngineInputData => Job.Engine;
- IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData
- {
- get { return Job.DeclarationAuxiliaries; }
- }
+ IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData => Job.DeclarationAuxiliaries;
- IRetarderInputData IVehicleComponentsEngineering.RetarderInputData
- {
- get { return GetRetarder; }
- }
+ IRetarderInputData IVehicleComponentsEngineering.RetarderInputData => GetRetarder;
- IRetarderInputData IVehicleComponentsDeclaration.RetarderInputData
- {
- get { return GetRetarder; }
- }
+ IRetarderInputData IVehicleComponentsDeclaration.RetarderInputData => GetRetarder;
- protected virtual IRetarderInputData GetRetarder
- {
- get {
- return _retarderInputData ?? (_retarderInputData = new JSONRetarderInputData(this));
- }
- }
+ protected virtual IRetarderInputData GetRetarder => _retarderInputData ?? (_retarderInputData = new JSONRetarderInputData(this));
- IPTOTransmissionInputData IVehicleComponentsEngineering.PTOTransmissionInputData
- {
- get { return _ptoInputData ?? (_ptoInputData = new JSONPTOTransmissioninputData(this)); }
- }
+ IPTOTransmissionInputData IVehicleComponentsEngineering.PTOTransmissionInputData => _ptoInputData ?? (_ptoInputData = new JSONPTOTransmissioninputData(this));
- IPTOTransmissionInputData IVehicleComponentsDeclaration.PTOTransmissionInputData
- {
- get { return _ptoInputData ?? (_ptoInputData = new JSONPTOTransmissioninputData(this)); }
- }
+ IPTOTransmissionInputData IVehicleComponentsDeclaration.PTOTransmissionInputData => _ptoInputData ?? (_ptoInputData = new JSONPTOTransmissioninputData(this));
- IAxlesEngineeringInputData IVehicleComponentsEngineering.AxleWheels
- {
- get { return this; }
- }
+ IAxlesEngineeringInputData IVehicleComponentsEngineering.AxleWheels => this;
- IElectricStorageEngineeringInputData IVehicleComponentsEngineering.ElectricStorage
- {
- get { return GetElectricStorage(); }
- }
+ IElectricStorageEngineeringInputData IVehicleComponentsEngineering.ElectricStorage => GetElectricStorage();
protected virtual IElectricStorageEngineeringInputData GetElectricStorage()
{
return null;
}
- IElectricMachinesEngineeringInputData IVehicleComponentsEngineering.ElectricMachines
- {
- get { return GetElectricMachines(); }
- }
+ IElectricMachinesEngineeringInputData IVehicleComponentsEngineering.ElectricMachines => GetElectricMachines();
protected virtual IElectricMachinesEngineeringInputData GetElectricMachines()
{
return null;
}
- public virtual IBusAuxiliariesDeclarationData BusAuxiliaries
- {
- get { return null; }
- }
+ public virtual IBusAuxiliariesDeclarationData BusAuxiliaries => null;
- IElectricStorageDeclarationInputData IVehicleComponentsDeclaration.ElectricStorage
- {
- get { return GetElectricStorage(); }
- }
+ IElectricStorageDeclarationInputData IVehicleComponentsDeclaration.ElectricStorage => GetElectricStorage();
- IElectricMachinesDeclarationInputData IVehicleComponentsDeclaration.ElectricMachines
- {
- get { return GetElectricMachines(); }
- }
+ IElectricMachinesDeclarationInputData IVehicleComponentsDeclaration.ElectricMachines => GetElectricMachines();
- IAxlesDeclarationInputData IVehicleComponentsDeclaration.AxleWheels
- {
- get { return this; }
- }
+ IAxlesDeclarationInputData IVehicleComponentsDeclaration.AxleWheels => this;
- public virtual bool VocationalVehicle
- {
- get { return DeclarationData.Vehicle.VocationalVehicleDefault; }
- }
+ public virtual bool VocationalVehicle => DeclarationData.Vehicle.VocationalVehicleDefault;
- public virtual bool SleeperCab
- {
- get { return DeclarationData.Vehicle.SleeperCabDefault; }
- }
+ public virtual bool SleeperCab => DeclarationData.Vehicle.SleeperCabDefault;
public virtual bool? AirdragModifiedMultistage { get; }
- public virtual TankSystem? TankSystem
- {
- get { return DeclarationData.Vehicle.TankSystemDefault; }
- }
+ public virtual TankSystem? TankSystem => DeclarationData.Vehicle.TankSystemDefault;
-
- public virtual bool ZeroEmissionVehicle
- {
- get { return DeclarationData.Vehicle.ZeroEmissionVehicleDefault; }
- }
- public virtual bool HybridElectricHDV
- {
- get { return DeclarationData.Vehicle.HybridElectricHDVDefault; }
- }
+ public virtual bool ZeroEmissionVehicle => DeclarationData.Vehicle.ZeroEmissionVehicleDefault;
- public virtual bool DualFuelVehicle
- {
- get { return DeclarationData.Vehicle.DualFuelVehicleDefault; }
- }
+ public virtual bool HybridElectricHDV => DeclarationData.Vehicle.HybridElectricHDVDefault;
- public virtual Watt MaxNetPower1
- {
- get { return null; }
- }
+ public virtual bool DualFuelVehicle => DeclarationData.Vehicle.DualFuelVehicleDefault;
- public virtual Watt MaxNetPower2
- {
- get { return null; }
- }
+ public virtual Watt MaxNetPower1 => null;
- public virtual RegistrationClass? RegisteredClass
- {
- get { return RegistrationClass.unknown; }
- }
+ public virtual Watt MaxNetPower2 => null;
- public virtual int? NumberPassengerSeatsUpperDeck
- {
- get { return 0; }
- }
+ public virtual RegistrationClass? RegisteredClass => RegistrationClass.unknown;
- public virtual int? NumberPassengerSeatsLowerDeck
- {
- get { return 0; }
- }
+ public virtual int? NumberPassengerSeatsUpperDeck => 0;
- public int? NumberPassengersStandingLowerDeck
- {
- get { return 0; }
- }
- public int? NumberPassengersStandingUpperDeck
- {
- get { return 0; }
- }
+ public virtual int? NumberPassengerSeatsLowerDeck => 0;
- public virtual CubicMeter CargoVolume {
- get { return 0.SI<CubicMeter>(); }
- }
+ public int? NumberPassengersStandingLowerDeck => 0;
+
+ public int? NumberPassengersStandingUpperDeck => 0;
+
+ public virtual CubicMeter CargoVolume => 0.SI<CubicMeter>();
public virtual TableData PTOCycleDuringStop {
get {
@@ -716,62 +477,30 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
}
- public virtual VehicleCode? VehicleCode
- {
- get { return VectoCommon.Models.VehicleCode.NOT_APPLICABLE; }
- }
-
- public virtual bool? LowEntry { get { return false; } }
-
- IVehicleComponentsDeclaration IVehicleDeclarationInputData.Components
- {
- get { return this; }
- }
+ public virtual VehicleCode? VehicleCode => VectoCommon.Models.VehicleCode.NOT_APPLICABLE;
- IAuxiliariesEngineeringInputData IVehicleComponentsEngineering.AuxiliaryInputData
- {
- get { return Job.EngineeringAuxiliaries; }
- }
-
-
+ public virtual bool? LowEntry => false;
+ IVehicleComponentsDeclaration IVehicleDeclarationInputData.Components => this;
-
+ IAuxiliariesEngineeringInputData IVehicleComponentsEngineering.AuxiliaryInputData => Job.EngineeringAuxiliaries;
#endregion
- public virtual string Manufacturer
- {
- get { return Constants.NOT_AVailABLE; }
- }
+ public virtual string Manufacturer => Constants.NOT_AVailABLE;
- public virtual string Model
- {
- get { return Constants.NOT_AVailABLE; }
- }
+ public virtual string Model => Constants.NOT_AVailABLE;
- public virtual DateTime Date
- {
- get { return DateTime.MinValue; }
- }
+ public virtual DateTime Date => DateTime.MinValue;
- public CertificationMethod CertificationMethod
- {
- get { return CertificationMethod.NotCertified; }
- }
+ public CertificationMethod CertificationMethod => CertificationMethod.NotCertified;
- public virtual string CertificationNumber
- {
- get { return Constants.NOT_AVailABLE; }
- }
+ public virtual string CertificationNumber => Constants.NOT_AVailABLE;
- public virtual DigestData DigestValue
- {
- get { return null; }
- }
+ public virtual DigestData DigestValue => null;
- public virtual XmlNode XMLSource { get { return null; } }
+ public virtual XmlNode XMLSource => null;
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Common/AbstractXMLResource.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Common/AbstractXMLResource.cs
index 555c5eb474b96f44d3e7d9b364df4d8f74a10ccb..057b4afd1e194aada2be9680a066c399ac4667fb 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Common/AbstractXMLResource.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Common/AbstractXMLResource.cs
@@ -44,13 +44,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Common {
SourceFile = source;
}
- public virtual DataSource DataSource
- {
- get { return new DataSource() { SourceFile = SourceFile, SourceVersion = SourceVersion, SourceType = SourceType }; }
- }
+ public virtual DataSource DataSource => new DataSource() { SourceFile = SourceFile, SourceVersion = SourceVersion, SourceType = SourceType };
- protected string SourceVersion { get { return XMLHelper.GetVersionFromNamespaceUri(SchemaNamespace); } }
+ protected string SourceVersion => XMLHelper.GetVersionFromNamespaceUri(SchemaNamespace);
protected abstract XNamespace SchemaNamespace { get; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/AbstractCommonComponentType.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/AbstractCommonComponentType.cs
index 738587d46f046b76493db187f6c585cce18a7d3f..66c2a3d2c0549a660819c8baaaebb7db7ff9e6d0 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/AbstractCommonComponentType.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/AbstractCommonComponentType.cs
@@ -43,30 +43,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider {
{
protected AbstractCommonComponentType(XmlNode node, string source) : base(node, source) { }
- public bool SavedInDeclarationMode
- {
- get { return true; }
- }
+ public bool SavedInDeclarationMode => true;
- public virtual string Manufacturer
- {
- get { return GetString(XMLNames.Component_Manufacturer); }
- }
+ public virtual string Manufacturer => GetString(XMLNames.Component_Manufacturer);
- public virtual string Model
- {
- get { return GetString(XMLNames.Component_Model); }
- }
+ public virtual string Model => GetString(XMLNames.Component_Model);
- public virtual DateTime Date
- {
- get { return XmlConvert.ToDateTime(GetString(XMLNames.Component_Date), XmlDateTimeSerializationMode.Utc); }
- }
+ public virtual DateTime Date => XmlConvert.ToDateTime(GetString(XMLNames.Component_Date), XmlDateTimeSerializationMode.Utc);
- public virtual string AppVersion
- {
- get { return GetString(XMLNames.Component_AppVersion); }
- }
+ public virtual string AppVersion => GetString(XMLNames.Component_AppVersion);
public virtual CertificationMethod CertificationMethod
{
@@ -76,16 +61,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider {
}
}
- public virtual string CertificationNumber
- {
- get { return GetString(XMLNames.Component_CertificationNumber); }
- }
+ public virtual string CertificationNumber => GetString(XMLNames.Component_CertificationNumber);
- public virtual DigestData DigestValue
- {
- get { return new DigestData(GetNode(XMLNames.DI_Signature, required:false)); }
- }
+ public virtual DigestData DigestValue => new DigestData(GetNode(XMLNames.DI_Signature, required:false));
- public virtual XmlNode XMLSource { get { return BaseNode; } }
+ public virtual XmlNode XMLSource => BaseNode;
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs
index 2fb18c5c348305bf47e2aa8ea9b4fc1375800b58..c1f56eba06a93c8d8fff85d1246d42a0c1c6d800 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs
@@ -57,10 +57,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IAuxiliaryDeclarationInputData
- public virtual AuxiliaryType Type
- {
- get { return _type ?? (_type = BaseNode.LocalName.ParseEnum<AuxiliaryType>()).Value; }
- }
+ public virtual AuxiliaryType Type => _type ?? (_type = BaseNode.LocalName.ParseEnum<AuxiliaryType>()).Value;
public virtual IList<string> Technology
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationADASDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationADASDataProvider.cs
index b718f1f21a347c54071146eec348bc3d0dff2b4a..41a8b121a6ab2305593a38642e34e9f1d367a9e7 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationADASDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationADASDataProvider.cs
@@ -55,10 +55,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -66,27 +63,16 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IAdvancedDriverAssistantSystemDeclarationInputData
- public virtual bool EngineStopStart
- {
- get { return XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ADAS_EngineStopStart)); }
- }
+ public virtual bool EngineStopStart => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ADAS_EngineStopStart));
- public virtual EcoRollType EcoRoll
- {
- get {
- return EcorollTypeHelper.Get(
- XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ADAS_EcoRollWithoutEngineStop)),
- XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart)));
- }
- }
+ public virtual EcoRollType EcoRoll =>
+ EcorollTypeHelper.Get(
+ XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ADAS_EcoRollWithoutEngineStop)),
+ XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart)));
- public virtual PredictiveCruiseControlType PredictiveCruiseControl
- {
- get { return PredictiveCruiseControlTypeHelper.Parse(GetString(XMLNames.Vehicle_ADAS_PCC)); }
- }
+ public virtual PredictiveCruiseControlType PredictiveCruiseControl => PredictiveCruiseControlTypeHelper.Parse(GetString(XMLNames.Vehicle_ADAS_PCC));
- public virtual bool? ATEcoRollReleaseLockupClutch { get { return null; } }
-
+ public virtual bool? ATEcoRollReleaseLockupClutch => null;
#endregion
}
@@ -109,10 +95,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationADASDataProviderV21(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
: base(vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -150,9 +133,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#endregion
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAirdragDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAirdragDataProvider.cs
index ff2c9f12ad7dcf357557d62fadc26b8c2f9c4776..64c48bc78944c78321a5c8d12a1e7b851d627337 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAirdragDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAirdragDataProvider.cs
@@ -56,48 +56,28 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IAirdragDeclarationInputData
- public virtual SquareMeter AirDragArea
- {
- get {
- return ElementExists(XMLNames.AirDrag_DeclaredCdxA)
- ? GetDouble(XMLNames.AirDrag_DeclaredCdxA).SI<SquareMeter>()
- : null;
- }
- }
+ public virtual SquareMeter AirDragArea =>
+ ElementExists(XMLNames.AirDrag_DeclaredCdxA)
+ ? GetDouble(XMLNames.AirDrag_DeclaredCdxA).SI<SquareMeter>()
+ : null;
- public virtual SquareMeter TransferredAirDragArea
- {
- get
- {
- return ElementExists(XMLNames.AirDrag_TransferredCDxA)
- ? GetDouble(XMLNames.AirDrag_TransferredCDxA).SI<SquareMeter>()
- : null;
- }
- }
+ public virtual SquareMeter TransferredAirDragArea =>
+ ElementExists(XMLNames.AirDrag_TransferredCDxA)
+ ? GetDouble(XMLNames.AirDrag_TransferredCDxA).SI<SquareMeter>()
+ : null;
- public virtual SquareMeter AirDragArea_0
- {
- get
- {
- return ElementExists(XMLNames.AirDrag_CdxA_0)
- ? GetDouble(XMLNames.AirDrag_CdxA_0).SI<SquareMeter>()
- : null;
- }
- }
+ public virtual SquareMeter AirDragArea_0 =>
+ ElementExists(XMLNames.AirDrag_CdxA_0)
+ ? GetDouble(XMLNames.AirDrag_CdxA_0).SI<SquareMeter>()
+ : null;
- public override CertificationMethod CertificationMethod
- {
- get { return CertificationMethod.Measured; }
- }
+ public override CertificationMethod CertificationMethod => CertificationMethod.Measured;
#endregion
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -121,11 +101,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationAirdragDataProviderV20(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
-
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -141,10 +117,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationAirdragDataProviderV28(IXMLDeclarationVehicleData vehicle, XmlNode componentNode,
string sourceFile) : base(vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAngledriveDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAngledriveDataProvider.cs
index 6df8613817ce08c127bd6fa1a80995ec13d89929..bee76d3ee5a6070b5f3a671f18961918eba68522 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAngledriveDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAngledriveDataProvider.cs
@@ -62,38 +62,22 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IAngledriveInputData
- public virtual AngledriveType Type
- {
- get { return Vehicle.AngledriveType; }
- }
+ public virtual AngledriveType Type => Vehicle.AngledriveType;
- public virtual double Ratio
- {
- get { return GetDouble(XMLNames.AngleDrive_Ratio); }
- }
+ public virtual double Ratio => GetDouble(XMLNames.AngleDrive_Ratio);
- public virtual TableData LossMap
- {
- get {
- return ReadTableData(
- XMLNames.AngleDrive_TorqueLossMap, XMLNames.Angledrive_LossMap_Entry,
- AttributeMappings.TransmissionLossmapMapping);
- }
- }
+ public virtual TableData LossMap =>
+ ReadTableData(
+ XMLNames.AngleDrive_TorqueLossMap, XMLNames.Angledrive_LossMap_Entry,
+ AttributeMappings.TransmissionLossmapMapping);
- public virtual double Efficiency
- {
- get { throw new VectoException("Efficiency not supported in Declaration Mode!"); }
- }
+ public virtual double Efficiency => throw new VectoException("Efficiency not supported in Declaration Mode!");
#endregion
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -119,10 +103,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(
vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -141,17 +122,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractCommonComponentType
- public override string CertificationNumber
- {
- get { return GetString(XMLNames.Component_CertificationNumber, required: false); }
- }
+ public override string CertificationNumber => GetString(XMLNames.Component_CertificationNumber, required: false);
#endregion
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs
index 73edfd6ba6550568d2937fd05ead8c915ca2b288..3613e72919411f6fae4a69ab8a386f45bf79eb63 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs
@@ -57,10 +57,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IAuxiliariesDeclarationInputData
- public virtual bool SavedInDeclarationMode
- {
- get { return true; }
- }
+ public virtual bool SavedInDeclarationMode => true;
public virtual IList<IAuxiliaryDeclarationInputData> Auxiliaries
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxleDataProvider.cs
index a07ffe3a345b5d9cb92ea9cc8cbdb5c50cf346f8..bef8672f8222816b6712368b09883c1297a8fd32 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxleDataProvider.cs
@@ -61,24 +61,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IAxleDeclarationInputData
- public virtual bool TwinTyres
- {
- get {
- return _twinTyre ?? (_twinTyre = XmlConvert.ToBoolean(GetString(XMLNames.AxleWheels_Axles_Axle_TwinTyres))).Value;
- }
- }
+ public virtual bool TwinTyres => _twinTyre ?? (_twinTyre = XmlConvert.ToBoolean(GetString(XMLNames.AxleWheels_Axles_Axle_TwinTyres))).Value;
- public virtual AxleType AxleType
- {
- get {
- return _axleType ?? (_axleType = GetString(XMLNames.AxleWheels_Axles_Axle_AxleType).ParseEnum<AxleType>()).Value;
- }
- }
+ public virtual AxleType AxleType => _axleType ?? (_axleType = GetString(XMLNames.AxleWheels_Axles_Axle_AxleType).ParseEnum<AxleType>()).Value;
- public virtual ITyreDeclarationInputData Tyre
- {
- get { return _tyre ?? (_tyre = Reader.Tyre); }
- }
+ public virtual ITyreDeclarationInputData Tyre => _tyre ?? (_tyre = Reader.Tyre);
#endregion
@@ -91,10 +78,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -119,10 +103,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationAxleDataProviderV20(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
: base(vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
-
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlegearDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlegearDataProvider.cs
index 8561242de3b64271da4effafc5e711d195be4c07..241830b52f72e322920bb2eca4909a8d811d3170 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlegearDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlegearDataProvider.cs
@@ -60,24 +60,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IAxleGearInputData
- public virtual double Ratio
- {
- get { return GetDouble(XMLNames.Axlegear_Ratio); }
- }
+ public virtual double Ratio => GetDouble(XMLNames.Axlegear_Ratio);
- public virtual TableData LossMap
- {
- get {
- return ReadTableData(
- XMLNames.Axlegear_TorqueLossMap, XMLNames.Axlegear_TorqueLossMap_Entry,
- AttributeMappings.TransmissionLossmapMapping);
- }
- }
+ public virtual TableData LossMap =>
+ ReadTableData(
+ XMLNames.Axlegear_TorqueLossMap, XMLNames.Axlegear_TorqueLossMap_Entry,
+ AttributeMappings.TransmissionLossmapMapping);
- public virtual double Efficiency
- {
- get { throw new VectoException("Efficiency not supported in Declaration Mode!"); }
- }
+ public virtual double Efficiency => throw new VectoException("Efficiency not supported in Declaration Mode!");
public virtual AxleLineType LineType
{
@@ -91,10 +81,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -120,10 +107,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(
vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
@@ -142,16 +126,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractCommonComponentType
- public override string CertificationNumber
- {
- get { return GetString(XMLNames.Component_CertificationNumber, required: false); }
- }
+ public override string CertificationNumber => GetString(XMLNames.Component_CertificationNumber, required: false);
#endregion
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs
index bc81ba80b3a323581b554c909b10bbcd8c9f98d6..4041fd877cfa3a749cee94e9ddbb89bd59259bbe 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlesDataProvider.cs
@@ -95,7 +95,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public XmlNode XMLSource { get { return BaseNode; } }
+ public XmlNode XMLSource => BaseNode;
#endregion
@@ -111,10 +111,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#endregion
- protected virtual XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected virtual XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -133,10 +130,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(
vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
@@ -155,9 +149,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(
vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
index 44b1c188e4bf54803bbb918fa84b68e02e689474..521cc4b5fc3f4ca46cbffd916aa6c603994a63fc 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
@@ -31,10 +31,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IBusAuxiliariesDeclarationData
- public virtual XmlNode XMLSource
- {
- get { return BaseNode; }
- }
+ public virtual XmlNode XMLSource => BaseNode;
public virtual string FanTechnology
{
@@ -50,30 +47,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public virtual IElectricSupplyDeclarationData ElectricSupply
- {
- get { return this; }
- }
+ public virtual IElectricSupplyDeclarationData ElectricSupply => this;
- public virtual IElectricConsumersDeclarationData ElectricConsumers
- {
- get { return null; }
- }
+ public virtual IElectricConsumersDeclarationData ElectricConsumers => null;
- public virtual IPneumaticSupplyDeclarationData PneumaticSupply
- {
- get { return this; }
- }
+ public virtual IPneumaticSupplyDeclarationData PneumaticSupply => this;
- public virtual IPneumaticConsumersDeclarationData PneumaticConsumers
- {
- get { return this; }
- }
+ public virtual IPneumaticConsumersDeclarationData PneumaticConsumers => this;
- public virtual IHVACBusAuxiliariesDeclarationData HVACAux
- {
- get { return this; }
- }
+ public virtual IHVACBusAuxiliariesDeclarationData HVACAux => this;
#endregion
@@ -130,20 +112,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get { return GetBool(new[] { XMLNames.BusAux_ElectricSystem, XMLNames.BusAux_ElectricSystem_SmartElectrics }); }
}
- public virtual Watt MaxAlternatorPower
- {
- get { return ElementExists("MaxAlternatorPower") ? GetDouble("MaxAlternatorPower").SI<Watt>() : null; }
- }
+ public virtual Watt MaxAlternatorPower => ElementExists("MaxAlternatorPower") ? GetDouble("MaxAlternatorPower").SI<Watt>() : null;
- public virtual WattSecond ElectricStorageCapacity
- {
- get
- {
- return ElementExists("ElectricStorageCapacity")
- ? GetDouble("ElectricStorageCapacity").SI(Unit.SI.Watt.Hour).Cast<WattSecond>()
- : null;
- }
- }
+ public virtual WattSecond ElectricStorageCapacity =>
+ ElementExists("ElectricStorageCapacity")
+ ? GetDouble("ElectricStorageCapacity").SI(Unit.SI.Watt.Hour).Cast<WattSecond>()
+ : null;
#endregion
@@ -174,10 +148,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IPneumaticSupplyDeclarationData
- public CompressorDrive CompressorDrive
- {
- get { return CompressorDriveHelper.Parse(GetString(XMLNames.CompressorDrive)); }
- }
+ public CompressorDrive CompressorDrive => CompressorDriveHelper.Parse(GetString(XMLNames.CompressorDrive));
public virtual string Clutch { get { return GetString(new[] { XMLNames.BusAux_PneumaticSystem, "Clutch" }); } }
@@ -211,66 +182,38 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IHVACBusAuxiliariesDeclarationData
- public virtual BusHVACSystemConfiguration? SystemConfiguration
- {
- get { return BusHVACSystemConfiguration.Unknown; }
- }
+ public virtual BusHVACSystemConfiguration? SystemConfiguration => BusHVACSystemConfiguration.Unknown;
- public virtual HeatPumpType? HeatPumpTypeDriverCompartment { get { return null; } }
- public virtual HeatPumpMode? HeatPumpModeDriverCompartment { get { return null; } }
- public virtual IList<Tuple<HeatPumpType, HeatPumpMode>> HeatPumpPassengerCompartments
- {
- get { return null; }
- }
+ public virtual HeatPumpType? HeatPumpTypeDriverCompartment => null;
+ public virtual HeatPumpMode? HeatPumpModeDriverCompartment => null;
- public virtual Watt AuxHeaterPower
- {
- get { return 0.SI<Watt>(); }
- }
+ public virtual IList<Tuple<HeatPumpType, HeatPumpMode>> HeatPumpPassengerCompartments => null;
- public virtual bool? DoubleGlazing
- {
- get { return false; }
- }
+ public virtual Watt AuxHeaterPower => 0.SI<Watt>();
- public virtual bool HeatPump
- {
- get { return false; }
- }
+ public virtual bool? DoubleGlazing => false;
- public virtual bool? OtherHeatingTechnology
- {
- get { return false; }
- }
+ public virtual bool HeatPump => false;
+
+ public virtual bool? OtherHeatingTechnology => false;
public virtual bool? AdjustableCoolantThermostat
{
get { return GetBool(new[] { "HVAC", "AdjustableCoolantThermostat" }); }
}
- public virtual bool? AdjustableAuxiliaryHeater
- {
- get { return false; }
- }
+ public virtual bool? AdjustableAuxiliaryHeater => false;
public virtual bool EngineWasteGasHeatExchanger
{
get { return GetBool(new[] { "HVAC", "EngineWasteGasHeatExchanger" }); }
}
- public virtual bool? SeparateAirDistributionDucts
- {
- get { return false; }
- }
+ public virtual bool? SeparateAirDistributionDucts => false;
- public virtual bool? WaterElectricHeater
- {
- get { return false; }
- }
- public virtual bool? AirElectricHeater
- {
- get { return false; }
- }
+ public virtual bool? WaterElectricHeater => false;
+
+ public virtual bool? AirElectricHeater => false;
#endregion
}
@@ -287,10 +230,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
: base(vehicle, componentNode, sourceFile) { }
- public override XmlNode XMLSource
- {
- get { return BaseNode; }
- }
+ public override XmlNode XMLSource => BaseNode;
}
public class XMLDeclarationCompleteBusAuxiliariesDataProviderV26 : XMLDeclarationPrimaryBusAuxiliariesDataProviderV26, IElectricConsumersDeclarationData
@@ -308,60 +248,33 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
- public override IList<string> SteeringPumpTechnology { get { return null; } }
+ public override IList<string> SteeringPumpTechnology => null;
- public override IElectricConsumersDeclarationData ElectricConsumers
- {
- get
- {
- return this;
- }
- }
+ public override IElectricConsumersDeclarationData ElectricConsumers => this;
- public override IPneumaticSupplyDeclarationData PneumaticSupply { get { return null; } }
+ public override IPneumaticSupplyDeclarationData PneumaticSupply => null;
//public override IPneumaticConsumersDeclarationData PneumaticConsumers { get { return null; } }
- public override BusHVACSystemConfiguration? SystemConfiguration
- {
- get { return BusHVACSystemConfigurationHelper.Parse(GetString(XMLNames.Bus_SystemConfiguration)); }
- }
+ public override BusHVACSystemConfiguration? SystemConfiguration => BusHVACSystemConfigurationHelper.Parse(GetString(XMLNames.Bus_SystemConfiguration));
- public override Watt AuxHeaterPower
- {
- get { return GetDouble(XMLNames.Bus_AuxiliaryHeaterPower).SI<Watt>(); }
- }
+ public override Watt AuxHeaterPower => GetDouble(XMLNames.Bus_AuxiliaryHeaterPower).SI<Watt>();
- public override bool? DoubleGlazing
- {
- get { return GetBool(XMLNames.Bus_DoubleGlazing); }
- }
+ public override bool? DoubleGlazing => GetBool(XMLNames.Bus_DoubleGlazing);
- public override bool HeatPump
- {
- get { return GetBool(XMLNames.Bus_HeatPump); }
- }
+ public override bool HeatPump => GetBool(XMLNames.Bus_HeatPump);
public override bool? AdjustableCoolantThermostat
{
get { return GetBool(new[] { "HVAC", XMLNames.Bus_AdjustableCoolantThermostat }); }
}
- public override bool? AdjustableAuxiliaryHeater
- {
- get { return GetBool(XMLNames.Bus_AdjustableAuxiliaryHeater); }
- }
+ public override bool? AdjustableAuxiliaryHeater => GetBool(XMLNames.Bus_AdjustableAuxiliaryHeater);
- public override bool EngineWasteGasHeatExchanger
- {
- get { return false; }
- }
+ public override bool EngineWasteGasHeatExchanger => false;
- public override bool? SeparateAirDistributionDucts
- {
- get { return GetBool(XMLNames.Bus_SeparateAirDistributionDucts); }
- }
+ public override bool? SeparateAirDistributionDucts => GetBool(XMLNames.Bus_SeparateAirDistributionDucts);
#endregion
@@ -400,31 +313,18 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
AirElectricHeater == null && OtherHeatingTechnology == null ;
}
- public override XmlNode XMLSource
- {
- get { return BaseNode; }
- }
+ public override XmlNode XMLSource => BaseNode;
- public override IHVACBusAuxiliariesDeclarationData HVACAux
- {
- get { return IsBusHVACTagEmpty() ? null : this; }
- }
+ public override IHVACBusAuxiliariesDeclarationData HVACAux => IsBusHVACTagEmpty() ? null : this;
- public override BusHVACSystemConfiguration? SystemConfiguration
- {
- get { return ElementExists(XMLNames.Bus_SystemConfiguration)
- ? BusHVACSystemConfigurationHelper.Parse(GetString(XMLNames.Bus_SystemConfiguration)) : null; }
- }
+ public override BusHVACSystemConfiguration? SystemConfiguration =>
+ ElementExists(XMLNames.Bus_SystemConfiguration)
+ ? BusHVACSystemConfigurationHelper.Parse(GetString(XMLNames.Bus_SystemConfiguration)) : null;
- public override HeatPumpType? HeatPumpTypeDriverCompartment
- {
- get
- {
- return ElementExists(XMLNames.Bus_HeatPumpTypeDriver)
- ? HeatPumpTypeHelper.Parse(GetString(XMLNames.Bus_HeatPumpTypeDriver)) : (HeatPumpType?)null;
- }
- }
+ public override HeatPumpType? HeatPumpTypeDriverCompartment =>
+ ElementExists(XMLNames.Bus_HeatPumpTypeDriver)
+ ? HeatPumpTypeHelper.Parse(GetString(XMLNames.Bus_HeatPumpTypeDriver)) : (HeatPumpType?)null;
public override HeatPumpMode? HeatPumpModeDriverCompartment
{
@@ -440,15 +340,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
- public override IList<Tuple<HeatPumpType, HeatPumpMode>> HeatPumpPassengerCompartments
- {
- get
- {
- return ElementExists(XMLNames.Bus_HeatPumpTypePassenger)
- && ElementExists(XMLNames.Bus_HeatPumpModePassenger)
- ? GetHeatPumpPassengerCompartments() : null;
- }
- }
+ public override IList<Tuple<HeatPumpType, HeatPumpMode>> HeatPumpPassengerCompartments =>
+ ElementExists(XMLNames.Bus_HeatPumpTypePassenger)
+ && ElementExists(XMLNames.Bus_HeatPumpModePassenger)
+ ? GetHeatPumpPassengerCompartments() : null;
private IList<Tuple<HeatPumpType, HeatPumpMode>> GetHeatPumpPassengerCompartments()
{
@@ -471,69 +366,34 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
return heatPumps.Any() != true ? null : heatPumps;
}
- public override Watt AuxHeaterPower
- {
- get
- {
- return ElementExists(XMLNames.Bus_AuxiliaryHeaterPower)
- ? GetDouble(XMLNames.Bus_AuxiliaryHeaterPower).SI<Watt>() : null;
- }
- }
+ public override Watt AuxHeaterPower =>
+ ElementExists(XMLNames.Bus_AuxiliaryHeaterPower)
+ ? GetDouble(XMLNames.Bus_AuxiliaryHeaterPower).SI<Watt>() : null;
- public override bool? DoubleGlazing
- {
- get
- {
- return ElementExists(XMLNames.Bus_DoubleGlazing)
- ? GetBool(XMLNames.Bus_DoubleGlazing) : (bool?)null;
- }
- }
+ public override bool? DoubleGlazing =>
+ ElementExists(XMLNames.Bus_DoubleGlazing)
+ ? GetBool(XMLNames.Bus_DoubleGlazing) : (bool?)null;
- public override bool? AdjustableAuxiliaryHeater
- {
- get
- {
- return ElementExists(XMLNames.Bus_AdjustableAuxiliaryHeater)
- ? GetBool(XMLNames.Bus_AdjustableAuxiliaryHeater) : (bool?)null;
- }
- }
+ public override bool? AdjustableAuxiliaryHeater =>
+ ElementExists(XMLNames.Bus_AdjustableAuxiliaryHeater)
+ ? GetBool(XMLNames.Bus_AdjustableAuxiliaryHeater) : (bool?)null;
- public override bool? SeparateAirDistributionDucts
- {
- get
- {
- return ElementExists(XMLNames.Bus_SeparateAirDistributionDucts)
- ? GetBool(XMLNames.Bus_SeparateAirDistributionDucts) : (bool?)null;
- }
- }
+ public override bool? SeparateAirDistributionDucts =>
+ ElementExists(XMLNames.Bus_SeparateAirDistributionDucts)
+ ? GetBool(XMLNames.Bus_SeparateAirDistributionDucts) : (bool?)null;
- public override bool? WaterElectricHeater
- {
- get
- {
- return ElementExists(XMLNames.Bus_WaterElectricHeater)
- ? GetBool(XMLNames.Bus_WaterElectricHeater) : (bool?)null;
- }
- }
+ public override bool? WaterElectricHeater =>
+ ElementExists(XMLNames.Bus_WaterElectricHeater)
+ ? GetBool(XMLNames.Bus_WaterElectricHeater) : (bool?)null;
- public override bool? AirElectricHeater
- {
- get
- {
- return ElementExists(XMLNames.Bus_AirElectricHeater)
- ? GetBool(XMLNames.Bus_AirElectricHeater) : (bool?)null;
- }
- }
+ public override bool? AirElectricHeater =>
+ ElementExists(XMLNames.Bus_AirElectricHeater)
+ ? GetBool(XMLNames.Bus_AirElectricHeater) : (bool?)null;
- public override bool? OtherHeatingTechnology
- {
- get
- {
- return ElementExists(XMLNames.Bus_OtherHeatingTechnology)
- ? GetBool(XMLNames.Bus_OtherHeatingTechnology) : (bool?)null;
- }
- }
+ public override bool? OtherHeatingTechnology =>
+ ElementExists(XMLNames.Bus_OtherHeatingTechnology)
+ ? GetBool(XMLNames.Bus_OtherHeatingTechnology) : (bool?)null;
private bool IsElectricConsumersTagEmpty()
{
@@ -542,10 +402,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
- public override IElectricConsumersDeclarationData ElectricConsumers
- {
- get { return IsElectricConsumersTagEmpty() ? null : this; }
- }
+ public override IElectricConsumersDeclarationData ElectricConsumers => IsElectricConsumersTagEmpty() ? null : this;
public override bool? InteriorLightsLED
{
@@ -598,29 +455,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
- public override IPneumaticSupplyDeclarationData PneumaticSupply
- {
- get { return null; }
- }
+ public override IPneumaticSupplyDeclarationData PneumaticSupply => null;
- public override IElectricSupplyDeclarationData ElectricSupply
- {
- get { return null; }
- }
+ public override IElectricSupplyDeclarationData ElectricSupply => null;
- public override IPneumaticConsumersDeclarationData PneumaticConsumers
- {
- get { return null; }
- }
+ public override IPneumaticConsumersDeclarationData PneumaticConsumers => null;
- public override string FanTechnology
- {
- get { return null; }
- }
+ public override string FanTechnology => null;
- public override IList<string> SteeringPumpTechnology
- {
- get { return null; }
- }
+ public override IList<string> SteeringPumpTechnology => null;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
index 8fa63495e3114561f43772b3cdcd7fda86c700e5..3e651e48dbb667f38d36cc06ff709344e81b514a 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
@@ -71,60 +71,30 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IVehicleComponentsDeclaration
- public virtual IAirdragDeclarationInputData AirdragInputData
- {
- get { return _airdragInputData ?? (_airdragInputData = ComponentReader.AirdragInputData); }
- }
+ public virtual IAirdragDeclarationInputData AirdragInputData => _airdragInputData ?? (_airdragInputData = ComponentReader.AirdragInputData);
- public virtual IGearboxDeclarationInputData GearboxInputData
- {
- get { return _gearboxInputData ?? (_gearboxInputData = ComponentReader.GearboxInputData); }
- }
+ public virtual IGearboxDeclarationInputData GearboxInputData => _gearboxInputData ?? (_gearboxInputData = ComponentReader.GearboxInputData);
- public virtual ITorqueConverterDeclarationInputData TorqueConverterInputData
- {
- get { return _torqueconverterInputData ?? (_torqueconverterInputData = ComponentReader.TorqueConverterInputData); }
- }
+ public virtual ITorqueConverterDeclarationInputData TorqueConverterInputData => _torqueconverterInputData ?? (_torqueconverterInputData = ComponentReader.TorqueConverterInputData);
- public virtual IAxleGearInputData AxleGearInputData
- {
- get { return _axleGearInputData ?? (_axleGearInputData = ComponentReader.AxleGearInputData); }
- }
+ public virtual IAxleGearInputData AxleGearInputData => _axleGearInputData ?? (_axleGearInputData = ComponentReader.AxleGearInputData);
- public virtual IAngledriveInputData AngledriveInputData
- {
- get { return _angledriveInputData ?? (_angledriveInputData = ComponentReader.AngledriveInputData); }
- }
+ public virtual IAngledriveInputData AngledriveInputData => _angledriveInputData ?? (_angledriveInputData = ComponentReader.AngledriveInputData);
- public virtual IEngineDeclarationInputData EngineInputData
- {
- get { return _engineInputData ?? (_engineInputData = ComponentReader.EngineInputData); }
- }
+ public virtual IEngineDeclarationInputData EngineInputData => _engineInputData ?? (_engineInputData = ComponentReader.EngineInputData);
- IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData
- {
- get { return _auxInputData ?? (_auxInputData = ComponentReader.AuxiliaryData); }
- }
+ IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData => _auxInputData ?? (_auxInputData = ComponentReader.AuxiliaryData);
- public virtual IRetarderInputData RetarderInputData
- {
- get { return _retarderInputData ?? (_retarderInputData = ComponentReader.RetarderInputData); }
- }
+ public virtual IRetarderInputData RetarderInputData => _retarderInputData ?? (_retarderInputData = ComponentReader.RetarderInputData);
- public virtual IPTOTransmissionInputData PTOTransmissionInputData
- {
- get { return _vehicle.PTOTransmissionInputData; }
- }
+ public virtual IPTOTransmissionInputData PTOTransmissionInputData => _vehicle.PTOTransmissionInputData;
- public virtual IAxlesDeclarationInputData AxleWheels
- {
- get { return _axleWheels ?? (_axleWheels = ComponentReader.AxlesDeclarationInputData); }
- }
+ public virtual IAxlesDeclarationInputData AxleWheels => _axleWheels ?? (_axleWheels = ComponentReader.AxlesDeclarationInputData);
- public virtual IBusAuxiliariesDeclarationData BusAuxiliaries { get { return null; } }
- public virtual IElectricStorageDeclarationInputData ElectricStorage { get { return null; } }
- public virtual IElectricMachinesDeclarationInputData ElectricMachines { get { return null; } }
+ public virtual IBusAuxiliariesDeclarationData BusAuxiliaries => null;
+ public virtual IElectricStorageDeclarationInputData ElectricStorage => null;
+ public virtual IElectricMachinesDeclarationInputData ElectricMachines => null;
#endregion
@@ -137,10 +107,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -162,10 +129,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
vehicle, componentNode, sourceFile)
{ }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -186,17 +150,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
{ }
- IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData
- {
- get { return null; }
- }
+ IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData => null;
- public override IBusAuxiliariesDeclarationData BusAuxiliaries { get { return _busAuxiliaries ?? (_busAuxiliaries = ComponentReader.BusAuxiliariesInputData); } }
+ public override IBusAuxiliariesDeclarationData BusAuxiliaries => _busAuxiliaries ?? (_busAuxiliaries = ComponentReader.BusAuxiliariesInputData);
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -216,21 +174,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of XMLDeclarationComponentsDataProviderV10
- public override IAxleGearInputData AxleGearInputData
- {
- get
- {
- return null;
- //throw new NotSupportedException("No Axlegeardata available");
- }
- }
+ public override IAxleGearInputData AxleGearInputData => null;
+ //throw new NotSupportedException("No Axlegeardata available");
#endregion
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -251,22 +200,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
vehicle, componentNode, sourceFile)
{ }
- IGearboxDeclarationInputData IVehicleComponentsDeclaration.GearboxInputData
- {
- get { return null; }
- }
+ IGearboxDeclarationInputData IVehicleComponentsDeclaration.GearboxInputData => null;
- IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData
- {
- get { return null; }
- }
+ IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData => null;
- public override IBusAuxiliariesDeclarationData BusAuxiliaries { get { return _busAuxiliaries ?? (_busAuxiliaries = ComponentReader.BusAuxiliariesInputData); } }
+ public override IBusAuxiliariesDeclarationData BusAuxiliaries => _busAuxiliaries ?? (_busAuxiliaries = ComponentReader.BusAuxiliariesInputData);
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
@@ -288,35 +228,20 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
- IRetarderInputData IVehicleComponentsDeclaration.RetarderInputData
- {
- get { return this; }
- }
+ IRetarderInputData IVehicleComponentsDeclaration.RetarderInputData => this;
- IAirdragDeclarationInputData IVehicleComponentsDeclaration.AirdragInputData
- {
- get { return null; }
- }
+ IAirdragDeclarationInputData IVehicleComponentsDeclaration.AirdragInputData => null;
- IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData
- {
- get { return null; }
- }
+ IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData => null;
- public override IBusAuxiliariesDeclarationData BusAuxiliaries
- {
- get { return _busAuxiliaries ?? (_busAuxiliaries = ComponentReader.BusAuxiliariesInputData); }
- }
+ public override IBusAuxiliariesDeclarationData BusAuxiliaries => _busAuxiliaries ?? (_busAuxiliaries = ComponentReader.BusAuxiliariesInputData);
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
#region IRetarderInputData Interface Implementation
- public RetarderType Type { get { return _vehicle.RetarderType; } }
- public double Ratio { get { return _vehicle.RetarderRatio; } }
+ public RetarderType Type => _vehicle.RetarderType;
+ public double Ratio => _vehicle.RetarderRatio;
public TableData LossMap { get; }
#endregion
@@ -354,45 +279,21 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
- public override IGearboxDeclarationInputData GearboxInputData
- {
- get { return null; }
- }
+ public override IGearboxDeclarationInputData GearboxInputData => null;
- public override ITorqueConverterDeclarationInputData TorqueConverterInputData
- {
- get { return null; }
- }
+ public override ITorqueConverterDeclarationInputData TorqueConverterInputData => null;
- public override IAxleGearInputData AxleGearInputData
- {
- get { return null; }
- }
+ public override IAxleGearInputData AxleGearInputData => null;
- public override IAngledriveInputData AngledriveInputData
- {
- get { return null; }
- }
+ public override IAngledriveInputData AngledriveInputData => null;
- public override IEngineDeclarationInputData EngineInputData
- {
- get { return null; }
- }
+ public override IEngineDeclarationInputData EngineInputData => null;
- public override IRetarderInputData RetarderInputData
- {
- get { return null; }
- }
+ public override IRetarderInputData RetarderInputData => null;
- public override IPTOTransmissionInputData PTOTransmissionInputData
- {
- get { return null; }
- }
+ public override IPTOTransmissionInputData PTOTransmissionInputData => null;
- public override IAxlesDeclarationInputData AxleWheels
- {
- get { return null; }
- }
+ public override IAxlesDeclarationInputData AxleWheels => null;
public override IBusAuxiliariesDeclarationData BusAuxiliaries
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs
index 62ab6b540fd21635b28f2d4b06bf665e8f7baca7..b598572a6c5a60ae60dba462804f32f0d28ecb31 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs
@@ -66,38 +66,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IEngineDeclarationInputData
- public virtual CubicMeter Displacement
- {
- get { return GetDouble(XMLNames.Engine_Displacement).SI(Unit.SI.Cubic.Centi.Meter).Cast<CubicMeter>(); }
- }
+ public virtual CubicMeter Displacement => GetDouble(XMLNames.Engine_Displacement).SI(Unit.SI.Cubic.Centi.Meter).Cast<CubicMeter>();
- public virtual Watt RatedPowerDeclared
- {
- get { return GetDouble(XMLNames.Engine_RatedPower).SI<Watt>(); }
- }
+ public virtual Watt RatedPowerDeclared => GetDouble(XMLNames.Engine_RatedPower).SI<Watt>();
- public virtual PerSecond RatedSpeedDeclared
- {
- get { return GetDouble(XMLNames.Engine_RatedSpeed).RPMtoRad(); }
- }
+ public virtual PerSecond RatedSpeedDeclared => GetDouble(XMLNames.Engine_RatedSpeed).RPMtoRad();
- public virtual NewtonMeter MaxTorqueDeclared
- {
- get { return GetDouble(XMLNames.Engine_MaxTorque).SI<NewtonMeter>(); }
- }
+ public virtual NewtonMeter MaxTorqueDeclared => GetDouble(XMLNames.Engine_MaxTorque).SI<NewtonMeter>();
- public virtual IList<IEngineModeDeclarationInputData> EngineModes
- {
- get {
- return _engineModes ??
- (_engineModes = new List<IEngineModeDeclarationInputData>() { new XMLSingleFuelEngineMode(BaseNode) });
- }
- }
+ public virtual IList<IEngineModeDeclarationInputData> EngineModes =>
+ _engineModes ??
+ (_engineModes = new List<IEngineModeDeclarationInputData>() { new XMLSingleFuelEngineMode(BaseNode) });
- public virtual WHRType WHRType
- {
- get { return WHRType.None; }
- }
+ public virtual WHRType WHRType => WHRType.None;
public class XMLSingleFuelEngineMode : AbstractXMLType, IEngineModeDeclarationInputData
@@ -106,37 +87,20 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLSingleFuelEngineMode(XmlNode baseNode) : base(baseNode) { }
- public virtual PerSecond IdleSpeed
- {
- get { return GetDouble(XMLNames.Engine_IdlingSpeed).RPMtoRad(); }
- }
+ public virtual PerSecond IdleSpeed => GetDouble(XMLNames.Engine_IdlingSpeed).RPMtoRad();
- public virtual TableData FullLoadCurve
- {
- get {
- return ReadTableData(
- XMLNames.Engine_FullLoadAndDragCurve, XMLNames.Engine_FullLoadCurve_Entry,
- AttributeMappings.EngineFullLoadCurveMapping);
- }
- }
+ public virtual TableData FullLoadCurve =>
+ ReadTableData(
+ XMLNames.Engine_FullLoadAndDragCurve, XMLNames.Engine_FullLoadCurve_Entry,
+ AttributeMappings.EngineFullLoadCurveMapping);
- public virtual IList<IEngineFuelDeclarationInputData> Fuels
- {
- get {
- return FuelsList ??
- (FuelsList = new List<IEngineFuelDeclarationInputData>() { new XMLSingleFuelEngineFuel(BaseNode) });
- }
- }
+ public virtual IList<IEngineFuelDeclarationInputData> Fuels =>
+ FuelsList ??
+ (FuelsList = new List<IEngineFuelDeclarationInputData>() { new XMLSingleFuelEngineFuel(BaseNode) });
- public virtual IWHRData WasteHeatRecoveryDataElectrical
- {
- get { return null; }
- }
+ public virtual IWHRData WasteHeatRecoveryDataElectrical => null;
- public virtual IWHRData WasteHeatRecoveryDataMechanical
- {
- get { return null; }
- }
+ public virtual IWHRData WasteHeatRecoveryDataMechanical => null;
}
public class XMLSingleFuelEngineFuel : AbstractXMLType, IEngineFuelDeclarationInputData
@@ -158,49 +122,27 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public virtual TableData FuelConsumptionMap
- {
- get {
- return ReadTableData(
- XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry,
- AttributeMappings.FuelConsumptionMapMapping);
- }
- }
+ public virtual TableData FuelConsumptionMap =>
+ ReadTableData(
+ XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry,
+ AttributeMappings.FuelConsumptionMapMapping);
- public virtual double WHTCMotorway
- {
- get { return GetDouble(XMLNames.Engine_WHTCMotorway); }
- }
+ public virtual double WHTCMotorway => GetDouble(XMLNames.Engine_WHTCMotorway);
- public virtual double WHTCRural
- {
- get { return GetDouble(XMLNames.Engine_WHTCRural); }
- }
+ public virtual double WHTCRural => GetDouble(XMLNames.Engine_WHTCRural);
- public virtual double WHTCUrban
- {
- get { return GetDouble(XMLNames.Engine_WHTCUrban); }
- }
+ public virtual double WHTCUrban => GetDouble(XMLNames.Engine_WHTCUrban);
- public virtual double ColdHotBalancingFactor
- {
- get { return GetDouble(XMLNames.Engine_ColdHotBalancingFactor); }
- }
+ public virtual double ColdHotBalancingFactor => GetDouble(XMLNames.Engine_ColdHotBalancingFactor);
- public virtual double CorrectionFactorRegPer
- {
- get { return GetDouble(XMLNames.Engine_CorrectionFactor_RegPer); }
- }
+ public virtual double CorrectionFactorRegPer => GetDouble(XMLNames.Engine_CorrectionFactor_RegPer);
}
#endregion
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -224,10 +166,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(
vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -249,10 +188,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(
vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -272,10 +208,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(
vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
#region Overrides of XMLDeclarationEngineDataProviderV10
@@ -427,10 +360,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of XMLSingleFuelEngineFuel
- public override FuelType FuelType
- {
- get { return GetAttribute(BaseNode, "type").ParseEnum<FuelType>(); }
- }
+ public override FuelType FuelType => GetAttribute(BaseNode, "type").ParseEnum<FuelType>();
#endregion
}
@@ -449,52 +379,24 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IWHRData
- public double UrbanCorrectionFactor
- {
- get { return GetNode(XMLNames.Engine_WHRCorrectionFactors_Urban, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1; }
- }
+ public double UrbanCorrectionFactor => GetNode(XMLNames.Engine_WHRCorrectionFactors_Urban, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1;
- public double RuralCorrectionFactor
- {
- get { return GetNode(XMLNames.Engine_WHRCorrectionFactors_Rural, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1; }
- }
+ public double RuralCorrectionFactor => GetNode(XMLNames.Engine_WHRCorrectionFactors_Rural, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1;
- public double MotorwayCorrectionFactor
- {
- get {
- return GetNode(XMLNames.Engine_WHRCorrectionFactors_Motorway, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1;
- }
- }
+ public double MotorwayCorrectionFactor => GetNode(XMLNames.Engine_WHRCorrectionFactors_Motorway, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1;
- public double BFColdHot
- {
- get {
- return GetNode(XMLNames.Engine_WHRCorrectionFactors_BFColdHot, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1;
- }
- }
+ public double BFColdHot => GetNode(XMLNames.Engine_WHRCorrectionFactors_BFColdHot, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1;
- public double CFRegPer
- {
- get {
- return GetNode(XMLNames.Engine_WHRCorrectionFactors_CFRegPer, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1;
- }
- }
+ public double CFRegPer => GetNode(XMLNames.Engine_WHRCorrectionFactors_CFRegPer, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1;
- public double EngineeringCorrectionFactor
- {
- get { return 1.0; }
- }
+ public double EngineeringCorrectionFactor => 1.0;
- public TableData GeneratedPower
- {
- get {
- return WHRPower ?? (WHRPower = BaseNode == null
- ? null
- : ReadTableData(
- XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry,
- AttributeMappings.WHRPowerMapMapping));
- }
- }
+ public TableData GeneratedPower =>
+ WHRPower ?? (WHRPower = BaseNode == null
+ ? null
+ : ReadTableData(
+ XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry,
+ AttributeMappings.WHRPowerMapMapping));
#endregion
}
@@ -514,18 +416,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationMultistagePrimaryVehicleBusEngineDataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode,
string sourceFile) : base(vehicle, componentNode, sourceFile) { }
- public override IList<IEngineModeDeclarationInputData> EngineModes
- {
- get
- {
- return _engineModes ??
- (_engineModes = new List<IEngineModeDeclarationInputData>() { new XMLSingleFuelEngineMode(BaseNode) });
- }
- }
+ public override IList<IEngineModeDeclarationInputData> EngineModes =>
+ _engineModes ??
+ (_engineModes = new List<IEngineModeDeclarationInputData>() { new XMLSingleFuelEngineMode(BaseNode) });
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs
index 34ea16ecdca63337e3d70e4616845119d50acd66..58160826488a24e72aadd2fbbda5fa1a0164eaeb 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs
@@ -66,10 +66,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -115,9 +112,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public virtual bool DifferentialIncluded { get { return false; } }
+ public virtual bool DifferentialIncluded => false;
- public virtual double AxlegearRatio { get { return double.NaN; } }
+ public virtual double AxlegearRatio => double.NaN;
//public virtual ITorqueConverterDeclarationInputData TorqueConverter
//{
@@ -145,10 +142,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(
vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -166,16 +160,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of XMLDeclarationGearboxDataProviderV10
- public override bool DifferentialIncluded { get { return GetBool(XMLNames.Gearbox_DifferentialIncluded); } }
+ public override bool DifferentialIncluded => GetBool(XMLNames.Gearbox_DifferentialIncluded);
- public override double AxlegearRatio { get { return DifferentialIncluded ? GetDouble(XMLNames.Gearbox_AxlegearRatio) : double.NaN; } }
+ public override double AxlegearRatio => DifferentialIncluded ? GetDouble(XMLNames.Gearbox_AxlegearRatio) : double.NaN;
#endregion
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -193,16 +184,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractCommonComponentType
- public override string CertificationNumber
- {
- get { return GetString(XMLNames.Component_CertificationNumber, required: false); }
- }
+ public override string CertificationNumber => GetString(XMLNames.Component_CertificationNumber, required: false);
#endregion
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationInputDataProvider.cs
index 73e3fa6d616312e7ce90e3e329d77fafdf76ff46..eceef33b4fdb270974a367550480665777da515f 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationInputDataProvider.cs
@@ -71,10 +71,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -87,12 +84,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
#endregion
- public virtual IDeclarationJobInputData JobInputData
- {
- get { return JobData ?? (JobData = Reader.JobData); }
- }
+ public virtual IDeclarationJobInputData JobInputData => JobData ?? (JobData = Reader.JobData);
- public virtual IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData { get { return null; } }
+ public virtual IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData => null;
public virtual XElement XMLHash { get; private set; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
index 4b23ba2efc27d5d8cd7092510231b5862df6fe8b..70fc89dbd810ffa829806576728efff7599a12cb 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
@@ -57,40 +57,23 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
- protected override DataSourceType SourceType
- {
- get { return DataSourceType.XMLFile; }
- }
+ protected override DataSourceType SourceType => DataSourceType.XMLFile;
#endregion
#region Implementation of IDeclarationJobInputData
- public virtual bool SavedInDeclarationMode
- {
- get { return true; }
- }
+ public virtual bool SavedInDeclarationMode => true;
- public virtual IVehicleDeclarationInputData Vehicle
- {
- get { return _vehicle ?? (_vehicle = Reader.CreateVehicle); }
- }
+ public virtual IVehicleDeclarationInputData Vehicle => _vehicle ?? (_vehicle = Reader.CreateVehicle);
- public virtual string JobName
- {
- get { return Vehicle.Identifier; }
- }
+ public virtual string JobName => Vehicle.Identifier;
- public virtual string ShiftStrategy { get { return null; } }
- public VectoSimulationJobType JobType
- {
- get { return VectoSimulationJobType.ConventionalVehicle; }
- }
+ public virtual string ShiftStrategy => null;
+
+ public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
#endregion
@@ -115,10 +98,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationJobInputDataProviderV20(XmlNode node, IXMLDeclarationInputData inputProvider, string fileName) :
base(node, inputProvider, fileName) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -139,24 +119,16 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
{
InputData = inputProvider;
}
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
- public IVehicleDeclarationInputData Vehicle
- {
- get { return _vehicle ?? (_vehicle = Reader.CreateVehicle); }
- }
+ public IVehicleDeclarationInputData Vehicle => _vehicle ?? (_vehicle = Reader.CreateVehicle);
protected override DataSourceType SourceType { get; }
public bool SavedInDeclarationMode { get; }
public string JobName { get; }
- public string ShiftStrategy { get{ return null; } }
- public VectoSimulationJobType JobType
- {
- get { return VectoSimulationJobType.ConventionalVehicle; }
- }
+ public string ShiftStrategy => null;
+
+ public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
public IXMLJobDataReader Reader { protected get; set; }
public IXMLPrimaryVehicleBusInputData InputData { get; }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
index 51aecfe1e599f63084a73edfb8fb1d655d74b84a..225b6dfb808a01eb7d6746dd6546280c2099f80c 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
@@ -37,26 +37,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
XMLHash = h.ComputeXmlHash();
}
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
- protected override DataSourceType SourceType
- {
- get { return DataSourceType.XMLFile; }
- }
+ protected override DataSourceType SourceType => DataSourceType.XMLFile;
- public IDeclarationMultistageJobInputData JobInputData
- {
- get { return JobData ?? (JobData = Reader.JobData); }
- }
+ public IDeclarationMultistageJobInputData JobInputData => JobData ?? (JobData = Reader.JobData);
- IDeclarationJobInputData IDeclarationInputDataProvider.JobInputData
- {
- get { throw new NotImplementedException(); }
- }
+ IDeclarationJobInputData IDeclarationInputDataProvider.JobInputData => throw new NotImplementedException();
public IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData { get; }
public XElement XMLHash { get; }
@@ -90,39 +78,21 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
SourceType = DataSourceType.XMLFile;
}
- public IPrimaryVehicleInformationInputDataProvider PrimaryVehicle
- {
- get { return _primaryVehicle ?? (_primaryVehicle = Reader.PrimaryVehicle); }
- }
+ public IPrimaryVehicleInformationInputDataProvider PrimaryVehicle => _primaryVehicle ?? (_primaryVehicle = Reader.PrimaryVehicle);
- public IList<IManufacturingStageInputData> ManufacturingStages
- {
- get { return _manufacturingStages ?? (_manufacturingStages = Reader.ManufacturingStages); }
- }
+ public IList<IManufacturingStageInputData> ManufacturingStages => _manufacturingStages ?? (_manufacturingStages = Reader.ManufacturingStages);
- public IManufacturingStageInputData ConsolidateManufacturingStage
- {
- get { return _concolidateManfacturingStage ?? (_concolidateManfacturingStage = Reader.ConsolidateManufacturingStage); }
- }
+ public IManufacturingStageInputData ConsolidateManufacturingStage => _concolidateManfacturingStage ?? (_concolidateManfacturingStage = Reader.ConsolidateManufacturingStage);
- public VectoSimulationJobType JobType
- {
- get { return VectoSimulationJobType.ConventionalVehicle; }
- }
+ public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
+
+ public bool InputComplete => Reader.InputComplete;
- public bool InputComplete
- {
- get { return Reader.InputComplete; }
- }
-
public IXMLMultistageJobReader Reader { protected get; set; }
public IXMLMultistageInputDataProvider InputData { get; }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
}
@@ -153,44 +123,26 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
_signatureNode = xmlNode.LastChild;
}
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
- protected override DataSourceType SourceType
- {
- get { return DataSourceType.XMLFile; }
- }
+ protected override DataSourceType SourceType => DataSourceType.XMLFile;
- public IVehicleDeclarationInputData Vehicle
- {
- get { return _vehicle ?? (_vehicle = Reader.JobData.Vehicle); }
- }
+ public IVehicleDeclarationInputData Vehicle => _vehicle ?? (_vehicle = Reader.JobData.Vehicle);
- public DigestData PrimaryVehicleInputDataHash
- {
- get { return _primaryVehicleInputDataHash ??
- (_primaryVehicleInputDataHash = Reader.GetDigestData(GetNode("InputDataSignature")));}
- }
+ public DigestData PrimaryVehicleInputDataHash =>
+ _primaryVehicleInputDataHash ??
+ (_primaryVehicleInputDataHash = Reader.GetDigestData(GetNode("InputDataSignature")));
- public DigestData VehicleSignatureHash
- {
- get { return _vehicleSignatureHash ??
- (_vehicleSignatureHash = Reader.GetDigestData(_signatureNode));}
- }
+ public DigestData VehicleSignatureHash =>
+ _vehicleSignatureHash ??
+ (_vehicleSignatureHash = Reader.GetDigestData(_signatureNode));
- public DigestData ManufacturerRecordHash
- {
- get { return _manufacturerRecordHash ??
- (_manufacturerRecordHash = Reader.GetDigestData(GetNode("ManufacturerRecordSignature"))); }
- }
+ public DigestData ManufacturerRecordHash =>
+ _manufacturerRecordHash ??
+ (_manufacturerRecordHash = Reader.GetDigestData(GetNode("ManufacturerRecordSignature")));
- public IResultsInputData ResultsInputData
- {
- get { return _resultsInputData ?? (_resultsInputData = Reader.ResultsInputData); }
- }
+ public IResultsInputData ResultsInputData => _resultsInputData ?? (_resultsInputData = Reader.ResultsInputData);
public IResult GetResult(VehicleClass vehicleClass, MissionType mission, string fuelMode, Kilogram payload)
{
@@ -200,20 +152,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
x.SimulationParameter.FuelMode.Equals(fuelMode, StringComparison.InvariantCultureIgnoreCase));
}
- public XmlNode ResultsNode
- {
- get { return GetNode(XMLNames.Report_Results); }
- }
+ public XmlNode ResultsNode => GetNode(XMLNames.Report_Results);
- public IApplicationInformation ApplicationInformation
- {
- get { return _applicationInformation ?? (_applicationInformation = Reader.ApplicationInformation); }
- }
+ public IApplicationInformation ApplicationInformation => _applicationInformation ?? (_applicationInformation = Reader.ApplicationInformation);
- public XmlNode ApplicationInformationNode
- {
- get { return GetNode(XMLNames.Tag_ApplicationInformation); }
- }
+ public XmlNode ApplicationInformationNode => GetNode(XMLNames.Tag_ApplicationInformation);
public XElement XMLHash { get; }
@@ -245,43 +188,21 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
_signatureXmlNode = xmlNode.LastChild;
}
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
- protected override DataSourceType SourceType
- {
- get { return DataSourceType.XMLFile; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
- public DigestData HashPreviousStage
- {
- get { return _hashPreviousStage ??
- (_hashPreviousStage = Reader.GetDigestData(GetNode("HashPreviousStage"))); }
- }
+ protected override DataSourceType SourceType => DataSourceType.XMLFile;
- public int StageCount
- {
- get { return Convert.ToInt32(GetAttribute(BaseNode, XMLNames.ManufacturingStage_StageCount)); }
- }
+ public DigestData HashPreviousStage =>
+ _hashPreviousStage ??
+ (_hashPreviousStage = Reader.GetDigestData(GetNode("HashPreviousStage")));
- public IVehicleDeclarationInputData Vehicle
- {
- get { return _vehicle ?? (_vehicle = Reader.Vehicle); }
- }
+ public int StageCount => Convert.ToInt32(GetAttribute(BaseNode, XMLNames.ManufacturingStage_StageCount));
- public IApplicationInformation ApplicationInformation
- {
- get
- {
- return _applicationInformation ?? (_applicationInformation = Reader.ApplicationInformation);
- }
- }
+ public IVehicleDeclarationInputData Vehicle => _vehicle ?? (_vehicle = Reader.Vehicle);
- public DigestData Signature
- {
- get { return _signature ?? (_signature = Reader.GetDigestData(_signatureXmlNode)); }
- }
+ public IApplicationInformation ApplicationInformation => _applicationInformation ?? (_applicationInformation = Reader.ApplicationInformation);
+
+ public DigestData Signature => _signature ?? (_signature = Reader.GetDigestData(_signatureXmlNode));
public IXMLMultistageReader Reader { protected get; set; }
}
@@ -301,14 +222,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
_vehicleInput = vehicleInput;
}
- public IVehicleDeclarationInputData VehicleInputData
- {
- get { return _vehicleInput; }
- }
- public IMultistageBusInputDataProvider MultistageJobInputData
- {
- get { return _multistageJobInputData; }
- }
+ public IVehicleDeclarationInputData VehicleInputData => _vehicleInput;
+
+ public IMultistageBusInputDataProvider MultistageJobInputData => _multistageJobInputData;
public DataSource DataSource { get; }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPTODataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPTODataProvider.cs
index 76d5a4369218e51550e01013616c4ebd6f7b101c..a145ecb7c1c055fe2ab66c323c4768272da9fb39 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPTODataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPTODataProvider.cs
@@ -79,20 +79,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public virtual TableData PTOLossMap
- {
- get { return null; }
- }
+ public virtual TableData PTOLossMap => null;
- public virtual TableData PTOCycleDuringStop
- {
- get { return null; }
- }
+ public virtual TableData PTOCycleDuringStop => null;
- public TableData PTOCycleWhileDriving
- {
- get { return null; }
- }
+ public TableData PTOCycleWhileDriving => null;
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusApplicationInformationDataProviderV01.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusApplicationInformationDataProviderV01.cs
index 8c6ea37fca75d78cb60f5268afd4990336189229..98493d3b028df9b8eaa98cd29e828b8b65e96118 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusApplicationInformationDataProviderV01.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusApplicationInformationDataProviderV01.cs
@@ -20,14 +20,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationMultistagePrimaryVehicleBusApplicationInformationDataProviderV01(XmlNode applicationNode)
: base(applicationNode) { }
- public string SimulationToolVersion
- {
- get { return GetString(XMLNames.Report_ApplicationInfo_SimulationToolVersion); }
- }
+ public string SimulationToolVersion => GetString(XMLNames.Report_ApplicationInfo_SimulationToolVersion);
- public DateTime Date
- {
- get { return XmlConvert.ToDateTime(GetString(XMLNames.Report_ApplicationInfo_Date), XmlDateTimeSerializationMode.Utc); }
- }
+ public DateTime Date => XmlConvert.ToDateTime(GetString(XMLNames.Report_ApplicationInfo_Date), XmlDateTimeSerializationMode.Utc);
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusResultsInputDataProviderV01.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusResultsInputDataProviderV01.cs
index d21580a183a424ae4c23fb6fd68c9653292387a3..caf7fc362daa27d37f56b020f2f365781e831f23 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusResultsInputDataProviderV01.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusResultsInputDataProviderV01.cs
@@ -28,15 +28,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
{
_resultsNode = resultsNode;
}
- public string Status
- {
- get { return GetString(XMLNames.Bus_Status); }
- }
+ public string Status => GetString(XMLNames.Bus_Status);
- public IList<IResult> Results
- {
- get { return _results ?? (_results = ReadResults()); }
- }
+ public IList<IResult> Results => _results ?? (_results = ReadResults());
private IList<IResult> ReadResults()
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationRetarderDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationRetarderDataProvider.cs
index 9f811e49873eb052ada7fcd762280d0d04aa7d66..e7206bfc712aaf41a3467c4ab4266687e190d4d9 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationRetarderDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationRetarderDataProvider.cs
@@ -60,33 +60,20 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IRetarderInputData
- public virtual RetarderType Type
- {
- get { return Vehicle.RetarderType; }
- }
+ public virtual RetarderType Type => Vehicle.RetarderType;
- public virtual double Ratio
- {
- get { return Vehicle.RetarderRatio; }
- }
+ public virtual double Ratio => Vehicle.RetarderRatio;
- public virtual TableData LossMap
- {
- get {
- return ReadTableData(
- XMLNames.Retarder_RetarderLossMap, XMLNames.Retarder_RetarderLossMap_Entry,
- AttributeMappings.RetarderLossmapMapping);
- }
- }
+ public virtual TableData LossMap =>
+ ReadTableData(
+ XMLNames.Retarder_RetarderLossMap, XMLNames.Retarder_RetarderLossMap_Entry,
+ AttributeMappings.RetarderLossmapMapping);
#endregion
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -107,9 +94,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(
vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTorqueConverterDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTorqueConverterDataProvider.cs
index a3052497b920bb106c7d09963ca54a71eda9e181..a3706df1d1704be79922b6355423e94ab8599393 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTorqueConverterDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTorqueConverterDataProvider.cs
@@ -58,23 +58,16 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of ITorqueconverterDeclarationInputData
- public virtual TableData TCData
- {
- get {
- return ReadTableData(
- XMLNames.TorqueConverter_Characteristics, XMLNames.TorqueConverter_Characteristics_Entry,
- AttributeMappings.TorqueConverterDataMapping);
- }
- }
+ public virtual TableData TCData =>
+ ReadTableData(
+ XMLNames.TorqueConverter_Characteristics, XMLNames.TorqueConverter_Characteristics_Entry,
+ AttributeMappings.TorqueConverterDataMapping);
#endregion
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -93,10 +86,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationTorqueConverterDataProviderV20(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -113,16 +103,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractCommonComponentType
- public override string CertificationNumber
- {
- get { return GetString(XMLNames.Component_CertificationNumber, required: false); }
- }
+ public override string CertificationNumber => GetString(XMLNames.Component_CertificationNumber, required: false);
#endregion
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs
index 8ef3270d7ebc06d57c71c0a9a99d9a538d2cac74..f02cc722c86efd6e4c66493cdaf04b6197b3188d 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs
@@ -61,10 +61,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -72,22 +69,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of ITyreDeclarationInputData
- public virtual string Dimension
- {
- get { return _dimension ?? (_dimension = GetString(XMLNames.AxleWheels_Axles_Axle_Dimension)); }
- }
+ public virtual string Dimension => _dimension ?? (_dimension = GetString(XMLNames.AxleWheels_Axles_Axle_Dimension));
- public virtual double RollResistanceCoefficient
- {
- get { return _rrc ?? (_rrc = GetDouble(XMLNames.AxleWheels_Axles_Axle_RRCDeclared)).Value; }
- }
+ public virtual double RollResistanceCoefficient => _rrc ?? (_rrc = GetDouble(XMLNames.AxleWheels_Axles_Axle_RRCDeclared)).Value;
- public virtual Newton TyreTestLoad
- {
- get { return _fzIso ?? (_fzIso = GetDouble(XMLNames.AxleWheels_Axles_Axle_FzISO).SI<Newton>()); }
- }
+ public virtual Newton TyreTestLoad => _fzIso ?? (_fzIso = GetDouble(XMLNames.AxleWheels_Axles_Axle_FzISO).SI<Newton>());
- public virtual string FuelEfficiencyClass { get { return DeclarationData.Wheels.TyreClass.Lookup(RollResistanceCoefficient); } }
+ public virtual string FuelEfficiencyClass => DeclarationData.Wheels.TyreClass.Lookup(RollResistanceCoefficient);
#endregion
}
@@ -105,10 +93,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationTyreDataProviderV20(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
: base(vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -124,10 +109,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationTyreDataProviderV22(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
: base(vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -143,11 +125,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationTyreDataProviderV23(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
: base(vehicle, componentNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
- public override string FuelEfficiencyClass { get { return GetString("FuelEfficiencyClass"); } }
+ public override string FuelEfficiencyClass => GetString("FuelEfficiencyClass");
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index 15de858e1ec65989b13ce5c405642bf4f7f3f2d2..bd4cae6aa3bef4d0cedd06b3bde098773649524c 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -96,39 +96,21 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public virtual IXMLPTOReader PTOReader { protected get; set; }
- public virtual XmlElement ADASNode
- {
- get { return _adasNode ?? (_adasNode = GetNode(XMLNames.Vehicle_ADAS, required: false) as XmlElement); }
- }
+ public virtual XmlElement ADASNode => _adasNode ?? (_adasNode = GetNode(XMLNames.Vehicle_ADAS, required: false) as XmlElement);
public virtual IXMLADASReader ADASReader { protected get; set; }
public virtual IXMLDeclarationJobInputData Job { get; }
- public virtual string Identifier
- {
- get { return GetAttribute(BaseNode, XMLNames.Component_ID_Attr); }
- }
+ public virtual string Identifier => GetAttribute(BaseNode, XMLNames.Component_ID_Attr);
- public virtual bool ExemptedVehicle
- {
- get { return ElementExists(XMLNames.Vehicle_HybridElectricHDV) && ElementExists(XMLNames.Vehicle_DualFuelVehicle); }
- }
+ public virtual bool ExemptedVehicle => ElementExists(XMLNames.Vehicle_HybridElectricHDV) && ElementExists(XMLNames.Vehicle_DualFuelVehicle);
- public virtual string VIN
- {
- get { return GetString(XMLNames.Vehicle_VIN); }
- }
+ public virtual string VIN => GetString(XMLNames.Vehicle_VIN);
- public virtual string LegislativeCategory
- {
- get { return null; }
- }
+ public virtual string LegislativeCategory => null;
- public virtual LegislativeClass? LegislativeClass
- {
- get { return GetString(XMLNames.Vehicle_LegislativeClass).ParseEnum<LegislativeClass>(); }
- }
+ public virtual LegislativeClass? LegislativeClass => GetString(XMLNames.Vehicle_LegislativeClass).ParseEnum<LegislativeClass>();
public virtual VehicleCategory VehicleCategory
{
@@ -142,16 +124,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public virtual Kilogram CurbMassChassis
- {
- get { return GetDouble(XMLNames.Vehicle_CurbMassChassis).SI<Kilogram>(); }
- }
+ public virtual Kilogram CurbMassChassis => GetDouble(XMLNames.Vehicle_CurbMassChassis).SI<Kilogram>();
- public virtual Kilogram GrossVehicleMassRating
- {
- get { return GetDouble(XMLNames.Vehicle_GrossVehicleMass).SI<Kilogram>(); }
- }
+ public virtual Kilogram GrossVehicleMassRating => GetDouble(XMLNames.Vehicle_GrossVehicleMass).SI<Kilogram>();
public virtual IList<ITorqueLimitInputData> TorqueLimits
{
@@ -173,30 +149,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public virtual AxleConfiguration AxleConfiguration
- {
- get { return AxleConfigurationHelper.Parse(GetString(XMLNames.Vehicle_AxleConfiguration)); }
- }
+ public virtual AxleConfiguration AxleConfiguration => AxleConfigurationHelper.Parse(GetString(XMLNames.Vehicle_AxleConfiguration));
- public virtual string ManufacturerAddress
- {
- get { return GetString(XMLNames.Component_ManufacturerAddress); }
- }
+ public virtual string ManufacturerAddress => GetString(XMLNames.Component_ManufacturerAddress);
- public virtual PerSecond EngineIdleSpeed
- {
- get { return GetDouble(XMLNames.Vehicle_IdlingSpeed).RPMtoRad(); }
- }
+ public virtual PerSecond EngineIdleSpeed => GetDouble(XMLNames.Vehicle_IdlingSpeed).RPMtoRad();
- public virtual double RetarderRatio
- {
- get { return GetDouble(XMLNames.Vehicle_RetarderRatio); }
- }
+ public virtual double RetarderRatio => GetDouble(XMLNames.Vehicle_RetarderRatio);
- public virtual IPTOTransmissionInputData PTOTransmissionInputData
- {
- get { return _ptoData ?? (_ptoData = PTOReader.PTOInputData); }
- }
+ public virtual IPTOTransmissionInputData PTOTransmissionInputData => _ptoData ?? (_ptoData = PTOReader.PTOInputData);
public virtual RetarderType RetarderType
{
@@ -214,142 +175,68 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public virtual AngledriveType AngledriveType
- {
- get { return GetString(XMLNames.Vehicle_AngledriveType).ParseEnum<AngledriveType>(); }
- }
+ public virtual AngledriveType AngledriveType => GetString(XMLNames.Vehicle_AngledriveType).ParseEnum<AngledriveType>();
- public virtual bool VocationalVehicle
- {
- get { return XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_VocationalVehicle)); }
- }
+ public virtual bool VocationalVehicle => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_VocationalVehicle));
- public virtual bool SleeperCab
- {
- get { return XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_SleeperCab)); }
- }
+ public virtual bool SleeperCab => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_SleeperCab));
public virtual bool? AirdragModifiedMultistage { get; }
- public virtual TankSystem? TankSystem
- {
- get {
- return ElementExists(XMLNames.Vehicle_NgTankSystem)
- ? EnumHelper.ParseEnum<TankSystem>(GetString(XMLNames.Vehicle_NgTankSystem))
- : (TankSystem?)null;
- }
- }
+ public virtual TankSystem? TankSystem =>
+ ElementExists(XMLNames.Vehicle_NgTankSystem)
+ ? EnumHelper.ParseEnum<TankSystem>(GetString(XMLNames.Vehicle_NgTankSystem))
+ : (TankSystem?)null;
- public virtual IAdvancedDriverAssistantSystemDeclarationInputData ADAS
- {
- get { return ADASReader.ADASInputData; }
- }
+ public virtual IAdvancedDriverAssistantSystemDeclarationInputData ADAS => ADASReader.ADASInputData;
- public virtual bool ZeroEmissionVehicle
- {
- get { return XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ZeroEmissionVehicle)); }
- }
+ public virtual bool ZeroEmissionVehicle => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ZeroEmissionVehicle));
- public virtual bool HybridElectricHDV
- {
- get { return XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_HybridElectricHDV)); }
- }
+ public virtual bool HybridElectricHDV => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_HybridElectricHDV));
- public virtual bool DualFuelVehicle
- {
- get { return XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_DualFuelVehicle)); }
- }
+ public virtual bool DualFuelVehicle => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_DualFuelVehicle));
- public virtual Watt MaxNetPower1
- {
- get {
- return ElementExists(XMLNames.Vehicle_MaxNetPower1)
- ? GetDouble(XMLNames.Vehicle_MaxNetPower1).SI<Watt>()
- : null;
- }
- }
+ public virtual Watt MaxNetPower1 =>
+ ElementExists(XMLNames.Vehicle_MaxNetPower1)
+ ? GetDouble(XMLNames.Vehicle_MaxNetPower1).SI<Watt>()
+ : null;
- public virtual Watt MaxNetPower2
- {
- get {
- return ElementExists(XMLNames.Vehicle_MaxNetPower2)
- ? GetDouble(XMLNames.Vehicle_MaxNetPower2).SI<Watt>()
- : null;
- }
- }
+ public virtual Watt MaxNetPower2 =>
+ ElementExists(XMLNames.Vehicle_MaxNetPower2)
+ ? GetDouble(XMLNames.Vehicle_MaxNetPower2).SI<Watt>()
+ : null;
- public virtual RegistrationClass? RegisteredClass
- {
- get { return RegistrationClass.unknown; }
- }
+ public virtual RegistrationClass? RegisteredClass => RegistrationClass.unknown;
- public virtual int? NumberPassengerSeatsUpperDeck
- {
- get { return 0; }
- }
+ public virtual int? NumberPassengerSeatsUpperDeck => 0;
- public virtual int? NumberPassengerSeatsLowerDeck
- {
- get { return 0; }
- }
+ public virtual int? NumberPassengerSeatsLowerDeck => 0;
- public virtual int? NumberPassengersStandingLowerDeck
- {
- get { return 0; }
- }
- public virtual int? NumberPassengersStandingUpperDeck
- {
- get { return 0; }
- }
+ public virtual int? NumberPassengersStandingLowerDeck => 0;
- public virtual CubicMeter CargoVolume
- {
- get { return 0.SI<CubicMeter>(); }
- }
+ public virtual int? NumberPassengersStandingUpperDeck => 0;
- public virtual VehicleCode? VehicleCode
- {
- get { return VectoCommon.Models.VehicleCode.NOT_APPLICABLE; }
- }
+ public virtual CubicMeter CargoVolume => 0.SI<CubicMeter>();
- public virtual bool? LowEntry
- {
- get { return false; }
- }
+ public virtual VehicleCode? VehicleCode => VectoCommon.Models.VehicleCode.NOT_APPLICABLE;
- public virtual bool Articulated
- {
- get { return false; }
- }
+ public virtual bool? LowEntry => false;
- public virtual Meter Height
- {
- get { return null; }
- }
+ public virtual bool Articulated => false;
- public virtual Meter Length
- {
- get { return null; }
- }
+ public virtual Meter Height => null;
- public virtual Meter Width
- {
- get { return null; }
- }
+ public virtual Meter Length => null;
- public virtual Meter EntranceHeight
- {
- get { return null; }
- }
+ public virtual Meter Width => null;
- public virtual ConsumerTechnology? DoorDriveTechnology { get { return ConsumerTechnology.Unknown; } }
+ public virtual Meter EntranceHeight => null;
+
+ public virtual ConsumerTechnology? DoorDriveTechnology => ConsumerTechnology.Unknown;
public virtual VehicleDeclarationType VehicleDeclarationType { get; }
- public virtual IVehicleComponentsDeclaration Components
- {
- get { return _components ?? (_components = ComponentReader.ComponentInputData); }
- }
+ public virtual IVehicleComponentsDeclaration Components => _components ?? (_components = ComponentReader.ComponentInputData);
#region Implementation of IAdvancedDriverAssistantSystemDeclarationInputData
@@ -357,10 +244,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -385,84 +269,39 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationVehicleDataProviderV20(IXMLDeclarationJobInputData jobData, XmlNode xmlNode, string sourceFile) :
base(jobData, xmlNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
- public override bool VocationalVehicle
- {
- get { return false; }
- }
+ public override bool VocationalVehicle => false;
- public override bool SleeperCab
- {
- get { return true; }
- }
+ public override bool SleeperCab => true;
- public override TankSystem? TankSystem
- {
- get { return VectoCommon.InputData.TankSystem.Compressed; }
- }
+ public override TankSystem? TankSystem => VectoCommon.InputData.TankSystem.Compressed;
- public override IAdvancedDriverAssistantSystemDeclarationInputData ADAS
- {
- get { return new ADASDefaultValues(); }
- }
+ public override IAdvancedDriverAssistantSystemDeclarationInputData ADAS => new ADASDefaultValues();
- public override bool ZeroEmissionVehicle
- {
- get { return false; }
- }
+ public override bool ZeroEmissionVehicle => false;
- public override bool HybridElectricHDV
- {
- get { return false; }
- }
+ public override bool HybridElectricHDV => false;
- public override bool DualFuelVehicle
- {
- get { return false; }
- }
+ public override bool DualFuelVehicle => false;
- public override Watt MaxNetPower1
- {
- get { return null; }
- }
+ public override Watt MaxNetPower1 => null;
- public override Watt MaxNetPower2
- {
- get { return null; }
- }
+ public override Watt MaxNetPower2 => null;
public class ADASDefaultValues : IAdvancedDriverAssistantSystemDeclarationInputData
{
#region Implementation of IAdvancedDriverAssistantSystemDeclarationInputData
- public bool EngineStopStart
- {
- get { return false; }
- }
+ public bool EngineStopStart => false;
- public EcoRollType EcoRoll
- {
- get { return EcoRollType.None; }
- }
+ public EcoRollType EcoRoll => EcoRollType.None;
- public PredictiveCruiseControlType PredictiveCruiseControl
- {
- get { return PredictiveCruiseControlType.None; }
- }
+ public PredictiveCruiseControlType PredictiveCruiseControl => PredictiveCruiseControlType.None;
- public bool? ATEcoRollReleaseLockupClutch
- {
- get { return null; }
- }
+ public bool? ATEcoRollReleaseLockupClutch => null;
- public XmlNode XMLSource
- {
- get { return null; }
- }
+ public XmlNode XMLSource => null;
#endregion
}
@@ -503,10 +342,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -528,10 +364,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -539,114 +372,51 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IVehicleDeclarationInputData
- public override bool ExemptedVehicle
- {
- get { return true; }
- }
+ public override bool ExemptedVehicle => true;
- public override AxleConfiguration AxleConfiguration
- {
- get { return AxleConfiguration.AxleConfig_Undefined; }
- }
+ public override AxleConfiguration AxleConfiguration => AxleConfiguration.AxleConfig_Undefined;
- public override IList<ITorqueLimitInputData> TorqueLimits
- {
- get { return new List<ITorqueLimitInputData>(); }
- }
+ public override IList<ITorqueLimitInputData> TorqueLimits => new List<ITorqueLimitInputData>();
- public override PerSecond EngineIdleSpeed
- {
- get { return null; }
- }
+ public override PerSecond EngineIdleSpeed => null;
- public override bool VocationalVehicle
- {
- get { return false; }
- }
+ public override bool VocationalVehicle => false;
- public override bool SleeperCab
- {
- get { return false; }
- }
+ public override bool SleeperCab => false;
- public override TankSystem? TankSystem
- {
- get { return null; }
- }
+ public override TankSystem? TankSystem => null;
- public override IAdvancedDriverAssistantSystemDeclarationInputData ADAS
- {
- get { return null; }
- }
+ public override IAdvancedDriverAssistantSystemDeclarationInputData ADAS => null;
- public override bool ZeroEmissionVehicle
- {
- get { return XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ZeroEmissionVehicle)); }
- }
+ public override bool ZeroEmissionVehicle => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ZeroEmissionVehicle));
- public override bool HybridElectricHDV
- {
- get { return XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_HybridElectricHDV)); }
- }
+ public override bool HybridElectricHDV => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_HybridElectricHDV));
- public override bool DualFuelVehicle
- {
- get { return XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_DualFuelVehicle)); }
- }
+ public override bool DualFuelVehicle => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_DualFuelVehicle));
- public override Watt MaxNetPower1
- {
- get { return GetDouble(XMLNames.Vehicle_MaxNetPower1).SI<Watt>(); }
- }
+ public override Watt MaxNetPower1 => GetDouble(XMLNames.Vehicle_MaxNetPower1).SI<Watt>();
- public override Watt MaxNetPower2
- {
- get { return GetDouble(XMLNames.Vehicle_MaxNetPower2).SI<Watt>(); }
- }
+ public override Watt MaxNetPower2 => GetDouble(XMLNames.Vehicle_MaxNetPower2).SI<Watt>();
- public override IVehicleComponentsDeclaration Components
- {
- get { return null; }
- }
+ public override IVehicleComponentsDeclaration Components => null;
#endregion
#region Implementation of IXMLDeclarationVehicleData
- public override XmlElement ComponentNode
- {
- get { return null; }
- }
+ public override XmlElement ComponentNode => null;
- public override XmlElement PTONode
- {
- get { return null; }
- }
+ public override XmlElement PTONode => null;
- public override XmlElement ADASNode
- {
- get { return null; }
- }
+ public override XmlElement ADASNode => null;
- public override AngledriveType AngledriveType
- {
- get { return AngledriveType.None; }
- }
+ public override AngledriveType AngledriveType => AngledriveType.None;
- public override RetarderType RetarderType
- {
- get { return RetarderType.None; }
- }
+ public override RetarderType RetarderType => RetarderType.None;
- public override double RetarderRatio
- {
- get { return 0; }
- }
+ public override double RetarderRatio => 0;
- public override IPTOTransmissionInputData PTOTransmissionInputData
- {
- get { return null; }
- }
+ public override IPTOTransmissionInputData PTOTransmissionInputData => null;
#endregion
}
@@ -673,68 +443,35 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of XMLDeclarationVehicleDataProviderV10
- public override bool SleeperCab
- {
- get { return false; }
- }
+ public override bool SleeperCab => false;
- public override IAdvancedDriverAssistantSystemDeclarationInputData ADAS
- {
- get { return ADASReader.ADASInputData; }
- }
+ public override IAdvancedDriverAssistantSystemDeclarationInputData ADAS => ADASReader.ADASInputData;
- public override XmlElement PTONode
- {
- get { return null; }
- }
+ public override XmlElement PTONode => null;
#region Overrides of XMLDeclarationVehicleDataProviderV10
- public override LegislativeClass? LegislativeClass
- {
- get { return VectoCommon.Models.LegislativeClass.M3; }
- }
+ public override LegislativeClass? LegislativeClass => VectoCommon.Models.LegislativeClass.M3;
#endregion
- public override IPTOTransmissionInputData PTOTransmissionInputData
- {
- get { return null; }
- }
+ public override IPTOTransmissionInputData PTOTransmissionInputData => null;
- public override VehicleCategory VehicleCategory
- {
- get { return VehicleCategory.HeavyBusPrimaryVehicle; }
- }
+ public override VehicleCategory VehicleCategory => VehicleCategory.HeavyBusPrimaryVehicle;
- public override bool Articulated
- {
- get { return GetBool(XMLNames.Vehicle_Articulated); }
- }
+ public override bool Articulated => GetBool(XMLNames.Vehicle_Articulated);
- public override Kilogram CurbMassChassis
- {
- get { return null; }
- }
+ public override Kilogram CurbMassChassis => null;
- public override Kilogram GrossVehicleMassRating
- {
- get { return GetDouble(XMLNames.Vehicle_TPMLM).SI<Kilogram>(); }
- }
+ public override Kilogram GrossVehicleMassRating => GetDouble(XMLNames.Vehicle_TPMLM).SI<Kilogram>();
- public override Meter EntranceHeight
- {
- get { return null; }
- }
+ public override Meter EntranceHeight => null;
#endregion
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -755,30 +492,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of XMLDeclarationVehicleDataProviderV10
- public override bool SleeperCab
- {
- get { return false; }
- }
+ public override bool SleeperCab => false;
- public override bool VocationalVehicle
- {
- get { return false; }
- }
+ public override bool VocationalVehicle => false;
- public override IPTOTransmissionInputData PTOTransmissionInputData
- {
- get { return null; }
- }
+ public override IPTOTransmissionInputData PTOTransmissionInputData => null;
- public override XmlElement PTONode
- {
- get { return null; }
- }
+ public override XmlElement PTONode => null;
- public override Kilogram GrossVehicleMassRating
- {
- get { return GetDouble(XMLNames.Vehicle_TPMLM).SI<Kilogram>(); }
- }
+ public override Kilogram GrossVehicleMassRating => GetDouble(XMLNames.Vehicle_TPMLM).SI<Kilogram>();
public override CubicMeter CargoVolume
{
@@ -796,10 +518,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -824,36 +543,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of XMLDeclarationVehicleDataProviderV10
- public override VehicleCategory VehicleCategory
- {
- get { return VehicleCategory.HeavyBusCompletedVehicle; }
- }
+ public override VehicleCategory VehicleCategory => VehicleCategory.HeavyBusCompletedVehicle;
- public override RegistrationClass? RegisteredClass
- {
- get { return RegistrationClassHelper.Parse(GetString(XMLNames.Vehicle_RegisteredClass)).First(); }
- }
+ public override RegistrationClass? RegisteredClass => RegistrationClassHelper.Parse(GetString(XMLNames.Vehicle_RegisteredClass)).First();
- public override VehicleCode? VehicleCode
- {
- get { return GetString(XMLNames.Vehicle_VehicleCode).ParseEnum<VehicleCode>(); }
- }
+ public override VehicleCode? VehicleCode => GetString(XMLNames.Vehicle_VehicleCode).ParseEnum<VehicleCode>();
//TechnicalPermissibleMaximumLadenMass
- public override Kilogram GrossVehicleMassRating
- {
- get { return GetDouble(XMLNames.TPMLM).SI<Kilogram>(); }
- }
+ public override Kilogram GrossVehicleMassRating => GetDouble(XMLNames.TPMLM).SI<Kilogram>();
- public override TankSystem? TankSystem
- {
- get
- {
- return ElementExists(XMLNames.Vehicle_NgTankSystem)
- ? EnumHelper.ParseEnum<TankSystem>(GetString(XMLNames.Vehicle_NgTankSystem))
- : (TankSystem?)null;
- }
- }
+ public override TankSystem? TankSystem =>
+ ElementExists(XMLNames.Vehicle_NgTankSystem)
+ ? EnumHelper.ParseEnum<TankSystem>(GetString(XMLNames.Vehicle_NgTankSystem))
+ : (TankSystem?)null;
public override int? NumberPassengerSeatsLowerDeck
{
@@ -872,53 +574,29 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
//HeightIntegratedBody
- public override Meter Height
- {
- get { return GetDouble(XMLNames.Bus_HeighIntegratedBody).SI<Meter>(); }
- }
+ public override Meter Height => GetDouble(XMLNames.Bus_HeighIntegratedBody).SI<Meter>();
//VehicleLength
- public override Meter Length
- {
- get { return GetDouble(XMLNames.Bus_VehicleLength).SI<Meter>(); }
- }
+ public override Meter Length => GetDouble(XMLNames.Bus_VehicleLength).SI<Meter>();
//VehicleWidth
- public override Meter Width
- {
- get { return GetDouble(XMLNames.Bus_VehicleWidth).SI<Meter>(); }
- }
+ public override Meter Width => GetDouble(XMLNames.Bus_VehicleWidth).SI<Meter>();
- public override XmlElement PTONode
- {
- get { return null; }
- }
+ public override XmlElement PTONode => null;
#endregion
- public override bool? LowEntry
- {
- get { return GetBool(XMLNames.Bus_LowEntry); }
- }
+ public override bool? LowEntry => GetBool(XMLNames.Bus_LowEntry);
- public override Meter EntranceHeight
- {
- get { return GetDouble(XMLNames.Bus_EntranceHeight).SI<Meter>(); }
- }
+ public override Meter EntranceHeight => GetDouble(XMLNames.Bus_EntranceHeight).SI<Meter>();
+
+ public override ConsumerTechnology? DoorDriveTechnology => ConsumerTechnologyHelper.Parse(GetString(XMLNames.BusAux_PneumaticSystem_DoorDriveTechnology));
- public override ConsumerTechnology? DoorDriveTechnology
- {
- get { return ConsumerTechnologyHelper.Parse(GetString(XMLNames.BusAux_PneumaticSystem_DoorDriveTechnology)); }
- }
-
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -950,90 +628,45 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractCommonComponentType
- public override string Manufacturer
- {
- get { return GetString(XMLNames.ManufacturerPrimaryVehicle); }
- }
+ public override string Manufacturer => GetString(XMLNames.ManufacturerPrimaryVehicle);
- public string ManufacturerAddress
- {
- get { return GetString(XMLNames.ManufacturerAddressPrimaryVehicle); }
- }
+ public string ManufacturerAddress => GetString(XMLNames.ManufacturerAddressPrimaryVehicle);
#endregion
#region IXMLDeclarationVehicleData interface
- public string VIN
- {
- get { return GetString(XMLNames.Vehicle_VIN); }
- }
+ public string VIN => GetString(XMLNames.Vehicle_VIN);
- public string LegislativeCategory
- {
- get { return GetString(XMLNames.Bus_LegislativeCategory); }
- }
+ public string LegislativeCategory => GetString(XMLNames.Bus_LegislativeCategory);
- public VehicleCategory VehicleCategory
- {
- get { return VehicleCategoryHelper.Parse(GetString("ChassisConfiguration")); }
- }
+ public VehicleCategory VehicleCategory => VehicleCategoryHelper.Parse(GetString("ChassisConfiguration"));
- public AxleConfiguration AxleConfiguration
- {
- get { return AxleConfigurationHelper.Parse(GetString(XMLNames.Vehicle_AxleConfiguration)); }
- }
+ public AxleConfiguration AxleConfiguration => AxleConfigurationHelper.Parse(GetString(XMLNames.Vehicle_AxleConfiguration));
//TechnicalPermissibleMaximumLadenMass
- public Kilogram GrossVehicleMassRating
- {
- get { return GetDouble(XMLNames.TPMLM).SI<Kilogram>(); }
- }
+ public Kilogram GrossVehicleMassRating => GetDouble(XMLNames.TPMLM).SI<Kilogram>();
//IdlingSpeed
- public PerSecond EngineIdleSpeed
- {
- get { return GetDouble(XMLNames.Engine_IdlingSpeed).RPMtoRad(); }
- }
+ public PerSecond EngineIdleSpeed => GetDouble(XMLNames.Engine_IdlingSpeed).RPMtoRad();
- public RetarderType RetarderType
- {
- get { return GetString(XMLNames.Vehicle_RetarderType).ParseEnum<RetarderType>(); }
- }
+ public RetarderType RetarderType => GetString(XMLNames.Vehicle_RetarderType).ParseEnum<RetarderType>();
- public double RetarderRatio
- {
- get { return GetDouble(XMLNames.Vehicle_RetarderRatio); }
- }
+ public double RetarderRatio => GetDouble(XMLNames.Vehicle_RetarderRatio);
- public AngledriveType AngledriveType
- {
- get { return GetString(XMLNames.Vehicle_AngledriveType).ParseEnum<AngledriveType>(); }
- }
+ public AngledriveType AngledriveType => GetString(XMLNames.Vehicle_AngledriveType).ParseEnum<AngledriveType>();
- public bool ZeroEmissionVehicle
- {
- get { return GetBool(XMLNames.Vehicle_ZeroEmissionVehicle); }
- }
+ public bool ZeroEmissionVehicle => GetBool(XMLNames.Vehicle_ZeroEmissionVehicle);
- public XmlElement ADASNode
- {
- get { return _adasNode ?? (_adasNode = GetNode(XMLNames.Vehicle_ADAS, required: false) as XmlElement); }
- }
+ public XmlElement ADASNode => _adasNode ?? (_adasNode = GetNode(XMLNames.Vehicle_ADAS, required: false) as XmlElement);
public IXMLADASReader ADASReader { get; set; }
- public IAdvancedDriverAssistantSystemDeclarationInputData ADAS
- {
- get { return _adas ?? (_adas = ADASReader.ADASInputData); }
- }
+ public IAdvancedDriverAssistantSystemDeclarationInputData ADAS => _adas ?? (_adas = ADASReader.ADASInputData);
- public IList<ITorqueLimitInputData> TorqueLimits
- {
- get { return ReadTorqueLimits(); }
- }
+ public IList<ITorqueLimitInputData> TorqueLimits => ReadTorqueLimits();
public XmlElement ComponentNode
{
@@ -1052,18 +685,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public Meter EntranceHeight { get; }
- public virtual ConsumerTechnology? DoorDriveTechnology
- {
- get { return ConsumerTechnology.Unknown; }
- }
+ public virtual ConsumerTechnology? DoorDriveTechnology => ConsumerTechnology.Unknown;
public virtual VehicleDeclarationType VehicleDeclarationType { get; }
- public IVehicleComponentsDeclaration Components
- {
- get { return _components ?? (_components = ComponentReader.ComponentInputData); }
- }
+ public IVehicleComponentsDeclaration Components => _components ?? (_components = ComponentReader.ComponentInputData);
#region Non seeded Properties
@@ -1076,10 +703,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public int? NumberPassengersStandingLowerDeck { get; }
public int? NumberPassengersStandingUpperDeck { get; }
- public CubicMeter CargoVolume
- {
- get { return 0.SI<CubicMeter>(); }
- }
+ public CubicMeter CargoVolume => 0.SI<CubicMeter>();
public Kilogram CurbMassChassis { get; }
public bool VocationalVehicle { get; }
public bool SleeperCab { get; }
@@ -1093,7 +717,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public RegistrationClass? RegisteredClass { get; }
public VehicleCode? VehicleCode { get; }
public bool? LowEntry { get; }
- public bool Articulated { get { return GetBool(XMLNames.Vehicle_Articulated); } }
+ public bool Articulated => GetBool(XMLNames.Vehicle_Articulated);
public Meter Height { get; }
public Meter Length { get; }
public Meter Width { get; }
@@ -1108,15 +732,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
- protected override DataSourceType SourceType
- {
- get { return DataSourceType.XMLFile; }
- }
+ protected override DataSourceType SourceType => DataSourceType.XMLFile;
#endregion
@@ -1169,64 +787,35 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public override LegislativeClass? LegislativeClass
- {
- get
- {
- return ElementExists(XMLNames.Bus_LegislativeCategory)
- ? GetString(XMLNames.Bus_LegislativeCategory).ParseEnum<LegislativeClass>()
- : (LegislativeClass?)null;
- }
- }
-
- public override Kilogram CurbMassChassis
- {
- get
- {
- return ElementExists(XMLNames.Bus_CorrectedActualMass)
- ? GetDouble(XMLNames.Bus_CorrectedActualMass).SI<Kilogram>()
- : null;
- }
- }
-
- public override Kilogram GrossVehicleMassRating
- {
- get {
- return ElementExists(XMLNames.Vehicle_TPMLM)
- ? GetDouble(XMLNames.Vehicle_TPMLM).SI<Kilogram>()
- : null;
- }
- }
+ public override LegislativeClass? LegislativeClass =>
+ ElementExists(XMLNames.Bus_LegislativeCategory)
+ ? GetString(XMLNames.Bus_LegislativeCategory).ParseEnum<LegislativeClass>()
+ : (LegislativeClass?)null;
- public override bool? AirdragModifiedMultistage
- {
- get
- {
- return ElementExists(XMLNames.Bus_AirdragModifiedMultistage)
- ? GetBool(XMLNames.Bus_AirdragModifiedMultistage)
- : (bool?)null;
- }
- }
+ public override Kilogram CurbMassChassis =>
+ ElementExists(XMLNames.Bus_CorrectedActualMass)
+ ? GetDouble(XMLNames.Bus_CorrectedActualMass).SI<Kilogram>()
+ : null;
- public override RegistrationClass? RegisteredClass
- {
- get
- {
- return ElementExists(XMLNames.Vehicle_RegisteredClass)
- ? RegistrationClassHelper.Parse(GetString(XMLNames.Vehicle_RegisteredClass)).First()
- : null;
- }
- }
+ public override Kilogram GrossVehicleMassRating =>
+ ElementExists(XMLNames.Vehicle_TPMLM)
+ ? GetDouble(XMLNames.Vehicle_TPMLM).SI<Kilogram>()
+ : null;
- public override TankSystem? TankSystem
- {
- get
- {
- return ElementExists(XMLNames.Vehicle_NgTankSystem)
- ? EnumHelper.ParseEnum<TankSystem>(GetString(XMLNames.Vehicle_NgTankSystem))
- : (TankSystem?)null;
- }
- }
+ public override bool? AirdragModifiedMultistage =>
+ ElementExists(XMLNames.Bus_AirdragModifiedMultistage)
+ ? GetBool(XMLNames.Bus_AirdragModifiedMultistage)
+ : (bool?)null;
+
+ public override RegistrationClass? RegisteredClass =>
+ ElementExists(XMLNames.Vehicle_RegisteredClass)
+ ? RegistrationClassHelper.Parse(GetString(XMLNames.Vehicle_RegisteredClass)).First()
+ : null;
+
+ public override TankSystem? TankSystem =>
+ ElementExists(XMLNames.Vehicle_NgTankSystem)
+ ? EnumHelper.ParseEnum<TankSystem>(GetString(XMLNames.Vehicle_NgTankSystem))
+ : (TankSystem?)null;
public override int? NumberPassengerSeatsLowerDeck
@@ -1275,89 +864,45 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
- public override VehicleCode? VehicleCode
- {
- get
- {
- return ElementExists(XMLNames.Vehicle_BodyworkCode)
- ? GetString(XMLNames.Vehicle_BodyworkCode).ParseEnum<VehicleCode>()
- : (VehicleCode?)null;
- }
- }
+ public override VehicleCode? VehicleCode =>
+ ElementExists(XMLNames.Vehicle_BodyworkCode)
+ ? GetString(XMLNames.Vehicle_BodyworkCode).ParseEnum<VehicleCode>()
+ : (VehicleCode?)null;
- public override bool? LowEntry
- {
- get
- {
- return ElementExists(XMLNames.Bus_LowEntry)
- ? GetBool(XMLNames.Bus_LowEntry)
- : (bool?)null;
- }
- }
+ public override bool? LowEntry =>
+ ElementExists(XMLNames.Bus_LowEntry)
+ ? GetBool(XMLNames.Bus_LowEntry)
+ : (bool?)null;
- public override Meter Height
- {
- get
- {
- return ElementExists(XMLNames.Bus_HeighIntegratedBody)
- ? GetDouble(XMLNames.Bus_HeighIntegratedBody).SI(Unit.SI.Milli.Meter).Cast<Meter>()
- : null;
- }
- }
+ public override Meter Height =>
+ ElementExists(XMLNames.Bus_HeighIntegratedBody)
+ ? GetDouble(XMLNames.Bus_HeighIntegratedBody).SI(Unit.SI.Milli.Meter).Cast<Meter>()
+ : null;
- public override Meter Length
- {
- get
- {
- return ElementExists(XMLNames.Bus_VehicleLength)
- ? GetDouble(XMLNames.Bus_VehicleLength).SI(Unit.SI.Milli.Meter).Cast<Meter>()
- : null;
- }
- }
+ public override Meter Length =>
+ ElementExists(XMLNames.Bus_VehicleLength)
+ ? GetDouble(XMLNames.Bus_VehicleLength).SI(Unit.SI.Milli.Meter).Cast<Meter>()
+ : null;
- public override Meter Width
- {
- get
- {
- return ElementExists(XMLNames.Bus_VehicleWidth)
- ? GetDouble(XMLNames.Bus_VehicleWidth).SI(Unit.SI.Milli.Meter).Cast<Meter>()
- : null;
- }
- }
+ public override Meter Width =>
+ ElementExists(XMLNames.Bus_VehicleWidth)
+ ? GetDouble(XMLNames.Bus_VehicleWidth).SI(Unit.SI.Milli.Meter).Cast<Meter>()
+ : null;
- public override Meter EntranceHeight
- {
- get
- {
- return ElementExists(XMLNames.Bus_EntranceHeight)
- ? GetDouble(XMLNames.Bus_EntranceHeight).SI(Unit.SI.Milli.Meter).Cast<Meter>()
- : null;
- }
- }
+ public override Meter EntranceHeight =>
+ ElementExists(XMLNames.Bus_EntranceHeight)
+ ? GetDouble(XMLNames.Bus_EntranceHeight).SI(Unit.SI.Milli.Meter).Cast<Meter>()
+ : null;
- public override ConsumerTechnology? DoorDriveTechnology
- {
- get
- {
- return ElementExists(XMLNames.BusAux_PneumaticSystem_DoorDriveTechnology)
- ? ConsumerTechnologyHelper.Parse(GetString(XMLNames.BusAux_PneumaticSystem_DoorDriveTechnology))
- : (ConsumerTechnology?)null;
- }
- }
+ public override ConsumerTechnology? DoorDriveTechnology =>
+ ElementExists(XMLNames.BusAux_PneumaticSystem_DoorDriveTechnology)
+ ? ConsumerTechnologyHelper.Parse(GetString(XMLNames.BusAux_PneumaticSystem_DoorDriveTechnology))
+ : (ConsumerTechnology?)null;
- public override VehicleDeclarationType VehicleDeclarationType
- {
- get { return VehicleDeclarationTypeHelper.Parse(GetString(XMLNames.Bus_VehicleDeclarationType)); }
- }
+ public override VehicleDeclarationType VehicleDeclarationType => VehicleDeclarationTypeHelper.Parse(GetString(XMLNames.Bus_VehicleDeclarationType));
- public override XmlElement ADASNode
- {
- get
- {
- return _adasNode ?? (_adasNode = GetNode(XMLNames.Vehicle_ADAS, required: false) as XmlElement);
- }
- }
+ public override XmlElement ADASNode => _adasNode ?? (_adasNode = GetNode(XMLNames.Vehicle_ADAS, required: false) as XmlElement);
public override XmlElement ComponentNode
@@ -1401,26 +946,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public override XmlElement PTONode
- {
- get { return null; }
- }
+ public override XmlElement PTONode => null;
+ #region Overrides of AbstractXMLResource
+ protected override DataSourceType SourceType => DataSourceType.XMLFile;
- #region Overrides of AbstractXMLResource
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
- protected override DataSourceType SourceType
- {
- get { return DataSourceType.XMLFile; }
- }
-
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
-
#endregion
}
@@ -1439,54 +973,29 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
: base(jobData, xmlNode, sourceFile) {}
- public override string Model
- {
- get
- {
- return ElementExists(XMLNames.Component_Model)
- ? GetString(XMLNames.Component_Model) : null;
- }
- }
+ public override string Model =>
+ ElementExists(XMLNames.Component_Model)
+ ? GetString(XMLNames.Component_Model) : null;
- public override LegislativeClass? LegislativeClass
- {
- get
- {
- return ElementExists(XMLNames.Bus_LegislativeCategory)
- ? GetString(XMLNames.Bus_LegislativeCategory).ParseEnum<LegislativeClass>()
- : (LegislativeClass?)null;
- }
- }
+ public override LegislativeClass? LegislativeClass =>
+ ElementExists(XMLNames.Bus_LegislativeCategory)
+ ? GetString(XMLNames.Bus_LegislativeCategory).ParseEnum<LegislativeClass>()
+ : (LegislativeClass?)null;
- public override Kilogram CurbMassChassis
- {
- get
- {
- return ElementExists(XMLNames.Bus_CorrectedActualMass)
- ? GetDouble(XMLNames.Bus_CorrectedActualMass).SI<Kilogram>()
- : null;
- }
- }
+ public override Kilogram CurbMassChassis =>
+ ElementExists(XMLNames.Bus_CorrectedActualMass)
+ ? GetDouble(XMLNames.Bus_CorrectedActualMass).SI<Kilogram>()
+ : null;
- public override Kilogram GrossVehicleMassRating
- {
- get
- {
- return ElementExists(XMLNames.Vehicle_TPMLM)
- ? GetDouble(XMLNames.Vehicle_TPMLM).SI<Kilogram>()
- : null;
- }
- }
-
- public override RegistrationClass? RegisteredClass
- {
- get
- {
- return ElementExists(XMLNames.Vehicle_RegisteredClass)
- ? RegistrationClassHelper.Parse(GetString(XMLNames.Vehicle_RegisteredClass)).First()
- : null;
- }
- }
+ public override Kilogram GrossVehicleMassRating =>
+ ElementExists(XMLNames.Vehicle_TPMLM)
+ ? GetDouble(XMLNames.Vehicle_TPMLM).SI<Kilogram>()
+ : null;
+
+ public override RegistrationClass? RegisteredClass =>
+ ElementExists(XMLNames.Vehicle_RegisteredClass)
+ ? RegistrationClassHelper.Parse(GetString(XMLNames.Vehicle_RegisteredClass)).First()
+ : null;
public override int? NumberPassengerSeatsLowerDeck
{
@@ -1510,63 +1019,32 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public override VehicleCode? VehicleCode
- {
- get
- {
- return ElementExists(XMLNames.Vehicle_BodyworkCode)
- ? GetString(XMLNames.Vehicle_BodyworkCode).ParseEnum<VehicleCode>()
- : (VehicleCode?)null;
- }
- }
+ public override VehicleCode? VehicleCode =>
+ ElementExists(XMLNames.Vehicle_BodyworkCode)
+ ? GetString(XMLNames.Vehicle_BodyworkCode).ParseEnum<VehicleCode>()
+ : (VehicleCode?)null;
- public override bool? LowEntry
- {
- get
- {
- return ElementExists(XMLNames.Bus_LowEntry)
- ? GetBool(XMLNames.Bus_LowEntry)
- : (bool?)null;
- }
- }
+ public override bool? LowEntry =>
+ ElementExists(XMLNames.Bus_LowEntry)
+ ? GetBool(XMLNames.Bus_LowEntry)
+ : (bool?)null;
- public override Meter Height
- {
- get
- {
- return ElementExists(XMLNames.Bus_HeighIntegratedBody)
- ? GetDouble(XMLNames.Bus_HeighIntegratedBody).SI(Unit.SI.Milli.Meter).Cast<Meter>()
- : null;
- }
- }
-
- public override XmlElement PTONode
- {
- get { return null; }
- }
+ public override Meter Height =>
+ ElementExists(XMLNames.Bus_HeighIntegratedBody)
+ ? GetDouble(XMLNames.Bus_HeighIntegratedBody).SI(Unit.SI.Milli.Meter).Cast<Meter>()
+ : null;
- public override XmlElement ComponentNode
- {
- get{ return null; }
- }
+ public override XmlElement PTONode => null;
- public override IVehicleComponentsDeclaration Components
- {
- get { return null; }
- }
+ public override XmlElement ComponentNode => null;
- #region Overrides of AbstractXMLResource
+ public override IVehicleComponentsDeclaration Components => null;
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ #region Overrides of AbstractXMLResource
- protected override DataSourceType SourceType
- {
- get { return DataSourceType.XMLFile; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+ protected override DataSourceType SourceType => DataSourceType.XMLFile;
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLGearData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLGearData.cs
index 6a13d75d4bc3e7ad2faaf9597ad82006eaf8bad0..44a39085ca37faef4c22000be90398cc123d6091 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLGearData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLGearData.cs
@@ -54,33 +54,22 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public virtual string SourceFile { get; }
- public virtual DataSource DataSource
- {
- get {
- return _dataSource ?? (_dataSource = new DataSource() {
- SourceFile = SourceFile,
- SourceType = DataSourceType.XMLEmbedded,
- SourceVersion = XMLHelper.GetVersionFromNamespaceUri(SchemaNamespace)
- });
- }
- }
+ public virtual DataSource DataSource =>
+ _dataSource ?? (_dataSource = new DataSource() {
+ SourceFile = SourceFile,
+ SourceType = DataSourceType.XMLEmbedded,
+ SourceVersion = XMLHelper.GetVersionFromNamespaceUri(SchemaNamespace)
+ });
protected abstract XNamespace SchemaNamespace { get; }
#region Implementation of ITransmissionInputData
- public virtual int Gear
- {
- get {
- return XmlConvert.ToUInt16(
- BaseNode.Attributes?.GetNamedItem(XMLNames.Gearbox_Gear_GearNumber_Attr).InnerText ?? "0");
- }
- }
+ public virtual int Gear =>
+ XmlConvert.ToUInt16(
+ BaseNode.Attributes?.GetNamedItem(XMLNames.Gearbox_Gear_GearNumber_Attr).InnerText ?? "0");
- public virtual double Ratio
- {
- get { return GetString(XMLNames.Gearbox_Gear_Ratio).ToDouble(double.NaN); }
- }
+ public virtual double Ratio => GetString(XMLNames.Gearbox_Gear_Ratio).ToDouble(double.NaN);
public virtual TableData LossMap
{
@@ -91,25 +80,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public virtual double Efficiency
- {
- get { return double.NaN; }
- }
+ public virtual double Efficiency => double.NaN;
- public virtual NewtonMeter MaxTorque
- {
- get { return GetNode(XMLNames.Gearbox_Gears_MaxTorque, required: false)?.InnerText.ToDouble().SI<NewtonMeter>(); }
- }
+ public virtual NewtonMeter MaxTorque => GetNode(XMLNames.Gearbox_Gears_MaxTorque, required: false)?.InnerText.ToDouble().SI<NewtonMeter>();
- public virtual PerSecond MaxInputSpeed
- {
- get { return GetNode(XMLNames.Gearbox_Gear_MaxSpeed, required: false)?.InnerText.ToDouble().RPMtoRad(); }
- }
+ public virtual PerSecond MaxInputSpeed => GetNode(XMLNames.Gearbox_Gear_MaxSpeed, required: false)?.InnerText.ToDouble().RPMtoRad();
- public virtual TableData ShiftPolygon
- {
- get { return null; }
- }
+ public virtual TableData ShiftPolygon => null;
#endregion
}
@@ -128,10 +105,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of XMLAbstractGearData
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
#endregion
}
@@ -149,10 +123,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLGearDataV20(XmlNode gearNode, string sourceFile) : base(gearNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
@@ -169,10 +140,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLMultistagePrimaryVehicleBusTransmissionDataV01(XmlNode gearNode, string sourceFile)
: base(gearNode, sourceFile) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLADASReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLADASReader.cs
index 614537eb1166b186488a91af28e15aa49a5b0f2b..056042ee81e2209d64c64081500ec5059b83a58a 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLADASReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLADASReader.cs
@@ -63,10 +63,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
#region Implementation of IXMLADASReader
- public virtual IAdvancedDriverAssistantSystemDeclarationInputData ADASInputData
- {
- get { return _adas ?? (_adas = CreateComponent(XMLNames.Vehicle_ADAS, ADASCreator)); }
- }
+ public virtual IAdvancedDriverAssistantSystemDeclarationInputData ADASInputData => _adas ?? (_adas = CreateComponent(XMLNames.Vehicle_ADAS, ADASCreator));
#endregion
@@ -79,10 +76,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
return Factory.CreateADASData(version, Vehicle, componentNode, sourceFile);
}
- public virtual XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ public virtual XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -99,15 +93,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public XMLADASReaderV20(IXMLDeclarationVehicleData vehicle, XmlNode vehicleNode) : base(
vehicle, vehicleNode) { }
- public override IAdvancedDriverAssistantSystemDeclarationInputData ADASInputData
- {
- get { return _adas ?? (_adas = CreateComponent(XMLNames.Vehicle_ADAS, ADASCreator, true)); }
- }
+ public override IAdvancedDriverAssistantSystemDeclarationInputData ADASInputData => _adas ?? (_adas = CreateComponent(XMLNames.Vehicle_ADAS, ADASCreator, true));
- public override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ public override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -123,10 +111,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public XMLADASReaderV21(IXMLDeclarationVehicleData vehicle, XmlNode vehicleNode) : base(
vehicle, vehicleNode) { }
- public override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ public override XNamespace SchemaNamespace => NAMESPACE_URI;
}
// ---------------------------------------------------------------------------------------
@@ -143,9 +128,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
vehicle, vehicleNode)
{ }
- public override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ public override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
index d7c7189f171db6b35ded6ffc9f5acd5ab976c902..a533e17847522120fbc05311db4ad8e9d45b6b33 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
@@ -91,26 +91,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
#region Implementation of IXMLComponentReader
- public virtual IVehicleComponentsDeclaration ComponentInputData
- {
- get { return _components ?? (_components = CreateComponent(XMLNames.Vehicle_Components, ComponentsCreator)); }
- }
+ public virtual IVehicleComponentsDeclaration ComponentInputData => _components ?? (_components = CreateComponent(XMLNames.Vehicle_Components, ComponentsCreator));
- public virtual IAirdragDeclarationInputData AirdragInputData
- {
- get
- {
- return _airdragInputData ?? (_airdragInputData = CreateComponent(XMLNames.Component_AirDrag, AirdragCreator, true));
- }
- }
+ public virtual IAirdragDeclarationInputData AirdragInputData => _airdragInputData ?? (_airdragInputData = CreateComponent(XMLNames.Component_AirDrag, AirdragCreator, true));
- public virtual IGearboxDeclarationInputData GearboxInputData
- {
- get
- {
- return _gearboxInputData ?? (_gearboxInputData = CreateComponent(XMLNames.Component_Gearbox, GearboxCreator));
- }
- }
+ public virtual IGearboxDeclarationInputData GearboxInputData => _gearboxInputData ?? (_gearboxInputData = CreateComponent(XMLNames.Component_Gearbox, GearboxCreator));
public virtual ITorqueConverterDeclarationInputData TorqueConverterInputData
{
@@ -125,7 +110,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
}
}
- public virtual IBusAuxiliariesDeclarationData BusAuxiliariesInputData { get { return null; } }
+ public virtual IBusAuxiliariesDeclarationData BusAuxiliariesInputData => null;
public virtual ITransmissionInputData CreateGear(XmlNode gearNode)
{
@@ -173,62 +158,29 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
}
- public virtual IAxleGearInputData AxleGearInputData
- {
- get
- {
- return _axlegearInputData ?? (_axlegearInputData = CreateComponent(XMLNames.Component_Axlegear, AxlegearCreator));
- }
- }
+ public virtual IAxleGearInputData AxleGearInputData => _axlegearInputData ?? (_axlegearInputData = CreateComponent(XMLNames.Component_Axlegear, AxlegearCreator));
- public virtual IAngledriveInputData AngledriveInputData
- {
- get
- {
- return _angledriveInputData ??
- (_angledriveInputData = CreateComponent(XMLNames.Component_Angledrive, AngledriveCreator, true));
- }
- }
+ public virtual IAngledriveInputData AngledriveInputData =>
+ _angledriveInputData ??
+ (_angledriveInputData = CreateComponent(XMLNames.Component_Angledrive, AngledriveCreator, true));
- public virtual IEngineDeclarationInputData EngineInputData
- {
- get { return _engineInputData ?? (_engineInputData = CreateComponent(XMLNames.Component_Engine, EngineCreator)); }
- }
+ public virtual IEngineDeclarationInputData EngineInputData => _engineInputData ?? (_engineInputData = CreateComponent(XMLNames.Component_Engine, EngineCreator));
- public virtual IAuxiliariesDeclarationInputData AuxiliaryData
- {
- get
- {
- return _auxiliaryInputData ??
- (_auxiliaryInputData = CreateComponent(XMLNames.Component_Auxiliaries, AuxiliaryCreator));
- }
- }
+ public virtual IAuxiliariesDeclarationInputData AuxiliaryData =>
+ _auxiliaryInputData ??
+ (_auxiliaryInputData = CreateComponent(XMLNames.Component_Auxiliaries, AuxiliaryCreator));
- public virtual IRetarderInputData RetarderInputData
- {
- get
- {
- return _retarderInputData ??
- (_retarderInputData = CreateComponent(XMLNames.Component_Retarder, RetarderCreator, true));
- }
- }
+ public virtual IRetarderInputData RetarderInputData =>
+ _retarderInputData ??
+ (_retarderInputData = CreateComponent(XMLNames.Component_Retarder, RetarderCreator, true));
- public virtual IAxlesDeclarationInputData AxlesDeclarationInputData
- {
- get
- {
- return _axlesInputData ?? (_axlesInputData = CreateComponent(XMLNames.Component_AxleWheels, AxleWheelsCreator));
- }
- }
+ public virtual IAxlesDeclarationInputData AxlesDeclarationInputData => _axlesInputData ?? (_axlesInputData = CreateComponent(XMLNames.Component_AxleWheels, AxleWheelsCreator));
- public virtual ITyreDeclarationInputData Tyre
- {
- get { return CreateComponent(XMLNames.AxleWheels_Axles_Axle_Tyre, TyreCreator); }
- }
+ public virtual ITyreDeclarationInputData Tyre => CreateComponent(XMLNames.AxleWheels_Axles_Axle_Tyre, TyreCreator);
#endregion
@@ -384,7 +336,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
vehicle, componentsNode)
{ }
- public override IBusAuxiliariesDeclarationData BusAuxiliariesInputData { get { return _busAuxInputData ?? (_busAuxInputData = CreateComponent(XMLNames.Component_Auxiliaries, BusAuxCreator)); } }
+ public override IBusAuxiliariesDeclarationData BusAuxiliariesInputData => _busAuxInputData ?? (_busAuxInputData = CreateComponent(XMLNames.Component_Auxiliaries, BusAuxCreator));
protected virtual IBusAuxiliariesDeclarationData BusAuxCreator(string version, XmlNode componentNode, string sourceFile)
{
@@ -411,33 +363,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public XMLMultistagePrimaryVehicleBusComponentReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode)
: base(vehicle, componentsNode) { }
- public override IGearboxDeclarationInputData GearboxInputData
- {
- get
- {
- return _gearboxInputData ?? (_gearboxInputData = CreateComponent(XMLNames.Component_Transmission, GearboxCreator));
- }
- }
+ public override IGearboxDeclarationInputData GearboxInputData => _gearboxInputData ?? (_gearboxInputData = CreateComponent(XMLNames.Component_Transmission, GearboxCreator));
- public override IRetarderInputData RetarderInputData
- {
- get { return null; }
- }
+ public override IRetarderInputData RetarderInputData => null;
- public override IAirdragDeclarationInputData AirdragInputData
- {
- get { return null; }
- }
+ public override IAirdragDeclarationInputData AirdragInputData => null;
- public override IAuxiliariesDeclarationInputData AuxiliaryData
- {
- get { return null; }
- }
+ public override IAuxiliariesDeclarationInputData AuxiliaryData => null;
- public override IBusAuxiliariesDeclarationData BusAuxiliariesInputData
- {
- get { return _busAuxInputData ?? (_busAuxInputData = CreateComponent(XMLNames.Component_Auxiliaries, BusAuxCreator)); }
- }
+ public override IBusAuxiliariesDeclarationData BusAuxiliariesInputData => _busAuxInputData ?? (_busAuxInputData = CreateComponent(XMLNames.Component_Auxiliaries, BusAuxCreator));
protected virtual IBusAuxiliariesDeclarationData BusAuxCreator(string version, XmlNode componentNode, string sourceFile)
{
@@ -463,7 +397,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
#region Overrides of XMLComponentReaderV10
- public override IAxleGearInputData AxleGearInputData { get { return null; } }
+ public override IAxleGearInputData AxleGearInputData => null;
#endregion
}
@@ -506,64 +440,29 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
}
- public override IAngledriveInputData AngledriveInputData
- {
- get { return null; }
- }
+ public override IAngledriveInputData AngledriveInputData => null;
- public override IAxleGearInputData AxleGearInputData
- {
- get { return null; }
- }
+ public override IAxleGearInputData AxleGearInputData => null;
- public override IAxlesDeclarationInputData AxlesDeclarationInputData
- {
- get { return null; }
- }
+ public override IAxlesDeclarationInputData AxlesDeclarationInputData => null;
- public override IEngineDeclarationInputData EngineInputData
- {
- get { return null; }
- }
+ public override IEngineDeclarationInputData EngineInputData => null;
- public override IGearboxDeclarationInputData GearboxInputData
- {
- get { return null; }
- }
+ public override IGearboxDeclarationInputData GearboxInputData => null;
- public override ITorqueConverterDeclarationInputData TorqueConverterInputData
- {
- get { return null; }
- }
+ public override ITorqueConverterDeclarationInputData TorqueConverterInputData => null;
- public override ITyreDeclarationInputData Tyre
- {
- get { return null; }
- }
+ public override ITyreDeclarationInputData Tyre => null;
- public override IRetarderInputData RetarderInputData
- {
- get { return null; }
- }
+ public override IRetarderInputData RetarderInputData => null;
- public override IAuxiliariesDeclarationInputData AuxiliaryData
- {
- get { return null; }
- }
+ public override IAuxiliariesDeclarationInputData AuxiliaryData => null;
- public override IAirdragDeclarationInputData AirdragInputData
- {
- get
- {
- return _airdragInputData ??
- (_airdragInputData = CreateComponent(XMLNames.Component_AirDrag, AirdragCreator));
- }
- }
-
- public override IBusAuxiliariesDeclarationData BusAuxiliariesInputData
- {
- get { return _busAuxInputData ?? (_busAuxInputData = CreateComponent(XMLNames.Component_Auxiliaries, BusAuxCreator)); }
- }
+ public override IAirdragDeclarationInputData AirdragInputData =>
+ _airdragInputData ??
+ (_airdragInputData = CreateComponent(XMLNames.Component_AirDrag, AirdragCreator));
+
+ public override IBusAuxiliariesDeclarationData BusAuxiliariesInputData => _busAuxInputData ?? (_busAuxInputData = CreateComponent(XMLNames.Component_Auxiliaries, BusAuxCreator));
protected virtual IBusAuxiliariesDeclarationData BusAuxCreator(string version, XmlNode componentNode, string sourceFile)
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs
index 83f3379d34e424ef3c58988674c44da604027275..53508442353bedc68f3195a79a155685bf28601b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs
@@ -65,10 +65,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
#region Implementation of IXMLDeclarationInputReader
- public virtual IDeclarationJobInputData JobData
- {
- get { return _jobData ?? (_jobData = CreateComponent(XMLNames.VectoInputDeclaration, JobCreator)); }
- }
+ public virtual IDeclarationJobInputData JobData => _jobData ?? (_jobData = CreateComponent(XMLNames.VectoInputDeclaration, JobCreator));
#endregion
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
index aca0d0a9e7f3ca929114984d2e52b9c9455e3bf2..2aa24cd7ccf787f928c97ba2e8c4eeeb8196dda4 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -42,10 +42,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
InputData = inputData;
}
- public IDeclarationMultistageJobInputData JobData
- {
- get { return _jobData ?? (_jobData = CreateComponent(XMLNames.VectoOutputMultistage, JobCreator)); }
- }
+ public IDeclarationMultistageJobInputData JobData => _jobData ?? (_jobData = CreateComponent(XMLNames.VectoOutputMultistage, JobCreator));
protected virtual IDeclarationMultistageJobInputData JobCreator(string version, XmlNode node, string arg3)
{
@@ -85,10 +82,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
SetManufacturingStageNodes();
}
- public IPrimaryVehicleInformationInputDataProvider PrimaryVehicle
- {
- get { return _primaryVehicle ?? (_primaryVehicle = CreateComponent(XMLNames.Bus_PrimaryVehicle, PrimaryVehicleCreator)); }
- }
+ public IPrimaryVehicleInformationInputDataProvider PrimaryVehicle => _primaryVehicle ?? (_primaryVehicle = CreateComponent(XMLNames.Bus_PrimaryVehicle, PrimaryVehicleCreator));
protected IPrimaryVehicleInformationInputDataProvider PrimaryVehicleCreator(string version, XmlNode node,
string arg3)
@@ -140,10 +134,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
}
}
- public VectoSimulationJobType JobType
- {
- get { return InputData.JobType; }
- }
+ public VectoSimulationJobType JobType => InputData.JobType;
public bool InputComplete
{
@@ -197,10 +188,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
_multistageData = multistageData;
}
- public IVehicleDeclarationInputData Vehicle
- {
- get { return _vehicle ?? (_vehicle = CreateComponent(XMLNames.Tag_Vehicle, VehicleCreator)); }
- }
+ public IVehicleDeclarationInputData Vehicle => _vehicle ?? (_vehicle = CreateComponent(XMLNames.Tag_Vehicle, VehicleCreator));
private IVehicleDeclarationInputData VehicleCreator(string version, XmlNode node, string arg3)
{
@@ -215,14 +203,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
return vehicle;
}
- public IApplicationInformation ApplicationInformation
- {
- get
- {
- return _applicationInformation ??
- (_applicationInformation = CreateComponent(XMLNames.Tag_ApplicationInformation, ApplicationCreator));
- }
- }
+ public IApplicationInformation ApplicationInformation =>
+ _applicationInformation ??
+ (_applicationInformation = CreateComponent(XMLNames.Tag_ApplicationInformation, ApplicationCreator));
protected IApplicationInformation ApplicationCreator(string version, XmlNode node, string agr3)
{
@@ -263,13 +246,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
_primaryInputData = inputData;
}
- public virtual IDeclarationJobInputData JobData
- {
- get
- {
- return _jobData ?? (_jobData = CreateComponent(XMLNames.Tag_Vehicle, JobCreator));
- }
- }
+ public virtual IDeclarationJobInputData JobData => _jobData ?? (_jobData = CreateComponent(XMLNames.Tag_Vehicle, JobCreator));
protected IDeclarationJobInputData JobCreator(string version, XmlNode node, string arg3)
@@ -280,14 +257,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
return job;
}
- public IResultsInputData ResultsInputData
- {
- get
- {
- return _resultsInputData ??
- (_resultsInputData = CreateComponent(XMLNames.Report_Results, ResultsInputDataCreator));
- }
- }
+ public IResultsInputData ResultsInputData =>
+ _resultsInputData ??
+ (_resultsInputData = CreateComponent(XMLNames.Report_Results, ResultsInputDataCreator));
protected IResultsInputData ResultsInputDataCreator(string version, XmlNode node, string arg3)
{
@@ -304,14 +276,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
return Factory.CreateApplicationInformationReader(version, node);
}
- public IApplicationInformation ApplicationInformation
- {
- get
- {
- return _applicationInformation ??
- (_applicationInformation = CreateComponent(XMLNames.Tag_ApplicationInformation, ApplicationCreator));
- }
- }
+ public IApplicationInformation ApplicationInformation =>
+ _applicationInformation ??
+ (_applicationInformation = CreateComponent(XMLNames.Tag_ApplicationInformation, ApplicationCreator));
}
// ---------------------------------------------------------------------------------------
@@ -389,30 +356,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
_primaryVehicle = primaryVehicle;
}
- public DigestData HashPreviousStage
- {
- get { return _manufacturingStages.First().HashPreviousStage; }
- }
+ public DigestData HashPreviousStage => _manufacturingStages.First().HashPreviousStage;
- public int StageCount
- {
- get { return _manufacturingStages.First().StageCount; }
- }
+ public int StageCount => _manufacturingStages.First().StageCount;
- public IVehicleDeclarationInputData Vehicle
- {
- get { return GetConsolidatedVehicleData(); }
- }
+ public IVehicleDeclarationInputData Vehicle => GetConsolidatedVehicleData();
- public IApplicationInformation ApplicationInformation
- {
- get { return _manufacturingStages.First().ApplicationInformation; }
- }
+ public IApplicationInformation ApplicationInformation => _manufacturingStages.First().ApplicationInformation;
- public DigestData Signature
- {
- get { return _manufacturingStages.First().Signature; }
- }
+ public DigestData Signature => _manufacturingStages.First().Signature;
public override bool IsInputDataComplete(VectoSimulationJobType jobType)
{
@@ -448,142 +400,60 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
#region ManufacturingStage mandatory properties
- public string Manufacturer
- {
- get { return _manufacturingStages.First().Vehicle.Manufacturer; }
- }
+ public string Manufacturer => _manufacturingStages.First().Vehicle.Manufacturer;
- public string ManufacturerAddress
- {
- get { return _manufacturingStages.First().Vehicle.ManufacturerAddress; }
- }
-
- public DateTime Date
- {
- get { return _manufacturingStages.First().Vehicle.Date; }
- }
+ public string ManufacturerAddress => _manufacturingStages.First().Vehicle.ManufacturerAddress;
- public string VIN
- {
- get { return _manufacturingStages.First().Vehicle.VIN; }
- }
+ public DateTime Date => _manufacturingStages.First().Vehicle.Date;
- public string LegislativeCategory
- {
- get { return null; }
- }
+ public string VIN => _manufacturingStages.First().Vehicle.VIN;
- public VehicleDeclarationType VehicleDeclarationType
- {
- get { return _manufacturingStages.First().Vehicle.VehicleDeclarationType; }
- }
+ public string LegislativeCategory => null;
+
+ public VehicleDeclarationType VehicleDeclarationType => _manufacturingStages.First().Vehicle.VehicleDeclarationType;
#endregion
#region ManufacturingStage optional properties
- public string Model
- {
- get { return GetVehiclePropertyValue<string>(nameof(Model)); }
- }
+ public string Model => GetVehiclePropertyValue<string>(nameof(Model));
- public LegislativeClass? LegislativeClass
- {
- get { return GetVehiclePropertyValue<LegislativeClass?>(nameof(LegislativeClass)); }
- }
+ public LegislativeClass? LegislativeClass => GetVehiclePropertyValue<LegislativeClass?>(nameof(LegislativeClass));
- public Kilogram CurbMassChassis
- {
- get { return GetVehiclePropertyValue<Kilogram>(nameof(CurbMassChassis)); }
- }
+ public Kilogram CurbMassChassis => GetVehiclePropertyValue<Kilogram>(nameof(CurbMassChassis));
- public Kilogram GrossVehicleMassRating
- {
- get
- {
- return GetVehiclePropertyValue<Kilogram>(nameof(GrossVehicleMassRating));
- }
- }
+ public Kilogram GrossVehicleMassRating => GetVehiclePropertyValue<Kilogram>(nameof(GrossVehicleMassRating));
- public bool? AirdragModifiedMultistage
- {
- get
- {
- return GetVehiclePropertyValue<bool?>(nameof(AirdragModifiedMultistage));
- }
- }
+ public bool? AirdragModifiedMultistage => GetVehiclePropertyValue<bool?>(nameof(AirdragModifiedMultistage));
- public TankSystem? TankSystem
- {
- get { return GetVehiclePropertyValue<TankSystem?>(nameof(TankSystem)); }
- }
+ public TankSystem? TankSystem => GetVehiclePropertyValue<TankSystem?>(nameof(TankSystem));
- public RegistrationClass? RegisteredClass
- {
- get { return GetVehiclePropertyValue<RegistrationClass?>(nameof(RegisteredClass)); }
- }
+ public RegistrationClass? RegisteredClass => GetVehiclePropertyValue<RegistrationClass?>(nameof(RegisteredClass));
- public int? NumberPassengerSeatsUpperDeck
- {
- get { return GetVehiclePropertyValue<int?>(nameof(NumberPassengerSeatsUpperDeck)); }
- }
+ public int? NumberPassengerSeatsUpperDeck => GetVehiclePropertyValue<int?>(nameof(NumberPassengerSeatsUpperDeck));
- public int? NumberPassengerSeatsLowerDeck
- {
- get { return GetVehiclePropertyValue<int?>(nameof(NumberPassengerSeatsLowerDeck)); }
- }
+ public int? NumberPassengerSeatsLowerDeck => GetVehiclePropertyValue<int?>(nameof(NumberPassengerSeatsLowerDeck));
- public int? NumberPassengersStandingLowerDeck
- {
- get { return GetVehiclePropertyValue<int?>(nameof(NumberPassengersStandingLowerDeck)); }
- }
+ public int? NumberPassengersStandingLowerDeck => GetVehiclePropertyValue<int?>(nameof(NumberPassengersStandingLowerDeck));
- public int? NumberPassengersStandingUpperDeck
- {
- get { return GetVehiclePropertyValue<int?>(nameof(NumberPassengersStandingUpperDeck)); }
- }
+ public int? NumberPassengersStandingUpperDeck => GetVehiclePropertyValue<int?>(nameof(NumberPassengersStandingUpperDeck));
- public VehicleCode? VehicleCode
- {
- get { return GetVehiclePropertyValue<VehicleCode?>(nameof(VehicleCode)); }
- }
+ public VehicleCode? VehicleCode => GetVehiclePropertyValue<VehicleCode?>(nameof(VehicleCode));
- public bool? LowEntry
- {
- get { return GetVehiclePropertyValue<bool?>(nameof(LowEntry)); }
- }
+ public bool? LowEntry => GetVehiclePropertyValue<bool?>(nameof(LowEntry));
- public Meter Height
- {
- get { return GetVehiclePropertyValue<Meter>(nameof(Height)); }
- }
+ public Meter Height => GetVehiclePropertyValue<Meter>(nameof(Height));
- public Meter Length
- {
- get { return GetVehiclePropertyValue<Meter>(nameof(Length)); }
- }
+ public Meter Length => GetVehiclePropertyValue<Meter>(nameof(Length));
- public Meter Width
- {
- get { return GetVehiclePropertyValue<Meter>(nameof(Width)); }
- }
+ public Meter Width => GetVehiclePropertyValue<Meter>(nameof(Width));
- public Meter EntranceHeight
- {
- get { return GetVehiclePropertyValue<Meter>(nameof(EntranceHeight)); }
- }
+ public Meter EntranceHeight => GetVehiclePropertyValue<Meter>(nameof(EntranceHeight));
- public ConsumerTechnology? DoorDriveTechnology
- {
- get { return GetVehiclePropertyValue<ConsumerTechnology?>(nameof(DoorDriveTechnology)); }
+ public ConsumerTechnology? DoorDriveTechnology => GetVehiclePropertyValue<ConsumerTechnology?>(nameof(DoorDriveTechnology));
- }
-
- public IAdvancedDriverAssistantSystemDeclarationInputData ADAS
- {
- get { return GetADAS(); }
- }
+ public IAdvancedDriverAssistantSystemDeclarationInputData ADAS => GetADAS();
private IAdvancedDriverAssistantSystemDeclarationInputData GetADAS()
{
@@ -595,10 +465,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
}
- public IVehicleComponentsDeclaration Components
- {
- get { return GetComponents(); }
- }
+ public IVehicleComponentsDeclaration Components => GetComponents();
private IVehicleComponentsDeclaration GetComponents()
{
@@ -748,25 +615,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public ConsolidatedADASData(IEnumerable<IManufacturingStageInputData> manufacturingStages)
: base(manufacturingStages) { }
- public bool EngineStopStart
- {
- get { return GetADASPropertyValue<bool>(nameof(EngineStopStart)); }
- }
+ public bool EngineStopStart => GetADASPropertyValue<bool>(nameof(EngineStopStart));
- public EcoRollType EcoRoll
- {
- get { return GetADASPropertyValue<EcoRollType>(nameof(EcoRoll)); }
- }
+ public EcoRollType EcoRoll => GetADASPropertyValue<EcoRollType>(nameof(EcoRoll));
- public PredictiveCruiseControlType PredictiveCruiseControl
- {
- get { return GetADASPropertyValue<PredictiveCruiseControlType>(nameof(PredictiveCruiseControl)); }
- }
+ public PredictiveCruiseControlType PredictiveCruiseControl => GetADASPropertyValue<PredictiveCruiseControlType>(nameof(PredictiveCruiseControl));
- public bool? ATEcoRollReleaseLockupClutch
- {
- get { return GetADASPropertyValue<bool?>(nameof(ATEcoRollReleaseLockupClutch)); }
- }
+ public bool? ATEcoRollReleaseLockupClutch => GetADASPropertyValue<bool?>(nameof(ATEcoRollReleaseLockupClutch));
public XmlNode XMLSource { get; }
@@ -807,10 +662,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
: base(manufacturingStages) { }
- public IAirdragDeclarationInputData AirdragInputData
- {
- get { return GetAirdragInputData(); }
- }
+ public IAirdragDeclarationInputData AirdragInputData => GetAirdragInputData();
private IAirdragDeclarationInputData GetAirdragInputData()
{
@@ -821,47 +673,25 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
(_consolidateAirdragData = new ConsolidatedAirdragData(_manufacturingStages));
}
- public IGearboxDeclarationInputData GearboxInputData
- {
- get { return null; }
- }
- public ITorqueConverterDeclarationInputData TorqueConverterInputData
- {
- get { return null; }
- }
- public IAxleGearInputData AxleGearInputData
- {
- get { return null; }
- }
- public IAngledriveInputData AngledriveInputData
- {
- get { return null; }
- }
- public IEngineDeclarationInputData EngineInputData
- {
- get { return null; }
- }
- public IAuxiliariesDeclarationInputData AuxiliaryInputData
- {
- get { return null; }
- }
- public IRetarderInputData RetarderInputData
- {
- get { return null; }
- }
- public IPTOTransmissionInputData PTOTransmissionInputData
- {
- get { return null; }
- }
- public IAxlesDeclarationInputData AxleWheels
- {
- get { return null; }
- }
-
- public IBusAuxiliariesDeclarationData BusAuxiliaries
- {
- get { return GetBusAuxiliaries(); }
- }
+ public IGearboxDeclarationInputData GearboxInputData => null;
+
+ public ITorqueConverterDeclarationInputData TorqueConverterInputData => null;
+
+ public IAxleGearInputData AxleGearInputData => null;
+
+ public IAngledriveInputData AngledriveInputData => null;
+
+ public IEngineDeclarationInputData EngineInputData => null;
+
+ public IAuxiliariesDeclarationInputData AuxiliaryInputData => null;
+
+ public IRetarderInputData RetarderInputData => null;
+
+ public IPTOTransmissionInputData PTOTransmissionInputData => null;
+
+ public IAxlesDeclarationInputData AxleWheels => null;
+
+ public IBusAuxiliariesDeclarationData BusAuxiliaries => GetBusAuxiliaries();
private IBusAuxiliariesDeclarationData GetBusAuxiliaries()
{
@@ -873,14 +703,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
}
- public IElectricStorageDeclarationInputData ElectricStorage
- {
- get { return null; }
- }
- public IElectricMachinesDeclarationInputData ElectricMachines
- {
- get { return null; }
- }
+ public IElectricStorageDeclarationInputData ElectricStorage => null;
+
+ public IElectricMachinesDeclarationInputData ElectricMachines => null;
private T GetComponentPropertyValue<T>(string propertyName)
{
@@ -934,56 +759,27 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
SetLastValidAirdragEntry();
}
- public string Manufacturer
- {
- get { return AirdragEntry?.Manufacturer; }
- }
+ public string Manufacturer => AirdragEntry?.Manufacturer;
- public string Model
- {
- get { return AirdragEntry?.Model; }
- }
+ public string Model => AirdragEntry?.Model;
- public DateTime Date
- {
- get { return AirdragEntry.Date; }
- }
+ public DateTime Date => AirdragEntry.Date;
- public string AppVersion
- {
- get { return AirdragEntry?.AppVersion; }
- }
- public CertificationMethod CertificationMethod
- {
- get { return AirdragEntry.CertificationMethod; }
- }
- public string CertificationNumber
- {
- get { return AirdragEntry?.CertificationNumber; }
- }
- public DigestData DigestValue
- {
- get { return AirdragEntry?.DigestValue; }
- }
- public SquareMeter AirDragArea
- {
- get { return AirdragEntry?.AirDragArea; }
- }
+ public string AppVersion => AirdragEntry?.AppVersion;
- public SquareMeter TransferredAirDragArea
- {
- get { return AirdragEntry?.TransferredAirDragArea; }
- }
+ public CertificationMethod CertificationMethod => AirdragEntry.CertificationMethod;
- public SquareMeter AirDragArea_0
- {
- get { return AirdragEntry.AirDragArea_0; }
- }
+ public string CertificationNumber => AirdragEntry?.CertificationNumber;
- public DataSource DataSource
- {
- get { return AirdragEntry?.DataSource; }
- }
+ public DigestData DigestValue => AirdragEntry?.DigestValue;
+
+ public SquareMeter AirDragArea => AirdragEntry?.AirDragArea;
+
+ public SquareMeter TransferredAirDragArea => AirdragEntry?.TransferredAirDragArea;
+
+ public SquareMeter AirDragArea_0 => AirdragEntry.AirDragArea_0;
+
+ public DataSource DataSource => AirdragEntry?.DataSource;
public bool SavedInDeclarationMode { get; }
private void SetLastValidAirdragEntry()
@@ -1025,27 +821,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public ConsolidatedBusAuxiliariesData(IEnumerable<IManufacturingStageInputData> manufacturingStages)
: base(manufacturingStages) { }
- public XmlNode XMLSource
- {
- get { return _xmlNode ?? (_xmlNode = GetBusAuxXMLSource()); }
- }
- public string FanTechnology
- {
- get { return null; }
- }
- public IList<string> SteeringPumpTechnology
- {
- get { return null; }
- }
- public IElectricSupplyDeclarationData ElectricSupply
- {
- get { return null; }
- }
+ public XmlNode XMLSource => _xmlNode ?? (_xmlNode = GetBusAuxXMLSource());
- public IElectricConsumersDeclarationData ElectricConsumers
- {
- get { return GetElectricConsumers(); }
- }
+ public string FanTechnology => null;
+
+ public IList<string> SteeringPumpTechnology => null;
+
+ public IElectricSupplyDeclarationData ElectricSupply => null;
+
+ public IElectricConsumersDeclarationData ElectricConsumers => GetElectricConsumers();
private IElectricConsumersDeclarationData GetElectricConsumers()
{
@@ -1056,20 +840,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
(_consolidateElectricConsumerData = new ConsolidateElectricConsumerData(_manufacturingStages));
}
- public IPneumaticSupplyDeclarationData PneumaticSupply
- {
- get { return null; }
- }
+ public IPneumaticSupplyDeclarationData PneumaticSupply => null;
- public IPneumaticConsumersDeclarationData PneumaticConsumers
- {
- get { return null; }
- }
+ public IPneumaticConsumersDeclarationData PneumaticConsumers => null;
- public IHVACBusAuxiliariesDeclarationData HVACAux
- {
- get { return GetHVACAux(); }
- }
+ public IHVACBusAuxiliariesDeclarationData HVACAux => GetHVACAux();
private IHVACBusAuxiliariesDeclarationData GetHVACAux()
{
@@ -1145,30 +920,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public ConsolidateElectricConsumerData(IEnumerable<IManufacturingStageInputData> manufacturingStages)
: base(manufacturingStages) { }
- public bool? InteriorLightsLED
- {
- get { return GetElectricConsumerPropertyValue<bool?>(nameof(InteriorLightsLED)); }
- }
+ public bool? InteriorLightsLED => GetElectricConsumerPropertyValue<bool?>(nameof(InteriorLightsLED));
- public bool? DayrunninglightsLED
- {
- get { return GetElectricConsumerPropertyValue<bool?>(nameof(DayrunninglightsLED)); }
- }
+ public bool? DayrunninglightsLED => GetElectricConsumerPropertyValue<bool?>(nameof(DayrunninglightsLED));
- public bool? PositionlightsLED
- {
- get { return GetElectricConsumerPropertyValue<bool?>(nameof(PositionlightsLED)); }
- }
+ public bool? PositionlightsLED => GetElectricConsumerPropertyValue<bool?>(nameof(PositionlightsLED));
- public bool? HeadlightsLED
- {
- get { return GetElectricConsumerPropertyValue<bool?>(nameof(HeadlightsLED)); }
- }
+ public bool? HeadlightsLED => GetElectricConsumerPropertyValue<bool?>(nameof(HeadlightsLED));
- public bool? BrakelightsLED
- {
- get { return GetElectricConsumerPropertyValue<bool?>(nameof(BrakelightsLED)); }
- }
+ public bool? BrakelightsLED => GetElectricConsumerPropertyValue<bool?>(nameof(BrakelightsLED));
private T GetElectricConsumerPropertyValue<T>(string propertyName)
@@ -1205,93 +965,27 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public ConsolidatedHVACBusAuxiliariesData(IEnumerable<IManufacturingStageInputData> manufacturingStages)
: base(manufacturingStages) { }
- public BusHVACSystemConfiguration? SystemConfiguration
- {
- get
- {
- return GetHVACBusAuxPropertyValue<BusHVACSystemConfiguration?>(nameof(SystemConfiguration));
- }
- }
+ public BusHVACSystemConfiguration? SystemConfiguration => GetHVACBusAuxPropertyValue<BusHVACSystemConfiguration?>(nameof(SystemConfiguration));
- public HeatPumpType? HeatPumpTypeDriverCompartment
- {
- get
- {
- return GetHVACBusAuxPropertyValue<HeatPumpType?>(nameof(HeatPumpTypeDriverCompartment));
- }
- }
+ public HeatPumpType? HeatPumpTypeDriverCompartment => GetHVACBusAuxPropertyValue<HeatPumpType?>(nameof(HeatPumpTypeDriverCompartment));
- public HeatPumpMode? HeatPumpModeDriverCompartment
- {
- get
- {
- return GetHVACBusAuxPropertyValue<HeatPumpMode?>(nameof(HeatPumpModeDriverCompartment));
- }
- }
+ public HeatPumpMode? HeatPumpModeDriverCompartment => GetHVACBusAuxPropertyValue<HeatPumpMode?>(nameof(HeatPumpModeDriverCompartment));
- public IList<Tuple<HeatPumpType, HeatPumpMode>> HeatPumpPassengerCompartments
- {
- get
- {
- return GetHeatPumpPassengerCompartments();
- }
- }
+ public IList<Tuple<HeatPumpType, HeatPumpMode>> HeatPumpPassengerCompartments => GetHeatPumpPassengerCompartments();
- public Watt AuxHeaterPower
- {
- get
- {
- return GetHVACBusAuxPropertyValue<Watt>(nameof(AuxHeaterPower));
- }
- }
+ public Watt AuxHeaterPower => GetHVACBusAuxPropertyValue<Watt>(nameof(AuxHeaterPower));
- public bool? DoubleGlazing
- {
- get
- {
- return GetHVACBusAuxPropertyValue<bool?>(nameof(DoubleGlazing));
- }
- }
+ public bool? DoubleGlazing => GetHVACBusAuxPropertyValue<bool?>(nameof(DoubleGlazing));
- public bool? AdjustableAuxiliaryHeater
- {
- get
- {
- return GetHVACBusAuxPropertyValue<bool?>(nameof(AdjustableAuxiliaryHeater));
- }
- }
+ public bool? AdjustableAuxiliaryHeater => GetHVACBusAuxPropertyValue<bool?>(nameof(AdjustableAuxiliaryHeater));
- public bool? SeparateAirDistributionDucts
- {
- get
- {
- return GetHVACBusAuxPropertyValue<bool?>(nameof(SeparateAirDistributionDucts));
- }
- }
+ public bool? SeparateAirDistributionDucts => GetHVACBusAuxPropertyValue<bool?>(nameof(SeparateAirDistributionDucts));
- public bool? WaterElectricHeater
- {
- get
- {
- return GetHVACBusAuxPropertyValue<bool?>(nameof(WaterElectricHeater));
- }
- }
+ public bool? WaterElectricHeater => GetHVACBusAuxPropertyValue<bool?>(nameof(WaterElectricHeater));
- public bool? AirElectricHeater
- {
- get
- {
- return GetHVACBusAuxPropertyValue<bool?>(nameof(AirElectricHeater));
- }
- }
+ public bool? AirElectricHeater => GetHVACBusAuxPropertyValue<bool?>(nameof(AirElectricHeater));
- public bool? OtherHeatingTechnology
- {
- get
- {
- return GetHVACBusAuxPropertyValue<bool?>(nameof(OtherHeatingTechnology));
- }
- }
+ public bool? OtherHeatingTechnology => GetHVACBusAuxPropertyValue<bool?>(nameof(OtherHeatingTechnology));
public bool? AdjustableCoolantThermostat { get; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs
index ebf913e97e2e8c54cbe4b2f80e86f3f7f3c063d1..aa3e141bb17f28c461195ee16fec50eab9a149c3 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs
@@ -66,10 +66,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
#region Implementation of IXMLJobDataReader
- public virtual IVehicleDeclarationInputData CreateVehicle
- {
- get { return _vehicle ?? (_vehicle = CreateComponent(XMLNames.Component_Vehicle, VehicleCreator)); }
- }
+ public virtual IVehicleDeclarationInputData CreateVehicle => _vehicle ?? (_vehicle = CreateComponent(XMLNames.Component_Vehicle, VehicleCreator));
#endregion
@@ -162,10 +159,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
_primaryBusJobData = busJobData;
}
- public IVehicleDeclarationInputData CreateVehicle
- {
- get { return _vehicle ?? (_vehicle = CreateComponent(XMLNames.Component_Vehicle, VehicleCreator)); }
- }
+ public IVehicleDeclarationInputData CreateVehicle => _vehicle ?? (_vehicle = CreateComponent(XMLNames.Component_Vehicle, VehicleCreator));
protected IVehicleDeclarationInputData VehicleCreator(string version, XmlNode vehicleNode, string sourceFile)
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLPTOReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLPTOReader.cs
index 7d69d820d81f9a333eaaf4e6fda0e75342c783e5..b8d842dcce2f4d8a0609be5263db429fe1842900 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLPTOReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLPTOReader.cs
@@ -63,10 +63,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
#region Implementation of IXMLPTOReader
- public virtual IPTOTransmissionInputData PTOInputData
- {
- get { return _ptoInputData ?? (_ptoInputData = CreateComponent(XMLNames.Vehicle_PTO, PTOCreator)); }
- }
+ public virtual IPTOTransmissionInputData PTOInputData => _ptoInputData ?? (_ptoInputData = CreateComponent(XMLNames.Vehicle_PTO, PTOCreator));
#endregion
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractCommonComponentType.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractCommonComponentType.cs
index 3832c28e091ed63df7ce21b184c51a499acf4225..3a76fecd895ee3d5665c384abd79ef265d75a018 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractCommonComponentType.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractCommonComponentType.cs
@@ -45,46 +45,22 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public AbstractCommonComponentType(XmlNode node, string source) : base(node, source) { }
- public bool SavedInDeclarationMode
- {
- get { return false; }
- }
+ public bool SavedInDeclarationMode => false;
- public string Manufacturer
- {
- get { return GetString(XMLNames.Component_Manufacturer); }
- }
+ public string Manufacturer => GetString(XMLNames.Component_Manufacturer);
- public string Model
- {
- get { return GetString(XMLNames.Component_Model); }
- }
+ public string Model => GetString(XMLNames.Component_Model);
- public DateTime Date
- {
- get { return XmlConvert.ToDateTime(GetString(XMLNames.Component_Date), XmlDateTimeSerializationMode.Utc); }
- }
+ public DateTime Date => XmlConvert.ToDateTime(GetString(XMLNames.Component_Date), XmlDateTimeSerializationMode.Utc);
- public virtual string AppVersion
- {
- get { return GetString(XMLNames.Component_AppVersion); }
- }
+ public virtual string AppVersion => GetString(XMLNames.Component_AppVersion);
- public virtual CertificationMethod CertificationMethod
- {
- get { return CertificationMethod.NotCertified; }
- }
+ public virtual CertificationMethod CertificationMethod => CertificationMethod.NotCertified;
- public virtual string CertificationNumber
- {
- get { return Constants.NOT_AVailABLE; }
- }
+ public virtual string CertificationNumber => Constants.NOT_AVailABLE;
- public virtual DigestData DigestValue
- {
- get { return null; }
- }
+ public virtual DigestData DigestValue => null;
- public virtual XmlNode XMLSource { get { return BaseNode; } }
+ public virtual XmlNode XMLSource => BaseNode;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractEngineeringXMLComponentDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractEngineeringXMLComponentDataProvider.cs
index e1bd6e91472da4fe38ae8763eebca23a1dee2edd..34eeb380a78a470c28d40affda9515bc16a535f7 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractEngineeringXMLComponentDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractEngineeringXMLComponentDataProvider.cs
@@ -49,19 +49,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
}
- public override DigestData DigestValue
- {
- get { return null; }
- }
+ public override DigestData DigestValue => null;
- public override string CertificationNumber
- {
- get { return "N.A."; }
- }
+ public override string CertificationNumber => "N.A.";
- public override CertificationMethod CertificationMethod
- {
- get { return CertificationMethod.NotCertified; }
- }
+ public override CertificationMethod CertificationMethod => CertificationMethod.NotCertified;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLDriverAcceleration.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLDriverAcceleration.cs
index e1aea43fba67bc8c4aa67243b2d4e453940c8815..b5cd07385ad31b481e95c51e0acb7bc4820d0be7 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLDriverAcceleration.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLDriverAcceleration.cs
@@ -62,18 +62,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
_accelerationCurve = new DriverAccelerationInputData() { AccelerationCurve = accCurve };
}
- public virtual IDriverAccelerationData AccelerationCurve
- {
- get {
- return BaseNode == null
- ? _accelerationCurve
- : new DriverAccelerationInputData() {
- AccelerationCurve = XMLHelper.ReadEntriesOrResource(
- BaseNode, DriverData.DataSource.SourcePath, null, XMLNames.DriverModel_DriverAccelerationCurve_Entry,
- AttributeMappings.DriverAccelerationCurveMapping)
- };
- }
- }
+ public virtual IDriverAccelerationData AccelerationCurve =>
+ BaseNode == null
+ ? _accelerationCurve
+ : new DriverAccelerationInputData() {
+ AccelerationCurve = XMLHelper.ReadEntriesOrResource(
+ BaseNode, DriverData.DataSource.SourcePath, null, XMLNames.DriverModel_DriverAccelerationCurve_Entry,
+ AttributeMappings.DriverAccelerationCurveMapping)
+ };
}
internal class XMLDriverAccelerationV10 : XMLDriverAccelerationV07
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAirdragDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAirdragDataProvider.cs
index 55450db3f4dd33bead859bb32b77379994fc375d..237e68efade8621cf6970a141b41b76a0149bdf4 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAirdragDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAirdragDataProvider.cs
@@ -59,38 +59,22 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
SourceType = (vehicle as IXMLResource).DataSource.SourceFile == fsBasePath ? DataSourceType.XMLEmbedded : DataSourceType.XMLFile;
}
- public virtual SquareMeter AirDragArea
- {
- get { return GetDouble(XMLNames.Vehicle_AirDragArea).SI<SquareMeter>(); }
- }
+ public virtual SquareMeter AirDragArea => GetDouble(XMLNames.Vehicle_AirDragArea).SI<SquareMeter>();
- public virtual SquareMeter TransferredAirDragArea
- {
- get { return AirDragArea; }
- }
+ public virtual SquareMeter TransferredAirDragArea => AirDragArea;
- public virtual SquareMeter AirDragArea_0
- {
- get { return AirDragArea; }
- }
+ public virtual SquareMeter AirDragArea_0 => AirDragArea;
- public virtual CrossWindCorrectionMode CrossWindCorrectionMode
- {
- get { return GetString(XMLNames.Vehicle_CrossWindCorrectionMode).ParseEnum<CrossWindCorrectionMode>(); }
- }
+ public virtual CrossWindCorrectionMode CrossWindCorrectionMode => GetString(XMLNames.Vehicle_CrossWindCorrectionMode).ParseEnum<CrossWindCorrectionMode>();
- public virtual TableData CrosswindCorrectionMap
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, DataSource.SourcePath, XMLNames.Vehicle_CrosswindCorrectionData, XMLNames.Vehicle_CrosswindCorrectionData_Entry,
- AttributeMappings.CrossWindCorrectionMapping);
- }
- }
+ public virtual TableData CrosswindCorrectionMap =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, DataSource.SourcePath, XMLNames.Vehicle_CrosswindCorrectionData, XMLNames.Vehicle_CrosswindCorrectionData_Entry,
+ AttributeMappings.CrossWindCorrectionMapping);
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -110,6 +94,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
IXMLEngineeringVehicleData vehicle, XmlNode axlegearNode, string fsBasePath) : base(
vehicle, axlegearNode, fsBasePath) { }
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAngledriveDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAngledriveDataProvider.cs
index ed21b6748679162c4be895990706b9e0a34328aa..a68fb1a7ffb83fbc3eb4881e99def856a55d9b7a 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAngledriveDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAngledriveDataProvider.cs
@@ -58,25 +58,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
SourceType = (vehicle as IXMLResource).DataSource.SourceFile == fsBasePath ? DataSourceType.XMLEmbedded : DataSourceType.XMLFile;
}
- public virtual AngledriveType Type
- {
- get { return Vehicle.AngledriveType; }
- }
+ public virtual AngledriveType Type => Vehicle.AngledriveType;
- public virtual double Ratio
- {
- get { return GetDouble(XMLNames.AngleDrive_Ratio); }
- }
+ public virtual double Ratio => GetDouble(XMLNames.AngleDrive_Ratio);
- public virtual TableData LossMap
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, DataSource.SourcePath,
- XMLNames.AngleDrive_TorqueLossMap, XMLNames.Angledrive_LossMap_Entry,
- AttributeMappings.TransmissionLossmapMapping);
- }
- }
+ public virtual TableData LossMap =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, DataSource.SourcePath,
+ XMLNames.AngleDrive_TorqueLossMap, XMLNames.Angledrive_LossMap_Entry,
+ AttributeMappings.TransmissionLossmapMapping);
public virtual double Efficiency
{
@@ -85,7 +75,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
#endregion
@@ -103,7 +93,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public XMLEngineeringAngledriveDataProviderV10(
IXMLEngineeringVehicleData vehicle, XmlNode axlegearNode, string fsBasePath) : base(
vehicle, axlegearNode, fsBasePath) { }
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
-
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAuxiliariesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAuxiliariesDataProvider.cs
index 288a4e82df6f8c13b8229df681cd06c8cfced9e1..bf1b144667593cc60bb407af2c6c0558b66af5b2 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAuxiliariesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAuxiliariesDataProvider.cs
@@ -67,14 +67,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
get;
}
- public IBusAuxiliariesEngineeringData BusAuxiliariesData
- {
- get
- {
- // TODO: MQ 20210211 - implement...
- return null;
- }
- }
+ public IBusAuxiliariesEngineeringData BusAuxiliariesData =>
+ // TODO: MQ 20210211 - implement...
+ null;
public Watt ElectricAuxPower { get; }
@@ -113,7 +108,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
}
- protected virtual XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected virtual XNamespace SchemaNamespace => NAMESPACE_URI;
#region Implementation of IAuxiliaryEngineeringInputData
@@ -142,6 +137,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public XMLAuxiliaryEngineeringDataV10(XmlNode node, string basePath) : base(node, basePath) { }
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAxlegearDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAxlegearDataProvider.cs
index 7d4c6ebf17fb730d9fad2d214227466983eb5769..99f25d10e85bebf22dc56d1ceb320f9b5dd91978 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAxlegearDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAxlegearDataProvider.cs
@@ -59,19 +59,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
}
- public virtual double Ratio
- {
- get { return GetDouble(XMLNames.Axlegear_Ratio); }
- }
+ public virtual double Ratio => GetDouble(XMLNames.Axlegear_Ratio);
- public virtual TableData LossMap
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, DataSource.SourcePath, XMLNames.Axlegear_TorqueLossMap, XMLNames.Axlegear_TorqueLossMap_Entry,
- AttributeMappings.TransmissionLossmapMapping);
- }
- }
+ public virtual TableData LossMap =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, DataSource.SourcePath, XMLNames.Axlegear_TorqueLossMap, XMLNames.Axlegear_TorqueLossMap_Entry,
+ AttributeMappings.TransmissionLossmapMapping);
public virtual double Efficiency
@@ -79,14 +72,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
get { return GetDouble(new[] { XMLNames.Axlegear_TorqueLossMap, XMLNames.Axlegear_Efficiency }, double.NaN); }
}
- public virtual AxleLineType LineType
- {
- get { return AxleLineType.SinglePortalAxle; }
- }
+ public virtual AxleLineType LineType => AxleLineType.SinglePortalAxle;
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
#endregion
@@ -108,14 +98,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
XmlNode axlegearNode, string fsBasePath)
: base(vehicle, axlegearNode, fsBasePath) { }
- public override AxleLineType LineType
- {
- get {
- return GetNode(XMLNames.Axlegear_LineType, required: false)?.InnerText.ParseEnum<AxleLineType>() ??
- AxleLineType.SinglePortalAxle;
- }
- }
+ public override AxleLineType LineType =>
+ GetNode(XMLNames.Axlegear_LineType, required: false)?.InnerText.ParseEnum<AxleLineType>() ??
+ AxleLineType.SinglePortalAxle;
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAxlesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAxlesDataProvider.cs
index c748e34eaee6162b438940b08bf5b7aa9d203eb1..eb4427ebc7ca8012eef059a74aa25708af067696 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAxlesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAxlesDataProvider.cs
@@ -93,7 +93,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -115,7 +115,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Overrides of XMLEngineeringAxlesDataProviderV07
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
#endregion
}
@@ -137,70 +137,37 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Implementation of IAxleDeclarationInputData
- public virtual bool TwinTyres
- {
- get { return XmlConvert.ToBoolean(GetNode(XMLNames.AxleWheels_Axles_Axle_TwinTyres)?.InnerText ?? ""); }
- }
+ public virtual bool TwinTyres => XmlConvert.ToBoolean(GetNode(XMLNames.AxleWheels_Axles_Axle_TwinTyres)?.InnerText ?? "");
- public virtual bool Steered
- {
- get { return XmlConvert.ToBoolean(GetNode(XMLNames.AxleWheels_Axles_Axle_Steered)?.InnerText ?? ""); }
- }
+ public virtual bool Steered => XmlConvert.ToBoolean(GetNode(XMLNames.AxleWheels_Axles_Axle_Steered)?.InnerText ?? "");
- public virtual AxleType AxleType
- {
- get { return (GetNode(XMLNames.AxleWheels_Axles_Axle_AxleType)?.InnerText ?? "").ParseEnum<AxleType>(); }
- }
+ public virtual AxleType AxleType => (GetNode(XMLNames.AxleWheels_Axles_Axle_AxleType)?.InnerText ?? "").ParseEnum<AxleType>();
- public virtual double AxleWeightShare
- {
- get { return GetNode(XMLNames.AxleWheels_Axles_Axle_WeightShare)?.InnerText.ToDouble() ?? 0; }
- }
+ public virtual double AxleWeightShare => GetNode(XMLNames.AxleWheels_Axles_Axle_WeightShare)?.InnerText.ToDouble() ?? 0;
- public virtual ITyreEngineeringInputData Tyre
- {
- get { return this; }
- }
+ public virtual ITyreEngineeringInputData Tyre => this;
- ITyreDeclarationInputData IAxleDeclarationInputData.Tyre
- {
- get { throw new NotImplementedException(); }
- }
+ ITyreDeclarationInputData IAxleDeclarationInputData.Tyre => throw new NotImplementedException();
#endregion
#region Implementation of ITyreDeclarationInputData
- public virtual string Dimension
- {
- get { return GetNode(XMLNames.AxleWheels_Axles_Axle_Dimension)?.InnerText; }
- }
+ public virtual string Dimension => GetNode(XMLNames.AxleWheels_Axles_Axle_Dimension)?.InnerText;
- public virtual double RollResistanceCoefficient
- {
- get { return GetNode(XMLNames.AxleWheels_Axles_Axle_RRCISO)?.InnerText.ToDouble() ?? double.NaN; }
- }
+ public virtual double RollResistanceCoefficient => GetNode(XMLNames.AxleWheels_Axles_Axle_RRCISO)?.InnerText.ToDouble() ?? double.NaN;
- public virtual Newton TyreTestLoad
- {
- get { return GetNode(XMLNames.AxleWheels_Axles_Axle_FzISO)?.InnerText.ToDouble().SI<Newton>(); }
- }
+ public virtual Newton TyreTestLoad => GetNode(XMLNames.AxleWheels_Axles_Axle_FzISO)?.InnerText.ToDouble().SI<Newton>();
- public virtual string FuelEfficiencyClass { get { return DeclarationData.Wheels.TyreClass.Lookup(RollResistanceCoefficient); } }
+ public virtual string FuelEfficiencyClass => DeclarationData.Wheels.TyreClass.Lookup(RollResistanceCoefficient);
#endregion
#region Implementation of ITyreEngineeringInputData
- public virtual KilogramSquareMeter Inertia
- {
- get { return GetNode(XMLNames.AxleWheels_Axles_Axle_Inertia)?.InnerText.ToDouble().SI<KilogramSquareMeter>(); }
- }
+ public virtual KilogramSquareMeter Inertia => GetNode(XMLNames.AxleWheels_Axles_Axle_Inertia)?.InnerText.ToDouble().SI<KilogramSquareMeter>();
- public virtual Meter DynamicTyreRadius
- {
- get { return GetNode(XMLNames.AxleWheels_Axles_Axle_DynamicTyreRadius)?.InnerText.ToDouble().SI(Unit.SI.Milli.Meter).Cast<Meter>(); }
- }
+ public virtual Meter DynamicTyreRadius => GetNode(XMLNames.AxleWheels_Axles_Axle_DynamicTyreRadius)?.InnerText.ToDouble().SI(Unit.SI.Milli.Meter).Cast<Meter>();
#endregion
@@ -208,7 +175,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -233,36 +200,18 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Implementation of IAxleDeclarationInputData
- public virtual bool TwinTyres
- {
- get { return XmlConvert.ToBoolean(GetNode(XMLNames.AxleWheels_Axles_Axle_TwinTyres)?.InnerText ?? ""); }
- }
+ public virtual bool TwinTyres => XmlConvert.ToBoolean(GetNode(XMLNames.AxleWheels_Axles_Axle_TwinTyres)?.InnerText ?? "");
- public virtual bool Steered
- {
- get { return XmlConvert.ToBoolean(GetNode(XMLNames.AxleWheels_Axles_Axle_Steered)?.InnerText ?? ""); }
- }
+ public virtual bool Steered => XmlConvert.ToBoolean(GetNode(XMLNames.AxleWheels_Axles_Axle_Steered)?.InnerText ?? "");
- public virtual AxleType AxleType
- {
- get { return (GetNode(XMLNames.AxleWheels_Axles_Axle_AxleType)?.InnerText ?? "").ParseEnum<AxleType>(); }
- }
+ public virtual AxleType AxleType => (GetNode(XMLNames.AxleWheels_Axles_Axle_AxleType)?.InnerText ?? "").ParseEnum<AxleType>();
- public virtual ITyreEngineeringInputData Tyre
- {
- get { return _tyre ?? (_tyre = Reader.Tyre); }
- }
+ public virtual ITyreEngineeringInputData Tyre => _tyre ?? (_tyre = Reader.Tyre);
- public virtual double AxleWeightShare
- {
- get { return GetNode(XMLNames.AxleWheels_Axles_Axle_WeightShare)?.InnerText.ToDouble() ?? 0; }
- }
+ public virtual double AxleWeightShare => GetNode(XMLNames.AxleWheels_Axles_Axle_WeightShare)?.InnerText.ToDouble() ?? 0;
- ITyreDeclarationInputData IAxleDeclarationInputData.Tyre
- {
- get { return Tyre; }
- }
+ ITyreDeclarationInputData IAxleDeclarationInputData.Tyre => Tyre;
#endregion
@@ -270,7 +219,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
#endregion
@@ -286,11 +235,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public XMLAxleEngineeringDataV10TEST(XmlNode node, IXMLEngineeringVehicleData vehicle) : base(node, vehicle) { }
- public override bool TwinTyres
- {
- get { return XmlConvert.ToBoolean(GetNode("TwinTires")?.InnerText ?? ""); }
- }
+ public override bool TwinTyres => XmlConvert.ToBoolean(GetNode("TwinTires")?.InnerText ?? "");
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringDriverDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringDriverDataProvider.cs
index a31d8cb40a8d904d6b2df55e745c324a762db73b..712da3c650bf06a7abe714b86df5ce7ee7ec314a 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringDriverDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringDriverDataProvider.cs
@@ -63,45 +63,24 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public IXMLDriverDataReader Reader { protected get; set; }
- public virtual IDriverAccelerationData AccelerationCurve
- {
- get { return (_accCurve ?? (_accCurve = Reader.AccelerationCurveData)).AccelerationCurve; }
- }
+ public virtual IDriverAccelerationData AccelerationCurve => (_accCurve ?? (_accCurve = Reader.AccelerationCurveData)).AccelerationCurve;
- public virtual ILookaheadCoastingInputData Lookahead
- {
- get { return _lookahead ?? (_lookahead = Reader.LookAheadData); }
- }
+ public virtual ILookaheadCoastingInputData Lookahead => _lookahead ?? (_lookahead = Reader.LookAheadData);
- public virtual IGearshiftEngineeringInputData GearshiftInputData
- {
- get { return _shiftParameters ?? (_shiftParameters = Reader.ShiftParameters); }
- }
+ public virtual IGearshiftEngineeringInputData GearshiftInputData => _shiftParameters ?? (_shiftParameters = Reader.ShiftParameters);
- public virtual IEngineStopStartEngineeringInputData EngineStopStartData { get { return null; } }
+ public virtual IEngineStopStartEngineeringInputData EngineStopStartData => null;
- public virtual IEcoRollEngineeringInputData EcoRollData
- {
- get { return null; }
- }
+ public virtual IEcoRollEngineeringInputData EcoRollData => null;
- public virtual IPCCEngineeringInputData PCCData
- {
- get { return null; }
- }
+ public virtual IPCCEngineeringInputData PCCData => null;
- public virtual IOverSpeedEngineeringInputData OverSpeedData
- {
- get { return _overspeed ?? (_overspeed = Reader.OverspeedData); }
- }
+ public virtual IOverSpeedEngineeringInputData OverSpeedData => _overspeed ?? (_overspeed = Reader.OverspeedData);
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -128,26 +107,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
inputData, driverDataNode, fsBasePath) { }
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
- public override IEngineStopStartEngineeringInputData EngineStopStartData
- {
- get { return _engineStopStart ?? (_engineStopStart = Reader.EngineStopStartData); }
- }
+ public override IEngineStopStartEngineeringInputData EngineStopStartData => _engineStopStart ?? (_engineStopStart = Reader.EngineStopStartData);
- public override IEcoRollEngineeringInputData EcoRollData
- {
- get { return _ecoRollData ?? (_ecoRollData = Reader.EcoRollData); }
- }
+ public override IEcoRollEngineeringInputData EcoRollData => _ecoRollData ?? (_ecoRollData = Reader.EcoRollData);
-
- public override IPCCEngineeringInputData PCCData
- {
- get { return _pccData ?? (_pccData = Reader.PCCData); }
- }
+
+ public override IPCCEngineeringInputData PCCData => _pccData ?? (_pccData = Reader.PCCData);
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringDriverLookAhead.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringDriverLookAhead.cs
index 2b5ec07b1ecf0aa95868fa9b956f74771af06e3a..6143021e6901520a4a056a817ab538b614e9b294 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringDriverLookAhead.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringDriverLookAhead.cs
@@ -60,66 +60,39 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Implementation of ILookaheadCoastingInputData
- public virtual bool Enabled
- {
- get { return GetBool(XMLNames.DriverModel_LookAheadCoasting_Enabled); }
- }
-
- public virtual MeterPerSecond MinSpeed
- {
- get {
- return GetNode(XMLNames.DriverModel_Overspeed_MinSpeed, required: false)
- ?.InnerText.ToDouble().KMPHtoMeterPerSecond() ??
- DeclarationData.Driver.LookAhead.MinimumSpeed;
- }
- }
-
- public virtual double CoastingDecisionFactorOffset
- {
- get {
- return GetNode(XMLNames.DriverModel_LookAheadCoasting_DecisionFactorOffset, required: false)
- ?.InnerText.ToDouble() ??
- DeclarationData.Driver.LookAhead.DecisionFactorCoastingOffset;
- }
- }
-
- public virtual double CoastingDecisionFactorScaling
- {
- get {
- return GetNode(XMLNames.DriverModel_LookAheadCoasting_DecisionFactorScaling, required: false)
- ?.InnerText.ToDouble() ??
- DeclarationData.Driver.LookAhead.DecisionFactorCoastingScaling;
- }
- }
-
- public virtual double LookaheadDistanceFactor
- {
- get {
- return GetNode(XMLNames.DriverModel_LookAheadCoasting_PreviewDistanceFactor, required: false)
- ?.InnerText.ToDouble() ??
- DeclarationData.Driver.LookAhead.LookAheadDistanceFactor;
- }
- }
-
- public virtual TableData CoastingDecisionFactorTargetSpeedLookup
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, DriverData.DataSource.SourcePath, XMLNames.DriverModel_LookAheadCoasting_SpeedDependentDecisionFactor,
- XMLNames.LookAheadCoasting_SpeedDependentDecisionFactor_Entry,
- AttributeMappings.CoastingDFTargetSpeedLookupMapping);
- }
- }
-
- public virtual TableData CoastingDecisionFactorVelocityDropLookup
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, DriverData.DataSource.SourcePath, XMLNames.DriverModel_LookAheadCoasting_VelocityDropDecisionFactor,
- XMLNames.LookAheadCoasting_VelocityDropDecisionFactor_Entry,
- AttributeMappings.CoastingDFVelocityDropLookupMapping);
- }
- }
+ public virtual bool Enabled => GetBool(XMLNames.DriverModel_LookAheadCoasting_Enabled);
+
+ public virtual MeterPerSecond MinSpeed =>
+ GetNode(XMLNames.DriverModel_Overspeed_MinSpeed, required: false)
+ ?.InnerText.ToDouble().KMPHtoMeterPerSecond() ??
+ DeclarationData.Driver.LookAhead.MinimumSpeed;
+
+ public virtual double CoastingDecisionFactorOffset =>
+ GetNode(XMLNames.DriverModel_LookAheadCoasting_DecisionFactorOffset, required: false)
+ ?.InnerText.ToDouble() ??
+ DeclarationData.Driver.LookAhead.DecisionFactorCoastingOffset;
+
+ public virtual double CoastingDecisionFactorScaling =>
+ GetNode(XMLNames.DriverModel_LookAheadCoasting_DecisionFactorScaling, required: false)
+ ?.InnerText.ToDouble() ??
+ DeclarationData.Driver.LookAhead.DecisionFactorCoastingScaling;
+
+ public virtual double LookaheadDistanceFactor =>
+ GetNode(XMLNames.DriverModel_LookAheadCoasting_PreviewDistanceFactor, required: false)
+ ?.InnerText.ToDouble() ??
+ DeclarationData.Driver.LookAhead.LookAheadDistanceFactor;
+
+ public virtual TableData CoastingDecisionFactorTargetSpeedLookup =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, DriverData.DataSource.SourcePath, XMLNames.DriverModel_LookAheadCoasting_SpeedDependentDecisionFactor,
+ XMLNames.LookAheadCoasting_SpeedDependentDecisionFactor_Entry,
+ AttributeMappings.CoastingDFTargetSpeedLookupMapping);
+
+ public virtual TableData CoastingDecisionFactorVelocityDropLookup =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, DriverData.DataSource.SourcePath, XMLNames.DriverModel_LookAheadCoasting_VelocityDropDecisionFactor,
+ XMLNames.LookAheadCoasting_VelocityDropDecisionFactor_Entry,
+ AttributeMappings.CoastingDFVelocityDropLookupMapping);
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringEcoRollDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringEcoRollDataProvider.cs
index 0bc99fc165a1fe42d22ba62763bde54d56e2c690..91721656a5fc5cec73bc23a4a176ca8ac9e1551f 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringEcoRollDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringEcoRollDataProvider.cs
@@ -20,30 +20,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Implementation of IEcoRollEngineeringInputData
- public MeterPerSecond MinSpeed
- {
- get { return GetDouble("MinSpeed", DeclarationData.Driver.EcoRoll.MinSpeed.AsKmph).KMPHtoMeterPerSecond(); }
- }
-
- public Second ActivationDelay
- {
- get { return GetDouble("ActivationDelay", DeclarationData.Driver.EcoRoll.ActivationDelay.Value()).SI<Second>(); }
- }
-
- public MeterPerSecond UnderspeedThreshold
- {
- get {
- return GetDouble("Underspeed", DeclarationData.Driver.EcoRoll.UnderspeedThreshold.AsKmph).KMPHtoMeterPerSecond();
- }
- }
-
- public MeterPerSquareSecond AccelerationUpperLimit
- {
- get {
- return GetDouble("MaxAcceleration", DeclarationData.Driver.EcoRoll.AccelerationUpperLimit.Value())
- .SI<MeterPerSquareSecond>();
- }
- }
+ public MeterPerSecond MinSpeed => GetDouble("MinSpeed", DeclarationData.Driver.EcoRoll.MinSpeed.AsKmph).KMPHtoMeterPerSecond();
+
+ public Second ActivationDelay => GetDouble("ActivationDelay", DeclarationData.Driver.EcoRoll.ActivationDelay.Value()).SI<Second>();
+
+ public MeterPerSecond UnderspeedThreshold => GetDouble("Underspeed", DeclarationData.Driver.EcoRoll.UnderspeedThreshold.AsKmph).KMPHtoMeterPerSecond();
+
+ public MeterPerSquareSecond AccelerationUpperLimit =>
+ GetDouble("MaxAcceleration", DeclarationData.Driver.EcoRoll.AccelerationUpperLimit.Value())
+ .SI<MeterPerSquareSecond>();
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringEngineDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringEngineDataProvider.cs
index 22319c5afe44092106ef7f8294200783fca3e7fe..abfd1c5c7eba0277f16e4dc818e94db0580a99e0 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringEngineDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringEngineDataProvider.cs
@@ -71,89 +71,40 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public XMLEngineeringEngineDataProviderV07(XmlNode node, string sourceFile) : base(null, node, sourceFile) { }
- public virtual CubicMeter Displacement
- {
- get { return GetDouble(XMLNames.Engine_Displacement).SI(Unit.SI.Cubic.Centi.Meter).Cast<CubicMeter>(); }
- }
-
- public virtual PerSecond IdleSpeed
- {
- get { return GetDouble(XMLNames.Engine_IdlingSpeed).RPMtoRad(); }
- }
+ public virtual CubicMeter Displacement => GetDouble(XMLNames.Engine_Displacement).SI(Unit.SI.Cubic.Centi.Meter).Cast<CubicMeter>();
- public virtual double WHTCEngineering
- {
- get { return GetDouble(XMLNames.Engine_WHTCEngineering); }
- }
+ public virtual PerSecond IdleSpeed => GetDouble(XMLNames.Engine_IdlingSpeed).RPMtoRad();
- IList<IEngineModeEngineeringInputData> IEngineEngineeringInputData.EngineModes
- {
- get { return _modes ?? (_modes = ReadEngineModes()); }
- }
+ public virtual double WHTCEngineering => GetDouble(XMLNames.Engine_WHTCEngineering);
- public virtual Second EngineStartTime
- {
- get { return null; }
- }
+ IList<IEngineModeEngineeringInputData> IEngineEngineeringInputData.EngineModes => _modes ?? (_modes = ReadEngineModes());
- public virtual double WHTCMotorway
- {
- get { throw new VectoException("Property not available in Engineering Mode"); }
- }
+ public virtual Second EngineStartTime => null;
- public virtual double WHTCRural
- {
- get { throw new VectoException("Property not available in Engineering Mode"); }
- }
+ public virtual double WHTCMotorway => throw new VectoException("Property not available in Engineering Mode");
- public virtual double WHTCUrban
- {
- get { throw new VectoException("Property not available in Engineering Mode"); }
- }
+ public virtual double WHTCRural => throw new VectoException("Property not available in Engineering Mode");
- public virtual double ColdHotBalancingFactor
- {
- get { throw new VectoException("Property not available in Engineering Mode"); }
- }
+ public virtual double WHTCUrban => throw new VectoException("Property not available in Engineering Mode");
- public virtual double CorrectionFactorRegPer
- {
- get {
- return 1;
+ public virtual double ColdHotBalancingFactor => throw new VectoException("Property not available in Engineering Mode");
- //GetDoubleElementValue(XMLNames.Engine_CorrectionFactor_RegPer);
- }
- }
+ public virtual double CorrectionFactorRegPer => 1;
- public virtual double CorrectionFactorNCV
- {
- get { return 1; }
- }
+ //GetDoubleElementValue(XMLNames.Engine_CorrectionFactor_RegPer);
+ public virtual double CorrectionFactorNCV => 1;
- public virtual FuelType FuelType
- {
- get {
- return FuelType.DieselCI; //GetElementValue(XMLNames.Engine_FuelType).ParseEnum<FuelType>();
- }
- }
+ public virtual FuelType FuelType => FuelType.DieselCI; //GetElementValue(XMLNames.Engine_FuelType).ParseEnum<FuelType>();
- public virtual TableData FuelConsumptionMap
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, DataSource.SourcePath, XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry,
- AttributeMappings.FuelConsumptionMapMapping);
- }
- }
+ public virtual TableData FuelConsumptionMap =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, DataSource.SourcePath, XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry,
+ AttributeMappings.FuelConsumptionMapMapping);
- public virtual TableData FullLoadCurve
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, DataSource.SourcePath, XMLNames.Engine_FullLoadAndDragCurve, XMLNames.Engine_FullLoadCurve_Entry,
- AttributeMappings.EngineFullLoadCurveMapping);
- }
- }
+ public virtual TableData FullLoadCurve =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, DataSource.SourcePath, XMLNames.Engine_FullLoadAndDragCurve, XMLNames.Engine_FullLoadCurve_Entry,
+ AttributeMappings.EngineFullLoadCurveMapping);
IList<IEngineFuelEngineeringInputData> IEngineModeEngineeringInputData.Fuels
{
@@ -165,65 +116,32 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
get { return new[] { this }.Cast<IEngineFuelDeclarationInputData>().ToList(); }
}
- public virtual IWHRData WasteHeatRecoveryDataElectrical
- {
- get { return null; }
- }
+ public virtual IWHRData WasteHeatRecoveryDataElectrical => null;
- public virtual IWHRData WasteHeatRecoveryDataMechanical
- {
- get { return null; }
- }
+ public virtual IWHRData WasteHeatRecoveryDataMechanical => null;
- public virtual Watt RatedPowerDeclared
- {
- get {
- return null; //GetDoubleElementValue(XMLNames.Engine_RatedPower).SI<Watt>();
- }
- }
+ public virtual Watt RatedPowerDeclared => null; //GetDoubleElementValue(XMLNames.Engine_RatedPower).SI<Watt>();
- public virtual PerSecond RatedSpeedDeclared
- {
- get {
- return null; //GetDoubleElementValue(XMLNames.Engine_RatedSpeed).RPMtoRad();
- }
- }
+ public virtual PerSecond RatedSpeedDeclared => null; //GetDoubleElementValue(XMLNames.Engine_RatedSpeed).RPMtoRad();
- public virtual NewtonMeter MaxTorqueDeclared
- {
- get {
- return null; //GetDoubleElementValue(XMLNames.Engine_MaxTorque).SI<NewtonMeter>();
- }
- }
+ public virtual NewtonMeter MaxTorqueDeclared => null; //GetDoubleElementValue(XMLNames.Engine_MaxTorque).SI<NewtonMeter>();
- public virtual IList<IEngineModeDeclarationInputData> EngineModes
- {
- get { return (_modes ?? (_modes = ReadEngineModes())).Cast<IEngineModeDeclarationInputData>().ToList(); }
- }
+ public virtual IList<IEngineModeDeclarationInputData> EngineModes => (_modes ?? (_modes = ReadEngineModes())).Cast<IEngineModeDeclarationInputData>().ToList();
protected virtual IList<IEngineModeEngineeringInputData> ReadEngineModes()
{
return new IEngineModeEngineeringInputData[] { this };
}
- public virtual WHRType WHRType
- {
- get { return WHRType.None; }
- }
+ public virtual WHRType WHRType => WHRType.None;
- public virtual KilogramSquareMeter Inertia
- {
- get { return GetString(XMLNames.Engine_Inertia, required: false)?.ToDouble().SI<KilogramSquareMeter>(); }
- }
+ public virtual KilogramSquareMeter Inertia => GetString(XMLNames.Engine_Inertia, required: false)?.ToDouble().SI<KilogramSquareMeter>();
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -245,17 +163,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
// engine-only constructor
public XMLEngineeringEngineDataProviderV10(XmlNode node, string sourceFile) : base(node, sourceFile) { }
- public override double WHTCEngineering
- {
- get { return GetDouble(XMLNames.Engine_FCCorrection, 1.0); }
- }
+ public override double WHTCEngineering => GetDouble(XMLNames.Engine_FCCorrection, 1.0);
#region Overrides of XMLEngineeringEngineDataProviderV07
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
#endregion
}
@@ -278,15 +190,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Overrides of XMLEngineeringEngineDataProviderV07
- public override PerSecond RatedSpeedDeclared
- {
- get { return GetString(XMLNames.Engine_RatedSpeed).Replace("rpm", "").ToDouble(0).RPMtoRad(); }
- }
+ public override PerSecond RatedSpeedDeclared => GetString(XMLNames.Engine_RatedSpeed).Replace("rpm", "").ToDouble(0).RPMtoRad();
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
#endregion
}
@@ -349,38 +255,21 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Implementation of IEngineModeDeclarationInputData
- public PerSecond IdleSpeed {
- get { return GetDouble(XMLNames.Engine_IdlingSpeed).RPMtoRad(); }
- }
- public TableData FullLoadCurve {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, Source.SourcePath, XMLNames.Engine_FullLoadAndDragCurve, XMLNames.Engine_FullLoadCurve_Entry,
- AttributeMappings.EngineFullLoadCurveMapping);
- }
- }
+ public PerSecond IdleSpeed => GetDouble(XMLNames.Engine_IdlingSpeed).RPMtoRad();
- IList<IEngineFuelEngineeringInputData> IEngineModeEngineeringInputData.Fuels
- {
- get { return _fuels ?? (_fuels = ReadFuels()); }
- }
+ public TableData FullLoadCurve =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, Source.SourcePath, XMLNames.Engine_FullLoadAndDragCurve, XMLNames.Engine_FullLoadCurve_Entry,
+ AttributeMappings.EngineFullLoadCurveMapping);
-
+ IList<IEngineFuelEngineeringInputData> IEngineModeEngineeringInputData.Fuels => _fuels ?? (_fuels = ReadFuels());
- IList<IEngineFuelDeclarationInputData> IEngineModeDeclarationInputData.Fuels
- {
- get { return (_fuels ?? (_fuels = ReadFuels())).Cast<IEngineFuelDeclarationInputData>().ToList(); }
- }
- public virtual IWHRData WasteHeatRecoveryDataElectrical
- {
- get { return WHRData ?? (WHRData = ReadWHRData("Electrical")); }
- }
+ IList<IEngineFuelDeclarationInputData> IEngineModeDeclarationInputData.Fuels => (_fuels ?? (_fuels = ReadFuels())).Cast<IEngineFuelDeclarationInputData>().ToList();
- public virtual IWHRData WasteHeatRecoveryDataMechanical
- {
- get { return WHRData ?? (WHRData = ReadWHRData("Mechanical")); }
- }
+ public virtual IWHRData WasteHeatRecoveryDataElectrical => WHRData ?? (WHRData = ReadWHRData("Electrical"));
+
+ public virtual IWHRData WasteHeatRecoveryDataMechanical => WHRData ?? (WHRData = ReadWHRData("Mechanical"));
#endregion
@@ -423,29 +312,26 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
}
}
- public virtual double WHTCMotorway { get { return 1; } }
+ public virtual double WHTCMotorway => 1;
- public virtual double WHTCRural { get { return 1; } }
+ public virtual double WHTCRural => 1;
- public virtual double WHTCUrban { get { return 1; } }
+ public virtual double WHTCUrban => 1;
- public virtual double ColdHotBalancingFactor { get { return 1; } }
+ public virtual double ColdHotBalancingFactor => 1;
- public virtual double CorrectionFactorRegPer { get { return 1; } }
+ public virtual double CorrectionFactorRegPer => 1;
- public virtual TableData FuelConsumptionMap {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, Source.SourcePath, XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry,
- AttributeMappings.FuelConsumptionMapMapping);
- }
- }
+ public virtual TableData FuelConsumptionMap =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, Source.SourcePath, XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry,
+ AttributeMappings.FuelConsumptionMapMapping);
#endregion
#region Implementation of IEngineFuelEngineeringInputData
- public double WHTCEngineering { get { return GetDouble(XMLNames.Engine_FCCorrection); } }
+ public double WHTCEngineering => GetDouble(XMLNames.Engine_FCCorrection);
#endregion
}
@@ -462,21 +348,17 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Implementation of IWHRData
- public virtual double UrbanCorrectionFactor { get { return 1; } }
- public virtual double RuralCorrectionFactor { get { return 1; } }
- public virtual double MotorwayCorrectionFactor { get { return 1; } }
- public virtual double BFColdHot { get { return 1; } }
- public virtual double CFRegPer { get { return 1; } }
- public virtual double EngineeringCorrectionFactor { get { return GetDouble(XMLNames.Engine_WHRCorrectionFactor); } }
+ public virtual double UrbanCorrectionFactor => 1;
+ public virtual double RuralCorrectionFactor => 1;
+ public virtual double MotorwayCorrectionFactor => 1;
+ public virtual double BFColdHot => 1;
+ public virtual double CFRegPer => 1;
+ public virtual double EngineeringCorrectionFactor => GetDouble(XMLNames.Engine_WHRCorrectionFactor);
- public virtual TableData GeneratedPower
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, Source.SourcePath, XMLNames.Engine_WHRMap, XMLNames.Engine_WHRMap_Entry,
- AttributeMappings.WHRPowerMapMapping);
- }
- }
+ public virtual TableData GeneratedPower =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, Source.SourcePath, XMLNames.Engine_WHRMap, XMLNames.Engine_WHRMap_Entry,
+ AttributeMappings.WHRPowerMapMapping);
#endregion
}
@@ -484,10 +366,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Overrides of XMLEngineeringEngineDataProviderV07
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringEngineStopStartDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringEngineStopStartDataProvider.cs
index c24014fa6be9ee2fef66e667e50fecc50376a796..a85532b12d1c37fe20ba40acb3b8a88915fac2ce 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringEngineStopStartDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringEngineStopStartDataProvider.cs
@@ -17,26 +17,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider {
public XMLEngineeringEngineStopStartDataProviderV10(IXMLEngineeringDriverData driverData, XmlNode node) : base(node) { }
- public virtual Second ActivationDelay
- {
- get { return GetDouble("ActivationDelay", DeclarationData.Driver.EngineStopStart.ActivationDelay.Value()).SI<Second>(); }
- }
+ public virtual Second ActivationDelay => GetDouble("ActivationDelay", DeclarationData.Driver.EngineStopStart.ActivationDelay.Value()).SI<Second>();
- public virtual Second MaxEngineOffTimespan
- {
- get { return GetDouble("MaxEngineOffTime", DeclarationData.Driver.EngineStopStart.MaxEngineOffTimespan.Value()).SI<Second>(); }
- }
+ public virtual Second MaxEngineOffTimespan => GetDouble("MaxEngineOffTime", DeclarationData.Driver.EngineStopStart.MaxEngineOffTimespan.Value()).SI<Second>();
- public virtual double UtilityFactorStandstill
- {
- get {
- return GetDouble("UtilityFactor", DeclarationData.Driver.EngineStopStart.UtilityFactor);
- }
- }
+ public virtual double UtilityFactorStandstill => GetDouble("UtilityFactor", DeclarationData.Driver.EngineStopStart.UtilityFactor);
- public double UtilityFactorDriving { get { return GetDouble("UtilityFactorDriving", DeclarationData.Driver.EngineStopStart.UtilityFactor); } }
-
- protected XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ public double UtilityFactorDriving => GetDouble("UtilityFactorDriving", DeclarationData.Driver.EngineStopStart.UtilityFactor);
+ protected XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearboxDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearboxDataProvider.cs
index 254f03bbb2b610ce83a82794ba8dcbfbbab09d14..3bdda5dee3c14c462997b48520cb9ff42d5b0128 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearboxDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearboxDataProvider.cs
@@ -62,30 +62,17 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
SourceType = (vehicle as IXMLResource).DataSource.SourceFile == fsBasePath ? DataSourceType.XMLEmbedded : DataSourceType.XMLFile;
}
- public virtual GearboxType Type
- {
- get { return GetString(XMLNames.Gearbox_TransmissionType).ParseEnum<GearboxType>(); }
- }
+ public virtual GearboxType Type => GetString(XMLNames.Gearbox_TransmissionType).ParseEnum<GearboxType>();
- public virtual KilogramSquareMeter Inertia
- {
- get { return GetDouble(XMLNames.Gearbox_Inertia).SI<KilogramSquareMeter>(); }
- }
+ public virtual KilogramSquareMeter Inertia => GetDouble(XMLNames.Gearbox_Inertia).SI<KilogramSquareMeter>();
- public virtual Second TractionInterruption
- {
- get { return GetDouble(XMLNames.Gearbox_TractionInterruption).SI<Second>(); }
- }
+ public virtual Second TractionInterruption => GetDouble(XMLNames.Gearbox_TractionInterruption).SI<Second>();
- public virtual Second PowershiftShiftTime
- {
- get {
- return GetNode(XMLNames.DriverModel_ShiftStrategyParameters_PowershiftShiftTime,
- ((XMLEngineeringInputDataProviderV07)Vehicle.Job.InputData).Document.DocumentElement, required: false)
- ?.InnerText.ToDouble().SI<Second>() ?? Constants.DefaultPowerShiftTime;
- }
- }
+ public virtual Second PowershiftShiftTime =>
+ GetNode(XMLNames.DriverModel_ShiftStrategyParameters_PowershiftShiftTime,
+ ((XMLEngineeringInputDataProviderV07)Vehicle.Job.InputData).Document.DocumentElement, required: false)
+ ?.InnerText.ToDouble().SI<Second>() ?? Constants.DefaultPowerShiftTime;
public virtual IList<ITransmissionInputData> Gears
{
@@ -104,15 +91,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
}
}
- public virtual bool DifferentialIncluded { get { return false; } }
- public virtual double AxlegearRatio { get { return double.NaN; } }
+ public virtual bool DifferentialIncluded => false;
+ public virtual double AxlegearRatio => double.NaN;
public IXMLGearboxReader Reader { protected get; set; }
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
#endregion
@@ -134,12 +121,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Overrides of XMLEngineeringGearboxDataProviderV07
- public override Second PowershiftShiftTime
- {
- get { return GetNode(XMLNames.DriverModel_ShiftStrategyParameters_PowershiftShiftTime, required: false)?.InnerText.ToDouble().SI<Second>() ?? Constants.DefaultPowerShiftTime; }
- }
+ public override Second PowershiftShiftTime => GetNode(XMLNames.DriverModel_ShiftStrategyParameters_PowershiftShiftTime, required: false)?.InnerText.ToDouble().SI<Second>() ?? Constants.DefaultPowerShiftTime;
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
#endregion
}
@@ -155,30 +139,18 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
BasePath = basePath;
}
- public virtual int Gear
- {
- get {
- return XmlConvert.ToUInt16(
- BaseNode.Attributes?.GetNamedItem(XMLNames.Gearbox_Gear_GearNumber_Attr).InnerText ?? "0");
- }
- }
+ public virtual int Gear =>
+ XmlConvert.ToUInt16(
+ BaseNode.Attributes?.GetNamedItem(XMLNames.Gearbox_Gear_GearNumber_Attr).InnerText ?? "0");
- public virtual double Ratio
- {
- get {
- return BaseNode.SelectSingleNode(XMLHelper.QueryLocalName(XMLNames.Gearbox_Gear_Ratio))?.InnerText.ToDouble() ??
- double.NaN;
- }
- }
+ public virtual double Ratio =>
+ BaseNode.SelectSingleNode(XMLHelper.QueryLocalName(XMLNames.Gearbox_Gear_Ratio))?.InnerText.ToDouble() ??
+ double.NaN;
- public virtual TableData LossMap
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, BasePath, XMLNames.Gearbox_Gear_TorqueLossMap, XMLNames.Gearbox_Gear_TorqueLossMap_Entry,
- AttributeMappings.TransmissionLossmapMapping);
- }
- }
+ public virtual TableData LossMap =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, BasePath, XMLNames.Gearbox_Gear_TorqueLossMap, XMLNames.Gearbox_Gear_TorqueLossMap_Entry,
+ AttributeMappings.TransmissionLossmapMapping);
public virtual double Efficiency
{
@@ -188,10 +160,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
}
}
- public virtual DataSource DataSource
- {
- get { return _dataSource ?? (_dataSource = new DataSource() { SourceFile = BasePath, SourceType = DataSourceType.XMLEmbedded, SourceVersion = XMLHelper.GetVersionFromNamespaceUri(SchemaNamespace) }); }
- }
+ public virtual DataSource DataSource => _dataSource ?? (_dataSource = new DataSource() { SourceFile = BasePath, SourceType = DataSourceType.XMLEmbedded, SourceVersion = XMLHelper.GetVersionFromNamespaceUri(SchemaNamespace) });
protected abstract XNamespace SchemaNamespace { get; }
}
@@ -210,33 +179,20 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Implementation of ITransmissionInputData
- public virtual NewtonMeter MaxTorque
- {
- get {
- return GetNode(XMLNames.Gearbox_Gears_MaxTorque, required: false)?.InnerText
- .ToDouble().SI<NewtonMeter>();
- }
- }
+ public virtual NewtonMeter MaxTorque =>
+ GetNode(XMLNames.Gearbox_Gears_MaxTorque, required: false)?.InnerText
+ .ToDouble().SI<NewtonMeter>();
- public virtual PerSecond MaxInputSpeed
- {
- get { return GetNode(XMLNames.Gearbox_Gear_MaxSpeed, required: false)?.InnerText.ToDouble().RPMtoRad(); }
- }
-
- public virtual TableData ShiftPolygon
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, BasePath, XMLNames.Gearbox_Gears_Gear_ShiftPolygon, XMLNames.TorqueConverter_ShiftPolygon_Entry,
- AttributeMappings.ShiftPolygonMapping);
- }
- }
+ public virtual PerSecond MaxInputSpeed => GetNode(XMLNames.Gearbox_Gear_MaxSpeed, required: false)?.InnerText.ToDouble().RPMtoRad();
+ public virtual TableData ShiftPolygon =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, BasePath, XMLNames.Gearbox_Gears_Gear_ShiftPolygon, XMLNames.TorqueConverter_ShiftPolygon_Entry,
+ AttributeMappings.ShiftPolygonMapping);
#endregion
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
-
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
internal class XMLGearDataV10 : XMLGearDataV07
@@ -251,7 +207,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public XMLGearDataV10(XmlNode gearNode, string basePath) : base(gearNode, basePath) { }
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
-
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs
index 83d9beb92d4887ed4398c9197bc4ae2348fd589d..41fbabdf1763e837b6d36e7230c7522e5cb5221c 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs
@@ -59,139 +59,92 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
// get { return GetNode(XMLNames.Gearbox_TractionInterruption)?.InnerText.ToDouble().SI<Second>(); }
//}
- public virtual Second MinTimeBetweenGearshift
- {
- get {
- return GetNode(XMLNames.DriverModel_ShiftStrategyParameters_TimeBetweenGearshift, required: false)
- ?.InnerText.ToDouble().SI<Second>() ?? DeclarationData.Gearbox.MinTimeBetweenGearshifts;
- }
- }
-
- public virtual double TorqueReserve
- {
- get {
- return GetNode(XMLNames.DriverModel_ShiftStrategyParameters_TorqueReserve, required: false)?.InnerText.ToDouble() ??
- DeclarationData.GearboxTCU.TorqueReserve;
- }
- }
-
- public virtual MeterPerSecond StartSpeed
- {
- get {
- return GetNode(XMLNames.DriverModel_ShiftStrategyParameters_StartSpeed, required: false)
- ?.InnerText.ToDouble().SI<MeterPerSecond>() ?? DeclarationData.GearboxTCU.StartSpeed;
- }
- }
-
- public virtual MeterPerSquareSecond StartAcceleration
- {
- get {
- return GetNode(XMLNames.DriverModel_ShiftStrategyParameters_StartAcceleration, required: false)
- ?.InnerText.ToDouble().SI<MeterPerSquareSecond>() ?? DeclarationData.GearboxTCU.StartAcceleration;
- }
- }
-
- public virtual double StartTorqueReserve
- {
- get {
- return GetNode(XMLNames.DriverModel_ShiftStrategyParameters_StartTorqueReserve, required: false)
- ?.InnerText.ToDouble() ??
- DeclarationData.GearboxTCU.TorqueReserveStart;
- }
- }
-
- public virtual Second DownshiftAfterUpshiftDelay
- {
- get {
- return GetNode(XMLNames.DriverModel_ShiftStrategyParameters_DownshiftAfterUpshiftDelay, required: false)
- ?.InnerText.ToDouble().SI<Second>() ??
- DeclarationData.Gearbox.DownshiftAfterUpshiftDelay;
- }
- }
-
- public virtual Second UpshiftAfterDownshiftDelay
- {
- get {
- return GetNode(XMLNames.DriverModel_ShiftStrategyParameters_UpshiftAfterDownshiftDelay, required: false)
- ?.InnerText.ToDouble().SI<Second>() ?? DeclarationData.Gearbox.UpshiftAfterDownshiftDelay;
- }
- }
-
- public virtual MeterPerSquareSecond UpshiftMinAcceleration
- {
- get {
- return GetNode(XMLNames.DriverModel_ShiftStrategyParameters_UpshiftMinAcceleration, required: false)
- ?.InnerText.ToDouble().SI<MeterPerSquareSecond>() ?? DeclarationData.Gearbox.UpshiftMinAcceleration;
- }
- }
-
- public virtual Second GearResidenceTime { get { return null; } }
- public virtual double? DnT99LHMin1 { get { return null; } }
- public virtual double? DnT99LHMin2 { get { return null; } }
- public virtual int? AllowedGearRangeUp { get { return null; } }
- public virtual int? AllowedGearRangeDown { get { return null; } }
- public virtual Second LookBackInterval { get { return null; } }
- public virtual Watt AvgCardanPowerThresholdPropulsion { get { return null; } }
- public virtual Watt CurrCardanPowerThresholdPropulsion { get { return null; } }
- public virtual double? TargetSpeedDeviationFactor { get { return null; } }
- public virtual double? EngineSpeedHighDriveOffFactor { get { return null; } }
- public virtual double? RatingFactorCurrentGear { get { return null; } }
- public virtual TableData AccelerationReserveLookup { get { return null; } }
- public virtual TableData ShareTorque99L { get { return null; } }
- public virtual TableData PredictionDurationLookup { get { return null; } }
- public virtual TableData ShareIdleLow { get { return null; } }
- public virtual TableData ShareEngineHigh { get { return null; } }
- public virtual string Source { get { return null; } }
- public virtual Second DriverAccelerationLookBackInterval { get { return null; } }
- public virtual MeterPerSquareSecond DriverAccelerationThresholdLow { get { return null; } }
- public virtual double? RatioEarlyUpshiftFC { get { return null; } }
- public virtual double? RatioEarlyDownshiftFC { get { return null; } }
- public int? AllowedGearRangeFC { get { return null; } }
-
- public double? VeloictyDropFactor { get { return null; } }
-
- public PerSecond MinEngineSpeedPostUpshift { get { return null; } }
- public Second ATLookAheadTime { get { return null; } }
- public double[][] ShiftSpeedsTCToLocked { get { return null; } }
-
- public double? AccelerationFactor
- {
- get { return null; }
- }
-
- public virtual TableData LoadStageShiftLines { get { return null; } }
- public virtual IList<double> LoadStageThresholdsUp { get { return null; } }
- public virtual IList<double> LoadStageThresholdsDown { get { return null; } }
-
- public virtual Second PowershiftShiftTime
- {
- get {
- return GetNode(XMLNames.DriverModel_ShiftStrategyParameters_PowershiftShiftTime, required: false)
- ?.InnerText.ToDouble().SI<Second>() ?? 0.8.SI<Second>();
- }
- }
+ public virtual Second MinTimeBetweenGearshift =>
+ GetNode(XMLNames.DriverModel_ShiftStrategyParameters_TimeBetweenGearshift, required: false)
+ ?.InnerText.ToDouble().SI<Second>() ?? DeclarationData.Gearbox.MinTimeBetweenGearshifts;
+
+ public virtual double TorqueReserve =>
+ GetNode(XMLNames.DriverModel_ShiftStrategyParameters_TorqueReserve, required: false)?.InnerText.ToDouble() ??
+ DeclarationData.GearboxTCU.TorqueReserve;
+
+ public virtual MeterPerSecond StartSpeed =>
+ GetNode(XMLNames.DriverModel_ShiftStrategyParameters_StartSpeed, required: false)
+ ?.InnerText.ToDouble().SI<MeterPerSecond>() ?? DeclarationData.GearboxTCU.StartSpeed;
+
+ public virtual MeterPerSquareSecond StartAcceleration =>
+ GetNode(XMLNames.DriverModel_ShiftStrategyParameters_StartAcceleration, required: false)
+ ?.InnerText.ToDouble().SI<MeterPerSquareSecond>() ?? DeclarationData.GearboxTCU.StartAcceleration;
+
+ public virtual double StartTorqueReserve =>
+ GetNode(XMLNames.DriverModel_ShiftStrategyParameters_StartTorqueReserve, required: false)
+ ?.InnerText.ToDouble() ??
+ DeclarationData.GearboxTCU.TorqueReserveStart;
+
+ public virtual Second DownshiftAfterUpshiftDelay =>
+ GetNode(XMLNames.DriverModel_ShiftStrategyParameters_DownshiftAfterUpshiftDelay, required: false)
+ ?.InnerText.ToDouble().SI<Second>() ??
+ DeclarationData.Gearbox.DownshiftAfterUpshiftDelay;
+
+ public virtual Second UpshiftAfterDownshiftDelay =>
+ GetNode(XMLNames.DriverModel_ShiftStrategyParameters_UpshiftAfterDownshiftDelay, required: false)
+ ?.InnerText.ToDouble().SI<Second>() ?? DeclarationData.Gearbox.UpshiftAfterDownshiftDelay;
+
+ public virtual MeterPerSquareSecond UpshiftMinAcceleration =>
+ GetNode(XMLNames.DriverModel_ShiftStrategyParameters_UpshiftMinAcceleration, required: false)
+ ?.InnerText.ToDouble().SI<MeterPerSquareSecond>() ?? DeclarationData.Gearbox.UpshiftMinAcceleration;
+
+ public virtual Second GearResidenceTime => null;
+ public virtual double? DnT99LHMin1 => null;
+ public virtual double? DnT99LHMin2 => null;
+ public virtual int? AllowedGearRangeUp => null;
+ public virtual int? AllowedGearRangeDown => null;
+ public virtual Second LookBackInterval => null;
+ public virtual Watt AvgCardanPowerThresholdPropulsion => null;
+ public virtual Watt CurrCardanPowerThresholdPropulsion => null;
+ public virtual double? TargetSpeedDeviationFactor => null;
+ public virtual double? EngineSpeedHighDriveOffFactor => null;
+ public virtual double? RatingFactorCurrentGear => null;
+ public virtual TableData AccelerationReserveLookup => null;
+ public virtual TableData ShareTorque99L => null;
+ public virtual TableData PredictionDurationLookup => null;
+ public virtual TableData ShareIdleLow => null;
+ public virtual TableData ShareEngineHigh => null;
+ public virtual string Source => null;
+ public virtual Second DriverAccelerationLookBackInterval => null;
+ public virtual MeterPerSquareSecond DriverAccelerationThresholdLow => null;
+ public virtual double? RatioEarlyUpshiftFC => null;
+ public virtual double? RatioEarlyDownshiftFC => null;
+ public int? AllowedGearRangeFC => null;
+
+ public double? VeloictyDropFactor => null;
+
+ public PerSecond MinEngineSpeedPostUpshift => null;
+ public Second ATLookAheadTime => null;
+ public double[][] ShiftSpeedsTCToLocked => null;
+
+ public double? AccelerationFactor => null;
+
+ public virtual TableData LoadStageShiftLines => null;
+ public virtual IList<double> LoadStageThresholdsUp => null;
+ public virtual IList<double> LoadStageThresholdsDown => null;
+
+ public virtual Second PowershiftShiftTime =>
+ GetNode(XMLNames.DriverModel_ShiftStrategyParameters_PowershiftShiftTime, required: false)
+ ?.InnerText.ToDouble().SI<Second>() ?? 0.8.SI<Second>();
#endregion
#region Implementation of ITorqueConverterEngineeringShiftParameterInputData
- public virtual MeterPerSquareSecond CLUpshiftMinAcceleration
- {
- get {
- return GetNode(XMLNames.TorqueConverter_CLUpshiftMinAcceleration, required: false)
- ?.InnerText.ToDouble().SI<MeterPerSquareSecond>() ??
- DeclarationData.Gearbox.UpshiftMinAcceleration;
- }
- }
-
- public virtual MeterPerSquareSecond CCUpshiftMinAcceleration
- {
- get {
- return GetNode(XMLNames.TorqueConverter_CCUpshiftMinAcceleration, required: false)
- ?.InnerText.ToDouble().SI<MeterPerSquareSecond>() ??
- DeclarationData.Gearbox.UpshiftMinAcceleration;
- }
- }
+ public virtual MeterPerSquareSecond CLUpshiftMinAcceleration =>
+ GetNode(XMLNames.TorqueConverter_CLUpshiftMinAcceleration, required: false)
+ ?.InnerText.ToDouble().SI<MeterPerSquareSecond>() ??
+ DeclarationData.Gearbox.UpshiftMinAcceleration;
+
+ public virtual MeterPerSquareSecond CCUpshiftMinAcceleration =>
+ GetNode(XMLNames.TorqueConverter_CCUpshiftMinAcceleration, required: false)
+ ?.InnerText.ToDouble().SI<MeterPerSquareSecond>() ??
+ DeclarationData.Gearbox.UpshiftMinAcceleration;
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringInputDataProvider.cs
index 5ffecf30c49ef2c01bb4696847d10ffcac99e254..5c8b3e2d7d29239c0406be2c442704a75a6d57ef 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringInputDataProvider.cs
@@ -74,15 +74,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Implementation of IEngineeringInputDataProvider
- public virtual IEngineeringJobInputData JobInputData
- {
- get { return JobData ?? (JobData = Reader.JobData); }
- }
+ public virtual IEngineeringJobInputData JobInputData => JobData ?? (JobData = Reader.JobData);
- public virtual IDriverEngineeringInputData DriverInputData
- {
- get { return DriverData ?? (DriverData = Reader.DriverModel); }
- }
+ public virtual IDriverEngineeringInputData DriverInputData => DriverData ?? (DriverData = Reader.DriverModel);
//public virtual IGearshiftEngineeringInputData GearshiftInputData { get { return DriverInputData.GearshiftInputData; } }
@@ -93,7 +87,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
#endregion
@@ -110,7 +104,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public XMLEngineeringInputDataProviderV10(XmlDocument xmldoc, string fileName) : base(xmldoc, fileName) { }
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
-
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringJobInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringJobInputDataProvider.cs
index 74e816324725d92a4c5f010f9318a76597e2eef4..c69db5c51fa67e9ae9c1808d0ddf9f464150717a 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringJobInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringJobInputDataProvider.cs
@@ -71,66 +71,38 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
}
- public virtual IHybridStrategyParameters HybridStrategyParameters
- {
- get { return null; }
- }
+ public virtual IHybridStrategyParameters HybridStrategyParameters => null;
- public virtual IList<ICycleData> Cycles
- {
- get { return (_cycles ?? (_cycles = Reader.CreateCycles)).Cycles; }
- }
+ public virtual IList<ICycleData> Cycles => (_cycles ?? (_cycles = Reader.CreateCycles)).Cycles;
- public virtual IEngineEngineeringInputData EngineOnly
- {
- get { return _engineOnly ?? (_engineOnly = Reader.CreateEngineOnly); }
- }
+ public virtual IEngineEngineeringInputData EngineOnly => _engineOnly ?? (_engineOnly = Reader.CreateEngineOnly);
- public virtual TableData PTOCycleWhileDrive { get { return null; } }
+ public virtual TableData PTOCycleWhileDrive => null;
- public string ShiftStrategy { get { return null; } }
+ public string ShiftStrategy => null;
public virtual VectoSimulationJobType JobType { get; }
- public virtual string JobName
- {
- get {
- return JobType == VectoSimulationJobType.EngineOnlySimulation
- ? EngineOnly.Model
- : (GetAttribute(BaseNode.SelectSingleNode(XMLHelper.QueryLocalName(XMLNames.Component_Vehicle)), "id") ??
- Vehicle.Model + " " + Vehicle.Manufacturer);
- }
- }
+ public virtual string JobName =>
+ JobType == VectoSimulationJobType.EngineOnlySimulation
+ ? EngineOnly.Model
+ : (GetAttribute(BaseNode.SelectSingleNode(XMLHelper.QueryLocalName(XMLNames.Component_Vehicle)), "id") ??
+ Vehicle.Model + " " + Vehicle.Manufacturer);
- public virtual bool SavedInDeclarationMode
- {
- get { return false; }
- }
+ public virtual bool SavedInDeclarationMode => false;
- public virtual IVehicleEngineeringInputData Vehicle
- {
- get { return _vehicle ?? (_vehicle = Reader.CreateVehicle); }
- }
+ public virtual IVehicleEngineeringInputData Vehicle => _vehicle ?? (_vehicle = Reader.CreateVehicle);
- IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle
- {
- get { return Vehicle; }
- }
+ IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle => Vehicle;
- public string SourePath
- {
- get { return FileName == null ? null : Path.GetDirectoryName(Path.GetFullPath(FileName)); }
- }
+ public string SourePath => FileName == null ? null : Path.GetDirectoryName(Path.GetFullPath(FileName));
- public IXMLEngineeringInputData InputData
- {
- get { return InputProvider; }
- }
+ public IXMLEngineeringInputData InputData => InputProvider;
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
#endregion
@@ -151,7 +123,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Overrides of XMLEngineeringJobInputDataProviderV07
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringOverspeed.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringOverspeed.cs
index 265403dfaa6fbf04ea132034c59bd2fc330f4025..1fbebfd71cb04e672c4f4f8b69a3ac51af8c3670 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringOverspeed.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringOverspeed.cs
@@ -58,31 +58,17 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Implementation of IOverSpeedEcoRollDeclarationInputData
- public virtual bool Enabled
- {
- get { return GetNode(XMLNames.DriverModel_Overspeed_Mode, required: false)?.InnerText.Equals("Overspeed", StringComparison.InvariantCultureIgnoreCase) ?? false; }
- }
+ public virtual bool Enabled => GetNode(XMLNames.DriverModel_Overspeed_Mode, required: false)?.InnerText.Equals("Overspeed", StringComparison.InvariantCultureIgnoreCase) ?? false;
#endregion
#region Implementation of IOverSpeedEcoRollEngineeringInputData
- public virtual MeterPerSecond MinSpeed
- {
- get { return GetNode(XMLNames.DriverModel_Overspeed_MinSpeed, required: false)?.InnerText.ToDouble().KMPHtoMeterPerSecond(); }
- }
+ public virtual MeterPerSecond MinSpeed => GetNode(XMLNames.DriverModel_Overspeed_MinSpeed, required: false)?.InnerText.ToDouble().KMPHtoMeterPerSecond();
- public virtual MeterPerSecond OverSpeed
- {
- get { return GetNode(XMLNames.DriverModel_Overspeed_AllowedOverspeed, required: false)?.InnerText.ToDouble().KMPHtoMeterPerSecond(); }
- }
+ public virtual MeterPerSecond OverSpeed => GetNode(XMLNames.DriverModel_Overspeed_AllowedOverspeed, required: false)?.InnerText.ToDouble().KMPHtoMeterPerSecond();
- public virtual MeterPerSecond UnderSpeed
- {
- get {
- return GetNode(XMLNames.DriverModel_Overspeed_AllowedUnderspeed, required: false)?.InnerText.ToDouble().KMPHtoMeterPerSecond();
- }
- }
+ public virtual MeterPerSecond UnderSpeed => GetNode(XMLNames.DriverModel_Overspeed_AllowedUnderspeed, required: false)?.InnerText.ToDouble().KMPHtoMeterPerSecond();
#endregion
}
@@ -99,10 +85,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public XMLEngineeringOverspeedV10(IXMLEngineeringDriverData driverData, XmlNode node) : base(driverData, node) { }
- public override bool Enabled
- {
- get { return XmlConvert.ToBoolean(GetNode(XMLNames.DriverModel_Overspeed_Enabled, required: false)?.InnerText ?? "false"); }
- }
-
+ public override bool Enabled => XmlConvert.ToBoolean(GetNode(XMLNames.DriverModel_Overspeed_Enabled, required: false)?.InnerText ?? "false");
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringPCCInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringPCCInputDataProvider.cs
index 0d8c253b43067e457cd654c675586ee509cf81a0..c93814bfac028463e2932d447a8669ecb03a8f53 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringPCCInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringPCCInputDataProvider.cs
@@ -19,41 +19,17 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider {
#region Implementation of IPCCEngineeringInputData
- public MeterPerSecond PCCEnabledSpeed
- {
- get { return GetDouble("EnablingSpeed", DeclarationData.Driver.PCC.PCCEnableSpeed.AsKmph).KMPHtoMeterPerSecond(); }
- }
-
- public MeterPerSecond MinSpeed
- {
- get { return GetDouble("MinSpeed", DeclarationData.Driver.PCC.MinSpeed.AsKmph).KMPHtoMeterPerSecond(); }
- }
-
- public Meter PreviewDistanceUseCase1
- {
- get {
- return GetDouble("PreviewDistanceUseCase1", DeclarationData.Driver.PCC.PreviewDistanceUseCase1.Value()).SI<Meter>();
- }
- }
-
- public Meter PreviewDistanceUseCase2
- {
- get {
- return GetDouble("PreviewDistanceUseCase2", DeclarationData.Driver.PCC.PreviewDistanceUseCase2.Value()).SI<Meter>();
- }
- }
-
- public MeterPerSecond Underspeed
- {
- get { return GetDouble("AllowedUnderspeed", DeclarationData.Driver.PCC.Underspeed.AsKmph).KMPHtoMeterPerSecond(); }
- }
-
- public MeterPerSecond OverspeedUseCase3
- {
- get {
- return GetDouble("AllowedOverspeed", DeclarationData.Driver.PCC.OverspeedUseCase3.AsKmph).KMPHtoMeterPerSecond();
- }
- }
+ public MeterPerSecond PCCEnabledSpeed => GetDouble("EnablingSpeed", DeclarationData.Driver.PCC.PCCEnableSpeed.AsKmph).KMPHtoMeterPerSecond();
+
+ public MeterPerSecond MinSpeed => GetDouble("MinSpeed", DeclarationData.Driver.PCC.MinSpeed.AsKmph).KMPHtoMeterPerSecond();
+
+ public Meter PreviewDistanceUseCase1 => GetDouble("PreviewDistanceUseCase1", DeclarationData.Driver.PCC.PreviewDistanceUseCase1.Value()).SI<Meter>();
+
+ public Meter PreviewDistanceUseCase2 => GetDouble("PreviewDistanceUseCase2", DeclarationData.Driver.PCC.PreviewDistanceUseCase2.Value()).SI<Meter>();
+
+ public MeterPerSecond Underspeed => GetDouble("AllowedUnderspeed", DeclarationData.Driver.PCC.Underspeed.AsKmph).KMPHtoMeterPerSecond();
+
+ public MeterPerSecond OverspeedUseCase3 => GetDouble("AllowedOverspeed", DeclarationData.Driver.PCC.OverspeedUseCase3.AsKmph).KMPHtoMeterPerSecond();
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringRetarderDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringRetarderDataProvider.cs
index 0cce5a065b51adabba1d461e62debf9ddc7555d7..f7a6d3883bf47085b91fcccd67f65a4abbdd8525 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringRetarderDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringRetarderDataProvider.cs
@@ -57,28 +57,18 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
SourceType = (vehicle as IXMLResource).DataSource.SourceFile == fsBasePath ? DataSourceType.XMLEmbedded : DataSourceType.XMLFile;
}
- public virtual RetarderType Type
- {
- get { return Vehicle.RetarderType; }
- }
+ public virtual RetarderType Type => Vehicle.RetarderType;
- public virtual double Ratio
- {
- get { return Vehicle.RetarderRatio; }
- }
+ public virtual double Ratio => Vehicle.RetarderRatio;
- public virtual TableData LossMap
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, DataSource.SourcePath, XMLNames.Retarder_RetarderLossMap, XMLNames.Retarder_RetarderLossMap_Entry,
- AttributeMappings.RetarderLossmapMapping);
- }
- }
+ public virtual TableData LossMap =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, DataSource.SourcePath, XMLNames.Retarder_RetarderLossMap, XMLNames.Retarder_RetarderLossMap_Entry,
+ AttributeMappings.RetarderLossmapMapping);
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
#endregion
@@ -99,7 +89,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Overrides of XMLEngineeringRetarderDataProviderV07
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringTorqueConverterDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringTorqueConverterDataProvider.cs
index 0aef9b3f4952fae4737b16e9c1b3d698c8c44eb6..1cc396acd9102b341ee038a0b8cd1b21f890edf5 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringTorqueConverterDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringTorqueConverterDataProvider.cs
@@ -60,54 +60,35 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.Impl
#region Implementation of ITorqueConverterDeclarationInputData
- public virtual TableData TCData
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, DataSource.SourcePath, XMLNames.TorqueConverter_Characteristics, XMLNames.TorqueConverter_Characteristics_Entry,
- AttributeMappings.TorqueConverterDataMapping);
- }
- }
+ public virtual TableData TCData =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, DataSource.SourcePath, XMLNames.TorqueConverter_Characteristics, XMLNames.TorqueConverter_Characteristics_Entry,
+ AttributeMappings.TorqueConverterDataMapping);
#endregion
#region Implementation of ITorqueConverterEngineeringInputData
- public virtual PerSecond ReferenceRPM
- {
- get {
- return GetNode(XMLNames.TorqueConverter_ReferenceRPM)?.InnerText.ToDouble().RPMtoRad() ??
- DeclarationData.TorqueConverter.ReferenceRPM;
- }
- }
+ public virtual PerSecond ReferenceRPM =>
+ GetNode(XMLNames.TorqueConverter_ReferenceRPM)?.InnerText.ToDouble().RPMtoRad() ??
+ DeclarationData.TorqueConverter.ReferenceRPM;
- public virtual KilogramSquareMeter Inertia
- {
- get {
- return GetNode(XMLNames.TorqueConverter_Inertia)?.InnerText.ToDouble().SI<KilogramSquareMeter>() ??
- 0.SI<KilogramSquareMeter>();
- }
- }
+ public virtual KilogramSquareMeter Inertia =>
+ GetNode(XMLNames.TorqueConverter_Inertia)?.InnerText.ToDouble().SI<KilogramSquareMeter>() ??
+ 0.SI<KilogramSquareMeter>();
- public virtual TableData ShiftPolygon
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, DataSource.SourcePath, XMLNames.TorqueConverter_ShiftPolygon, XMLNames.TorqueConverter_ShiftPolygon_Entry,
- AttributeMappings.ShiftPolygonMapping);
- }
- }
+ public virtual TableData ShiftPolygon =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, DataSource.SourcePath, XMLNames.TorqueConverter_ShiftPolygon, XMLNames.TorqueConverter_ShiftPolygon_Entry,
+ AttributeMappings.ShiftPolygonMapping);
- public virtual PerSecond MaxInputSpeed
- {
- get { return GetNode(XMLNames.TorqueConverter_MaxInputSpeed)?.InnerText.ToDouble().RPMtoRad(); }
- }
+ public virtual PerSecond MaxInputSpeed => GetNode(XMLNames.TorqueConverter_MaxInputSpeed)?.InnerText.ToDouble().RPMtoRad();
#endregion
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
#endregion
@@ -127,7 +108,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.Impl
#region Overrides of XMLEngineeringTorqueConverterDataProviderV07
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleComponentsDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleComponentsDataProvider.cs
index def7f434d177cb2b5435073ec0d2fe5f0201fdb3..9f1de3fc1d4d04e85d8e8a9f20c1008b3f86ec7a 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleComponentsDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleComponentsDataProvider.cs
@@ -63,65 +63,36 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Implementation of IVehicleComponentsEngineering
- public override DataSource DataSource
- {
- get { return ((IXMLResource)Vehicle).DataSource; }
- }
+ public override DataSource DataSource => ((IXMLResource)Vehicle).DataSource;
public IXMLComponentsReader ComponentReader { protected get; set; }
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
- public virtual IAirdragEngineeringInputData AirdragInputData
- {
- get { return _airdragInputData ?? (_airdragInputData = ComponentReader.AirdragInputData); }
- }
+ public virtual IAirdragEngineeringInputData AirdragInputData => _airdragInputData ?? (_airdragInputData = ComponentReader.AirdragInputData);
- public virtual IGearboxEngineeringInputData GearboxInputData
- {
- get { return _gearboxInputData ?? (_gearboxInputData = ComponentReader.GearboxData); }
- }
- public virtual ITorqueConverterEngineeringInputData TorqueConverterInputData
- {
- get { return _torqueConverterInputData ?? (_torqueConverterInputData = ComponentReader.TorqueConverter); }
- }
+ public virtual IGearboxEngineeringInputData GearboxInputData => _gearboxInputData ?? (_gearboxInputData = ComponentReader.GearboxData);
- public virtual IAxleGearInputData AxleGearInputData
- {
- get { return _axleGearInputData ?? (_axleGearInputData = ComponentReader.AxleGearInputData); }
- }
-
- public virtual IAngledriveInputData AngledriveInputData
- {
- get { return _angledriveInputData ?? (_angledriveInputData = ComponentReader.AngularGearInputData); }
- }
+ public virtual ITorqueConverterEngineeringInputData TorqueConverterInputData => _torqueConverterInputData ?? (_torqueConverterInputData = ComponentReader.TorqueConverter);
- public virtual IEngineEngineeringInputData EngineInputData
- {
- get { return _engineInputData ?? (_engineInputData = ComponentReader.EngineInputData); }
- }
+ public virtual IAxleGearInputData AxleGearInputData => _axleGearInputData ?? (_axleGearInputData = ComponentReader.AxleGearInputData);
- public virtual IAuxiliariesEngineeringInputData AuxiliaryInputData
- {
- get { return _auxInputData ?? (_auxInputData = ComponentReader.AuxiliaryData); }
- }
+ public virtual IAngledriveInputData AngledriveInputData => _angledriveInputData ?? (_angledriveInputData = ComponentReader.AngularGearInputData);
- public virtual IRetarderInputData RetarderInputData
- {
- get { return _retarderInputData ?? (_retarderInputData = ComponentReader.RetarderInputData); }
- }
+ public virtual IEngineEngineeringInputData EngineInputData => _engineInputData ?? (_engineInputData = ComponentReader.EngineInputData);
- public IPTOTransmissionInputData PTOTransmissionInputData { get { return Vehicle; } }
+ public virtual IAuxiliariesEngineeringInputData AuxiliaryInputData => _auxInputData ?? (_auxInputData = ComponentReader.AuxiliaryData);
- public IAxlesEngineeringInputData AxleWheels
- {
- get { return _axleWheels ?? (_axleWheels = ComponentReader.AxlesEngineeringInputData); }
- }
+ public virtual IRetarderInputData RetarderInputData => _retarderInputData ?? (_retarderInputData = ComponentReader.RetarderInputData);
- public virtual IElectricStorageEngineeringInputData ElectricStorage { get { return null; } }
- public virtual IElectricMachinesEngineeringInputData ElectricMachines { get { return null; } }
+ public IPTOTransmissionInputData PTOTransmissionInputData => Vehicle;
+
+ public IAxlesEngineeringInputData AxleWheels => _axleWheels ?? (_axleWheels = ComponentReader.AxlesEngineeringInputData);
+
+ public virtual IElectricStorageEngineeringInputData ElectricStorage => null;
+ public virtual IElectricMachinesEngineeringInputData ElectricMachines => null;
#endregion
@@ -142,7 +113,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public XMLEngineeringVehicleComponentsDataProviderV10(IXMLEngineeringVehicleData vehicle, XmlNode baseNode, string source) : base(vehicle, baseNode, source) { }
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
-
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
index 0856567215232a6ed62cf5190ef0a5f62c8a6a18..fd6f9ccda3372030103c0c3dfae67b103e2c827a 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
@@ -70,27 +70,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public IXMLComponentsReader ComponentReader { protected get; set; }
- public virtual XmlElement ComponentNode
- {
- get { return _componentNode ?? (_componentNode = GetNode(XMLNames.Vehicle_Components) as XmlElement); }
- }
+ public virtual XmlElement ComponentNode => _componentNode ?? (_componentNode = GetNode(XMLNames.Vehicle_Components) as XmlElement);
#region Implementation of IComponentInputData
- public override CertificationMethod CertificationMethod
- {
- get { return CertificationMethod.NotCertified; }
- }
+ public override CertificationMethod CertificationMethod => CertificationMethod.NotCertified;
- public override string CertificationNumber
- {
- get { return "N.A."; }
- }
+ public override string CertificationNumber => "N.A.";
- public override DigestData DigestValue
- {
- get { return null; }
- }
+ public override DigestData DigestValue => null;
#endregion
@@ -98,168 +86,85 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public string Identifier { get; }
- public bool ExemptedVehicle
- {
- get { return false; }
- }
+ public bool ExemptedVehicle => false;
- public virtual string VIN
- {
- get { return GetString(XMLNames.Vehicle_VIN); }
- }
+ public virtual string VIN => GetString(XMLNames.Vehicle_VIN);
- public string LegislativeCategory
- {
- get { return null; }
- }
+ public string LegislativeCategory => null;
- public virtual LegislativeClass? LegislativeClass
- {
- get { return GetString(XMLNames.Vehicle_LegislativeClass).ParseEnum<LegislativeClass>(); }
- }
+ public virtual LegislativeClass? LegislativeClass => GetString(XMLNames.Vehicle_LegislativeClass).ParseEnum<LegislativeClass>();
- public virtual VehicleCategory VehicleCategory
- {
- get {
- return GetNode(XMLNames.Vehicle_VehicleCategory, required: false)?.InnerText.ParseEnum<VehicleCategory>() ??
- VehicleCategory.Unknown;
- }
- }
+ public virtual VehicleCategory VehicleCategory =>
+ GetNode(XMLNames.Vehicle_VehicleCategory, required: false)?.InnerText.ParseEnum<VehicleCategory>() ??
+ VehicleCategory.Unknown;
- public virtual AxleConfiguration AxleConfiguration
- {
- get { return AxleConfigurationHelper.Parse(GetString(XMLNames.Vehicle_AxleConfiguration)); }
- }
+ public virtual AxleConfiguration AxleConfiguration => AxleConfigurationHelper.Parse(GetString(XMLNames.Vehicle_AxleConfiguration));
- public virtual Kilogram CurbMassChassis
- {
- get { return GetDouble(XMLNames.Vehicle_CurbMassChassis).SI<Kilogram>(); }
- }
+ public virtual Kilogram CurbMassChassis => GetDouble(XMLNames.Vehicle_CurbMassChassis).SI<Kilogram>();
- public virtual Kilogram CurbMassExtra
- {
- get { return GetDouble(XMLNames.Vehicle_CurbMassExtra).SI<Kilogram>(); }
- }
+ public virtual Kilogram CurbMassExtra => GetDouble(XMLNames.Vehicle_CurbMassExtra).SI<Kilogram>();
- public virtual Kilogram GrossVehicleMassRating
- {
- get { return GetDouble(XMLNames.Vehicle_GrossVehicleMass).SI<Kilogram>(); }
- }
+ public virtual Kilogram GrossVehicleMassRating => GetDouble(XMLNames.Vehicle_GrossVehicleMass).SI<Kilogram>();
- public virtual string ManufacturerAddress
- {
- get { return GetString(XMLNames.Component_ManufacturerAddress); }
- }
+ public virtual string ManufacturerAddress => GetString(XMLNames.Component_ManufacturerAddress);
- public virtual PerSecond EngineIdleSpeed
- {
- get { return GetDouble(XMLNames.Vehicle_IdlingSpeed).RPMtoRad(); }
- }
+ public virtual PerSecond EngineIdleSpeed => GetDouble(XMLNames.Vehicle_IdlingSpeed).RPMtoRad();
- public bool VocationalVehicle
- {
- get { return false; }
- }
+ public bool VocationalVehicle => false;
- public bool SleeperCab
- {
- get { return false; }
- }
+ public bool SleeperCab => false;
- public virtual bool? AirdragModifiedMultistage
- {
- get { return null; }
- }
+ public virtual bool? AirdragModifiedMultistage => null;
- public TankSystem? TankSystem
- {
- get {
- return ElementExists(XMLNames.Vehicle_NgTankSystem)
- ? EnumHelper.ParseEnum<TankSystem>(GetString(XMLNames.Vehicle_NgTankSystem))
- : (TankSystem?)null;
- }
- }
+ public TankSystem? TankSystem =>
+ ElementExists(XMLNames.Vehicle_NgTankSystem)
+ ? EnumHelper.ParseEnum<TankSystem>(GetString(XMLNames.Vehicle_NgTankSystem))
+ : (TankSystem?)null;
-
- public bool ZeroEmissionVehicle
- {
- get { return false; }
- }
- public bool HybridElectricHDV
- {
- get { return false; }
- }
+ public bool ZeroEmissionVehicle => false;
- public bool DualFuelVehicle
- {
- get { return false; }
- }
+ public bool HybridElectricHDV => false;
- public Watt MaxNetPower1
- {
- get { return null; }
- }
+ public bool DualFuelVehicle => false;
- public Watt MaxNetPower2
- {
- get { return null; }
- }
+ public Watt MaxNetPower1 => null;
+
+ public Watt MaxNetPower2 => null;
- public virtual RegistrationClass? RegisteredClass { get { return RegistrationClass.unknown;} }
- public virtual int? NumberPassengerSeatsUpperDeck { get { return 0; } }
- public virtual int? NumberPassengerSeatsLowerDeck { get { return 0; } }
- public int? NumberPassengersStandingLowerDeck { get { return 0; } }
- public int? NumberPassengersStandingUpperDeck { get { return 0; } }
+ public virtual RegistrationClass? RegisteredClass => RegistrationClass.unknown;
+ public virtual int? NumberPassengerSeatsUpperDeck => 0;
+ public virtual int? NumberPassengerSeatsLowerDeck => 0;
+ public int? NumberPassengersStandingLowerDeck => 0;
+ public int? NumberPassengersStandingUpperDeck => 0;
public CubicMeter CargoVolume { get; }
- public virtual VehicleCode? VehicleCode { get { return VectoCommon.Models.VehicleCode.NOT_APPLICABLE; } }
- public virtual bool? LowEntry { get { return false; } }
- public virtual bool Articulated { get { return false; } }
-
+ public virtual VehicleCode? VehicleCode => VectoCommon.Models.VehicleCode.NOT_APPLICABLE;
+ public virtual bool? LowEntry => false;
+ public virtual bool Articulated => false;
+
- public virtual Meter Width { get { return null; } }
- public virtual Meter EntranceHeight { get { return null; } }
- public ConsumerTechnology? DoorDriveTechnology { get { return ConsumerTechnology.Unknown; } }
+ public virtual Meter Width => null;
+ public virtual Meter EntranceHeight => null;
+ public ConsumerTechnology? DoorDriveTechnology => ConsumerTechnology.Unknown;
public virtual VehicleDeclarationType VehicleDeclarationType { get; }
- public TableData MaxPropulsionTorque
- {
- get { return null; }
- }
+ public TableData MaxPropulsionTorque => null;
- IVehicleComponentsDeclaration IVehicleDeclarationInputData.Components
- {
- get { return null; }
- }
+ IVehicleComponentsDeclaration IVehicleDeclarationInputData.Components => null;
- IAdvancedDriverAssistantSystemDeclarationInputData IVehicleDeclarationInputData.ADAS
- {
- get { return null; }
- }
+ IAdvancedDriverAssistantSystemDeclarationInputData IVehicleDeclarationInputData.ADAS => null;
- public virtual GearshiftPosition PTO_DriveGear { get { return null; } }
- public virtual PerSecond PTO_DriveEngineSpeed { get { return null; } }
+ public virtual GearshiftPosition PTO_DriveGear => null;
+ public virtual PerSecond PTO_DriveEngineSpeed => null;
- public double InitialSOC
- {
- get { return double.NaN; }
- }
+ public double InitialSOC => double.NaN;
- public VectoSimulationJobType VehicleType
- {
- get { return VectoSimulationJobType.ConventionalVehicle; }
- }
+ public VectoSimulationJobType VehicleType => VectoSimulationJobType.ConventionalVehicle;
- public IAdvancedDriverAssistantSystemsEngineering ADAS
- {
- get { return null; }
- }
+ public IAdvancedDriverAssistantSystemsEngineering ADAS => null;
- public virtual Kilogram Loading
- {
- get { return GetDouble(XMLNames.Vehicle_Loading).SI<Kilogram>(); }
- }
+ public virtual Kilogram Loading => GetDouble(XMLNames.Vehicle_Loading).SI<Kilogram>();
public virtual Meter DynamicTyreRadius
{
@@ -304,79 +209,47 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
}
- public virtual Meter Height
- {
- get { return GetNode("VehicleHeight")?.InnerText.ToDouble().SI<Meter>(); }
- }
+ public virtual Meter Height => GetNode("VehicleHeight")?.InnerText.ToDouble().SI<Meter>();
- public TableData ElectricMotorTorqueLimits
- {
- get { return null; }
- }
+ public TableData ElectricMotorTorqueLimits => null;
- public virtual Meter Length { get { return null; } }
+ public virtual Meter Length => null;
- public IVehicleComponentsEngineering Components
- {
- get { return _components ?? (_components = ComponentReader.ComponentInputData); }
- }
+ public IVehicleComponentsEngineering Components => _components ?? (_components = ComponentReader.ComponentInputData);
#endregion
- public virtual RetarderType RetarderType
- {
- get { return GetString(XMLNames.Vehicle_RetarderType).ParseEnum<RetarderType>(); }
- }
+ public virtual RetarderType RetarderType => GetString(XMLNames.Vehicle_RetarderType).ParseEnum<RetarderType>();
- public virtual double RetarderRatio
- {
- get { return GetDouble(XMLNames.Vehicle_RetarderRatio); }
- }
+ public virtual double RetarderRatio => GetDouble(XMLNames.Vehicle_RetarderRatio);
- public virtual AngledriveType AngledriveType
- {
- get { return GetString(XMLNames.Vehicle_AngledriveType).ParseEnum<AngledriveType>(); }
- }
+ public virtual AngledriveType AngledriveType => GetString(XMLNames.Vehicle_AngledriveType).ParseEnum<AngledriveType>();
public virtual IXMLEngineeringJobInputData Job { get; }
#region Implementation of IPTOTransmissionInputData
- public virtual string PTOTransmissionType
- {
- get { return GetString(XMLNames.Vehicle_PTOType); }
- }
+ public virtual string PTOTransmissionType => GetString(XMLNames.Vehicle_PTOType);
- public virtual TableData PTOLossMap
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, DataSource.SourcePath, XMLNames.Vehicle_PTOIdleLossMap, XMLNames.Vehicle_PTOIdleLossMap_Entry,
- AttributeMappings.PTOLossMap);
- }
- }
+ public virtual TableData PTOLossMap =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, DataSource.SourcePath, XMLNames.Vehicle_PTOIdleLossMap, XMLNames.Vehicle_PTOIdleLossMap_Entry,
+ AttributeMappings.PTOLossMap);
- public virtual TableData PTOCycleDuringStop
- {
- get {
- return XMLHelper.ReadEntriesOrResource(
- BaseNode, DataSource.SourcePath, XMLNames.Vehicle_PTOCycle, XMLNames.Vehicle_PTOCycle_Entry,
- AttributeMappings.PTOCycleMap);
- }
- }
+ public virtual TableData PTOCycleDuringStop =>
+ XMLHelper.ReadEntriesOrResource(
+ BaseNode, DataSource.SourcePath, XMLNames.Vehicle_PTOCycle, XMLNames.Vehicle_PTOCycle_Entry,
+ AttributeMappings.PTOCycleMap);
- public TableData PTOCycleWhileDriving { get { return null;} }
+ public TableData PTOCycleWhileDriving => null;
#endregion
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -398,10 +271,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Overrides of XMLEngineeringVehicleDataProviderV07
- protected override XNamespace SchemaNamespace
- {
- get { return NAMESPACE_URI; }
- }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLTyreEngineeringDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLTyreEngineeringDataProvider.cs
index 3f7e1e631b54ef6345de61d0f877b69d640886af..b9b910eb1ca559ee042f35390c5fcd63999ba072 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLTyreEngineeringDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLTyreEngineeringDataProvider.cs
@@ -57,44 +57,27 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
#region Implementation of ITyreDeclarationInputData
- public virtual string Dimension
- {
- get { return GetNode(XMLNames.AxleWheels_Axles_Axle_Dimension, required:false)?.InnerText; }
- }
+ public virtual string Dimension => GetNode(XMLNames.AxleWheels_Axles_Axle_Dimension, required:false)?.InnerText;
- public virtual double RollResistanceCoefficient
- {
- get { return GetNode(XMLNames.AxleWheels_Axles_Axle_RRCISO, required: false)?.InnerText.ToDouble() ?? double.NaN; }
- }
+ public virtual double RollResistanceCoefficient => GetNode(XMLNames.AxleWheels_Axles_Axle_RRCISO, required: false)?.InnerText.ToDouble() ?? double.NaN;
- public virtual Newton TyreTestLoad
- {
- get { return GetNode(XMLNames.AxleWheels_Axles_Axle_FzISO, required: false)?.InnerText.ToDouble().SI<Newton>(); }
- }
+ public virtual Newton TyreTestLoad => GetNode(XMLNames.AxleWheels_Axles_Axle_FzISO, required: false)?.InnerText.ToDouble().SI<Newton>();
- public virtual string FuelEfficiencyClass { get { return DeclarationData.Wheels.TyreClass.Lookup(RollResistanceCoefficient); } }
+ public virtual string FuelEfficiencyClass => DeclarationData.Wheels.TyreClass.Lookup(RollResistanceCoefficient);
#endregion
#region Implementation of ITyreEngineeringInputData
- public virtual KilogramSquareMeter Inertia
- {
- get { return GetNode(XMLNames.AxleWheels_Axles_Axle_Inertia, required: false)?.InnerText.ToDouble().SI<KilogramSquareMeter>(); }
- }
+ public virtual KilogramSquareMeter Inertia => GetNode(XMLNames.AxleWheels_Axles_Axle_Inertia, required: false)?.InnerText.ToDouble().SI<KilogramSquareMeter>();
- public virtual Meter DynamicTyreRadius
- {
- get {
- return GetNode(XMLNames.AxleWheels_Axles_Axle_DynamicTyreRadius, required: false)?.InnerText.ToDouble().SI(Unit.SI.Milli.Meter).Cast<Meter>();
- }
- }
+ public virtual Meter DynamicTyreRadius => GetNode(XMLNames.AxleWheels_Axles_Axle_DynamicTyreRadius, required: false)?.InnerText.ToDouble().SI(Unit.SI.Milli.Meter).Cast<Meter>();
#endregion
#region Overrides of AbstractXMLResource
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
protected override DataSourceType SourceType { get; }
@@ -112,6 +95,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public XMLTyreEngineeringDataProviderV10TEST(IXMLEngineeringVehicleData vehicle, XmlNode baseNode, string source) : base(vehicle, baseNode, source) { }
- protected override XNamespace SchemaNamespace { get { return NAMESPACE_URI; } }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLComponentsEngineeringReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLComponentsEngineeringReader.cs
index 53ff2067b479310c6139a8a2c376497c7bd074e1..8b058dd1e629aba0a7efe5df7cad5243830a8ffe 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLComponentsEngineeringReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLComponentsEngineeringReader.cs
@@ -90,81 +90,35 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.Reader
#region Implementation of IEngineeringComponentsFactory
- public virtual IAxleGearInputData AxleGearInputData
- {
- get {
- return _axleGearInputData ?? (_axleGearInputData = CreateComponent(XMLNames.Component_Axlegear, AxlegearCreator));
- }
- }
-
- public virtual IAngledriveInputData AngularGearInputData
- {
- get {
- return _angularGearInputData ?? (_angularGearInputData = CreateComponent(
- XMLNames.Component_Angledrive, AngledriveCreator, false, true));
- }
- }
-
- public virtual IEngineEngineeringInputData EngineInputData
- {
- get { return _engineInputData ?? (_engineInputData = CreateComponent(XMLNames.Component_Engine, EngineCreator)); }
- }
+ public virtual IAxleGearInputData AxleGearInputData => _axleGearInputData ?? (_axleGearInputData = CreateComponent(XMLNames.Component_Axlegear, AxlegearCreator));
- public virtual IRetarderInputData RetarderInputData
- {
- get {
- return _retarderInputData ?? (_retarderInputData = CreateComponent(
- XMLNames.Component_Retarder, RetarderCreator, false, true));
- }
- }
+ public virtual IAngledriveInputData AngularGearInputData =>
+ _angularGearInputData ?? (_angularGearInputData = CreateComponent(
+ XMLNames.Component_Angledrive, AngledriveCreator, false, true));
- public virtual IAuxiliariesEngineeringInputData AuxiliaryData
- {
- get {
- return _auxiliaryData ?? (_auxiliaryData = CreateComponent(XMLNames.Component_Auxiliaries, AuxiliariesCreator));
- }
- }
+ public virtual IEngineEngineeringInputData EngineInputData => _engineInputData ?? (_engineInputData = CreateComponent(XMLNames.Component_Engine, EngineCreator));
- public virtual IGearboxEngineeringInputData GearboxData
- {
- get { return _gearboxData ?? (_gearboxData = CreateComponent(XMLNames.Component_Gearbox, GearboxCreator)); }
- }
+ public virtual IRetarderInputData RetarderInputData =>
+ _retarderInputData ?? (_retarderInputData = CreateComponent(
+ XMLNames.Component_Retarder, RetarderCreator, false, true));
- public virtual IPTOTransmissionInputData PTOData
- {
- get { return Vehicle; }
- }
+ public virtual IAuxiliariesEngineeringInputData AuxiliaryData => _auxiliaryData ?? (_auxiliaryData = CreateComponent(XMLNames.Component_Auxiliaries, AuxiliariesCreator));
- public virtual IAirdragEngineeringInputData AirdragInputData
- {
- get {
- return _airdragInputData ?? (_airdragInputData = CreateComponent(XMLNames.Component_AirDrag, AirdragCreator));
- }
- }
+ public virtual IGearboxEngineeringInputData GearboxData => _gearboxData ?? (_gearboxData = CreateComponent(XMLNames.Component_Gearbox, GearboxCreator));
- public virtual IAxlesEngineeringInputData AxlesEngineeringInputData
- {
- get { return _axlesInputData ?? (_axlesInputData = CreateComponent(XMLNames.Component_AxleWheels, AxlesCreator)); }
- }
+ public virtual IPTOTransmissionInputData PTOData => Vehicle;
- public virtual ITorqueConverterEngineeringInputData TorqueConverter
- {
- get {
- return _torqueConverterInputData ?? (_torqueConverterInputData = CreateComponent(
- XMLNames.Component_TorqueConverter, TorqueConverterCreator, true, true));
- }
- }
+ public virtual IAirdragEngineeringInputData AirdragInputData => _airdragInputData ?? (_airdragInputData = CreateComponent(XMLNames.Component_AirDrag, AirdragCreator));
- public virtual ITyreEngineeringInputData Tyre
- {
- get { return _tyre ?? (_tyre = CreateComponent(XMLNames.AxleWheels_Axles_Axle_Tyre, TyreCreator)); }
- }
+ public virtual IAxlesEngineeringInputData AxlesEngineeringInputData => _axlesInputData ?? (_axlesInputData = CreateComponent(XMLNames.Component_AxleWheels, AxlesCreator));
- public virtual IVehicleComponentsEngineering ComponentInputData { get {
- return _components ?? (_components = CreateComponent(XMLNames.Vehicle_Components, ComponentsCreator, requireDataNode:false));
- } }
+ public virtual ITorqueConverterEngineeringInputData TorqueConverter =>
+ _torqueConverterInputData ?? (_torqueConverterInputData = CreateComponent(
+ XMLNames.Component_TorqueConverter, TorqueConverterCreator, true, true));
+ public virtual ITyreEngineeringInputData Tyre => _tyre ?? (_tyre = CreateComponent(XMLNames.AxleWheels_Axles_Axle_Tyre, TyreCreator));
+ public virtual IVehicleComponentsEngineering ComponentInputData => _components ?? (_components = CreateComponent(XMLNames.Vehicle_Components, ComponentsCreator, requireDataNode:false));
public IAxleEngineeringInputData CreateAxle(XmlNode axleNode)
@@ -327,9 +281,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.Reader
public XMLComponentsEngineeringReaderV10TEST(IXMLEngineeringVehicleData vehicle, XmlNode componentsNode) : base(vehicle, componentsNode) { }
- public override ITyreEngineeringInputData Tyre
- {
- get { return _tyre ?? (_tyre = CreateComponent("Tire", TyreCreator)); }
- }
+ public override ITyreEngineeringInputData Tyre => _tyre ?? (_tyre = CreateComponent("Tire", TyreCreator));
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLDriverDataReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLDriverDataReader.cs
index f0fec049710b9777487bd48737e2d1d1b8c8a58d..c10d5c34d838cf021d722c8b89de101d87e60d60 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLDriverDataReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLDriverDataReader.cs
@@ -109,13 +109,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.Reader.Impl {
}
}
- public IGearshiftEngineeringInputData ShiftParameters
- {
- get {
- return CreateData(
- XMLNames.DriverModel_ShiftStrategyParameters, ShiftParametersCreator, false);
- }
- }
+ public IGearshiftEngineeringInputData ShiftParameters =>
+ CreateData(
+ XMLNames.DriverModel_ShiftStrategyParameters, ShiftParametersCreator, false);
public IEngineStopStartEngineeringInputData EngineStopStartData
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLEngineeringInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLEngineeringInputReader.cs
index 3c8c64e719689a18450bab050a17e23a10b43e91..2c86710b5c15a2bfcd9f823e3b201f3924fdaf5c 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLEngineeringInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLEngineeringInputReader.cs
@@ -62,15 +62,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.Reader
InputData = inputData;
}
- public IEngineeringJobInputData JobData
- {
- get { return _jobData ?? (_jobData = CreateComponent(XMLNames.VectoInputEngineering, JobCreator, false, requireDataNode: false)); }
- }
+ public IEngineeringJobInputData JobData => _jobData ?? (_jobData = CreateComponent(XMLNames.VectoInputEngineering, JobCreator, false, requireDataNode: false));
- public IDriverEngineeringInputData DriverModel
- {
- get { return _driverModel ?? (_driverModel = CreateComponent(XMLNames.Component_DriverModel, DriverModelCreator, requireDataNode:false)); }
- }
+ public IDriverEngineeringInputData DriverModel => _driverModel ?? (_driverModel = CreateComponent(XMLNames.Component_DriverModel, DriverModelCreator, requireDataNode:false));
public IEngineeringJobInputData JobCreator(string version, XmlNode baseNode, string filename)
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLJobDataReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLJobDataReader.cs
index b07eebb680587f2294fc1148211b8453381ca143..7eb709039190bb4d4c1351a1a6090f7eb259ef9f 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLJobDataReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLJobDataReader.cs
@@ -68,10 +68,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.Reader
get { return _engine ?? (_engine = CreateComponent(XMLNames.Component_Engine, (version, node, sourceFile) => Factory.CreateEngineOnlyEngine(version, node, sourceFile))); }
}
- public IVehicleEngineeringInputData CreateVehicle
- {
- get { return _vehicle ?? (_vehicle = CreateComponent(XMLNames.Component_Vehicle, VehicleCreator, requireDataNode: false)); }
- }
+ public IVehicleEngineeringInputData CreateVehicle => _vehicle ?? (_vehicle = CreateComponent(XMLNames.Component_Vehicle, VehicleCreator, requireDataNode: false));
public IXMLCyclesDataProvider CreateCycles
diff --git a/VectoCore/VectoCore/InputData/Impl/InputData.cs b/VectoCore/VectoCore/InputData/Impl/InputData.cs
index a7df5c9d5f21dc070dcb577c193bd351a1e2ad38..8150668f0adabda1232946698ad7dd34c832e0b3 100644
--- a/VectoCore/VectoCore/InputData/Impl/InputData.cs
+++ b/VectoCore/VectoCore/InputData/Impl/InputData.cs
@@ -111,10 +111,7 @@ namespace TUGraz.VectoCore.InputData.Impl
public AxleType AxleType { get; internal set; }
- ITyreDeclarationInputData IAxleDeclarationInputData.Tyre
- {
- get { return Tyre; }
- }
+ ITyreDeclarationInputData IAxleDeclarationInputData.Tyre => Tyre;
public ITyreEngineeringInputData Tyre { get; internal set; }
@@ -236,10 +233,7 @@ namespace TUGraz.VectoCore.InputData.Impl
public string Technology { get; }
- public WattSecond ElectricStorageCapacity
- {
- get { return Capacity * Voltage; }
- }
+ public WattSecond ElectricStorageCapacity => Capacity * Voltage;
#endregion
}
@@ -260,10 +254,7 @@ namespace TUGraz.VectoCore.InputData.Impl
#region Implementation of IBusAuxElectricStorageDeclarationInputData
public string Technology { get; }
- public WattSecond ElectricStorageCapacity
- {
- get { return Capacity * Voltage * Voltage / 2.0; }
- }
+ public WattSecond ElectricStorageCapacity => Capacity * Voltage * Voltage / 2.0;
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs
index dbfe126ca6db278b5688a2f9c9e6f58bb5d69257..89d2dfe882738dec51e5a33ae11136de6e70c8ee 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs
@@ -88,10 +88,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
public ISingleBusInputDataProvider SingleBusInputData { get; set; }
- protected IVehicleDeclarationInputData CompletedVehicle
- {
- get { return SingleBusInputData?.CompletedVehicle; }
- }
-
+ protected IVehicleDeclarationInputData CompletedVehicle => SingleBusInputData?.CompletedVehicle;
}
}
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
index dbf57e760315e9ff244ba97f13539cbfe691c971..76184399efa075a6a0b6bcf5385cb64c013e6913 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
@@ -69,15 +69,9 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
Report = report;
}
- protected IVehicleDeclarationInputData PrimaryVehicle
- {
- get { return InputDataProvider.PrimaryVehicleData.Vehicle; }
- }
+ protected IVehicleDeclarationInputData PrimaryVehicle => InputDataProvider.PrimaryVehicleData.Vehicle;
- protected IVehicleDeclarationInputData CompletedVehicle
- {
- get { return InputDataProvider.JobInputData.Vehicle; }
- }
+ protected IVehicleDeclarationInputData CompletedVehicle => InputDataProvider.JobInputData.Vehicle;
public IEnumerable<VectoRunData> NextRun()
{
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
index bf96069f51cffad6510f6cf89723d82a6ab14c9b..0c823cf2e20b21a122d9b886c07d2be645afe721 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
@@ -50,17 +50,9 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
- protected IVehicleDeclarationInputData PrimaryVehicle
- {
- get { return InputDataProvider.JobInputData.PrimaryVehicle.Vehicle; }
- }
-
- protected IVehicleDeclarationInputData CompletedVehicle
- {
- get { return InputDataProvider.JobInputData.ConsolidateManufacturingStage.Vehicle; }
- }
-
+ protected IVehicleDeclarationInputData PrimaryVehicle => InputDataProvider.JobInputData.PrimaryVehicle.Vehicle;
+ protected IVehicleDeclarationInputData CompletedVehicle => InputDataProvider.JobInputData.ConsolidateManufacturingStage.Vehicle;
public IEnumerable<VectoRunData> NextRun()
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs
index 20791a0cba50fc7257b62fd843df3e1009534885..ed8f4997fd56990b8fd3210baf6a0de5f85b92d0 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs
@@ -56,7 +56,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
#region Overrides of AbstractDeclarationVectoRunDataFactory
- protected override IDeclarationDataAdapter DataAdapter { get { return _dao; } }
+ protected override IDeclarationDataAdapter DataAdapter => _dao;
#endregion
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
index fa3fcf02e873933a62d93bf7e6da95d303f654ed..b17b25cd403bd28fd1f2ffc85617e6ca12de14c1 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
@@ -22,10 +22,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
#region Overrides of AbstractDeclarationVectoRunDataFactory
- protected override IDeclarationDataAdapter DataAdapter
- {
- get { return _dao; }
- }
+ protected override IDeclarationDataAdapter DataAdapter => _dao;
#endregion
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
index bd665772cf6740688e677448df8f94f2f1a75d95..edb06d2e89689a5b1ac5741e966d1d527029750b 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
@@ -60,7 +60,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl {
#endregion
- protected override IDeclarationDataAdapter DataAdapter { get { return _dao; } }
+ protected override IDeclarationDataAdapter DataAdapter => _dao;
protected override VectoRunData CreateVectoRunData(IVehicleDeclarationInputData vehicle, int modeIdx, Mission mission, KeyValuePair<LoadingType, Tuple<Kilogram, double?>> loading)
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryHeavyBusPrimary.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryHeavyBusPrimary.cs
index 72495949ad5a96d5839845ad2a0fb307b2ba6330..d5662ca8144f2dd37018f852bd8a29891dc4b52b 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryHeavyBusPrimary.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryHeavyBusPrimary.cs
@@ -31,12 +31,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl {
#region Implementation of IVectoRunDataFactory
- protected override IDeclarationDataAdapter Dao { get {
- return _dao ?? (_dao = new DeclarationDataAdapterPrimaryBus());
- } }
-
-
-
+ protected override IDeclarationDataAdapter Dao => _dao ?? (_dao = new DeclarationDataAdapterPrimaryBus());
#endregion
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryLorries.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryLorries.cs
index 3d9af605ede37536944329dfdf5c8c4615b752b2..a1357c407b3d9057a726c33e817dd5683316bf97 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryLorries.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryLorries.cs
@@ -57,7 +57,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
protected DeclarationVTPModeVectoRunDataFactoryLorries(IVTPDeclarationJobInputData job, IVTPReport report) : base(job, report)
{ }
- protected override IDeclarationDataAdapter Dao { get { return _dao ?? (_dao = new DeclarationDataAdapterHeavyLorry()); } }
+ protected override IDeclarationDataAdapter Dao => _dao ?? (_dao = new DeclarationDataAdapterHeavyLorry());
protected override void Initialize()
{
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/BusAuxiliaries.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/BusAuxiliaries.cs
index c9d5e3b491785a9d1a0f1d63840510f77d370e0a..9a10e768bfe0a741da1b1d0f64122a31e8dbab73 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/BusAuxiliaries.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/BusAuxiliaries.cs
@@ -93,18 +93,12 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries
}
- public override Watt ElectricPowerConsumer {
- get { return AveragePowerDemandAtAlternatorFromElectrics; }
- }
+ public override Watt ElectricPowerConsumer => AveragePowerDemandAtAlternatorFromElectrics;
- public override Watt HVACElectricalPowerConsumer {
- get { return ssmTool.ElectricalWAdjusted; }
- }
+ public override Watt HVACElectricalPowerConsumer => ssmTool.ElectricalWAdjusted;
- public override Watt ElectricPowerConsumerSum {
- get { return ssmTool.ElectricalWAdjusted + AveragePowerDemandAtAlternatorFromElectrics; }
- }
+ public override Watt ElectricPowerConsumerSum => ssmTool.ElectricalWAdjusted + AveragePowerDemandAtAlternatorFromElectrics;
protected Watt AveragePowerDemandAtAlternatorFromElectrics {
get {
@@ -245,21 +239,12 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries
public ISignals Signals { get; set; }
- public virtual Watt ElectricPowerConsumer
- {
- get { return M2.AveragePowerDemandAtAlternatorFromElectrics; }
- }
+ public virtual Watt ElectricPowerConsumer => M2.AveragePowerDemandAtAlternatorFromElectrics;
- public virtual Watt HVACElectricalPowerConsumer
- {
- get { return M1.AveragePowerDemandAtAlternatorFromHVACElectrics; }
- }
+ public virtual Watt HVACElectricalPowerConsumer => M1.AveragePowerDemandAtAlternatorFromHVACElectrics;
- public virtual Watt ElectricPowerConsumerSum
- {
- get { return M1.AveragePowerDemandAtAlternatorFromHVACElectrics + M2.AveragePowerDemandAtAlternatorFromElectrics; }
- }
+ public virtual Watt ElectricPowerConsumerSum => M1.AveragePowerDemandAtAlternatorFromHVACElectrics + M2.AveragePowerDemandAtAlternatorFromElectrics;
public virtual Watt ElectricPowerDemandMech
{
@@ -288,10 +273,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries
}
}
- public virtual NormLiter PSDemandConsumer
- {
- get { return M3.AverageAirConsumed * Signals.SimulationInterval; }
- }
+ public virtual NormLiter PSDemandConsumer => M3.AverageAirConsumed * Signals.SimulationInterval;
public virtual NormLiter PSAirGenerated
{
@@ -311,10 +293,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries
}
}
- public virtual NormLiter PSAirGeneratedAlwaysOn
- {
- get { return M4.GetFlowRate() * Signals.SimulationInterval; }
- }
+ public virtual NormLiter PSAirGeneratedAlwaysOn => M4.GetFlowRate() * Signals.SimulationInterval;
public virtual Watt PSPowerDemandAirGenerated
@@ -330,27 +309,15 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries
}
}
- public virtual Watt PSPowerCompressorAlwaysOn
- {
- get { return M4.GetPowerCompressorOn(); }
- }
+ public virtual Watt PSPowerCompressorAlwaysOn => M4.GetPowerCompressorOn();
- public virtual Watt PSPowerCompressorDragOnly
- {
- get { return M4.GetPowerCompressorOff(); }
- }
+ public virtual Watt PSPowerCompressorDragOnly => M4.GetPowerCompressorOff();
- public virtual Watt HVACMechanicalPowerConsumer
- {
- get { return M1.AveragePowerDemandAtCrankFromHVACMechanicals; }
- }
+ public virtual Watt HVACMechanicalPowerConsumer => M1.AveragePowerDemandAtCrankFromHVACMechanicals;
+
+ public virtual Watt HVACMechanicalPowerGenerated => M1.AveragePowerDemandAtCrankFromHVACMechanicals;
- public virtual Watt HVACMechanicalPowerGenerated
- {
- get { return M1.AveragePowerDemandAtCrankFromHVACMechanicals; }
- }
-
//public string AuxiliaryName
//{
// get { return "BusAuxiliaries"; }
@@ -361,10 +328,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries
// get { return "Version 2.0 DEV"; }
//}
- public virtual Watt AuxiliaryPowerAtCrankWatts
- {
- get { return M8.AuxPowerAtCrankFromElectricalHVACAndPneumaticsAncillaries; }
- }
+ public virtual Watt AuxiliaryPowerAtCrankWatts => M8.AuxPowerAtCrankFromElectricalHVACAndPneumaticsAncillaries;
public WattSecond BatteryEnergyDemand(Second dt, double essFactor)
{
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/AlternatorMap.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/AlternatorMap.cs
index 9defeccb84dce87fb765d2f33d46782580ef54a1..f285fade20841a2f952db547d3a7f68918eeb467 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/AlternatorMap.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/AlternatorMap.cs
@@ -233,12 +233,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
return GetValue(rpm, currentDemand);
}
- public IList<string> Technologies
- {
- get {
- return new List<string>();
- }
- }
+ public IList<string> Technologies => new List<string>();
// Public Events
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/CombinedAlternator.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/CombinedAlternator.cs
index 37cae3b8b00fc5c25443b2c45d3959a55ef542cd..fba3ba300ea77d5ade1f31fceb6d40cfb709e19f 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/CombinedAlternator.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/CombinedAlternator.cs
@@ -63,12 +63,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
return alternatorMapValues;
}
- public IList<string> Technologies
- {
- get {
- return new List<string>();
- }
- }
+ public IList<string> Technologies => new List<string>();
protected void Initialise(IList<ICombinedAlternatorMapRow> map)
{
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ElectricalConsumerList.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ElectricalConsumerList.cs
index 1a1a2b6346030d2cd345f673a56b493d53ee9b83..8567bf8edfbe5e261a13eaf3f6b7d51a627cd061 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ElectricalConsumerList.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ElectricalConsumerList.cs
@@ -28,12 +28,6 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
// Interface implementation
- public IReadOnlyList<ElectricalConsumer> Items
- {
- get {
- return _items;
- }
- }
-
+ public IReadOnlyList<ElectricalConsumer> Items => _items;
}
}
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ElectricsUserInputsConfig.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ElectricsUserInputsConfig.cs
index f6b20452afaa04d573450dfc0ccebaf6816d0728..c1034927fac9a00ce2568b377c5c5f8bf5a4dea0 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ElectricsUserInputsConfig.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ElectricsUserInputsConfig.cs
@@ -52,20 +52,11 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
}
}
- public Ampere AverageCurrentDemand
- {
- get { return AverageCurrentDemandInclBaseLoad(false, false); }
- }
+ public Ampere AverageCurrentDemand => AverageCurrentDemandInclBaseLoad(false, false);
- public Ampere AverageCurrentDemandEngineOffStandstill
- {
- get { return AverageCurrentDemandInclBaseLoad(true, true); }
- }
+ public Ampere AverageCurrentDemandEngineOffStandstill => AverageCurrentDemandInclBaseLoad(true, true);
- public Ampere AverageCurrentDemandEngineOffDriving
- {
- get { return AverageCurrentDemandInclBaseLoad(true, false); }
- }
+ public Ampere AverageCurrentDemandEngineOffDriving => AverageCurrentDemandInclBaseLoad(true, false);
public Ampere AverageCurrentDemandWithoutBaseLoad(bool engineOff, bool vehicleStopped)
{
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/M00Impl.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/M00Impl.cs
index a654e35008113682db0b76700c78d24ced414209..3fd966a4b5fa94c6331957df5f746b0782b09b74 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/M00Impl.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/M00Impl.cs
@@ -56,10 +56,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
#region Implementation of IM0_NonSmart_AlternatorsSetEfficiency
- public Ampere GetHVACElectricalCurrentDemand
- {
- get { return _ElectricalPowerW / _powernetVoltage; }
- }
+ public Ampere GetHVACElectricalCurrentDemand => _ElectricalPowerW / _powernetVoltage;
public double AlternatorsEfficiency
{
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/M0_5Impl.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/M0_5Impl.cs
index 7c04b90df818ba7b4e5540b875a43be6e05c31b5..720df336851ed424b41caac818f5533e8d97c916 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/M0_5Impl.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/M0_5Impl.cs
@@ -79,30 +79,15 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
}
}
- public double AlternatorsEfficiencyIdleResultCard
- {
- get { return _alternatorMap.GetEfficiency(_signals.EngineSpeed, SmartIdleCurrent); }
- }
+ public double AlternatorsEfficiencyIdleResultCard => _alternatorMap.GetEfficiency(_signals.EngineSpeed, SmartIdleCurrent);
- public Ampere SmartTractionCurrent
- {
- get { return _resultCardTraction.GetSmartCurrentResult(HvacPlusNonBaseCurrents()); }
- }
+ public Ampere SmartTractionCurrent => _resultCardTraction.GetSmartCurrentResult(HvacPlusNonBaseCurrents());
- public double AlternatorsEfficiencyTractionOnResultCard
- {
- get { return _alternatorMap.GetEfficiency(_signals.EngineSpeed, SmartTractionCurrent); }
- }
+ public double AlternatorsEfficiencyTractionOnResultCard => _alternatorMap.GetEfficiency(_signals.EngineSpeed, SmartTractionCurrent);
- public Ampere SmartOverrunCurrent
- {
- get { return _resultCardOverrun.GetSmartCurrentResult(HvacPlusNonBaseCurrents()); }
- }
+ public Ampere SmartOverrunCurrent => _resultCardOverrun.GetSmartCurrentResult(HvacPlusNonBaseCurrents());
- public double AlternatorsEfficiencyOverrunResultCard
- {
- get { return _alternatorMap.GetEfficiency(_signals.EngineSpeed, SmartOverrunCurrent); }
- }
+ public double AlternatorsEfficiencyOverrunResultCard => _alternatorMap.GetEfficiency(_signals.EngineSpeed, SmartOverrunCurrent);
#endregion
}
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ResultCard.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ResultCard.cs
index 53c73c8b2255a34a27f8dee2b88b8e8833495f78..e4f4a86ca18f73413652de7ab8667b8dfa2c6af2 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ResultCard.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ResultCard.cs
@@ -27,7 +27,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
return 10.SI<Ampere>();
}
- public Dictionary<Ampere, Ampere> Entries { get { return new Dictionary<Ampere, Ampere>();} }
+ public Dictionary<Ampere, Ampere> Entries => new Dictionary<Ampere, Ampere>();
#endregion
}
@@ -51,10 +51,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
// Public class outputs
- public IReadOnlyList<SmartResult> Results
- {
- get { return _results; }
- }
+ public IReadOnlyList<SmartResult> Results => _results;
public Ampere GetSmartCurrentResult(Ampere Amps)
{
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleAlternator.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleAlternator.cs
index 8ef09f4b2c30c3398fa426d75cb4cef3a2fd7a86..02052660cf0f23d3f08fc30bb0f70448009c575d 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleAlternator.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleAlternator.cs
@@ -24,7 +24,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
return _efficiency;
}
- public string Source { get { return null; } }
+ public string Source => null;
#endregion
}
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleBattery.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleBattery.cs
index 5ea0ed14fd494c1e4135b4272c4472875b4e0c00..6fff2a8be4a8dcf535cdb86ffb59d39ff3118cea 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleBattery.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleBattery.cs
@@ -15,14 +15,9 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
#region Implementation of ISimpleBatteryInfo
- public double SOC
- {
- get { return 0; }
- }
- public WattSecond Capacity
- {
- get { return 0.SI<WattSecond>(); }
- }
+ public double SOC => 0;
+
+ public WattSecond Capacity => 0.SI<WattSecond>();
#endregion
@@ -80,10 +75,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
public double SOC { get; internal set; }
public WattSecond Capacity { get; }
- public WattSecond ConsumedEnergy
- {
- get { return CurrentState.ConsumedEnergy; }
- }
+ public WattSecond ConsumedEnergy => CurrentState.ConsumedEnergy;
public void ConsumeEnergy(WattSecond energy, bool dryRun)
{
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/HVAC/M01Impl.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/HVAC/M01Impl.cs
index 967308d31eec200f50f888b085c98a8ebf74dda2..0bbdf2139eb353914efe7d2fdcee668ebcf4b2f7 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/HVAC/M01Impl.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/HVAC/M01Impl.cs
@@ -48,20 +48,11 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC
#region Implementation of IM1_AverageHVACLoadDemand
- public Watt AveragePowerDemandAtCrankFromHVACMechanicals
- {
- get { return _MechanicalPower * (1 / _compressorGearEfficiency); }
- }
+ public Watt AveragePowerDemandAtCrankFromHVACMechanicals => _MechanicalPower * (1 / _compressorGearEfficiency);
- public Watt AveragePowerDemandAtAlternatorFromHVACElectrics
- {
- get { return _ElectricalPower; }
- }
+ public Watt AveragePowerDemandAtAlternatorFromHVACElectrics => _ElectricalPower;
- public Watt AveragePowerDemandAtCrankFromHVACElectrics
- {
- get { return _ElectricalPower * (1 / _m0.AlternatorsEfficiency / _alternatorGearEfficiency); }
- }
+ public Watt AveragePowerDemandAtCrankFromHVACElectrics => _ElectricalPower * (1 / _m0.AlternatorsEfficiency / _alternatorGearEfficiency);
//public KilogramPerSecond HVACFueling()
//{
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMInputs.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMInputs.cs
index feaa56a3fa93bc58e850a756b2b042a03912592c..ec98baf60b02ed655c464107ab21ed53503d2c25 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMInputs.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMInputs.cs
@@ -69,10 +69,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC
public Kelvin CoolingBoundaryTemperature { get; set; }
// C28 - ( oC )
- public Kelvin TemperatureCoolingTurnsOff
- {
- get { return 17.0.DegCelsiusToKelvin(); }
- }
+ public Kelvin TemperatureCoolingTurnsOff => 17.0.DegCelsiusToKelvin();
// C29 - ( L/H ) --- !! 1/h
public PerSecond VentilationRate { get; set; }
@@ -93,16 +90,10 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC
public double AuxHeaterEfficiency { get; set; }
// C38 - ( KW/HKG )
- public JoulePerKilogramm GCVDieselOrHeatingOil
- {
- get { return HeatingFuel.LowerHeatingValueVecto; }
- }
+ public JoulePerKilogramm GCVDieselOrHeatingOil => HeatingFuel.LowerHeatingValueVecto;
// C42 - ( K )
- public Kelvin MaxTemperatureDeltaForLowFloorBusses
- {
- get { return Constants.BusAuxiliaries.SteadyStateModel.MaxTemperatureDeltaForLowFloorBusses; }
- }
+ public Kelvin MaxTemperatureDeltaForLowFloorBusses => Constants.BusAuxiliaries.SteadyStateModel.MaxTemperatureDeltaForLowFloorBusses;
// C43 - ( Fraction )
public double MaxPossibleBenefitFromTechnologyList { get; set; }
@@ -113,10 +104,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC
// ( EC_EnviromentalTemperature and EC_Solar) (Batch Mode)
public IEnvironmentalConditionsMap EnvironmentalConditionsMap { get; set; }
- public bool BatchMode
- {
- get { return EnvironmentalConditionsMap != null && EnvironmentalConditionsMap.GetEnvironmentalConditions().Any(); }
- }
+ public bool BatchMode => EnvironmentalConditionsMap != null && EnvironmentalConditionsMap.GetEnvironmentalConditions().Any();
// C53 - "Continous/2-stage/3-stage/4-stage
@@ -150,40 +138,22 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC
#region Implementation of ISSMInputs
[JsonIgnore]
- public ISSMBusParameters BusParameters
- {
- get { return this; }
- }
+ public ISSMBusParameters BusParameters => this;
[JsonIgnore]
- public ISSMBoundaryConditions BoundaryConditions
- {
- get { return this; }
- }
+ public ISSMBoundaryConditions BoundaryConditions => this;
[JsonIgnore]
- public IEnvironmentalConditions EnvironmentalConditions
- {
- get { return this; }
- }
+ public IEnvironmentalConditions EnvironmentalConditions => this;
[JsonIgnore]
- public IACSystem ACSystem
- {
- get { return this; }
- }
+ public IACSystem ACSystem => this;
[JsonIgnore]
- public IVentilation Ventilation
- {
- get { return this; }
- }
+ public IVentilation Ventilation => this;
[JsonIgnore]
- public IAuxHeater AuxHeater
- {
- get { return this; }
- }
+ public IAuxHeater AuxHeater => this;
public ISSMTechnologyBenefits Technologies { get; set; }
public string HVACTechnology { get; set; }
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMTOOL.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMTOOL.cs
index 570820d80931a796f874f2e42ea8f59023f11d2e..0a4d11e144ed973c4d45ac1552a47f45d4411e25 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMTOOL.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMTOOL.cs
@@ -27,14 +27,9 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC
#region Implementation of ISSMPowerDemand
- public Watt ElectricalWAdjusted
- {
- get { return _ssmInput.ElectricPower; }
- }
- public Watt MechanicalWBaseAdjusted
- {
- get { return _ssmInput.MechanicalPower; }
- }
+ public Watt ElectricalWAdjusted => _ssmInput.ElectricPower;
+
+ public Watt MechanicalWBaseAdjusted => _ssmInput.MechanicalPower;
public Watt AverageAuxHeaterPower(Watt averageUseableEngineWasteHeat)
{
@@ -75,19 +70,9 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC
private bool CompressorCapacityInsufficientWarned;
// Base Values
- public Watt ElectricalWBase
- {
- get {
- return Calculate.ElectricalWBase; // .SI(Of Watt)()
- }
- }
+ public Watt ElectricalWBase => Calculate.ElectricalWBase; // .SI(Of Watt)()
- public Watt MechanicalWBase
- {
- get {
- return Calculate.MechanicalWBase; // .SI(Of Watt)()
- }
- }
+ public Watt MechanicalWBase => Calculate.MechanicalWBase; // .SI(Of Watt)()
//public KilogramPerSecond FuelPerHBase
//{
@@ -97,12 +82,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC
//}
// Adjusted Values
- public Watt ElectricalWAdjusted
- {
- get {
- return Calculate.ElectricalWAdjusted; // .SI(Of Watt)()
- }
- }
+ public Watt ElectricalWAdjusted => Calculate.ElectricalWAdjusted; // .SI(Of Watt)()
public Watt MechanicalWBaseAdjusted
{
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/M09Impl.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/M09Impl.cs
index fe3b4e47408344b61b48aa82b1e07dd0a9f9e7bf..6e82b1cb5866fd8e9b07884649fbed51affa2078 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/M09Impl.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/M09Impl.cs
@@ -109,25 +109,13 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl
_TotalCycleFuelConsumptionCompressorOffContinuouslyAggregate += s12 * stepTimeInSeconds;
}
- public NormLiter LitresOfAirCompressorOnContinually
- {
- get { return _LitresOfAirCompressorOnContinuallyAggregate; }
- }
+ public NormLiter LitresOfAirCompressorOnContinually => _LitresOfAirCompressorOnContinuallyAggregate;
- public NormLiter LitresOfAirCompressorOnOnlyInOverrun
- {
- get { return _LitresOfAirCompressorOnOnlyInOverrunAggregate; }
- }
+ public NormLiter LitresOfAirCompressorOnOnlyInOverrun => _LitresOfAirCompressorOnOnlyInOverrunAggregate;
- public Kilogram TotalCycleFuelConsumptionCompressorOnContinuously
- {
- get { return _TotalCycleFuelConsumptionCompressorOnContinuouslyAggregate; }
- }
+ public Kilogram TotalCycleFuelConsumptionCompressorOnContinuously => _TotalCycleFuelConsumptionCompressorOnContinuouslyAggregate;
- public Kilogram TotalCycleFuelConsumptionCompressorOffContinuously
- {
- get { return _TotalCycleFuelConsumptionCompressorOffContinuouslyAggregate; }
- }
+ public Kilogram TotalCycleFuelConsumptionCompressorOffContinuously => _TotalCycleFuelConsumptionCompressorOffContinuouslyAggregate;
#endregion
}
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/M11Impl.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/M11Impl.cs
index b5e5f782b8360b21387a91bdea8d18b866b79122..f94e9bfade44ede061b00d3e5c623f7e0bd27589 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/M11Impl.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/M11Impl.cs
@@ -37,40 +37,19 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl
#region Implementation of IM11
- public Joule SmartElectricalTotalCycleElectricalEnergyGeneratedDuringOverrunOnly
- {
- get { return AG1; }
- }
+ public Joule SmartElectricalTotalCycleElectricalEnergyGeneratedDuringOverrunOnly => AG1;
- public Joule SmartElectricalTotalCycleEletricalEnergyGenerated
- {
- get { return AG2; }
- }
+ public Joule SmartElectricalTotalCycleEletricalEnergyGenerated => AG2;
- public Joule TotalCycleElectricalDemand
- {
- get { return AG3; }
- }
+ public Joule TotalCycleElectricalDemand => AG3;
- public Kilogram TotalCycleFuelConsumptionSmartElectricalLoad
- {
- get { return AG4; }
- }
+ public Kilogram TotalCycleFuelConsumptionSmartElectricalLoad => AG4;
- public Kilogram TotalCycleFuelConsumptionZeroElectricalLoad
- {
- get { return AG5; }
- }
+ public Kilogram TotalCycleFuelConsumptionZeroElectricalLoad => AG5;
- public Joule StopStartSensitiveTotalCycleElectricalDemand
- {
- get { return AG6; }
- }
+ public Joule StopStartSensitiveTotalCycleElectricalDemand => AG6;
- public Kilogram TotalCycleFuelConsuptionAverageLoads
- {
- get { return AG7; }
- }
+ public Kilogram TotalCycleFuelConsuptionAverageLoads => AG7;
public void ClearAggregates()
{
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M04Impl.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M04Impl.cs
index 59d353a136d2a86ad991e29efa3e5a7b0d1c6c16..eb96cda82e36fd14749bccf125cdca8ff2dddaa4 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M04Impl.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M04Impl.cs
@@ -29,7 +29,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Pneumati
public double PulleyGearRatio
{
- get { return _pulleyGearRatio; }
+ get => _pulleyGearRatio;
set {
if (value < MinRatio || value > MaxRatio) {
throw new ArgumentOutOfRangeException(
@@ -43,7 +43,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Pneumati
public double PulleyGearEfficiency
{
- get { return _pulleyGearEfficiency; }
+ get => _pulleyGearEfficiency;
set {
if (value < MinEff || value > MaxEff) {
throw new ArgumentOutOfRangeException(
diff --git a/VectoCore/VectoCore/Models/Connector/Ports/Impl/BatteryResponse.cs b/VectoCore/VectoCore/Models/Connector/Ports/Impl/BatteryResponse.cs
index 06023c3d862d1258838c4917473fa7c7bd6fce92..055f5352800abfb8b7b9d1a7528b605c41bbaf21 100644
--- a/VectoCore/VectoCore/Models/Connector/Ports/Impl/BatteryResponse.cs
+++ b/VectoCore/VectoCore/Models/Connector/Ports/Impl/BatteryResponse.cs
@@ -72,25 +72,15 @@ namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
public IRESSResponse RESSResponse { get; set; }
- public Watt MaxPowerDrive
- {
- get
- {
- return (RESSResponse != null && RESSResponse.MaxDischargePower != null ? RESSResponse.MaxDischargePower : 0.SI<Watt>()) -
- (ChargingPower != null ? ChargingPower : 0.SI<Watt>()) +
- (AuxPower != null ? AuxPower : 0.SI<Watt>());
- }
- }
-
- public Watt MaxPowerDrag
- {
- get
- {
- return (RESSResponse != null && RESSResponse.MaxChargePower != null ? RESSResponse.MaxChargePower : 0.SI<Watt>()) -
- (ChargingPower != null ? ChargingPower : 0.SI<Watt>()) +
- (AuxPower != null ? AuxPower : 0.SI<Watt>());
- }
- }
+ public Watt MaxPowerDrive =>
+ (RESSResponse != null && RESSResponse.MaxDischargePower != null ? RESSResponse.MaxDischargePower : 0.SI<Watt>()) -
+ (ChargingPower != null ? ChargingPower : 0.SI<Watt>()) +
+ (AuxPower != null ? AuxPower : 0.SI<Watt>());
+
+ public Watt MaxPowerDrag =>
+ (RESSResponse != null && RESSResponse.MaxChargePower != null ? RESSResponse.MaxChargePower : 0.SI<Watt>()) -
+ (ChargingPower != null ? ChargingPower : 0.SI<Watt>()) +
+ (AuxPower != null ? AuxPower : 0.SI<Watt>());
public Watt RESSPowerDemand { get; set; }
diff --git a/VectoCore/VectoCore/Models/Declaration/ADASCombination.cs b/VectoCore/VectoCore/Models/Declaration/ADASCombination.cs
index a131c669d9c2c9ab89a4cd20157ade6c38e818a3..b7e3218a1402db40e46fdc50c5e3e8508b5b8c10 100644
--- a/VectoCore/VectoCore/Models/Declaration/ADASCombination.cs
+++ b/VectoCore/VectoCore/Models/Declaration/ADASCombination.cs
@@ -72,18 +72,9 @@ namespace TUGraz.VectoCore.Models.Declaration
}
}
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".ADAS.ADAS_Combinations.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".ADAS.ADAS_Combinations.csv";
- protected override string ErrorMessage
- {
- get {
- return
- "ADAS Combination Lookup Error: No entry found for engine stop/start: {0}, eco roll: {1}, PCC: {2}";
- }
- }
+ protected override string ErrorMessage => "ADAS Combination Lookup Error: No entry found for engine stop/start: {0}, eco roll: {1}, PCC: {2}";
protected override void ParseData(DataTable table)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/AirDrag.cs b/VectoCore/VectoCore/Models/Declaration/AirDrag.cs
index 2bd3b3788416daaafdbeb75b45d18993b8c351e3..e23a5349314fb64a2fb0e16e9ad9b35a1e44de75 100644
--- a/VectoCore/VectoCore/Models/Declaration/AirDrag.cs
+++ b/VectoCore/VectoCore/Models/Declaration/AirDrag.cs
@@ -39,15 +39,9 @@ namespace TUGraz.VectoCore.Models.Declaration
{
public sealed class AirDrag : LookupData<string, AirDrag.Entry>
{
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".VCDV.VCDV_parameters.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".VCDV.VCDV_parameters.csv";
- protected override string ErrorMessage
- {
- get { return "AirDrag Lookup Error: no value found. Key: '{0}'"; }
- }
+ protected override string ErrorMessage => "AirDrag Lookup Error: no value found. Key: '{0}'";
protected override void ParseData(DataTable table)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/BusAlternatorTechnologies.cs b/VectoCore/VectoCore/Models/Declaration/BusAlternatorTechnologies.cs
index c0156498dcc9c8b3958e3348c582c02e143e0bbd..bc6ac0a9e2d1018e10fd005171243a4809f7a8dd 100644
--- a/VectoCore/VectoCore/Models/Declaration/BusAlternatorTechnologies.cs
+++ b/VectoCore/VectoCore/Models/Declaration/BusAlternatorTechnologies.cs
@@ -9,12 +9,10 @@ namespace TUGraz.VectoCore.Models.Declaration {
{
#region Overrides of LookupData
- protected override string ResourceId { get { return DeclarationData.DeclarationDataResourcePrefix + ".Buses.AlternatorTechnologies.csv"; } }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".Buses.AlternatorTechnologies.csv";
+
+ protected override string ErrorMessage => "Bus-Alternator Technology Lookup Error: No value found for Technology. Key: '{0}'";
- protected override string ErrorMessage
- {
- get { return "Bus-Alternator Technology Lookup Error: No value found for Technology. Key: '{0}'"; }
- }
protected override void ParseData(DataTable table)
{
Data = table.Rows.Cast<DataRow>()
diff --git a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
index 3587c6bd982a6fd4e785865c1e9e05b8662d681b..bbd03585ca561155665a11754a8a22b321294f5a 100644
--- a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
@@ -20,18 +20,12 @@ namespace TUGraz.VectoCore.Models.Declaration
#region Overrides of LookupData
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + COMPLETED_BUS_SEGMENTS_CSV; }
- }
-
- protected override string ErrorMessage
- {
- get { return "ERROR: Could not find the declaration segment for vehicle. numberOfAxles: {0}, vehicleCode: {1}, registrationClass: {2}, " +
- "passengersLowerDeck: {3}, bodyHeight: {4} , lowEntry: {5}";
- }
- }
-
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + COMPLETED_BUS_SEGMENTS_CSV;
+
+ protected override string ErrorMessage =>
+ "ERROR: Could not find the declaration segment for vehicle. numberOfAxles: {0}, vehicleCode: {1}, registrationClass: {2}, " +
+ "passengersLowerDeck: {3}, bodyHeight: {4} , lowEntry: {5}";
+
protected override void ParseData(DataTable table)
{
_segmentTable = table.Copy();
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index 90d40f9efa8974be81e787f15c4b4503b92eeb2d..53aaf138ca6477fb77f5b90de751a85e91712768 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -203,43 +203,24 @@ namespace TUGraz.VectoCore.Models.Declaration
public static BusAlternatorTechnologies AlternatorTechnologies = new BusAlternatorTechnologies();
private static HVACCoolingPower hvacMaxCoolingPower;
- public static List<SSMTechnology> SSMTechnologyList
- {
- get {
- return ssmTechnologies ?? (ssmTechnologies = SSMTechnologiesReader.ReadFromStream(
- RessourceHelper.ReadStream(DeclarationDataResourcePrefix + ".Buses.SSMTechList.csv")));
- }
- }
+ public static List<SSMTechnology> SSMTechnologyList =>
+ ssmTechnologies ?? (ssmTechnologies = SSMTechnologiesReader.ReadFromStream(
+ RessourceHelper.ReadStream(DeclarationDataResourcePrefix + ".Buses.SSMTechList.csv")));
- public static IEnvironmentalConditionsMap DefaultEnvironmentalConditions
- {
- get {
- return envMap ?? (envMap = EnvironmentalContidionsMapReader.ReadStream(
- RessourceHelper.ReadStream(DeclarationDataResourcePrefix + ".Buses.DefaultClimatic.aenv")));
- }
- }
+ public static IEnvironmentalConditionsMap DefaultEnvironmentalConditions =>
+ envMap ?? (envMap = EnvironmentalContidionsMapReader.ReadStream(
+ RessourceHelper.ReadStream(DeclarationDataResourcePrefix + ".Buses.DefaultClimatic.aenv")));
- public static ElectricalConsumerList DefaultElectricConsumerList
- {
- get {
- return elUserConfig ?? (elUserConfig = ElectricConsumerReader.ReadStream(
- RessourceHelper.ReadStream(DeclarationDataResourcePrefix + ".Buses.ElectricConsumers.csv")));
- }
- }
+ public static ElectricalConsumerList DefaultElectricConsumerList =>
+ elUserConfig ?? (elUserConfig = ElectricConsumerReader.ReadStream(
+ RessourceHelper.ReadStream(DeclarationDataResourcePrefix + ".Buses.ElectricConsumers.csv")));
- public static IActuationsMap ActuationsMap
- {
- get {
- return actuationsMap ?? (actuationsMap = ActuationsMapReader.ReadStream(
- RessourceHelper.ReadStream(DeclarationDataResourcePrefix + ".Buses.DefaultActuationsMap.apac")));
- }
- }
+ public static IActuationsMap ActuationsMap =>
+ actuationsMap ?? (actuationsMap = ActuationsMapReader.ReadStream(
+ RessourceHelper.ReadStream(DeclarationDataResourcePrefix + ".Buses.DefaultActuationsMap.apac")));
- public static HVACCoolingPower HVACMaxCoolingPower
- {
- get { return hvacMaxCoolingPower ?? (hvacMaxCoolingPower = new HVACCoolingPower()); }
- }
+ public static HVACCoolingPower HVACMaxCoolingPower => hvacMaxCoolingPower ?? (hvacMaxCoolingPower = new HVACCoolingPower());
public static PerSecond VentilationRate(BusHVACSystemConfiguration? hvacSystemConfig, bool heating)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs b/VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs
index 5eae698c46488875eab76230ced2149e811cf8df..d1604744e93bad3474f6d833c55581dee7a33dec 100644
--- a/VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs
+++ b/VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs
@@ -42,15 +42,9 @@ namespace TUGraz.VectoCore.Models.Declaration
{
private readonly Alternator _alternator = new Alternator();
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUX.ES-Tech.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".VAUX.ES-Tech.csv";
- protected override string ErrorMessage
- {
- get { return "Auxiliary Lookup Error: No value found for Electric System. Mission: '{0}', Technology: '{1}'"; }
- }
+ protected override string ErrorMessage => "Auxiliary Lookup Error: No value found for Electric System. Mission: '{0}', Technology: '{1}'";
protected override void ParseData(DataTable table)
{
@@ -76,15 +70,9 @@ namespace TUGraz.VectoCore.Models.Declaration
internal sealed class Alternator : LookupData<MissionType, string, double>
{
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUX.ALT-Tech.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".VAUX.ALT-Tech.csv";
- protected override string ErrorMessage
- {
- get { return "Auxiliary Lookup Error: No value found for Alternator. Mission: '{0}', Technology: '{1}'"; }
- }
+ protected override string ErrorMessage => "Auxiliary Lookup Error: No value found for Alternator. Mission: '{0}', Technology: '{1}'";
protected override void ParseData(DataTable table)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/Fan.cs b/VectoCore/VectoCore/Models/Declaration/Fan.cs
index 95fe70f25df75342b289a63a8bf425b2ee625bef..ac7dabac8ed32f5f74a677d8dc094188de180f93 100644
--- a/VectoCore/VectoCore/Models/Declaration/Fan.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Fan.cs
@@ -95,12 +95,9 @@ namespace TUGraz.VectoCore.Models.Declaration
{
//private readonly List<string> FullyElectricFanTechnologies = new List<string>();
- protected override string ErrorMessage
- {
- get { return "Auxiliary Lookup Error: No value found for Fan. Mission: '{0}', Technology: '{1}'"; }
- }
+ protected override string ErrorMessage => "Auxiliary Lookup Error: No value found for Fan. Mission: '{0}', Technology: '{1}'";
- protected override void ParseData(DataTable table)
+ protected override void ParseData(DataTable table)
{
foreach (DataRow row in table.Rows)
{
@@ -146,17 +143,11 @@ namespace TUGraz.VectoCore.Models.Declaration
public sealed class FanMediumLorries : AbstractFan
{
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUX.Fan-Tech-Medium.csv"; }
- }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".VAUX.Fan-Tech-Medium.csv";
+ }
public sealed class FanHeavyLorries : AbstractFan
{
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUX.Fan-Tech.csv"; }
- }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".VAUX.Fan-Tech.csv";
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/Declaration/FuelData.cs b/VectoCore/VectoCore/Models/Declaration/FuelData.cs
index 7aa63279ae83229c86ccdafb4eb024dc4082cb9a..ff8f94808d5eb2645556c87ebb25e65726ff21ef 100644
--- a/VectoCore/VectoCore/Models/Declaration/FuelData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/FuelData.cs
@@ -54,15 +54,9 @@ namespace TUGraz.VectoCore.Models.Declaration
private FuelData() { }
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".FuelTypes.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".FuelTypes.csv";
- protected override string ErrorMessage
- {
- get { return "FuelType {0} {1} not found!"; }
- }
+ protected override string ErrorMessage => "FuelType {0} {1} not found!";
public Entry Lookup(FuelType fuelType, TankSystem? tankSystem = null)
{
@@ -81,10 +75,7 @@ namespace TUGraz.VectoCore.Models.Declaration
return entries.First();
}
- public static Entry Diesel
- {
- get { return Instance().Lookup(FuelType.DieselCI, null); }
- }
+ public static Entry Diesel => Instance().Lookup(FuelType.DieselCI, null);
protected override void ParseData(DataTable table)
{
@@ -166,10 +157,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public JoulePerKilogramm LowerHeatingValueVectoEngine { get; }
- public double HeatingValueCorrection
- {
- get { return LowerHeatingValueVectoEngine / LowerHeatingValueVecto; }
- }
+ public double HeatingValueCorrection => LowerHeatingValueVectoEngine / LowerHeatingValueVecto;
public string GetLabel()
{
diff --git a/VectoCore/VectoCore/Models/Declaration/HVAC.cs b/VectoCore/VectoCore/Models/Declaration/HVAC.cs
index c4e05fe303ab4d577906a0919108182dd70dbe32..7c20b0e87d62a0995968c694ef9879209cc8ad33 100644
--- a/VectoCore/VectoCore/Models/Declaration/HVAC.cs
+++ b/VectoCore/VectoCore/Models/Declaration/HVAC.cs
@@ -44,17 +44,9 @@ namespace TUGraz.VectoCore.Models.Declaration
{
private List<string> Technologies;
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUX.HVAC-Table.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".VAUX.HVAC-Table.csv";
- protected override string ErrorMessage
- {
- get {
- return "Auxiliary Lookup Error: No value found for HVAC. Mission: '{0}', Technology: '{1}' , HDVClass: '{2}'";
- }
- }
+ protected override string ErrorMessage => "Auxiliary Lookup Error: No value found for HVAC. Mission: '{0}', Technology: '{1}' , HDVClass: '{2}'";
protected override void ParseData(DataTable table)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/HVACCoolingPower.cs b/VectoCore/VectoCore/Models/Declaration/HVACCoolingPower.cs
index f320d5cf9bac426ec7f04e2474baea3370293ffa..5be5e155552bf6e2064fb8500a6d4d8b9977edb5 100644
--- a/VectoCore/VectoCore/Models/Declaration/HVACCoolingPower.cs
+++ b/VectoCore/VectoCore/Models/Declaration/HVACCoolingPower.cs
@@ -33,7 +33,8 @@ namespace TUGraz.VectoCore.Models.Declaration {
#region Overrides of LookupData
protected override string ResourceId { get; }
- protected override string ErrorMessage { get { return "No entry found for configuration {0}, mission {1}"; } }
+ protected override string ErrorMessage => "No entry found for configuration {0}, mission {1}";
+
protected override void ParseData(DataTable table)
{
var missionTypes = Enum.GetValues(typeof(MissionType)).Cast<MissionType>().Where(
diff --git a/VectoCore/VectoCore/Models/Declaration/LACDecisionFactor.cs b/VectoCore/VectoCore/Models/Declaration/LACDecisionFactor.cs
index 3b8c92d1cd7a0562e93960cf73e1a589785aeb33..c9e6ba094862062f634e7806a9af167f9425b48e 100644
--- a/VectoCore/VectoCore/Models/Declaration/LACDecisionFactor.cs
+++ b/VectoCore/VectoCore/Models/Declaration/LACDecisionFactor.cs
@@ -71,15 +71,9 @@ namespace TUGraz.VectoCore.Models.Declaration
public sealed class LACDecisionFactorVdrop : LookupData<MeterPerSecond, double>
{
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".LAC-DF-Vdrop.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".LAC-DF-Vdrop.csv";
- protected override string ErrorMessage
- {
- get { throw new System.NotImplementedException(); }
- }
+ protected override string ErrorMessage => throw new System.NotImplementedException();
public LACDecisionFactorVdrop() {}
@@ -125,15 +119,9 @@ namespace TUGraz.VectoCore.Models.Declaration
public sealed class LACDecisionFactorVTarget : LookupData<MeterPerSecond, double>
{
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".LAC-DF-Vtarget.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".LAC-DF-Vtarget.csv";
- protected override string ErrorMessage
- {
- get { throw new System.NotImplementedException(); }
- }
+ protected override string ErrorMessage => throw new System.NotImplementedException();
public LACDecisionFactorVTarget() {}
diff --git a/VectoCore/VectoCore/Models/Declaration/LookupData.cs b/VectoCore/VectoCore/Models/Declaration/LookupData.cs
index 413ab9f9a26e871f668999277d2b51df4496eaad..03f7315e3d2d4c9c70632820f228c1a5e039c35b 100644
--- a/VectoCore/VectoCore/Models/Declaration/LookupData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/LookupData.cs
@@ -88,7 +88,7 @@ namespace TUGraz.VectoCore.Models.Declaration
{
protected Dictionary<TKey, TValue> Data = new Dictionary<TKey, TValue>();
- protected override string ErrorMessage { get { return "key {0} not found in lookup data"; } }
+ protected override string ErrorMessage => "key {0} not found in lookup data";
public virtual TValue Lookup(TKey key)
{
@@ -99,10 +99,7 @@ namespace TUGraz.VectoCore.Models.Declaration
}
}
- public Dictionary<TKey, TValue> Entries
- {
- get { return Data; }
- }
+ public Dictionary<TKey, TValue> Entries => Data;
}
public abstract class LookupData<TKey1, TKey2, TValue> : LookupData where TValue : struct
diff --git a/VectoCore/VectoCore/Models/Declaration/PT1.cs b/VectoCore/VectoCore/Models/Declaration/PT1.cs
index 9d063d929893f6993676318ace58931b29e8a11a..427e8decf1f6974b2070e0ef303330b4fe24a24b 100644
--- a/VectoCore/VectoCore/Models/Declaration/PT1.cs
+++ b/VectoCore/VectoCore/Models/Declaration/PT1.cs
@@ -41,15 +41,9 @@ namespace TUGraz.VectoCore.Models.Declaration
{
public sealed class PT1 : LookupData<PerSecond, PT1.PT1Result>
{
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".PT1.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".PT1.csv";
- protected override string ErrorMessage
- {
- get { throw new InvalidOperationException("ErrorMessage not applicable."); }
- }
+ protected override string ErrorMessage => throw new InvalidOperationException("ErrorMessage not applicable.");
private List<KeyValuePair<PerSecond, Second>> _entries;
diff --git a/VectoCore/VectoCore/Models/Declaration/PTOTransmission.cs b/VectoCore/VectoCore/Models/Declaration/PTOTransmission.cs
index c8336db0fcf6040275761378db44bb003d4ea5a1..61cb57c6f31781722ee7c76aded1bbd144676cc4 100644
--- a/VectoCore/VectoCore/Models/Declaration/PTOTransmission.cs
+++ b/VectoCore/VectoCore/Models/Declaration/PTOTransmission.cs
@@ -40,15 +40,9 @@ namespace TUGraz.VectoCore.Models.Declaration
{
public const string NoPTO = "None";
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUX.PTO-tech.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".VAUX.PTO-tech.csv";
- protected override string ErrorMessage
- {
- get { return "PTO Transmission Lookup Error: No value found for PTO Transmission. Technology: '{0}'"; }
- }
+ protected override string ErrorMessage => "PTO Transmission Lookup Error: No value found for PTO Transmission. Technology: '{0}'";
protected override void ParseData(DataTable table)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/Payloads.cs b/VectoCore/VectoCore/Models/Declaration/Payloads.cs
index 5c8ee7fa3bbb7e144de95be0a1f358435d2abc5c..63b3080770069a6ac6530b90dcbc166ea049ea6d 100644
--- a/VectoCore/VectoCore/Models/Declaration/Payloads.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Payloads.cs
@@ -39,15 +39,9 @@ namespace TUGraz.VectoCore.Models.Declaration
{
public sealed class Payloads : LookupData<Kilogram, Payloads.PayloadEntry>
{
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".Payloads.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".Payloads.csv";
- protected override string ErrorMessage
- {
- get { throw new InvalidOperationException("ErrorMessage not applicable."); }
- }
+ protected override string ErrorMessage => throw new InvalidOperationException("ErrorMessage not applicable.");
public Kilogram Lookup10Percent(Kilogram grossVehicleWeight)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/PneumaticSystem.cs b/VectoCore/VectoCore/Models/Declaration/PneumaticSystem.cs
index 4c137a52711bfbc0ad2520dc868fe3488cf6ef85..5222c8b0370903e4d4fa70feacdc4955840cc236 100644
--- a/VectoCore/VectoCore/Models/Declaration/PneumaticSystem.cs
+++ b/VectoCore/VectoCore/Models/Declaration/PneumaticSystem.cs
@@ -40,15 +40,9 @@ namespace TUGraz.VectoCore.Models.Declaration
{
public sealed class PneumaticSystem : LookupData<MissionType, string, AuxDemandEntry>, IDeclarationAuxiliaryTable
{
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUX.PS-Table.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".VAUX.PS-Table.csv";
- protected override string ErrorMessage
- {
- get { return "Auxiliary Lookup Error: No value found for Pneumatic System. Mission: '{0}', Technology: '{1}'"; }
- }
+ protected override string ErrorMessage => "Auxiliary Lookup Error: No value found for Pneumatic System. Mission: '{0}', Technology: '{1}'";
protected override void ParseData(DataTable table)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs b/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
index a69f6935f75e86423de9d1ad844bcf80213f8f37..80ad3251a312d913ed0d925c36c89e31ef0bb08f 100644
--- a/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
@@ -17,18 +17,9 @@ namespace TUGraz.VectoCore.Models.Declaration
#region Overrides of LookupData
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".PrimaryBusSegmentationTable.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".PrimaryBusSegmentationTable.csv";
- protected override string ErrorMessage
- {
- get {
- return
- "ERROR: Could not find the declaration segment for vehicle. Category: {0}, AxleConfiguration: {1}, GrossVehicleWeight: {2}";
- }
- }
+ protected override string ErrorMessage => "ERROR: Could not find the declaration segment for vehicle. Category: {0}, AxleConfiguration: {1}, GrossVehicleWeight: {2}";
protected override void ParseData(DataTable table)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/StandardBodies.cs b/VectoCore/VectoCore/Models/Declaration/StandardBodies.cs
index 4d81f98301400cff85f6da49876f45b3c5b1aaa0..8287ef494740ccce3055b066026fd0d6eebade10 100644
--- a/VectoCore/VectoCore/Models/Declaration/StandardBodies.cs
+++ b/VectoCore/VectoCore/Models/Declaration/StandardBodies.cs
@@ -46,10 +46,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public readonly List<Wheels.Entry> Wheels;
public readonly CubicMeter CargoVolume;
- public Kilogram MaxPayLoad
- {
- get { return GrossVehicleWeight - CurbWeight; }
- }
+ public Kilogram MaxPayLoad => GrossVehicleWeight - CurbWeight;
public StandardBody(string name, Kilogram curbWeight, Kilogram grossVehicleWeight, SquareMeter[] deltaCrossWindArea,
Wheels.Entry? wheels, int axleCount, CubicMeter volume) :
@@ -92,15 +89,9 @@ namespace TUGraz.VectoCore.Models.Declaration
public static readonly StandardBody Empty = new StandardBody("", 0.SI<Kilogram>(), 0.SI<Kilogram>(),
new[] { 0.SI<SquareMeter>(), 0.SI<SquareMeter>() }, null, 0, 0.SI<CubicMeter>());
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".Body_Trailers_Weights.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".Body_Trailers_Weights.csv";
- protected override string ErrorMessage
- {
- get { return "StandardWeigths Lookup Error: No value found for ID '{0}'"; }
- }
+ protected override string ErrorMessage => "StandardWeigths Lookup Error: No value found for ID '{0}'";
public override StandardBody Lookup(string id)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/SteeringPump.cs b/VectoCore/VectoCore/Models/Declaration/SteeringPump.cs
index 194c81e2f4e82effa9323e0d6b056f1b69895085..2f24beb5edc17da0f76794209a894e00b48843ff 100644
--- a/VectoCore/VectoCore/Models/Declaration/SteeringPump.cs
+++ b/VectoCore/VectoCore/Models/Declaration/SteeringPump.cs
@@ -73,15 +73,9 @@ namespace TUGraz.VectoCore.Models.Declaration
private sealed class SteeringPumpBaseLine : LookupData<MissionType, VehicleClass, SteeringPumpValues<Watt>>
{
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUX.SP-Table.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".VAUX.SP-Table.csv";
- protected override string ErrorMessage
- {
- get { return "Auxiliary Lookup Error: No value found for Steering Pump. Mission: '{0}', HDVClass: '{1}'"; }
- }
+ protected override string ErrorMessage => "Auxiliary Lookup Error: No value found for Steering Pump. Mission: '{0}', HDVClass: '{1}'";
protected override void ParseData(DataTable table)
{
@@ -102,15 +96,9 @@ namespace TUGraz.VectoCore.Models.Declaration
private sealed class SteeringPumpTechnologies : LookupData<string, SteeringPumpValues<double>>
{
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUX.SP-Tech.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".VAUX.SP-Tech.csv";
- protected override string ErrorMessage
- {
- get { return "Auxiliary Lookup Error: No value found for SteeringPump Technology. Key: '{0}'"; }
- }
+ protected override string ErrorMessage => "Auxiliary Lookup Error: No value found for SteeringPump Technology. Key: '{0}'";
protected override void ParseData(DataTable table)
{
@@ -149,15 +137,9 @@ namespace TUGraz.VectoCore.Models.Declaration
private sealed class SteeringPumpAxles : LookupData<MissionType, int, SteeringPumpValues<double>>
{
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUX.SP-Axles.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".VAUX.SP-Axles.csv";
- protected override string ErrorMessage
- {
- get { return "Auxiliary Lookup Error: No value found for SteeringPump Axle. Mission: '{0}', Axle Count: '{1}'"; }
- }
+ protected override string ErrorMessage => "Auxiliary Lookup Error: No value found for SteeringPump Axle. Mission: '{0}', Axle Count: '{1}'";
protected override void ParseData(DataTable table)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/SteeringPumpBus.cs b/VectoCore/VectoCore/Models/Declaration/SteeringPumpBus.cs
index 3da8514f463b0d72f7aa1078a615baa8582ed602..09037d36f1f2b5d2e4ca57c024179cc8fc9a3cd8 100644
--- a/VectoCore/VectoCore/Models/Declaration/SteeringPumpBus.cs
+++ b/VectoCore/VectoCore/Models/Declaration/SteeringPumpBus.cs
@@ -59,8 +59,9 @@ namespace TUGraz.VectoCore.Models.Declaration {
{
#region Overrides of LookupData
- protected override string ResourceId { get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUXBus.SP-Axles_Bus.csv"; } }
- protected override string ErrorMessage { get { return "Auxiliary Lookup Error: No value found for Steering Pump. Mission: '{0}', HDVClass: '{1}'"; } }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".VAUXBus.SP-Axles_Bus.csv";
+ protected override string ErrorMessage => "Auxiliary Lookup Error: No value found for Steering Pump. Mission: '{0}', HDVClass: '{1}'";
+
protected override void ParseData(DataTable table)
{
foreach (DataRow row in table.Rows) {
@@ -83,8 +84,9 @@ namespace TUGraz.VectoCore.Models.Declaration {
{
#region Overrides of LookupData
- protected override string ResourceId { get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUXBus.SP-Factors_Bus.csv"; } }
- protected override string ErrorMessage { get { return "Auxiliary Lookup Error: No value found for Steering Pump. Mission: '{0}', HDVClass: '{1}'"; } }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".VAUXBus.SP-Factors_Bus.csv";
+ protected override string ErrorMessage => "Auxiliary Lookup Error: No value found for Steering Pump. Mission: '{0}', HDVClass: '{1}'";
+
protected override void ParseData(DataTable table)
{
var missionTypes = Enum.GetValues(typeof(MissionType)).Cast<MissionType>().Where(
diff --git a/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs b/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs
index 814f8784b6fdd4ffa9e6b9fae78cad45739fe403..7c781379368e13e99228e850b143579510564581 100644
--- a/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs
@@ -45,18 +45,9 @@ namespace TUGraz.VectoCore.Models.Declaration
{
private DataTable _segmentTable;
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".SegmentTable.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".SegmentTable.csv";
- protected override string ErrorMessage
- {
- get {
- return
- "ERROR: Could not find the declaration segment for vehicle. Category: {0}, AxleConfiguration: {1}, GrossVehicleWeight: {2}";
- }
- }
+ protected override string ErrorMessage => "ERROR: Could not find the declaration segment for vehicle. Category: {0}, AxleConfiguration: {1}, GrossVehicleWeight: {2}";
protected override void ParseData(DataTable table)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/TyreClass.cs b/VectoCore/VectoCore/Models/Declaration/TyreClass.cs
index bad4a7e0c706c414cafcd1927885feeefc5b81f2..b1c4855b2ca2e6123205ac152b6ff90138ee1d75 100644
--- a/VectoCore/VectoCore/Models/Declaration/TyreClass.cs
+++ b/VectoCore/VectoCore/Models/Declaration/TyreClass.cs
@@ -50,8 +50,9 @@ namespace TUGraz.VectoCore.Models.Declaration
#region Overrides of LookupData
- protected override string ResourceId { get { return DeclarationData.DeclarationDataResourcePrefix + ".TyreLabeling.csv"; } }
- protected override string ErrorMessage { get { return "No Tyre class found for RRC {0}"; } }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".TyreLabeling.csv";
+ protected override string ErrorMessage => "No Tyre class found for RRC {0}";
+
protected override void ParseData(DataTable table)
{
foreach (DataRow row in table.Rows) {
diff --git a/VectoCore/VectoCore/Models/Declaration/WHTCCorrection.cs b/VectoCore/VectoCore/Models/Declaration/WHTCCorrection.cs
index ca33052e8b5320c3eb9880fe753bc97c752b3cd4..2123c256e8d19fbd1c3f05e0eeab53d7f6b1f9ed 100644
--- a/VectoCore/VectoCore/Models/Declaration/WHTCCorrection.cs
+++ b/VectoCore/VectoCore/Models/Declaration/WHTCCorrection.cs
@@ -50,15 +50,9 @@ namespace TUGraz.VectoCore.Models.Declaration
private sealed class WHTCCorrectionData : LookupData<MissionType, Entry>
{
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".WHTC-Weighting-Factors.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".WHTC-Weighting-Factors.csv";
- protected override string ErrorMessage
- {
- get { return "WHTC Correction Lookup Error: no value found. Mission: '{0}'"; }
- }
+ protected override string ErrorMessage => "WHTC Correction Lookup Error: no value found. Mission: '{0}'";
protected override void ParseData(DataTable table)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/WeightingFactors.cs b/VectoCore/VectoCore/Models/Declaration/WeightingFactors.cs
index 6a8dd8e35430b9b5fca9e4b151e585cb42d156f8..b8e0c101204b52b1f2c075a8eeb40e3004e3ffc2 100644
--- a/VectoCore/VectoCore/Models/Declaration/WeightingFactors.cs
+++ b/VectoCore/VectoCore/Models/Declaration/WeightingFactors.cs
@@ -55,8 +55,9 @@ namespace TUGraz.VectoCore.Models.Declaration
#region Overrides of LookupData
- protected override string ResourceId { get { return DeclarationData.DeclarationDataResourcePrefix + ".CO2Standards.MissionProfileWeights.csv"; } }
- protected override string ErrorMessage { get { return "No Weighting Factors found for Weighting Group {0}"; } }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".CO2Standards.MissionProfileWeights.csv";
+ protected override string ErrorMessage => "No Weighting Factors found for Weighting Group {0}";
+
protected override void ParseData(DataTable table)
{
var loadingTypes = new[] { LoadingType.LowLoading, LoadingType.ReferenceLoad };
diff --git a/VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs b/VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs
index 65bf744edb766b3eb00535204bff23fb2dcf2024..1487733f93c171f9abe974b32cdfb180cc42b564 100644
--- a/VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs
+++ b/VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs
@@ -84,10 +84,10 @@ namespace TUGraz.VectoCore.Models.Declaration
#region Overrides of LookupData
- protected override string ResourceId { get { return DeclarationData.DeclarationDataResourcePrefix + ".CO2Standards.WeightingGroups.csv"; } }
- protected override string ErrorMessage { get {
- return "WeightingGroup Lookup Error: no entry found for group {0}, sleeper cab: {1}, engine rated power {2}";
- } }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".CO2Standards.WeightingGroups.csv";
+
+ protected override string ErrorMessage => "WeightingGroup Lookup Error: no entry found for group {0}, sleeper cab: {1}, engine rated power {2}";
+
protected override void ParseData(DataTable table)
{
foreach (DataRow row in table.Rows) {
diff --git a/VectoCore/VectoCore/Models/Declaration/Wheels.cs b/VectoCore/VectoCore/Models/Declaration/Wheels.cs
index afa97f2805903da2b7ea76ee32ae29e3a3325b85..3ae7aae077a3cbfd1f4ad09011115ab71908d724 100644
--- a/VectoCore/VectoCore/Models/Declaration/Wheels.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Wheels.cs
@@ -42,15 +42,9 @@ namespace TUGraz.VectoCore.Models.Declaration
private string[] _dimensions;
public TyreClass TyreClass = new TyreClass();
- protected override string ResourceId
- {
- get { return DeclarationData.DeclarationDataResourcePrefix + ".Wheels.csv"; }
- }
+ protected override string ResourceId => DeclarationData.DeclarationDataResourcePrefix + ".Wheels.csv";
- protected override string ErrorMessage
- {
- get { return "Wheels Lookup Error: No value found for Wheels. Key: '{0}'"; }
- }
+ protected override string ErrorMessage => "Wheels Lookup Error: No value found for Wheels. Key: '{0}'";
public override Entry Lookup(string key)
{
@@ -76,10 +70,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public Meter WheelsDiameter;
public double CircumferenceFactor;
- public Meter DynamicTyreRadius
- {
- get { return WheelsDiameter * CircumferenceFactor / (2 * Math.PI); }
- }
+ public Meter DynamicTyreRadius => WheelsDiameter * CircumferenceFactor / (2 * Math.PI);
}
public string[] GetWheelsDimensions()
diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericBusEngineData.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericBusEngineData.cs
index dd376e59ebb0bb46dd356783c42b0d79e5063b81..1ca0c50e61b0ebb74c3d1c056cb836525ffba950 100644
--- a/VectoCore/VectoCore/Models/GenericModelData/GenericBusEngineData.cs
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericBusEngineData.cs
@@ -32,10 +32,7 @@ namespace TUGraz.VectoCore.Models.Declaration
private static GenericBusEngineData _instance;
- public static GenericBusEngineData Instance
- {
- get { return _instance ?? (_instance = new GenericBusEngineData()); }
- }
+ public static GenericBusEngineData Instance => _instance ?? (_instance = new GenericBusEngineData());
#endregion
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
index 7aeca33d1d57e26819b49dc3e7422bd6a4b679de..01865075001a5d3da5991012565c5bfb70730be6 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
@@ -47,11 +47,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl {
#region Overrides of VectoRun
- public override double Progress { get { return 1; } }
+ public override double Progress => 1;
- public override string CycleName { get { return "ExemptedVehicle"; } }
+ public override string CycleName => "ExemptedVehicle";
- public override string RunSuffix { get { return ""; } }
+ public override string RunSuffix => "";
protected override IResponse DoSimulationStep()
{
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PCCEcoRollEngineStopPreprocessor.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PCCEcoRollEngineStopPreprocessor.cs
index 2c1894114e9a739641733690f5d3292bf8bd6dda..a8987e044a6f97b692107508bf89d244eb55ed99 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PCCEcoRollEngineStopPreprocessor.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PCCEcoRollEngineStopPreprocessor.cs
@@ -166,9 +166,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
public int CurrentIdx { get; private set; }
- public int Count { get { return Segments.Count; } }
+ public int Count => Segments.Count;
- public PCCSegment Current { get { return Segments.Any() ? Segments[CurrentIdx] : null; } }
+ public PCCSegment Current => Segments.Any() ? Segments[CurrentIdx] : null;
public List<PCCSegment> Segments { get; }
}
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index 1aa637a434e9d524a385cb6853b595ab1946ad39..a8d2815cb4945d1894e08e22db1f7b07ad3d5ffc 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -1087,20 +1087,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
#region Implementation of IDriverInfo
- public DrivingBehavior DriverBehavior
- {
- get { return DrivingBehavior.Accelerating; }
- }
+ public DrivingBehavior DriverBehavior => DrivingBehavior.Accelerating;
- public DrivingAction DrivingAction
- {
- get { return DrivingAction.Accelerate; }
- }
+ public DrivingAction DrivingAction => DrivingAction.Accelerate;
- public MeterPerSquareSecond DriverAcceleration
- {
- get { return 0.SI<MeterPerSquareSecond>(); }
- }
+ public MeterPerSquareSecond DriverAcceleration => 0.SI<MeterPerSquareSecond>();
#endregion
}
@@ -1128,75 +1119,39 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
#region Implementation of IGearboxInfo
- public GearboxType GearboxType
- {
- get {return GearboxType.DrivingCycle; }
- }
+ public GearboxType GearboxType => GearboxType.DrivingCycle;
- public GearshiftPosition Gear
- {
- get { return new GearshiftPosition(0); }
- }
+ public GearshiftPosition Gear => new GearshiftPosition(0);
- public bool TCLocked
- {
- get { return true; }
- }
+ public bool TCLocked => true;
- public MeterPerSecond StartSpeed
- {
- get { throw new VectoException("No Gearbox available. StartSpeed unknown."); }
- }
+ public MeterPerSecond StartSpeed => throw new VectoException("No Gearbox available. StartSpeed unknown.");
- public MeterPerSquareSecond StartAcceleration
- {
- get { throw new VectoException("No Gearbox available. StartAcceleration unknown."); }
- }
+ public MeterPerSquareSecond StartAcceleration => throw new VectoException("No Gearbox available. StartAcceleration unknown.");
public Watt GearboxLoss()
{
throw new VectoException("No Gearbox available.");
}
- public Second LastShift
- {
- get { throw new VectoException("No Gearbox available."); }
- }
+ public Second LastShift => throw new VectoException("No Gearbox available.");
- public Second LastUpshift
- {
- get { throw new VectoException("No Gearbox available."); }
- }
+ public Second LastUpshift => throw new VectoException("No Gearbox available.");
- public Second LastDownshift
- {
- get { throw new VectoException("No Gearbox available."); }
- }
+ public Second LastDownshift => throw new VectoException("No Gearbox available.");
public GearData GetGearData(uint gear)
{
throw new VectoException("No Gearbox available.");
}
- public GearshiftPosition NextGear
- {
- get { throw new VectoException("No Gearbox available."); }
- }
+ public GearshiftPosition NextGear => throw new VectoException("No Gearbox available.");
- public Second TractionInterruption
- {
- get { throw new NotImplementedException(); }
- }
+ public Second TractionInterruption => throw new NotImplementedException();
- public uint NumGears
- {
- get { throw new NotImplementedException(); }
- }
+ public uint NumGears => throw new NotImplementedException();
- public bool DisengageGearbox
- {
- get { throw new VectoException("No Gearbox available."); }
- }
+ public bool DisengageGearbox => throw new VectoException("No Gearbox available.");
public bool GearEngaged(Second absTime)
{
@@ -1229,10 +1184,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
#region Implementation of IMileageCounter
- public Meter Distance
- {
- get { return 0.SI<Meter>(); }
- }
+ public Meter Distance => 0.SI<Meter>();
#endregion
}
@@ -1260,35 +1212,17 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
#region Implementation of IVehicleInfo
- public MeterPerSecond VehicleSpeed
- {
- get { return 0.SI<MeterPerSecond>(); }
- }
+ public MeterPerSecond VehicleSpeed => 0.SI<MeterPerSecond>();
- public bool VehicleStopped
- {
- get { throw new System.NotImplementedException(); }
- }
+ public bool VehicleStopped => throw new System.NotImplementedException();
- public Kilogram VehicleMass
- {
- get { throw new System.NotImplementedException(); }
- }
+ public Kilogram VehicleMass => throw new System.NotImplementedException();
- public Kilogram VehicleLoading
- {
- get { throw new System.NotImplementedException(); }
- }
+ public Kilogram VehicleLoading => throw new System.NotImplementedException();
- public Kilogram TotalMass
- {
- get { throw new System.NotImplementedException(); }
- }
+ public Kilogram TotalMass => throw new System.NotImplementedException();
- public CubicMeter CargoVolume
- {
- get { throw new System.NotImplementedException(); }
- }
+ public CubicMeter CargoVolume => throw new System.NotImplementedException();
public Newton AirDragResistance(MeterPerSecond previousVelocity, MeterPerSecond nextVelocity)
{
@@ -1305,10 +1239,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
throw new System.NotImplementedException();
}
- public MeterPerSecond MaxVehicleSpeed
- {
- get { throw new System.NotImplementedException(); }
- }
+ public MeterPerSecond MaxVehicleSpeed => throw new System.NotImplementedException();
#endregion
}
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
index b3b21458d2d3923b077c5c0b55d023cc46b4b419..3770538e26a5de7b3ef1b56987666633cf563ad3 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
@@ -61,30 +61,15 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
public int RunIdentifier { get; protected set; }
- public virtual string RunName
- {
- get { return Container.RunData.JobName; }
- }
+ public virtual string RunName => Container.RunData.JobName;
- public virtual string CycleName
- {
- get { return Container.RunData.Cycle.Name; }
- }
+ public virtual string CycleName => Container.RunData.Cycle.Name;
- public virtual string RunSuffix
- {
- get { return Container.RunData.ModFileSuffix; }
- }
+ public virtual string RunSuffix => Container.RunData.ModFileSuffix;
- public int JobRunIdentifier
- {
- get { return Container.RunData.JobRunId; }
- }
+ public int JobRunIdentifier => Container.RunData.JobRunId;
- public virtual double Progress
- {
- get { return CyclePort.Progress * (PostProcessingDone ? 1.0 : 0.99) * (WritingResultsDone ? 1.0 : 0.99); }
- }
+ public virtual double Progress => CyclePort.Progress * (PostProcessingDone ? 1.0 : 0.99) * (WritingResultsDone ? 1.0 : 0.99);
protected VectoRun(IVehicleContainer container)
{
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs b/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
index b5404afbcfeb8839d5720b4bdb73179bc11694ad..71c8d5202e7e268754772f21515b0b10c85ce245 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
@@ -82,10 +82,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
public IDCDCConverter DCDCConverter { get; private set; }
- public virtual bool IsTestPowertrain
- {
- get { return false; }
- }
+ public virtual bool IsTestPowertrain => false;
internal ISimulationOutPort Cycle;
@@ -109,10 +106,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
#region IVehicleContainer
- public virtual IModalDataContainer ModalData
- {
- get { return ModData; }
- }
+ public virtual IModalDataContainer ModalData => ModData;
public virtual ISimulationOutPort GetCycleOutPort()
{
@@ -128,21 +122,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
- public IPowertainInfo PowertrainInfo
- {
- get { return this; }
- }
+ public IPowertainInfo PowertrainInfo => this;
- public IHybridControllerInfo HybridControllerInfo
- {
- get { return HybridController; }
- }
-
- public IHybridControllerCtl HybridControllerCtl
- {
- get { return HybridController; }
- }
+ public IHybridControllerInfo HybridControllerInfo => HybridController;
+ public IHybridControllerCtl HybridControllerCtl => HybridController;
public virtual void AddComponent(VectoSimulationComponent component)
@@ -236,10 +220,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
DrivingCycleInfo?.FinishSimulation();
}
- public virtual IEnumerable<ISimulationPreprocessor> GetPreprocessingRuns
- {
- get { return new ReadOnlyCollection<ISimulationPreprocessor>(Preprocessors); }
- }
+ public virtual IEnumerable<ISimulationPreprocessor> GetPreprocessingRuns => new ReadOnlyCollection<ISimulationPreprocessor>(Preprocessors);
public virtual void AddPreprocessor(ISimulationPreprocessor simulationPreprocessor)
{
@@ -262,10 +243,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
public virtual bool HasElectricMotor { get; private set; }
- public PowertrainPosition[] ElectricMotorPositions
- {
- get { return ElectricMotors.Keys.ToArray(); }
- }
+ public PowertrainPosition[] ElectricMotorPositions => ElectricMotors.Keys.ToArray();
public virtual bool HasCombustionEngine { get; private set; }
@@ -297,29 +275,19 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
#region Overrides of VehicleContainer
- public override IMileageCounter MileageCounter
- {
- get { return _mileageCounter; }
-
- }
+ public override IMileageCounter MileageCounter => _mileageCounter;
#endregion
#region Overrides of VehicleContainer
- public override IVehicleInfo VehicleInfo
- {
- get { return _vehicleInfo; }
- }
+ public override IVehicleInfo VehicleInfo => _vehicleInfo;
#endregion
#region Overrides of VehicleContainer
- public override IGearboxInfo GearboxInfo
- {
- get { return _gearboxInfo; }
- }
+ public override IGearboxInfo GearboxInfo => _gearboxInfo;
#endregion
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs
index 6d5983615d94447127e863e78c55d0406d234d34..dfcfbfbd5e8cb52dcf256563b74681175fc1d868 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs
@@ -60,10 +60,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
DataBus = dataBus;
}
- public CrossWindCorrectionMode CorrectionMode
- {
- get { return CrossWindCorrectionMode.VAirBetaLookupTable; }
- }
+ public CrossWindCorrectionMode CorrectionMode => CrossWindCorrectionMode.VAirBetaLookupTable;
public Watt AverageAirDragPowerLoss(MeterPerSecond v1, MeterPerSecond v2, KilogramPerCubicMeter airDensity)
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
index 9a1292cc2008c5331877b76455fb0ea32881c21e..cb64cfeac6d78d550a6b1710d51428d9f9323619 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
@@ -170,10 +170,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
/// <summary>
/// [%] Optional.
/// </summary>
- public Scalar RoadGradientPercent
- {
- get { return (Math.Tan(RoadGradient.Value()) * 100).SI<Scalar>(); }
- }
+ public Scalar RoadGradientPercent => (Math.Tan(RoadGradient.Value()) * 100).SI<Scalar>();
public Dictionary<FuelType, KilogramPerSecond> VTPFuelconsumption;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs
index eaf186a03d4aa27aa4abaf218542412717594fdd..c1752c795dbf43a8a7e24ec4da242c1e8e86356e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs
@@ -106,19 +106,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
/// Get the rated speed from the given full-load curve (i.e. speed with max. power)
/// </summary>
[Required, SIRange(0, 5000 * Constants.RPMToRad)]
- public PerSecond RatedSpeed
- {
- get { return _ratedSpeed ?? ComputeRatedSpeed().Item1; }
- }
+ public PerSecond RatedSpeed => _ratedSpeed ?? ComputeRatedSpeed().Item1;
/// <summary>
/// Gets the maximum power.
/// </summary>
[Required, SIRange(0, 10000 * 5000 * Constants.RPMToRad)]
- public Watt MaxPower
- {
- get { return _maxPower ?? ComputeRatedSpeed().Item2; }
- }
+ public Watt MaxPower => _maxPower ?? ComputeRatedSpeed().Item2;
public NewtonMeter MaxTorque
{
@@ -277,30 +271,15 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
}
}
- public PerSecond NTq99hSpeed
- {
- get { return _nTq99hSpeed ?? (_nTq99hSpeed = FindEnginSpeedForTorque(0.99 * MaxTorque).Last()); }
- }
+ public PerSecond NTq99hSpeed => _nTq99hSpeed ?? (_nTq99hSpeed = FindEnginSpeedForTorque(0.99 * MaxTorque).Last());
- public PerSecond NTq99lSpeed
- {
- get { return _nTq99lSpeed ?? (_nTq99lSpeed = FindEnginSpeedForTorque(0.99 * MaxTorque).First()); }
- }
+ public PerSecond NTq99lSpeed => _nTq99lSpeed ?? (_nTq99lSpeed = FindEnginSpeedForTorque(0.99 * MaxTorque).First());
- public PerSecond NP99hSpeed
- {
- get { return _nP99hSpeed ?? (_nP99hSpeed = ComputeNP99HSpeed()); }
- }
+ public PerSecond NP99hSpeed => _nP99hSpeed ?? (_nP99hSpeed = ComputeNP99HSpeed());
- public PerSecond NTq98hSpeed
- {
- get { return _nTq98hSpeed ?? (_nTq98hSpeed = FindEnginSpeedForTorque(0.98 * MaxTorque).Last()); }
- }
+ public PerSecond NTq98hSpeed => _nTq98hSpeed ?? (_nTq98hSpeed = FindEnginSpeedForTorque(0.98 * MaxTorque).Last());
- public PerSecond NP98hSpeed
- {
- get { return _nP98hSpeed ?? (_nP98hSpeed = ComputeNP98HSpeed()); }
- }
+ public PerSecond NP98hSpeed => _nP98hSpeed ?? (_nP98hSpeed = ComputeNP98HSpeed());
private PerSecond ComputeNP99HSpeed()
{
@@ -322,10 +301,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
return retVal;
}
- public PerSecond LoSpeed
- {
- get { return _engineSpeedLo ?? (_engineSpeedLo = FindEngineSpeedForPower(0.55 * MaxPower).First()); }
- }
+ public PerSecond LoSpeed => _engineSpeedLo ?? (_engineSpeedLo = FindEngineSpeedForPower(0.55 * MaxPower).First());
//public PerSecond HiSpeed
//{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/WHRPowerMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/WHRPowerMap.cs
index f238ae28186563e20a2712487202d39db72c851f..f932d239d8ba0a2bd1525fc6910c03677579f8f5 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/WHRPowerMap.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/WHRPowerMap.cs
@@ -15,10 +15,7 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
WHRMap = whrMap;
}
- public string Name
- {
- get { return WHRMap.Name; }
- }
+ public string Name => WHRMap.Name;
public class Entry
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs
index bec2802d1899b068677136f1087e3b6e1cc44498..466874138ec53f71f21b389d44b6962638b703d3 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs
@@ -54,15 +54,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
TorqueConverterRatio = double.NaN;
}
- public bool HasTorqueConverter
- {
- get { return !double.IsNaN(TorqueConverterRatio) && TorqueConverterGearLossMap != null; }
- }
+ public bool HasTorqueConverter => !double.IsNaN(TorqueConverterRatio) && TorqueConverterGearLossMap != null;
- public bool HasLockedGear
- {
- get { return !double.IsNaN(Ratio) && LossMap != null; }
- }
+ public bool HasLockedGear => !double.IsNaN(Ratio) && LossMap != null;
[ValidateObject]
public ShiftPolygon ShiftPolygon { get; internal set; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs
index ed7babace64f6dfab1b1c0bb582c45495592938e..2702ca1cf1832e66d30addf373d992c31e52d63a 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs
@@ -54,16 +54,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
}
[JsonIgnore]
- public ReadOnlyCollection<ShiftPolygonEntry> Upshift
- {
- get { return _upShiftPolygon.AsReadOnly(); }
- }
+ public ReadOnlyCollection<ShiftPolygonEntry> Upshift => _upShiftPolygon.AsReadOnly();
[JsonIgnore]
- public ReadOnlyCollection<ShiftPolygonEntry> Downshift
- {
- get { return _downShiftPolygon.AsReadOnly(); }
- }
+ public ReadOnlyCollection<ShiftPolygonEntry> Downshift => _downShiftPolygon.AsReadOnly();
public string[] DownshiftSerialized
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
index 87239edc6d15e1d23ef9e421c5fe7503c80f8ec1..de9e1b6fb3dcdb50ba3e6532964fa132e80dbae3 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
@@ -136,10 +136,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
inAngularVelocity.AsRPM);
}
- public GearLossMapEntry this[int i]
- {
- get { return _entries[i]; }
- }
+ public GearLossMapEntry this[int i] => _entries[i];
#if DEBUG
public void DrawGraph()
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
index e6b26aa3b4a57b78d9c1ec7d737680c81245632f..eb4c7d5c00c0c8d2280800b9a0a7356cdd9e31d2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
@@ -81,13 +81,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[JsonIgnore]
- public GearList GearList
- {
- get
- {
- return _gearlist ?? (_gearlist = CreateGearList());
- }
- }
+ public GearList GearList => _gearlist ?? (_gearlist = CreateGearList());
private GearList CreateGearList()
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ShiftStrategy/AverageAccelerationTorqueLookup.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ShiftStrategy/AverageAccelerationTorqueLookup.cs
index 9f475b8c1a44eda7739294e05887a91e643fb8e7..7a62beffe7461fe2def052f2987504701fd3b103 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/ShiftStrategy/AverageAccelerationTorqueLookup.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ShiftStrategy/AverageAccelerationTorqueLookup.cs
@@ -10,9 +10,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl {
public KeyValuePair<Tuple<PerSecond, NewtonMeter>, NewtonMeter>[] Data
{
- set {
- SetData(value);
- }
+ set => SetData(value);
}
#region Overrides of Interpolate2D<PerSecond,NewtonMeter,NewtonMeter,KeyValuePair<Tuple<PerSecond,NewtonMeter>,NewtonMeter>>
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
index ba466b68f6de66b15a4d600d44225d81da4974e2..288df23b962c15809381207dc5f4919c1854e318 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
@@ -100,7 +100,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
public List<Axle> AxleData
{
- get { return _axleData; }
+ get => _axleData;
internal set {
_axleData = value;
_wheelsInertia = null;
@@ -163,7 +163,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
}
return _wheelsInertia;
}
- internal set { _wheelsInertia = value; }
+ internal set => _wheelsInertia = value;
}
//[Required, SIRange(0, 1E12)]
@@ -175,7 +175,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
}
return _totalRollResistanceCoefficient.GetValueOrDefault();
}
- protected internal set { _totalRollResistanceCoefficient = value; }
+ protected internal set => _totalRollResistanceCoefficient = value;
}
public double RollResistanceCoefficientWithoutTrailer
@@ -186,7 +186,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
}
return _rollResistanceCoefficientWithoutTrailer.GetValueOrDefault();
}
- protected internal set { _rollResistanceCoefficientWithoutTrailer = value; }
+ protected internal set => _rollResistanceCoefficientWithoutTrailer = value;
}
public Kilogram TotalVehicleMass
@@ -200,10 +200,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
}
}
- public Kilogram TotalCurbMass
- {
- get { return (CurbMass ?? 0.SI<Kilogram>()) + (BodyAndTrailerMass ?? 0.SI<Kilogram>()); }
- }
+ public Kilogram TotalCurbMass => (CurbMass ?? 0.SI<Kilogram>()) + (BodyAndTrailerMass ?? 0.SI<Kilogram>());
public Kilogram MinimumVehicleMass
{
@@ -215,10 +212,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
}
}
- public Kilogram MaximumVehicleMass
- {
- get { return GrossVehicleMass; }
- }
+ public Kilogram MaximumVehicleMass => GrossVehicleMass;
public double AverageRollingResistanceTruck
{
@@ -228,7 +222,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
}
return _averageRollingResistanceTruck.GetValueOrDefault();
}
- protected internal set { _averageRollingResistanceTruck = value; }
+ protected internal set => _averageRollingResistanceTruck = value;
}
public bool ZeroEmissionVehicle { get; internal set; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/ElectricSystem.cs b/VectoCore/VectoCore/Models/SimulationComponent/ElectricSystem.cs
index feaeceaaddf82e653ba91952048fb9745d519111..3cecf2e8b025422c005393c32dd18d3861b6ee51 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/ElectricSystem.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/ElectricSystem.cs
@@ -57,10 +57,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent
return response;
}
- public Watt ElectricAuxPower { get { return PreviousState.AuxPower; } }
- public Watt ChargePower { get { return PreviousState.ChargePower; } }
- public Watt BatteryPower { get { return PreviousState.BatteryPower; } }
- public Watt ConsumerPower { get { return PreviousState.ConsumerPower; } }
+ public Watt ElectricAuxPower => PreviousState.AuxPower;
+ public Watt ChargePower => PreviousState.ChargePower;
+ public Watt BatteryPower => PreviousState.BatteryPower;
+ public Watt ConsumerPower => PreviousState.ConsumerPower;
protected override void DoWriteModalResults(Second absTime, Second dt, IModalDataContainer container)
{
@@ -107,15 +107,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent
#region Implementation of IRESSInfo
- public Volt InternalCellVoltage
- {
- get { return Battery.InternalVoltage; }
- }
+ public Volt InternalCellVoltage => Battery.InternalVoltage;
- public double StateOfCharge
- {
- get { return Battery.StateOfCharge; }
- }
+ public double StateOfCharge => Battery.StateOfCharge;
public Watt MaxChargePower(Second dt)
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
index b286ae2e62d4b9bad47c868c3777cdb86019eb97..957eb1897fb40bfb496cb73fdb40acdf12ec03eb 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
@@ -93,10 +93,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
DataBus.EngineInfo.EngineN95hSpeed));
}
- public override GearshiftPosition NextGear
- {
- get { return _nextGear; }
- }
+ public override GearshiftPosition NextGear => _nextGear;
public override ShiftPolygon ComputeDeclarationShiftPolygon(
GearboxType gearboxType, int i, EngineFullLoadCurve engineDataFullLoadCurve, IList<ITransmissionInputData> gearboxGears,
@@ -106,7 +103,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
i, engineDataFullLoadCurve, gearboxGears, engineData, axlegearRatio, dynamicTyreRadius);
}
- public static string Name { get { return "AMT - Classic"; } }
+ public static string Name => "AMT - Classic";
public override GearshiftPosition Engage(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity)
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyOptimized.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyOptimized.cs
index 1b5f4270061e09eb95ca695caf9401a0e9b3d7ee..138745bc67141b00a7517632f9f84eca8d659247 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyOptimized.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyOptimized.cs
@@ -331,10 +331,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return response;
}
- public new static string Name
- {
- get { return "AMT - EffShift"; }
- }
+ public new static string Name => "AMT - EffShift";
#region Overrides of AMTShiftStrategy
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATClutchInfo.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATClutchInfo.cs
index b003e1917a6637dfa41572f8c28ad3ac4b506c71..59593d6bf4e052602745d3e60fd828ca677532cc 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATClutchInfo.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATClutchInfo.cs
@@ -31,10 +31,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl {
return true;
}
- public Watt ClutchLosses
- {
- get { return 0.SI<Watt>(); }
- }
+ public Watt ClutchLosses => 0.SI<Watt>();
#endregion
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
index 586f2a494c275ab9a82e770dd6da16912d4ccf86..aebd38acfbbceb46a69370bf6dd55cc151be3661 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
@@ -55,12 +55,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
internal WattSecond _powershiftLossEnergy;
protected internal KilogramSquareMeter EngineInertia;
- public bool TorqueConverterLocked {
- get { return CurrentState.Gear.TorqueConverterLocked.Value; }
- //set { CurrentState.TorqueConverterLocked = value; }
- }
+ public bool TorqueConverterLocked => CurrentState.Gear.TorqueConverterLocked.Value;
- public override bool TCLocked { get { return Gear.TorqueConverterLocked.Value; } }
+ //set { CurrentState.TorqueConverterLocked = value; }
+ public override bool TCLocked => Gear.TorqueConverterLocked.Value;
public ATGearbox(IVehicleContainer container, IShiftStrategy strategy)
: base(container)
@@ -77,7 +75,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public IIdleController IdleController
{
- get { return _idleController; }
+ get => _idleController;
set
{
_idleController = value;
@@ -85,18 +83,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
}
- public bool ShiftToLocked
- {
- get {
- return PreviousState.Gear.Gear == Gear.Gear && !PreviousState.Gear.TorqueConverterLocked.Value &&
- Gear.TorqueConverterLocked.Value;
- }
- }
+ public bool ShiftToLocked =>
+ PreviousState.Gear.Gear == Gear.Gear && !PreviousState.Gear.TorqueConverterLocked.Value &&
+ Gear.TorqueConverterLocked.Value;
public bool Disengaged
{
- get { return CurrentState.Disengaged; }
- set { CurrentState.Disengaged = value; }
+ get => CurrentState.Disengaged;
+ set => CurrentState.Disengaged = value;
}
public override void Connect(ITnOutPort other)
@@ -107,41 +101,29 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override Second LastUpshift
{
- get
- {
- return -double.MaxValue.SI<Second>();
- //throw new System.NotImplementedException();
- }
- protected internal set { throw new System.NotImplementedException(); }
+ get => -double.MaxValue.SI<Second>();
+ //throw new System.NotImplementedException();
+ protected internal set => throw new System.NotImplementedException();
}
public override Second LastDownshift
{
- get
- {
- return -double.MaxValue.SI<Second>();
- //throw new System.NotImplementedException();
- }
- protected internal set { throw new System.NotImplementedException(); }
+ get => -double.MaxValue.SI<Second>();
+ //throw new System.NotImplementedException();
+ protected internal set => throw new System.NotImplementedException();
}
- public override GearshiftPosition NextGear
- {
- get { return _strategy.NextGear; }
- }
+ public override GearshiftPosition NextGear => _strategy.NextGear;
#region Overrides of AbstractGearbox<ATGearboxState>
public override GearshiftPosition Gear
{
- get { return _gear; }
- protected internal set
- {
- _gear = value;
- //if (PreviousState.Gear == value) {
- // RequestAfterGearshift = false;
- //}
- }
+ get => _gear;
+ protected internal set => _gear = value;
+ //if (PreviousState.Gear == value) {
+ // RequestAfterGearshift = false;
+ //}
}
#endregion
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs
index 3de1faed011b5d79a817fc85624920d6de08118e..59c9b16a6a1d98397424fe65f1cbfdc17f5f16fa 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs
@@ -56,7 +56,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override IGearbox Gearbox
{
- get { return _gearbox; }
+ get => _gearbox;
set {
_gearbox = value as ATGearbox;
if (_gearbox == null) {
@@ -65,10 +65,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
}
- public override GearshiftPosition NextGear
- {
- get { return _nextGear.Gear; }
- }
+ public override GearshiftPosition NextGear => _nextGear.Gear;
public override ShiftPolygon ComputeDeclarationShiftPolygon(
GearboxType gearboxType, int i, EngineFullLoadCurve engineDataFullLoadCurve,
@@ -79,10 +76,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
engineDataFullLoadCurve, i == 0, i >= gearboxGears.Count - 1);
}
- public static string Name
- {
- get { return "AT - Classic"; }
- }
+ public static string Name => "AT - Classic";
public ATShiftStrategy(IVehicleContainer dataBus) : base(dataBus)
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategyOptimized.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategyOptimized.cs
index 2b93654877837415599470b6c3f41c14a83fd591..09d73e115d4c8a2615a75960ce3567e8ba04ae99 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategyOptimized.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategyOptimized.cs
@@ -35,10 +35,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
private List<SchmittTrigger> LoadStageSteps = new List<SchmittTrigger>();
private ShiftLineSet UpshiftLineTCLocked = new ShiftLineSet();
- public new static string Name
- {
- get { return "AT - EffShift"; }
- }
+ public new static string Name => "AT - EffShift";
public ATShiftStrategyOptimized(IVehicleContainer dataBus) : base(dataBus)
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AbstractGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AbstractGearbox.cs
index 7a6f069d53538f148502e0932ed1cf659954557f..e7b845bf7362c79d6caa4cef783f79cd4805e519 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AbstractGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AbstractGearbox.cs
@@ -69,18 +69,15 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
#region IGearboxCockpit
- public GearboxType GearboxType
- {
- get { return ModelData.Type; }
- }
+ public GearboxType GearboxType => ModelData.Type;
/// <summary>
/// The current gear.
/// </summary>
public virtual GearshiftPosition Gear
{
- get { return _gear; }
- protected internal set { _gear = value; }
+ get => _gear;
+ protected internal set => _gear = value;
}
public abstract bool TCLocked { get; }
@@ -120,15 +117,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public abstract GearshiftPosition NextGear { get; }
- public virtual Second TractionInterruption
- {
- get { return ModelData.TractionInterruption; }
- }
+ public virtual Second TractionInterruption => ModelData.TractionInterruption;
- public uint NumGears
- {
- get { return (uint)ModelData.Gears.Count; }
- }
+ public uint NumGears => (uint)ModelData.Gears.Count;
#endregion
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Angledrive.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Angledrive.cs
index 325c1574158b2b562c94d72cbe019e2c3640ff59..4d50c43c3d4e53416effca7df1aca9b943370c5b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Angledrive.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Angledrive.cs
@@ -60,9 +60,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
container[ModalResultField.P_angle_in] = CurrentState.InTorque * avgAngularVelocity;
}
- public double Ratio
- {
- get { return ModelData.Ratio; }
- }
+ public double Ratio => ModelData.Ratio;
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs
index 13d75f344d3e5ea3ca4d2254d46fddc2898cf4ae..7d84011aee946b43143c2309e93fcfdfa18be9e7 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs
@@ -76,17 +76,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return PreviousState.TorqueLossResult.Value * PreviousState.InAngularVelocity;
}
- public Tuple<PerSecond, NewtonMeter> CurrentAxleDemand
- {
- get {
- return Tuple.Create(
- (PreviousState.InAngularVelocity + CurrentState.InAngularVelocity) / 2.0, CurrentState.InTorque);
- }
- }
+ public Tuple<PerSecond, NewtonMeter> CurrentAxleDemand =>
+ Tuple.Create(
+ (PreviousState.InAngularVelocity + CurrentState.InAngularVelocity) / 2.0, CurrentState.InTorque);
- public double Ratio
- {
- get { return ModelData.Ratio; }
- }
+ public double Ratio => ModelData.Ratio;
}
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Battery.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Battery.cs
index 98c95a97d4103d5d78fc822c78735e623c5faf9d..89effcf3c48116088aabb54eba241bc335e05328 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Battery.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Battery.cs
@@ -23,10 +23,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
#region Implementation of IBatteryProvider
- public IElectricEnergyStoragePort MainBatteryPort
- {
- get { return this; }
- }
+ public IElectricEnergyStoragePort MainBatteryPort => this;
#endregion
@@ -169,23 +166,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
#region Implementation of IRESSInfo
- public Volt InternalVoltage
- {
- get { return ModelData.SOCMap.Lookup(PreviousState.StateOfCharge); }
- }
+ public Volt InternalVoltage => ModelData.SOCMap.Lookup(PreviousState.StateOfCharge);
- public double StateOfCharge
- {
- get { return PreviousState.StateOfCharge; }
- }
+ public double StateOfCharge => PreviousState.StateOfCharge;
- public WattSecond StoredEnergy
- {
- get {
- return PreviousState.StateOfCharge * ModelData.Capacity * ModelData.SOCMap.Lookup(PreviousState.StateOfCharge);
- }
- }
+ public WattSecond StoredEnergy => PreviousState.StateOfCharge * ModelData.Capacity * ModelData.SOCMap.Lookup(PreviousState.StateOfCharge);
public Watt MaxChargePower(Second dt)
{
@@ -207,14 +193,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return VectoMath.Max(maxDischargePower, maxPower);
}
- public double MinSoC
- {
- get { return ModelData.MinSOC; }
- }
- public double MaxSoC
- {
- get { return ModelData.MaxSOC; }
- }
+ public double MinSoC => ModelData.MinSOC;
+
+ public double MaxSoC => ModelData.MaxSOC;
//public Ampere MaxCurrent
//{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
index 434b08694afa8e62d98c71484098e04582096468..ed2d5bed7e495e86f31333f383fe463701fcb58f 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
@@ -402,12 +402,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
#region Implementation of ISimpleBatteryInfo
- public double SOC {
- get { return busAuxAdapter.ElectricStorage.SOC; }
- }
- public WattSecond Capacity {
- get { return busAuxAdapter.ElectricStorage.Capacity; }
- }
+ public double SOC => busAuxAdapter.ElectricStorage.SOC;
+
+ public WattSecond Capacity => busAuxAdapter.ElectricStorage.Capacity;
#endregion
}
@@ -424,9 +421,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
#region Implementation of ISimpleBatteryInfo
- public double SOC {
- get { return ElectricStorage.SOC.IsEqual(1, 1e-2) ? 1 : 0.5; }
- }
+ public double SOC => ElectricStorage.SOC.IsEqual(1, 1e-2) ? 1 : 0.5;
public WattSecond Capacity { get; }
#endregion
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
index 37dc467c7c72a0dc6ba7cd939376ceff0a4b1074..ea68172d4584fa428267deb2c4839a76a4650ace 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
@@ -54,7 +54,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public IIdleController IdleController
{
- get { return _idleController; }
+ get => _idleController;
set
{
_idleController = value;
@@ -244,10 +244,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return DataBus.GearboxInfo.GearEngaged(absTime);
}
- public Watt ClutchLosses
- {
- get { return PreviousState.ClutchLoss; }
- }
+ public Watt ClutchLosses => PreviousState.ClutchLoss;
public class ClutchState : SimpleComponentState
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
index 3eb8529f93e1a4111b0cc3dcf76a8b985a0a84ef..2d0481f8edf633413a407ab1b9104b0f2d4f444d 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
@@ -86,20 +86,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
#region IEngineCockpit
- public virtual bool EngineOn
- {
- get { return PreviousState.EngineOn; }
- }
+ public virtual bool EngineOn => PreviousState.EngineOn;
- public PerSecond EngineSpeed
- {
- get { return PreviousState.EngineSpeed; }
- }
+ public PerSecond EngineSpeed => PreviousState.EngineSpeed;
- public NewtonMeter EngineTorque
- {
- get { return PreviousState.EngineTorque; }
- }
+ public NewtonMeter EngineTorque => PreviousState.EngineTorque;
public Watt EngineStationaryFullPower(PerSecond angularSpeed)
{
@@ -125,31 +116,15 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
0.SI<Second>(), dt, 0.SI<NewtonMeter>(), avgEngineSpeed, true) * avgEngineSpeed;
}
- public PerSecond EngineIdleSpeed
- {
- get { return ModelData.IdleSpeed; }
- }
+ public PerSecond EngineIdleSpeed => ModelData.IdleSpeed;
- public PerSecond EngineRatedSpeed
- {
- get { return ModelData.FullLoadCurves[0].RatedSpeed; }
- }
-
- public PerSecond EngineN95hSpeed
- {
- get { return ModelData.FullLoadCurves[0].N95hSpeed; }
- }
+ public PerSecond EngineRatedSpeed => ModelData.FullLoadCurves[0].RatedSpeed;
- public PerSecond EngineN80hSpeed
+ public PerSecond EngineN95hSpeed => ModelData.FullLoadCurves[0].N95hSpeed;
- {
- get { return ModelData.FullLoadCurves[0].N80hSpeed; }
- }
+ public PerSecond EngineN80hSpeed => ModelData.FullLoadCurves[0].N80hSpeed;
- public IIdleController IdleController
- {
- get { return EngineIdleController ?? (EngineIdleController = new CombustionEngineIdleController(this, DataBus)); }
- }
+ public IIdleController IdleController => EngineIdleController ?? (EngineIdleController = new CombustionEngineIdleController(this, DataBus));
protected CombustionEngineIdleController EngineIdleController { get; set; }
@@ -840,7 +815,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public virtual bool CombustionEngineOn
{
- get { return true; }
+ get => true;
set { }
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
index d804febb1f6786623d69ccab15638ab66220d415..cc57aade72277ae810c9e279f3929fffe5a17c80 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
@@ -135,7 +135,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return response;
}
- public override bool TCLocked { get { return Gear.TorqueConverterLocked ?? false; } }
+ public override bool TCLocked => Gear.TorqueConverterLocked ?? false;
/// <summary>
/// Requests the Gearbox to deliver torque and angularVelocity
@@ -451,14 +451,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override Second LastUpshift
{
- get { throw new System.NotImplementedException(); }
- protected internal set { throw new System.NotImplementedException(); }
+ get => throw new System.NotImplementedException();
+ protected internal set => throw new System.NotImplementedException();
}
public override Second LastDownshift
{
- get { throw new System.NotImplementedException(); }
- protected internal set { throw new System.NotImplementedException(); }
+ get => throw new System.NotImplementedException();
+ protected internal set => throw new System.NotImplementedException();
}
public override GearshiftPosition NextGear
@@ -532,8 +532,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override bool DisengageGearbox
{
- get { return false; }
- set { throw new System.NotImplementedException(); }
+ get => false;
+ set => throw new System.NotImplementedException();
}
public override void TriggerGearshift(Second absTime, Second dt)
@@ -577,10 +577,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
throw new System.NotImplementedException();
}
- public override GearshiftPosition NextGear
- {
- get { throw new System.NotImplementedException(); }
- }
+ public override GearshiftPosition NextGear => throw new System.NotImplementedException();
public override ShiftPolygon ComputeDeclarationShiftPolygon(
GearboxType gearboxType, int i, EngineFullLoadCurve engineDataFullLoadCurve, IList<ITransmissionInputData> gearboxGears,
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
index 03a84de8dd84cd8b3aaa102945c5f5d8025de890..e80b6ac61927077c6e1508168695a360115aed7b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
@@ -777,20 +777,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public DefaultDriverStrategy DriverStrategy { get; set; }
- protected IDriverActions Driver
- {
- get { return _driver ?? (_driver = DriverStrategy.Driver); }
- }
+ protected IDriverActions Driver => _driver ?? (_driver = DriverStrategy.Driver);
- protected DriverData DriverData
- {
- get { return _driverData ?? (_driverData = Driver.DriverData); }
- }
+ protected DriverData DriverData => _driverData ?? (_driverData = Driver.DriverData);
- protected IDataBus DataBus
- {
- get { return _dataBus ?? (_dataBus = Driver.DataBus); }
- }
+ protected IDataBus DataBus => _dataBus ?? (_dataBus = Driver.DataBus);
public IResponse Request(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient)
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
index 91b5363bb1cd6b99711a2b5091cda58a51edb0b4..e257278d34a104ab4b1aa3a30d8146259ef5cbe1 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
@@ -65,15 +65,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
private MeterPerSquareSecond StartAcceleration;
private MeterPerSecond StartSpeed;
- private DrivingCycleData.DrivingCycleEntry Left
- {
- get { return CycleIntervalIterator.LeftSample; }
- }
+ private DrivingCycleData.DrivingCycleEntry Left => CycleIntervalIterator.LeftSample;
- private DrivingCycleData.DrivingCycleEntry Right
- {
- get { return CycleIntervalIterator.RightSample; }
- }
+ private DrivingCycleData.DrivingCycleEntry Right => CycleIntervalIterator.RightSample;
public DistanceBasedDrivingCycle(IVehicleContainer container, IDrivingCycleData cycle) : base(container)
{
@@ -427,20 +421,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
/// <summary>
/// Progress of the distance in the driving cycle.
/// </summary>
- public double Progress
- {
- get {
- return Data.Entries.Count > 0
- ? (CurrentState.Distance.Value() - Data.Entries.First().Distance.Value()) /
- (Data.Entries.Last().Distance.Value() - Data.Entries.First().Distance.Value())
- : 0;
- }
- }
+ public double Progress =>
+ Data.Entries.Count > 0
+ ? (CurrentState.Distance.Value() - Data.Entries.First().Distance.Value()) /
+ (Data.Entries.Last().Distance.Value() - Data.Entries.First().Distance.Value())
+ : 0;
- public Second StopTime
- {
- get { return CycleIntervalIterator.LeftSample.StoppingTime; }
- }
+ public Second StopTime => CycleIntervalIterator.LeftSample.StoppingTime;
public Meter CycleStartDistance { get; internal set; }
@@ -491,17 +478,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
Data.Finish();
}
- public CycleData CycleData
- {
- get {
- return new CycleData {
- AbsTime = CurrentState.AbsTime,
- AbsDistance = CurrentState.Distance,
- LeftSample = Left,
- RightSample = CycleIntervalIterator.RightSample
- };
- }
- }
+ public CycleData CycleData =>
+ new CycleData {
+ AbsTime = CurrentState.AbsTime,
+ AbsDistance = CurrentState.Distance,
+ LeftSample = Left,
+ RightSample = CycleIntervalIterator.RightSample
+ };
public bool PTOActive { get; private set; }
@@ -549,16 +532,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return retVal;
}
- public Meter Altitude
- {
- get { return PreviousState.Altitude; }
- }
+ public Meter Altitude => PreviousState.Altitude;
- public Radian RoadGradient { get { return CurrentState.Gradient; } }
- public MeterPerSecond TargetSpeed
- {
- get { return CurrentState.VehicleTargetSpeed; }
- }
+ public Radian RoadGradient => CurrentState.Gradient;
+
+ public MeterPerSecond TargetSpeed => CurrentState.VehicleTargetSpeed;
public sealed class DrivingCycleState
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
index 7dd3c9926059093453c60ef23102566ce6f32c20..02b8894c21f032a0b06176cf7413def1a8df516d 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
@@ -131,10 +131,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return retVal;
}
- public new IDataBus DataBus
- {
- get { return base.DataBus; }
- }
+ public new IDataBus DataBus => base.DataBus;
/// <summary>
/// see documentation of IDriverActions
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DrivingCycleEnumerator.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DrivingCycleEnumerator.cs
index d2e736240db05d192a4fca0572e7eb23e5ca334c..d218b7ee5b386882a561aa1d4f14750868d3e8a2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DrivingCycleEnumerator.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DrivingCycleEnumerator.cs
@@ -62,27 +62,15 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
};
}
- public DrivingCycleData.DrivingCycleEntry Current
- {
- get { return LeftSample; }
- }
+ public DrivingCycleData.DrivingCycleEntry Current => LeftSample;
- public DrivingCycleData.DrivingCycleEntry LeftSample
- {
- get { return _data.Entries[_currentCycleIndex]; }
- }
+ public DrivingCycleData.DrivingCycleEntry LeftSample => _data.Entries[_currentCycleIndex];
- public DrivingCycleData.DrivingCycleEntry RightSample
- {
- get { return _currentCycleIndex + 1 >= _data.Entries.Count ? null : _data.Entries[_currentCycleIndex + 1]; }
- }
+ public DrivingCycleData.DrivingCycleEntry RightSample => _currentCycleIndex + 1 >= _data.Entries.Count ? null : _data.Entries[_currentCycleIndex + 1];
public bool LastEntry { get; private set; }
- object System.Collections.IEnumerator.Current
- {
- get { return LeftSample; }
- }
+ object System.Collections.IEnumerator.Current => LeftSample;
public bool MoveNext()
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyGearboxInfo.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyGearboxInfo.cs
index 43be274584ec503a1abf0301d62fae288bc76ac6..32b108d69df67cce0396ff904cdd21bc1771f0fb 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyGearboxInfo.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyGearboxInfo.cs
@@ -26,75 +26,39 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
#region Implementation of IGearboxInfo
- public GearboxType GearboxType
- {
- get { return GearboxType.AMT; }
- }
+ public GearboxType GearboxType => GearboxType.AMT;
- public GearshiftPosition Gear
- {
- get { return new GearshiftPosition(1); }
- }
+ public GearshiftPosition Gear => new GearshiftPosition(1);
- public bool TCLocked
- {
- get { return true; }
- }
+ public bool TCLocked => true;
- public MeterPerSecond StartSpeed
- {
- get { return DeclarationData.GearboxTCU.StartSpeed; }
- }
+ public MeterPerSecond StartSpeed => DeclarationData.GearboxTCU.StartSpeed;
- public MeterPerSquareSecond StartAcceleration
- {
- get { return DeclarationData.GearboxTCU.StartAcceleration; }
- }
+ public MeterPerSquareSecond StartAcceleration => DeclarationData.GearboxTCU.StartAcceleration;
public Watt GearboxLoss()
{
return 0.SI<Watt>();
}
- public Second LastShift
- {
- get { return -double.MaxValue.SI<Second>(); }
- }
+ public Second LastShift => -double.MaxValue.SI<Second>();
- public Second LastUpshift
- {
- get { return -double.MaxValue.SI<Second>(); }
- }
+ public Second LastUpshift => -double.MaxValue.SI<Second>();
- public Second LastDownshift
- {
- get { return -double.MaxValue.SI<Second>(); }
- }
+ public Second LastDownshift => -double.MaxValue.SI<Second>();
public GearData GetGearData(uint gear)
{
throw new NotImplementedException();
}
- public GearshiftPosition NextGear
- {
- get { throw new NotImplementedException(); }
- }
+ public GearshiftPosition NextGear => throw new NotImplementedException();
- public Second TractionInterruption
- {
- get { return 0.SI<Second>(); }
- }
+ public Second TractionInterruption => 0.SI<Second>();
- public uint NumGears
- {
- get { return 1; }
- }
+ public uint NumGears => 1;
- public bool DisengageGearbox
- {
- get { return false; }
- }
+ public bool DisengageGearbox => false;
public bool GearEngaged(Second absTime)
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
index 7e9ff4a809457b960f5e04c9838f0543a2c4457f..b54e9f0bf737852758b537345b93e78f8c3b9b0f 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
@@ -526,10 +526,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
- public PerSecond ElectricMotorSpeed
- {
- get { return PreviousState.EMSpeed; }
- }
+ public PerSecond ElectricMotorSpeed => PreviousState.EMSpeed;
public void Connect(IElectricSystem powersupply)
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/GearRating.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/GearRating.cs
index 8d9ce00efea22a7055d7439f4f821ed5ce72c342..e99785a56ea814f1ff7d98aa1831a4d8e7840501 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/GearRating.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/GearRating.cs
@@ -30,10 +30,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl {
public GearRatingCase RatingCase { get; }
public PerSecond MaxEngineSpeed { get; }
- public double NumericValue
- {
- get { return ((int)RatingCase - 1) * CaseSeparationInterval + Rating.LimitTo(0, CaseSeparationInterval-1); }
- }
+ public double NumericValue => ((int)RatingCase - 1) * CaseSeparationInterval + Rating.LimitTo(0, CaseSeparationInterval-1);
public static bool operator <(GearRating first, GearRating second)
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
index 40cebdc69f4b43bc41bbdddf71f2eda4f7aa9066..a55530a20223f01ff70eab20c33acdfa845050cb 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
@@ -71,10 +71,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override Second LastDownshift { get; protected internal set; }
- public override GearshiftPosition NextGear
- {
- get { return _strategy?.NextGear ?? _nextGear; }
- }
+ public override GearshiftPosition NextGear => _strategy?.NextGear ?? _nextGear;
public override bool GearEngaged(Second absTime)
{
@@ -135,10 +132,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return response;
}
- public override bool TCLocked
- {
- get { return true; }
- }
+ public override bool TCLocked => true;
protected internal virtual ResponseDryRun Initialize(Second absTime, GearshiftPosition gear, NewtonMeter outTorque, PerSecond outAngularVelocity)
{
@@ -575,17 +569,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public bool SwitchToNeutral
{
- set
- {
- _overrideDisengage = value ? DataBus.AbsTime : null;
- //Disengaged = value;
- }
+ set => _overrideDisengage = value ? DataBus.AbsTime : null;
+ //Disengaged = value;
}
- public override Second LastShift
- {
- get { return EngageTime; }
- }
+ public override Second LastShift => EngageTime;
}
public class PEVGearbox : Gearbox
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
index 9f8032b500481797faf7b4820ad89af38d811b2c..e99a696cbff567c2829974e070d9c752ca4d7402 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
@@ -49,10 +49,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
ElectricSystem = es;
}
- public IHybridControlStrategy Strategy
- {
- get { return _hybridStrategy; }
- }
+ public IHybridControlStrategy Strategy => _hybridStrategy;
public IElectricSystem ElectricSystem { get; }
@@ -86,45 +83,27 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
//}
}
- SimpleComponentState IHybridController.PreviousState
- {
- get { return PreviousState; }
- }
+ SimpleComponentState IHybridController.PreviousState => PreviousState;
public virtual IElectricMotorControl ElectricMotorControl(PowertrainPosition pos)
{
return _electricMotorCtl[pos];
}
- public virtual IShiftStrategy ShiftStrategy
- {
- get { return _shiftStrategy; }
- }
+ public virtual IShiftStrategy ShiftStrategy => _shiftStrategy;
public GearshiftPosition SelectedGear { get; protected set; }
- public bool GearboxEngaged
- {
- get { return CurrentStrategySettings.GearboxEngaged; }
- }
+ public bool GearboxEngaged => CurrentStrategySettings.GearboxEngaged;
public PerSecond ElectricMotorSpeed(PowertrainPosition pos)
{
return CurrentStrategySettings.MechanicalAssistPower[pos].Item1;
}
- public Second SimulationInterval
- {
- get
- {
- return CurrentStrategySettings.SimulationInterval;
- }
- }
+ public Second SimulationInterval => CurrentStrategySettings.SimulationInterval;
- public PerSecond ICESpeed
- {
- get { return CurrentStrategySettings.EvaluatedSolution.Response?.Engine.EngineSpeed; }
- }
+ public PerSecond ICESpeed => CurrentStrategySettings.EvaluatedSolution.Response?.Engine.EngineSpeed;
public IResponse Request(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
@@ -274,15 +253,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
//return CurrentState.StrategyResponse.MechanicalAssistPower[pos];
}
- public GearshiftPosition NextGear
- {
- get { return CurrentState.StrategyResponse.NextGear; }
- }
+ public GearshiftPosition NextGear => CurrentState.StrategyResponse.NextGear;
- public bool ShiftRequired
- {
- get { return CurrentState.StrategyResponse.ShiftRequired; }
- }
+ public bool ShiftRequired => CurrentState.StrategyResponse.ShiftRequired;
public IHybridControlledGearbox Gearbox { protected get; set; }
public ICombustionEngine Engine { protected get; set; }
@@ -531,7 +504,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override IGearbox Gearbox
{
- get { return _gearbox; }
+ get => _gearbox;
set
{
var myGearbox = value as Gearbox;
@@ -544,10 +517,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
}
- public override GearshiftPosition NextGear
- {
- get { return _nextGear; }
- }
+ public override GearshiftPosition NextGear => _nextGear;
public void SetNextGear(GearshiftPosition nextGear)
{
@@ -567,7 +537,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override IGearbox Gearbox
{
- get { return _gearbox; }
+ get => _gearbox;
set
{
var myGearbox = value as ATGearbox;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/MTShiftStrategy.cs
index c595f12c726e926e0f294687691fcbe588d7a963..deb1e9e501dc01f49fca3b719b2a722e986611b8 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/MTShiftStrategy.cs
@@ -43,6 +43,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
SkipGears = true;
}
- public new static string Name { get { return "MT Shift Strategy"; } }
+ public new static string Name => "MT Shift Strategy";
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
index 4360fca3bd65040cab9671a635d5dd21d2145446..b9689796aadfb73715bac2c91958392b25916302 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
@@ -44,9 +44,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public bool SkipGears { get; }
- public static string Name {
- get { return "AMT - EffShift (BEV)"; }
- }
+ public static string Name => "AMT - EffShift (BEV)";
public PEVAMTShiftStrategy(IVehicleContainer dataBus)
@@ -641,7 +639,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public void Disengage(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity) { }
public IGearbox Gearbox {
- get { return _gearbox; }
+ get => _gearbox;
set {
var myGearbox = value as Gearbox;
if (myGearbox == null) {
@@ -651,9 +649,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
}
- public GearshiftPosition NextGear {
- get { return _nextGear; }
- }
+ public GearshiftPosition NextGear => _nextGear;
public bool CheckGearshiftRequired { get; protected set; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PTOCycleController.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PTOCycleController.cs
index 24cb6dc355707ec475b3fce02d6784c3c0850f8b..db93702f781420f96552fb94158b5e06558f5d56 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PTOCycleController.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PTOCycleController.cs
@@ -47,7 +47,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
public ITnOutPort RequestPort
{
- set { NextComponent = value; }
+ set => NextComponent = value;
}
public readonly Second Duration;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs
index 4f4aa1082190a89a9e8a27b118b63cb8579017c2..36c6974618180d9a0a1994fb6cd4c935b6be9005 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs
@@ -116,30 +116,15 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
/// <summary>
/// True if the angularVelocity at the wheels is 0.
/// </summary>
- public virtual bool VehicleStopped
- {
- get { return CycleIterator.LeftSample.WheelAngularVelocity.IsEqual(0); }
- }
+ public virtual bool VehicleStopped => CycleIterator.LeftSample.WheelAngularVelocity.IsEqual(0);
- public Kilogram VehicleMass
- {
- get { return RunData.VehicleData.TotalCurbMass; }
- }
+ public Kilogram VehicleMass => RunData.VehicleData.TotalCurbMass;
- public Kilogram VehicleLoading
- {
- get { return RunData.VehicleData.Loading; }
- }
+ public Kilogram VehicleLoading => RunData.VehicleData.Loading;
- public Kilogram TotalMass
- {
- get { return RunData.VehicleData.TotalVehicleMass; }
- }
+ public Kilogram TotalMass => RunData.VehicleData.TotalVehicleMass;
- public CubicMeter CargoVolume
- {
- get { return RunData.VehicleData.CargoVolume; }
- }
+ public CubicMeter CargoVolume => RunData.VehicleData.CargoVolume;
public Newton AirDragResistance(MeterPerSecond previousVelocity, MeterPerSecond nextVelocity)
{
@@ -156,25 +141,16 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
throw new System.NotImplementedException();
}
- public MeterPerSecond MaxVehicleSpeed { get { return null; } }
+ public MeterPerSecond MaxVehicleSpeed => null;
/// <summary>
/// Always Driving.
/// </summary>
- public DrivingBehavior DriverBehavior
- {
- get { return DrivingBehavior.Driving; }
- }
+ public DrivingBehavior DriverBehavior => DrivingBehavior.Driving;
- public DrivingAction DrivingAction
- {
- get { return DrivingAction.Accelerate; }
- }
+ public DrivingAction DrivingAction => DrivingAction.Accelerate;
- public MeterPerSquareSecond DriverAcceleration
- {
- get { return 0.SI<MeterPerSquareSecond>(); }
- }
+ public MeterPerSquareSecond DriverAcceleration => 0.SI<MeterPerSquareSecond>();
#endregion
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs
index 1970981e5ef32bef3ab0a974fe4ea3c1ed849060..e7cb660c2c3d5c48c3fba2ecb7fe4986761df1d6 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs
@@ -49,7 +49,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override IGearbox Gearbox
{
- get { return _gearbox; }
+ get => _gearbox;
set {
var myGearbox = value as Gearbox;
if (myGearbox == null) {
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimpleHybridController.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimpleHybridController.cs
index 2390dbb7ea7fad7a2b891df063e69b857685f0e8..98ad19713484f87f360100eee558dfd23e8abf70 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimpleHybridController.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimpleHybridController.cs
@@ -62,15 +62,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl {
#region Implementation of IHybridController
- public IShiftStrategy ShiftStrategy
- {
- get { return null; }
- }
+ public IShiftStrategy ShiftStrategy => null;
- public SimpleComponentState PreviousState
- {
- get { throw new System.NotImplementedException(); }
- }
+ public SimpleComponentState PreviousState => throw new System.NotImplementedException();
public IElectricMotorControl ElectricMotorControl(PowertrainPosition pos)
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimplePowertrainContainer.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimplePowertrainContainer.cs
index ca523806819f30ff811089970def1f36f500c9dd..8f0f795da17247d4991a05906b6c8a7c4089889b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimplePowertrainContainer.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimplePowertrainContainer.cs
@@ -13,46 +13,25 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl {
RunData = runData;
}
- public IDriverDemandOutPort VehiclePort
- {
- get { return (VehicleInfo as Vehicle)?.OutPort(); }
- }
+ public IDriverDemandOutPort VehiclePort => (VehicleInfo as Vehicle)?.OutPort();
- public ITnOutPort GearboxOutPort
- {
- get { return (GearboxInfo as IGearbox)?.OutPort(); }
- }
+ public ITnOutPort GearboxOutPort => (GearboxInfo as IGearbox)?.OutPort();
- public IGearbox GearboxCtlTest
- {
- get { return GearboxInfo as IGearbox; }
- }
+ public IGearbox GearboxCtlTest => GearboxInfo as IGearbox;
- public override Second AbsTime { get { return 0.SI<Second>(); } }
+ public override Second AbsTime => 0.SI<Second>();
- public override IDriverInfo DriverInfo { get { return base.DriverInfo ?? this; } }
+ public override IDriverInfo DriverInfo => base.DriverInfo ?? this;
- public override bool IsTestPowertrain
- {
- get { return true; }
- }
+ public override bool IsTestPowertrain => true;
#region Implementation of IDriverInfo
- public DrivingBehavior DriverBehavior
- {
- get { return DrivingBehavior.Driving; }
- }
+ public DrivingBehavior DriverBehavior => DrivingBehavior.Driving;
- public DrivingAction DrivingAction
- {
- get { return DrivingAction.Accelerate; }
- }
+ public DrivingAction DrivingAction => DrivingAction.Accelerate;
- public MeterPerSquareSecond DriverAcceleration
- {
- get { return 0.SI<MeterPerSquareSecond>(); }
- }
+ public MeterPerSquareSecond DriverAcceleration => 0.SI<MeterPerSquareSecond>();
#endregion
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs
index 45e6fd86a036b4840970c0687642a2a9ced969fd..1a674af4ab74f6b429799d7474381cac09e2eb26 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs
@@ -244,6 +244,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl {
IVehicleContainer container, CombustionEngineData modelData, bool pt1Disabled = false) : base(
container, modelData, pt1Disabled) { }
- public EngineState EnginePreviousState { get { return PreviousState; } }
+ public EngineState EnginePreviousState => PreviousState;
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/SuperCap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SuperCap.cs
index 57e408318d4a1b6b9b9a7345a07f5d31336c0f2e..f786f997b509c0a119549b553f7d252c6c777ef4 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/SuperCap.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SuperCap.cs
@@ -22,25 +22,15 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
ModelData = modelData;
}
- public IElectricEnergyStoragePort MainBatteryPort
- {
- get { return this; }
- }
- public Volt InternalVoltage
- {
- get { return PreviousState.Charge / ModelData.Capacity; }
- }
+ public IElectricEnergyStoragePort MainBatteryPort => this;
- public double StateOfCharge
- {
- get { return PreviousState.Charge / (ModelData.Capacity * ModelData.MaxVoltage); }
- }
+ public Volt InternalVoltage => PreviousState.Charge / ModelData.Capacity;
- public WattSecond StoredEnergy
- {
+ public double StateOfCharge => PreviousState.Charge / (ModelData.Capacity * ModelData.MaxVoltage);
+
+ public WattSecond StoredEnergy =>
// E = 1/2 C * U^2 = 1/2 Q^2/C
- get { return PreviousState.Charge * InternalVoltage / 2.0; }
- }
+ PreviousState.Charge * InternalVoltage / 2.0;
public Watt MaxChargePower(Second dt)
{
@@ -63,14 +53,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return VectoMath.Max(maxDischargePower, maxPower);
}
- public double MinSoC
- {
- get { return ModelData.MinVoltage / ModelData.MaxVoltage; }
- }
- public double MaxSoC
- {
- get { return 1; }
- }
+ public double MinSoC => ModelData.MinVoltage / ModelData.MaxVoltage;
+
+ public double MaxSoC => 1;
public void Initialize(double initialSoC)
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VTPCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VTPCycle.cs
index 22d178872f56dffeb2e4da6b62207543b457cbcf..45b6c89e991c588b79590445d11970064611f39a 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VTPCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VTPCycle.cs
@@ -315,14 +315,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return DoHandleRequest(absTime, dt, CycleIterator.LeftSample.WheelAngularVelocity);
}
- public override bool VehicleStopped
- {
- get
- {
- return CycleIterator.Previous().LeftSample.VehicleTargetSpeed
- .IsEqual(0.KMPHtoMeterPerSecond(), 0.3.KMPHtoMeterPerSecond());
- }
- }
+ public override bool VehicleStopped =>
+ CycleIterator.Previous().LeftSample.VehicleTargetSpeed
+ .IsEqual(0.KMPHtoMeterPerSecond(), 0.3.KMPHtoMeterPerSecond());
protected override void DoCommitSimulationStep(Second time, Second simulationInterval)
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
index 6b21ee7b7553413764741235027b7abcbd55ef9a..dcbea7750d45b2e499620e3a7086ed20e7eb2965 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
@@ -244,40 +244,19 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return AirdragData.CrossWindCorrectionCurve.AverageAirDragPowerLoss(v1, v2, ModelData.AirDensity);
}
- public Meter Distance
- {
- get { return PreviousState.Distance; }
- }
+ public Meter Distance => PreviousState.Distance;
- public MeterPerSecond VehicleSpeed
- {
- get { return PreviousState.Velocity; }
- }
+ public MeterPerSecond VehicleSpeed => PreviousState.Velocity;
- public bool VehicleStopped
- {
- get { return PreviousState.Velocity.IsEqual(0.SI<MeterPerSecond>(), 0.01.SI<MeterPerSecond>()); }
- }
+ public bool VehicleStopped => PreviousState.Velocity.IsEqual(0.SI<MeterPerSecond>(), 0.01.SI<MeterPerSecond>());
- public Kilogram VehicleMass
- {
- get { return ModelData.TotalCurbMass; }
- }
+ public Kilogram VehicleMass => ModelData.TotalCurbMass;
- public Kilogram VehicleLoading
- {
- get { return ModelData.Loading; }
- }
+ public Kilogram VehicleLoading => ModelData.Loading;
- public Kilogram TotalMass
- {
- get { return ModelData.TotalVehicleMass; }
- }
+ public Kilogram TotalMass => ModelData.TotalVehicleMass;
- public CubicMeter CargoVolume
- {
- get { return ModelData.CargoVolume; }
- }
+ public CubicMeter CargoVolume => ModelData.CargoVolume;
public class VehicleState
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs
index 9e9b33c285ea43ae32ed9a46b72b4107d2bcfd48..6afaf44cc2d0eb9b8d351fdc9c4eeb73e37b070c 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs
@@ -93,10 +93,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
container[ModalResultField.P_wheel_inertia] = CurrentState.InertiaTorqueLoss * avgAngularSpeed;
}
- public Kilogram ReducedMassWheels
- {
- get { return (_totalWheelsInertia / DynamicTyreRadius / DynamicTyreRadius).Cast<Kilogram>(); }
- }
+ public Kilogram ReducedMassWheels => (_totalWheelsInertia / DynamicTyreRadius / DynamicTyreRadius).Cast<Kilogram>();
public Meter DynamicTyreRadius { get; }
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
index c5b025e2d16fa32c9beceba242ec5df3f7cd339f..a7f2c150aa4480e3d801ea23c206b9df0f631afc 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
@@ -571,13 +571,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
public virtual IHybridController Controller { protected get; set; }
- public PerSecond MinICESpeed
- {
- get
- {
- return ModelData.EngineData.IdleSpeed;
- }
- }
+ public PerSecond MinICESpeed => ModelData.EngineData.IdleSpeed;
public bool AllowEmergencyShift { protected get; set; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/TestPowertrain.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/TestPowertrain.cs
index e4fa2ff709d8b8d2ad2414414e427d65ad341ada..1d1126314a53aee8b65f1a756a0b50b55c8bd8b3 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/TestPowertrain.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/TestPowertrain.cs
@@ -114,45 +114,24 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies {
#region Implementation of IDrivingCycleInfo
- public CycleData CycleData
- {
- get { return realContainer.DrivingCycleInfo.CycleData; }
- }
+ public CycleData CycleData => realContainer.DrivingCycleInfo.CycleData;
- public bool PTOActive
- {
- get { return realContainer.DrivingCycleInfo.PTOActive; }
- }
+ public bool PTOActive => realContainer.DrivingCycleInfo.PTOActive;
public DrivingCycleData.DrivingCycleEntry CycleLookAhead(Meter distance)
{
return realContainer.DrivingCycleInfo.CycleLookAhead(distance);
}
- public Meter Altitude
- {
- get { return realContainer.DrivingCycleInfo.Altitude; }
- }
+ public Meter Altitude => realContainer.DrivingCycleInfo.Altitude;
- public Radian RoadGradient
- {
- get { return realContainer.DrivingCycleInfo.RoadGradient; }
- }
+ public Radian RoadGradient => realContainer.DrivingCycleInfo.RoadGradient;
- public MeterPerSecond TargetSpeed
- {
- get { return realContainer.DrivingCycleInfo.TargetSpeed; }
- }
+ public MeterPerSecond TargetSpeed => realContainer.DrivingCycleInfo.TargetSpeed;
- public Second StopTime
- {
- get { return realContainer.DrivingCycleInfo.StopTime; }
- }
+ public Second StopTime => realContainer.DrivingCycleInfo.StopTime;
- public Meter CycleStartDistance
- {
- get { return realContainer?.DrivingCycleInfo?.CycleStartDistance ?? 0.SI<Meter>(); }
- }
+ public Meter CycleStartDistance => realContainer?.DrivingCycleInfo?.CycleStartDistance ?? 0.SI<Meter>();
public IReadOnlyList<DrivingCycleData.DrivingCycleEntry> LookAhead(Meter lookaheadDistance)
{
@@ -164,10 +143,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies {
return realContainer.DrivingCycleInfo.LookAhead(time);
}
- public SpeedChangeEntry LastTargetspeedChange
- {
- get { return realContainer.DrivingCycleInfo.LastTargetspeedChange; }
- }
+ public SpeedChangeEntry LastTargetspeedChange => realContainer.DrivingCycleInfo.LastTargetspeedChange;
public void FinishSimulation()
{
@@ -201,20 +177,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies {
#region Implementation of IDriverInfo
- public DrivingBehavior DriverBehavior
- {
- get { return realContainer?.DriverInfo?.DriverBehavior ?? DrivingBehavior.Accelerating; }
- }
+ public DrivingBehavior DriverBehavior => realContainer?.DriverInfo?.DriverBehavior ?? DrivingBehavior.Accelerating;
- public DrivingAction DrivingAction
- {
- get { return realContainer?.DriverInfo?.DrivingAction ?? DrivingAction.Accelerate; }
- }
+ public DrivingAction DrivingAction => realContainer?.DriverInfo?.DrivingAction ?? DrivingAction.Accelerate;
- public MeterPerSquareSecond DriverAcceleration
- {
- get { return realContainer?.DriverInfo.DriverAcceleration; }
- }
+ public MeterPerSquareSecond DriverAcceleration => realContainer?.DriverInfo.DriverAcceleration;
#endregion
diff --git a/VectoCore/VectoCore/OutputData/FileIO/FileOutputVIFWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/FileOutputVIFWriter.cs
index bf397d5ef0299c4595347ebb76ea533c9f8065e5..c42e6bb4b9b9ea2f1f6d91c5e857ae9b06afff92 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/FileOutputVIFWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/FileOutputVIFWriter.cs
@@ -14,11 +14,8 @@ namespace TUGraz.VectoCore.OutputData.FileIO
private string _jobFile;
private readonly int _numberOfManufacturingStages;
- public string XMLMultistageReportFileName
- {
- get { return Path.ChangeExtension(_jobFile, $"{REPORT_ENDING_PREFIX}{_numberOfManufacturingStages + 2}.xml"); }
- }
-
+ public string XMLMultistageReportFileName => Path.ChangeExtension(_jobFile, $"{REPORT_ENDING_PREFIX}{_numberOfManufacturingStages + 2}.xml");
+
public FileOutputVIFWriter(string jobFile, int numberOfManufacturingStages) : base(jobFile)
{
_jobFile = jobFile;
diff --git a/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
index cf36a8dd30ddda62e1a4721f7e504c15806a14d6..67a0a46ebe7193e463a3f3a5b1eecfae29fd2ccf 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
@@ -45,46 +45,22 @@ namespace TUGraz.VectoCore.OutputData.FileIO
{
private readonly string _jobFile;
- public string BasePath
- {
- get { return Path.GetDirectoryName(_jobFile); }
- }
+ public string BasePath => Path.GetDirectoryName(_jobFile);
- public string PDFReportName
- {
- get { return Path.ChangeExtension(_jobFile, Constants.FileExtensions.PDFReport); }
- }
+ public string PDFReportName => Path.ChangeExtension(_jobFile, Constants.FileExtensions.PDFReport);
- public string XMLFullReportName
- {
- get { return Path.ChangeExtension(_jobFile, "RSLT_MANUFACTURER.xml"); }
- }
+ public string XMLFullReportName => Path.ChangeExtension(_jobFile, "RSLT_MANUFACTURER.xml");
- public string XMLCustomerReportName
- {
- get { return Path.ChangeExtension(_jobFile, "RSLT_CUSTOMER.xml"); }
- }
+ public string XMLCustomerReportName => Path.ChangeExtension(_jobFile, "RSLT_CUSTOMER.xml");
- public string XMLPrimaryVehicleReportName
- {
- get { return Path.ChangeExtension(_jobFile, "RSLT_VIF.xml"); }
- }
+ public string XMLPrimaryVehicleReportName => Path.ChangeExtension(_jobFile, "RSLT_VIF.xml");
- public string XMLMonitoringReportName
- {
- get { return Path.ChangeExtension(_jobFile, "RSLT_MONITORING.xml"); }
- }
+ public string XMLMonitoringReportName => Path.ChangeExtension(_jobFile, "RSLT_MONITORING.xml");
- public string XMLVTPReportName
- {
- get { return Path.ChangeExtension(_jobFile, "VTP_Report.xml"); }
- }
+ public string XMLVTPReportName => Path.ChangeExtension(_jobFile, "VTP_Report.xml");
+
+ public string SumFileName => Path.ChangeExtension(_jobFile, Constants.FileExtensions.SumFile);
- public string SumFileName
- {
- get { return Path.ChangeExtension(_jobFile, Constants.FileExtensions.SumFile); }
- }
-
/// <summary>
///
/// </summary>
diff --git a/VectoCore/VectoCore/OutputData/ModFilter/ActualModalDataFilter.cs b/VectoCore/VectoCore/OutputData/ModFilter/ActualModalDataFilter.cs
index d86cd295bb3c13743e46e849749fda0ecb0f9c7c..a693de730522ca168dac9029d603f49034c6a905 100644
--- a/VectoCore/VectoCore/OutputData/ModFilter/ActualModalDataFilter.cs
+++ b/VectoCore/VectoCore/OutputData/ModFilter/ActualModalDataFilter.cs
@@ -164,9 +164,6 @@ namespace TUGraz.VectoCore.OutputData.ModFilter
}
}
- public string ID
- {
- get { return "sim"; }
- }
+ public string ID => "sim";
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
index a7b1b69a44191e7e3ecf5db37915e3cbaf2199fd..6d6978f4a04e9bd5df420728546b4dff99ecd3da 100644
--- a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
@@ -162,59 +162,36 @@ namespace TUGraz.VectoCore.OutputData
}
- public int JobRunId
- {
- get { return _runData.JobRunId; }
- }
- public string RunName
- {
- get { return _runData.JobName; }
- }
- public string CycleName
- {
- get { return _runData.Cycle?.Name ?? ""; }
- }
- public string RunSuffix
- {
- get { return _runData.ModFileSuffix; }
- }
+ public int JobRunId => _runData.JobRunId;
+
+ public string RunName => _runData.JobName;
+
+ public string CycleName => _runData.Cycle?.Name ?? "";
+
+ public string RunSuffix => _runData.ModFileSuffix;
public bool WriteModalResults { get; set; }
public VectoRun.Status RunStatus { get; protected set; }
- public string Error
- {
- get { return SimException == null ? null : SimException.Message; }
- }
+ public string Error => SimException == null ? null : SimException.Message;
- public string StackTrace
- {
- get
- {
- return SimException == null
- ? null
- : (SimException.StackTrace ?? (SimException.InnerException != null ? SimException.InnerException.StackTrace : null));
- }
- }
-
+ public string StackTrace =>
+ SimException == null
+ ? null
+ : (SimException.StackTrace ?? (SimException.InnerException != null ? SimException.InnerException.StackTrace : null));
- public void Reset()
+
+ public void Reset()
{
Data.Rows.Clear();
CurrentRow = Data.NewRow();
ClearAggregateResults();
}
- public Second Duration
- {
- get { return _duration ?? (_duration = CalcDuration()); }
- }
+ public Second Duration => _duration ?? (_duration = CalcDuration());
- public Meter Distance
- {
- get { return _distance ?? (_distance = CalcDistance()); }
- }
+ public Meter Distance => _distance ?? (_distance = CalcDistance());
public Func<Second, Joule, Joule> AuxHeaterDemandCalc { get; set; }
@@ -269,10 +246,7 @@ namespace TUGraz.VectoCore.OutputData
return null;
}
- public bool HasCombustionEngine
- {
- get { return _runData.JobType != VectoSimulationJobType.BatteryElectricVehicle; }
- }
+ public bool HasCombustionEngine => _runData.JobType != VectoSimulationJobType.BatteryElectricVehicle;
public WattSecond TotalElectricMotorWorkDrive(PowertrainPosition emPos)
{
@@ -510,10 +484,7 @@ namespace TUGraz.VectoCore.OutputData
return TimeIntegral<WattSecond>(ModalResultField.P_reess_loss);
}
- public ICorrectedModalData CorrectedModalData
- {
- get { return _correctedModalData ?? (_correctedModalData = PostProcessingCorrection.ApplyCorrection(this, _runData)); }
- }
+ public ICorrectedModalData CorrectedModalData => _correctedModalData ?? (_correctedModalData = PostProcessingCorrection.ApplyCorrection(this, _runData));
public void CalculateAggregateValues()
@@ -578,10 +549,7 @@ namespace TUGraz.VectoCore.OutputData
}
}
- public bool HasTorqueConverter
- {
- get { return _runData.GearboxData?.TorqueConverterData != null; }
- }
+ public bool HasTorqueConverter => _runData.GearboxData?.TorqueConverterData != null;
public void CommitSimulationStep()
{
@@ -626,10 +594,7 @@ namespace TUGraz.VectoCore.OutputData
return max == null || min == null ? null : max - min;
}
- public IList<IFuelProperties> FuelData
- {
- get { return FuelColumns.Keys.ToList(); }
- }
+ public IList<IFuelProperties> FuelData => FuelColumns.Keys.ToList();
public void Finish(VectoRun.Status runStatus, Exception exception = null)
{
@@ -867,8 +832,8 @@ namespace TUGraz.VectoCore.OutputData
public object this[ModalResultField key]
{
- get { return CurrentRow[key.GetName()]; }
- set { CurrentRow[key.GetName()] = value; }
+ get => CurrentRow[key.GetName()];
+ set => CurrentRow[key.GetName()] = value;
}
public string GetColumnName(IFuelProperties fuelData, ModalResultField mrf)
@@ -904,14 +869,14 @@ namespace TUGraz.VectoCore.OutputData
public object this[ModalResultField key, PowertrainPosition pos]
{
- get { return CurrentRow[string.Format(key.GetCaption(), pos.GetName())]; }
- set { CurrentRow[string.Format(key.GetCaption(), pos.GetName())] = value; }
+ get => CurrentRow[string.Format(key.GetCaption(), pos.GetName())];
+ set => CurrentRow[string.Format(key.GetCaption(), pos.GetName())] = value;
}
public object this[string auxId]
{
- get { return CurrentRow[Auxiliaries[auxId]]; }
- set { CurrentRow[Auxiliaries[auxId]] = value; }
+ get => CurrentRow[Auxiliaries[auxId]];
+ set => CurrentRow[Auxiliaries[auxId]] = value;
}
[MethodImpl(MethodImplOptions.Synchronized)]
diff --git a/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs b/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs
index 4c3689044b42ea54e9ddcc1ce79e9ee9e41e33ed..cc2188ed1d2563ecee06d06a91fc23f72a654228 100644
--- a/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs
+++ b/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs
@@ -172,16 +172,10 @@ namespace TUGraz.VectoCore.OutputData
public WattSecond WorkWHREl { get; set; }
public WattSecond WorkWHRElMech { get; set; }
public WattSecond WorkWHRMech { get; set; }
- public WattSecond WorkWHR
- {
- get { return WorkWHRElMech + WorkWHRMech; }
- }
+ public WattSecond WorkWHR => WorkWHRElMech + WorkWHRMech;
public WattSecond WorkBusAuxPSCorr { get; set; }
public WattSecond WorkBusAuxESMech { get; set; }
- public WattSecond WorkBusAuxCorr
- {
- get { return WorkBusAuxPSCorr + WorkBusAuxESMech; }
- }
+ public WattSecond WorkBusAuxCorr => WorkBusAuxPSCorr + WorkBusAuxESMech;
public Joule AuxHeaterDemand { get; set; }
public KilogramPerMeter KilogramCO2PerMeter { get; set; }
@@ -215,18 +209,13 @@ namespace TUGraz.VectoCore.OutputData
public Second ICEOffTimeStandstill { get; set; }
public WattSecond EnergyAuxICEOffStandstill { get; set; }
public WattSecond EnergyAuxICEOnStandstill { get; set; }
- public Watt AvgAuxPowerICEOnStandstill {
- get { return ICEOffTimeStandstill.IsEqual(0) ? 0.SI<Watt>() : EnergyAuxICEOnStandstill / ICEOffTimeStandstill; }
- }
+ public Watt AvgAuxPowerICEOnStandstill => ICEOffTimeStandstill.IsEqual(0) ? 0.SI<Watt>() : EnergyAuxICEOnStandstill / ICEOffTimeStandstill;
public Second ICEOffTimeDriving { get; set; }
public WattSecond EnergyAuxICEOffDriving { get; set; }
public WattSecond EnergyPowerICEOnDriving { get; set; }
- public Watt AvgAuxPowerICEOnDriving
- {
- get { return ICEOffTimeDriving.IsEqual(0) ? 0.SI<Watt>() : EnergyPowerICEOnDriving / ICEOffTimeDriving; }
- }
+ public Watt AvgAuxPowerICEOnDriving => ICEOffTimeDriving.IsEqual(0) ? 0.SI<Watt>() : EnergyPowerICEOnDriving / ICEOffTimeDriving;
public WattSecond EnergyDCDCMissing { get; set; }
@@ -272,42 +261,30 @@ namespace TUGraz.VectoCore.OutputData
public KilogramPerWattSecond EngineLineCorrectionFactor { get; set; }
public KilogramPerWattSecond VehicleLine { get; set; }
- public KilogramPerSecond FC_ESS_CORR_H { get { return Duration != null ? (FcEssCorr / Duration) : null; } }
- public KilogramPerSecond FC_BusAux_PS_CORR_H { get { return Duration != null ? (FcBusAuxPsCorr / Duration) : null; } }
- public KilogramPerSecond FC_BusAux_ES_CORR_H { get { return Duration != null ? (FcBusAuxEsCorr / Duration) : null; } }
- public KilogramPerSecond FC_WHR_CORR_H { get { return Duration != null ? (FcWHRCorr / Duration) : null; } }
- public KilogramPerSecond FC_AUXHTR_H { get { return Duration != null ? (FcAuxHtr / Duration) : null; } }
- public KilogramPerSecond FC_AUXHTR_H_CORR { get { return Duration != null ? (FcAuxHtrCorr / Duration) : null; } }
- public KilogramPerSecond FC_FINAL_H { get { return Duration != null ? FcFinal / Duration : null; } }
-
- public KilogramPerMeter FC_ESS_CORR_KM { get { return Distance != null ? (FcEssCorr / Distance) : null; } }
- public KilogramPerMeter FC_WHR_CORR_KM { get { return Distance != null ? (FcWHRCorr / Distance) : null; } }
- public KilogramPerMeter FC_BusAux_PS_CORR_KM { get { return Distance != null ? (FcBusAuxPsCorr / Distance) : null; } }
- public KilogramPerMeter FC_BusAux_ES_CORR_KM { get { return Distance != null ? (FcBusAuxEsCorr / Distance) : null; } }
- public KilogramPerMeter FC_AUXHTR_KM { get { return Distance != null ? (FcAuxHtr / Distance) : null; } }
- public KilogramPerMeter FC_AUXHTR_KM_CORR { get { return Distance != null ? (FcAuxHtrCorr / Distance) : null; } }
- public KilogramPerMeter FC_FINAL_KM { get { return Distance != null ? FcFinal / Distance : null; } }
-
- public VolumePerMeter FuelVolumePerMeter
- {
- get
- {
- return Fuel.FuelDensity != null && Distance != null
- ? (FcFinal / Distance / Fuel.FuelDensity).Cast<VolumePerMeter>()
- : null;
- }
- }
-
- public Kilogram TotalFuelConsumptionCorrected
- {
- get { return FcFinal; }
- }
-
- public Joule EnergyDemand
- {
- get { return FcFinal * Fuel.LowerHeatingValueVecto; }
- }
-
+ public KilogramPerSecond FC_ESS_CORR_H => Duration != null ? (FcEssCorr / Duration) : null;
+ public KilogramPerSecond FC_BusAux_PS_CORR_H => Duration != null ? (FcBusAuxPsCorr / Duration) : null;
+ public KilogramPerSecond FC_BusAux_ES_CORR_H => Duration != null ? (FcBusAuxEsCorr / Duration) : null;
+ public KilogramPerSecond FC_WHR_CORR_H => Duration != null ? (FcWHRCorr / Duration) : null;
+ public KilogramPerSecond FC_AUXHTR_H => Duration != null ? (FcAuxHtr / Duration) : null;
+ public KilogramPerSecond FC_AUXHTR_H_CORR => Duration != null ? (FcAuxHtrCorr / Duration) : null;
+ public KilogramPerSecond FC_FINAL_H => Duration != null ? FcFinal / Duration : null;
+
+ public KilogramPerMeter FC_ESS_CORR_KM => Distance != null ? (FcEssCorr / Distance) : null;
+ public KilogramPerMeter FC_WHR_CORR_KM => Distance != null ? (FcWHRCorr / Distance) : null;
+ public KilogramPerMeter FC_BusAux_PS_CORR_KM => Distance != null ? (FcBusAuxPsCorr / Distance) : null;
+ public KilogramPerMeter FC_BusAux_ES_CORR_KM => Distance != null ? (FcBusAuxEsCorr / Distance) : null;
+ public KilogramPerMeter FC_AUXHTR_KM => Distance != null ? (FcAuxHtr / Distance) : null;
+ public KilogramPerMeter FC_AUXHTR_KM_CORR => Distance != null ? (FcAuxHtrCorr / Distance) : null;
+ public KilogramPerMeter FC_FINAL_KM => Distance != null ? FcFinal / Distance : null;
+
+ public VolumePerMeter FuelVolumePerMeter =>
+ Fuel.FuelDensity != null && Distance != null
+ ? (FcFinal / Distance / Fuel.FuelDensity).Cast<VolumePerMeter>()
+ : null;
+
+ public Kilogram TotalFuelConsumptionCorrected => FcFinal;
+
+ public Joule EnergyDemand => FcFinal * Fuel.LowerHeatingValueVecto;
#endregion
}
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLAccelerationDataWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLAccelerationDataWriter.cs
index 31028be6babea6abc41a2868af7bc93714154352..e4e6959c70fd7116d1053d499e7c67d3f93b0b6e 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLAccelerationDataWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLAccelerationDataWriter.cs
@@ -50,10 +50,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer.DriverData
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLEngineeringLookaheadDataWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLEngineeringLookaheadDataWriter.cs
index 22718baea32212f249aeea3d0085992ff424ff37..0e3e2a58c5f10740cd965fffc77481210494ab1b 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLEngineeringLookaheadDataWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLEngineeringLookaheadDataWriter.cs
@@ -95,10 +95,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer.DriverData
}
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
}
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLEngineeringOverspeedDataWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLEngineeringOverspeedDataWriter.cs
index 0456fd7b20fb972fce0d2ab20bd96319e7f463ae..c4f8c6680aec44252a0f2c3e2f616ebdaf27cd89 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLEngineeringOverspeedDataWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLEngineeringOverspeedDataWriter.cs
@@ -72,10 +72,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer.DriverData
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
}
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLShiftParmeterDataWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLShiftParmeterDataWriter.cs
index c30a3a96e1865d03af3f661a4e3590f26d405cfd..73c8ecd429d076a55d48f800aa7b425082729d5f 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLShiftParmeterDataWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/DriverData/XMLShiftParmeterDataWriter.cs
@@ -46,10 +46,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer.DriverData
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringADASWriterV10.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringADASWriterV10.cs
index 736dc6835e053488edac89779c3af7cc5006a00a..fa6c5d734c1c73b2b18abcc21b74c63c4d1e7138 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringADASWriterV10.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringADASWriterV10.cs
@@ -64,7 +64,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer {
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace { get { return Writer.RegisterNamespace(NAMESPACE_URI); } }
+ public override XNamespace ComponentDataNamespace => Writer.RegisterNamespace(NAMESPACE_URI);
#endregion
}
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAirdragWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAirdragWriter.cs
index 20271e5f5199ad9adc900e6d0fd94d8ef00105e0..302bbe84ba83c877c07eee03d265b33a3faf6465 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAirdragWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAirdragWriter.cs
@@ -51,10 +51,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAngledriveWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAngledriveWriter.cs
index 633441cb834cd700b2492531efedacc95690d373..1d47e0b614fa1a55122b2d673af1e5091baed0d5 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAngledriveWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAngledriveWriter.cs
@@ -51,10 +51,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAuxiliariesWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAuxiliariesWriter.cs
index 3f90887cf5035f22b1388aa6de994aefbaeb22ce..459abf52236d76cd081875440337c37c182db417 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAuxiliariesWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAuxiliariesWriter.cs
@@ -43,10 +43,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer {
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
}
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAuxiliaryWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAuxiliaryWriter.cs
index c3079bfb51b7a8246445a2e0e66e5fa042a8314c..d34ea8cc5bb276f4e311c3a0fe84318f0433b634 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAuxiliaryWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAuxiliaryWriter.cs
@@ -43,10 +43,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer {
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
}
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAxleWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAxleWriter.cs
index ed4773fba25709dea1ed976175cc4a3f1f668c76..b107c34f56c22e2ac34c4f82ac27b26aa5f499b2 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAxleWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAxleWriter.cs
@@ -54,10 +54,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#region Overrides of AbstractXMLWriter
@@ -107,10 +104,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
{
public new const string NAMESPACE_URI = XMLDefinitions.ENGINEERING_DEFINITONS_NAMESPACE_V10_TEST;
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
public override object[] WriteXML(IAxleEngineeringInputData axle, int idx, Meter dynamicTyreRadius)
{
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAxlegearWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAxlegearWriter.cs
index 854972858453f0591d045f8ec1f2ca71ad38aa36..ea4c2d91ecbf189be20279e124be6cafaddd4d66 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAxlegearWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAxlegearWriter.cs
@@ -51,10 +51,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAxlesWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAxlesWriter.cs
index 584723774ba32aaabdca347a09d3b391ebdab9bc..2343549cb82e8d1ef8449145d727023a60ab7968 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAxlesWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringAxlesWriter.cs
@@ -84,10 +84,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#endregion
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringComponentsWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringComponentsWriter.cs
index ad83f82f4e95e56cb41f260e3635ac98c2b0df83..6d8a5e395945691d55fab4afd180f63808f3f1e3 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringComponentsWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringComponentsWriter.cs
@@ -143,10 +143,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
}
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringDriverDataWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringDriverDataWriter.cs
index cdb41a3f59e3e9f25c0cb3bad8a8475ffc253ec2..7068d5276970f0099fc66e5bc08b805bd1a324f7 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringDriverDataWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringDriverDataWriter.cs
@@ -88,10 +88,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
}
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringEngineWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringEngineWriter.cs
index 030415319b6036e2c9b81ef513d985a0eeacac03..084bcd4943d35ae646ce0828a063a7d1665ef9ee 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringEngineWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringEngineWriter.cs
@@ -95,10 +95,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentNamespace ?? (_componentNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentNamespace ?? (_componentNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
}
@@ -126,9 +123,6 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
};
}
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentNamespace ?? (_componentNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentNamespace ?? (_componentNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringGearDataWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringGearDataWriter.cs
index 517c4cc82f00f332111aa1c650970f9d50f06eaa..186fe95ae1b23915dbf5dcc8922e6b6f518e8c82 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringGearDataWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringGearDataWriter.cs
@@ -49,10 +49,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringGearboxWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringGearboxWriter.cs
index 1a3d1f815953401729b9c3d681411103113558c4..98ece6cfb4c17b0e738060565aee66d4b09b1023 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringGearboxWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringGearboxWriter.cs
@@ -83,10 +83,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentNamespace ?? (_componentNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentNamespace ?? (_componentNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringJobWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringJobWriter.cs
index a3e54bdef7477b707f01d4548f7d217399fb8a36..f7e9b0d2c980ae78745a95a35b0bf2ef5951fa8c 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringJobWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringJobWriter.cs
@@ -149,10 +149,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
}
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringRetarderWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringRetarderWriter.cs
index 31b2a6324c69b619373e239eebdb48abbc3aec9e..f0d94281d473759e90d3203bede0354b263eb179 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringRetarderWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringRetarderWriter.cs
@@ -49,10 +49,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringTorqueconverterWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringTorqueconverterWriter.cs
index 9be6472c3998ac74cc7fcfe219a013b0f434f031..0203c136e1cc12d152fa02451e54fa410e4947dc 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringTorqueconverterWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringTorqueconverterWriter.cs
@@ -53,10 +53,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringTyreWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringTyreWriter.cs
index b4341b8c4fb3fe51d24a5548fded17658ea70069..73e5602fb4790b6217c4d086fffc5c617e4bf954 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringTyreWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringTyreWriter.cs
@@ -49,10 +49,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringVehicleDataWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringVehicleDataWriter.cs
index a25091712c7d25ac904b798a4749838720ce9e33..3541e0bc24e1310452d0b402bc69b24ffe46ef96 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringVehicleDataWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringVehicleDataWriter.cs
@@ -56,10 +56,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
#region Overrides of AbstractXMLWriter
- public override XNamespace ComponentDataNamespace
- {
- get { return _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI)); }
- }
+ public override XNamespace ComponentDataNamespace => _componentDataNamespace ?? (_componentDataNamespace = Writer.RegisterNamespace(NAMESPACE_URI));
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs
index c53f43e48c30f4c0edda372a091e6565e2d88afd..5118d89ea6bf966dcaf84632242f08315bd98bd1 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs
@@ -22,7 +22,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
public IPrimaryVehicleInformationInputDataProvider PrimaryVehicleRecordFile { get; set; }
- public IVehicleDeclarationInputData PrimaryVehicle { get { return PrimaryVehicleRecordFile.Vehicle; } }
+ public IVehicleDeclarationInputData PrimaryVehicle => PrimaryVehicleRecordFile.Vehicle;
public override void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
index 8c9264c404579050ee16321ea83fdad749140bbb..cc7f166f39fc28ee77542a69b6e5f18cf1228666 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
@@ -181,20 +181,11 @@ namespace TUGraz.VectoCore.OutputData.XML
- public virtual XDocument FullReport
- {
- get { return ManufacturerRpt.Report; }
- }
+ public virtual XDocument FullReport => ManufacturerRpt.Report;
- public virtual XDocument CustomerReport
- {
- get { return CustomerRpt.Report; }
- }
+ public virtual XDocument CustomerReport => CustomerRpt.Report;
- public virtual XDocument PrimaryVehicleReport
- {
- get { return null; }
- }
+ public virtual XDocument PrimaryVehicleReport => null;
protected override void DoStoreResult(ResultEntry entry, VectoRunData runData, IModalDataContainer modData)
@@ -262,38 +253,34 @@ namespace TUGraz.VectoCore.OutputData.XML
CustomerRpt = new XMLCustomerReport();
}
- private static IDictionary<Tuple<MissionType, LoadingType>, double> ZeroWeighting
- {
- get {
- return new ReadOnlyDictionary<Tuple<MissionType, LoadingType>, double>(
- new Dictionary<Tuple<MissionType, LoadingType>, double>() {
- { Tuple.Create(MissionType.LongHaul, LoadingType.LowLoading), 0 },
- { Tuple.Create(MissionType.LongHaul, LoadingType.ReferenceLoad), 0 },
- { Tuple.Create(MissionType.RegionalDelivery, LoadingType.LowLoading), 0 },
- { Tuple.Create(MissionType.RegionalDelivery, LoadingType.ReferenceLoad), 0 },
- { Tuple.Create(MissionType.UrbanDelivery, LoadingType.LowLoading), 0 },
- { Tuple.Create(MissionType.UrbanDelivery, LoadingType.ReferenceLoad), 0 },
- { Tuple.Create(MissionType.LongHaulEMS, LoadingType.LowLoading), 0 },
- { Tuple.Create(MissionType.LongHaulEMS, LoadingType.ReferenceLoad), 0 },
- { Tuple.Create(MissionType.RegionalDeliveryEMS, LoadingType.LowLoading), 0 },
- { Tuple.Create(MissionType.RegionalDeliveryEMS, LoadingType.ReferenceLoad), 0 },
- { Tuple.Create(MissionType.MunicipalUtility, LoadingType.LowLoading), 0 },
- { Tuple.Create(MissionType.MunicipalUtility, LoadingType.ReferenceLoad), 0 },
- { Tuple.Create(MissionType.Construction, LoadingType.LowLoading), 0 },
- { Tuple.Create(MissionType.Construction, LoadingType.ReferenceLoad), 0 },
- { Tuple.Create(MissionType.HeavyUrban, LoadingType.LowLoading), 0 },
- { Tuple.Create(MissionType.HeavyUrban, LoadingType.ReferenceLoad), 0 },
- { Tuple.Create(MissionType.Urban, LoadingType.LowLoading), 0 },
- { Tuple.Create(MissionType.Urban, LoadingType.ReferenceLoad), 0 },
- { Tuple.Create(MissionType.Suburban, LoadingType.LowLoading), 0 },
- { Tuple.Create(MissionType.Suburban, LoadingType.ReferenceLoad), 0 },
- { Tuple.Create(MissionType.Interurban, LoadingType.LowLoading), 0 },
- { Tuple.Create(MissionType.Interurban, LoadingType.ReferenceLoad), 0 },
- { Tuple.Create(MissionType.Coach, LoadingType.LowLoading), 0 },
- { Tuple.Create(MissionType.Coach, LoadingType.ReferenceLoad), 0 },
- });
- }
- }
+ private static IDictionary<Tuple<MissionType, LoadingType>, double> ZeroWeighting =>
+ new ReadOnlyDictionary<Tuple<MissionType, LoadingType>, double>(
+ new Dictionary<Tuple<MissionType, LoadingType>, double>() {
+ { Tuple.Create(MissionType.LongHaul, LoadingType.LowLoading), 0 },
+ { Tuple.Create(MissionType.LongHaul, LoadingType.ReferenceLoad), 0 },
+ { Tuple.Create(MissionType.RegionalDelivery, LoadingType.LowLoading), 0 },
+ { Tuple.Create(MissionType.RegionalDelivery, LoadingType.ReferenceLoad), 0 },
+ { Tuple.Create(MissionType.UrbanDelivery, LoadingType.LowLoading), 0 },
+ { Tuple.Create(MissionType.UrbanDelivery, LoadingType.ReferenceLoad), 0 },
+ { Tuple.Create(MissionType.LongHaulEMS, LoadingType.LowLoading), 0 },
+ { Tuple.Create(MissionType.LongHaulEMS, LoadingType.ReferenceLoad), 0 },
+ { Tuple.Create(MissionType.RegionalDeliveryEMS, LoadingType.LowLoading), 0 },
+ { Tuple.Create(MissionType.RegionalDeliveryEMS, LoadingType.ReferenceLoad), 0 },
+ { Tuple.Create(MissionType.MunicipalUtility, LoadingType.LowLoading), 0 },
+ { Tuple.Create(MissionType.MunicipalUtility, LoadingType.ReferenceLoad), 0 },
+ { Tuple.Create(MissionType.Construction, LoadingType.LowLoading), 0 },
+ { Tuple.Create(MissionType.Construction, LoadingType.ReferenceLoad), 0 },
+ { Tuple.Create(MissionType.HeavyUrban, LoadingType.LowLoading), 0 },
+ { Tuple.Create(MissionType.HeavyUrban, LoadingType.ReferenceLoad), 0 },
+ { Tuple.Create(MissionType.Urban, LoadingType.LowLoading), 0 },
+ { Tuple.Create(MissionType.Urban, LoadingType.ReferenceLoad), 0 },
+ { Tuple.Create(MissionType.Suburban, LoadingType.LowLoading), 0 },
+ { Tuple.Create(MissionType.Suburban, LoadingType.ReferenceLoad), 0 },
+ { Tuple.Create(MissionType.Interurban, LoadingType.LowLoading), 0 },
+ { Tuple.Create(MissionType.Interurban, LoadingType.ReferenceLoad), 0 },
+ { Tuple.Create(MissionType.Coach, LoadingType.LowLoading), 0 },
+ { Tuple.Create(MissionType.Coach, LoadingType.ReferenceLoad), 0 },
+ });
public static IEnumerable<XElement> GetResults(ResultEntry result, XNamespace tns, bool fullOutput)
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs
index 918d4055ff4f250e6a92d9c409665bb04dffcd10..850db9412d924e5e8ec3ef42cf45207855331f94 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs
@@ -38,39 +38,34 @@ namespace TUGraz.VectoCore.OutputData.XML {
}
#endregion
- private static IDictionary<Tuple<MissionType, LoadingType>, double> EqualWeighting
- {
- get
- {
- return new ReadOnlyDictionary<Tuple<MissionType, LoadingType>, double>(
- new Dictionary<Tuple<MissionType, LoadingType>, double>() {
- { Tuple.Create(MissionType.LongHaul, LoadingType.LowLoading), 1 },
- { Tuple.Create(MissionType.LongHaul, LoadingType.ReferenceLoad), 1 },
- { Tuple.Create(MissionType.RegionalDelivery, LoadingType.LowLoading), 1 },
- { Tuple.Create(MissionType.RegionalDelivery, LoadingType.ReferenceLoad), 1 },
- { Tuple.Create(MissionType.UrbanDelivery, LoadingType.LowLoading), 1 },
- { Tuple.Create(MissionType.UrbanDelivery, LoadingType.ReferenceLoad), 1 },
- { Tuple.Create(MissionType.LongHaulEMS, LoadingType.LowLoading), 1 },
- { Tuple.Create(MissionType.LongHaulEMS, LoadingType.ReferenceLoad), 1 },
- { Tuple.Create(MissionType.RegionalDeliveryEMS, LoadingType.LowLoading), 1 },
- { Tuple.Create(MissionType.RegionalDeliveryEMS, LoadingType.ReferenceLoad), 1 },
- { Tuple.Create(MissionType.MunicipalUtility, LoadingType.LowLoading), 1 },
- { Tuple.Create(MissionType.MunicipalUtility, LoadingType.ReferenceLoad), 1 },
- { Tuple.Create(MissionType.Construction, LoadingType.LowLoading), 1 },
- { Tuple.Create(MissionType.Construction, LoadingType.ReferenceLoad), 1 },
- { Tuple.Create(MissionType.HeavyUrban, LoadingType.LowLoading), 1 },
- { Tuple.Create(MissionType.HeavyUrban, LoadingType.ReferenceLoad), 1 },
- { Tuple.Create(MissionType.Urban, LoadingType.LowLoading), 1 },
- { Tuple.Create(MissionType.Urban, LoadingType.ReferenceLoad), 1 },
- { Tuple.Create(MissionType.Suburban, LoadingType.LowLoading), 1 },
- { Tuple.Create(MissionType.Suburban, LoadingType.ReferenceLoad), 1 },
- { Tuple.Create(MissionType.Interurban, LoadingType.LowLoading), 1 },
- { Tuple.Create(MissionType.Interurban, LoadingType.ReferenceLoad), 1 },
- { Tuple.Create(MissionType.Coach, LoadingType.LowLoading), 1 },
- { Tuple.Create(MissionType.Coach, LoadingType.ReferenceLoad), 1 },
- });
- }
- }
+ private static IDictionary<Tuple<MissionType, LoadingType>, double> EqualWeighting =>
+ new ReadOnlyDictionary<Tuple<MissionType, LoadingType>, double>(
+ new Dictionary<Tuple<MissionType, LoadingType>, double>() {
+ { Tuple.Create(MissionType.LongHaul, LoadingType.LowLoading), 1 },
+ { Tuple.Create(MissionType.LongHaul, LoadingType.ReferenceLoad), 1 },
+ { Tuple.Create(MissionType.RegionalDelivery, LoadingType.LowLoading), 1 },
+ { Tuple.Create(MissionType.RegionalDelivery, LoadingType.ReferenceLoad), 1 },
+ { Tuple.Create(MissionType.UrbanDelivery, LoadingType.LowLoading), 1 },
+ { Tuple.Create(MissionType.UrbanDelivery, LoadingType.ReferenceLoad), 1 },
+ { Tuple.Create(MissionType.LongHaulEMS, LoadingType.LowLoading), 1 },
+ { Tuple.Create(MissionType.LongHaulEMS, LoadingType.ReferenceLoad), 1 },
+ { Tuple.Create(MissionType.RegionalDeliveryEMS, LoadingType.LowLoading), 1 },
+ { Tuple.Create(MissionType.RegionalDeliveryEMS, LoadingType.ReferenceLoad), 1 },
+ { Tuple.Create(MissionType.MunicipalUtility, LoadingType.LowLoading), 1 },
+ { Tuple.Create(MissionType.MunicipalUtility, LoadingType.ReferenceLoad), 1 },
+ { Tuple.Create(MissionType.Construction, LoadingType.LowLoading), 1 },
+ { Tuple.Create(MissionType.Construction, LoadingType.ReferenceLoad), 1 },
+ { Tuple.Create(MissionType.HeavyUrban, LoadingType.LowLoading), 1 },
+ { Tuple.Create(MissionType.HeavyUrban, LoadingType.ReferenceLoad), 1 },
+ { Tuple.Create(MissionType.Urban, LoadingType.LowLoading), 1 },
+ { Tuple.Create(MissionType.Urban, LoadingType.ReferenceLoad), 1 },
+ { Tuple.Create(MissionType.Suburban, LoadingType.LowLoading), 1 },
+ { Tuple.Create(MissionType.Suburban, LoadingType.ReferenceLoad), 1 },
+ { Tuple.Create(MissionType.Interurban, LoadingType.LowLoading), 1 },
+ { Tuple.Create(MissionType.Interurban, LoadingType.ReferenceLoad), 1 },
+ { Tuple.Create(MissionType.Coach, LoadingType.LowLoading), 1 },
+ { Tuple.Create(MissionType.Coach, LoadingType.ReferenceLoad), 1 },
+ });
protected internal override void DoWriteReport()
{
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs
index 55b66e65deed1369944482d30ae80a0b61a208f7..b175bac434da38fcbc56b375526f095b23c584e1 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs
@@ -15,17 +15,11 @@ namespace TUGraz.VectoCore.OutputData.XML {
_primaryReport = new XMLPrimaryVehicleReport();
}
- public override XDocument CustomerReport
- {
- get { return null; }
- }
+ public override XDocument CustomerReport => null;
+
+ public override XDocument PrimaryVehicleReport => _primaryReport?.Report;
- public override XDocument PrimaryVehicleReport
- {
- get { return _primaryReport?.Report; }
- }
-
#region Overrides of XMLDeclarationReport
protected override void InstantiateReports(VectoRunData modelData)
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs
index cb166c50c44758fb2ae47b81f43b93ef549b4a77..0144f8cfa034cd2c1c2aa3dc49a293b0473f328d 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs
@@ -20,9 +20,8 @@ namespace TUGraz.VectoCore.OutputData.XML {
public IPrimaryVehicleInformationInputDataProvider PrimaryVehicleRecordFile { get; set; }
- public IVehicleDeclarationInputData PrimaryVehicle { get { return PrimaryVehicleRecordFile.Vehicle; } }
+ public IVehicleDeclarationInputData PrimaryVehicle => PrimaryVehicleRecordFile.Vehicle;
-
#region Overrides of AbstractXMLManufacturerReport
diff --git a/VectoCore/VectoCore/Utils/DelaunayMap.cs b/VectoCore/VectoCore/Utils/DelaunayMap.cs
index 91eb81f5e0247a4fc471f7d52ecdd1a88dea291c..6fb478bb382398747380bdcce3bd1ac18f156f93 100644
--- a/VectoCore/VectoCore/Utils/DelaunayMap.cs
+++ b/VectoCore/VectoCore/Utils/DelaunayMap.cs
@@ -62,7 +62,7 @@ namespace TUGraz.VectoCore.Utils
_mapName = name;
}
- public string Name { get { return _mapName; } }
+ public string Name => _mapName;
public void AddPoint(double x, double y, double z)
{
diff --git a/VectoCore/VectoCore/Utils/IterationStatistics.cs b/VectoCore/VectoCore/Utils/IterationStatistics.cs
index 5a4da47f967ed4b643a80e83bad6ef7d03e89b47..d8c0fa7797797b3be0477de137b6158e2e0bf9b3 100644
--- a/VectoCore/VectoCore/Utils/IterationStatistics.cs
+++ b/VectoCore/VectoCore/Utils/IterationStatistics.cs
@@ -45,17 +45,11 @@ namespace TUGraz.VectoCore.Utils
private static readonly ThreadLocal<List<DataEntry>> DataLocal =
new ThreadLocal<List<DataEntry>>(() => new List<DataEntry>());
- public static List<DataEntry> Data
- {
- get { return DataLocal.Value; }
- }
+ public static List<DataEntry> Data => DataLocal.Value;
private static readonly ThreadLocal<Stopwatch> TimerLocal = new ThreadLocal<Stopwatch>(Stopwatch.StartNew);
- private static Stopwatch Timer
- {
- get { return TimerLocal.Value; }
- }
+ private static Stopwatch Timer => TimerLocal.Value;
private static readonly ThreadLocal<Dictionary<string, Dictionary<string, double>>> CurrentLocal =
new ThreadLocal<Dictionary<string, Dictionary<string, double>>>(
@@ -63,8 +57,8 @@ namespace TUGraz.VectoCore.Utils
private static Dictionary<string, Dictionary<string, double>> Current
{
- get { return CurrentLocal.Value; }
- set { CurrentLocal.Value = value; }
+ get => CurrentLocal.Value;
+ set => CurrentLocal.Value = value;
}
[Conditional("TRACE")]
diff --git a/VectoCore/VectoCore/Utils/MeanShiftClustering.cs b/VectoCore/VectoCore/Utils/MeanShiftClustering.cs
index 104b91efa013aa894c1d2f5ef63dc9db825601d7..eff059ade0b73a7f9a85914e3d1626b3775c115e 100644
--- a/VectoCore/VectoCore/Utils/MeanShiftClustering.cs
+++ b/VectoCore/VectoCore/Utils/MeanShiftClustering.cs
@@ -116,7 +116,7 @@ namespace TUGraz.VectoCore.Utils
_count++;
}
- public double? Mean { get { return _count > 0 ? _sum / _count : (double?)null; } }
+ public double? Mean => _count > 0 ? _sum / _count : (double?)null;
public override string ToString()
{
diff --git a/VectoCore/VectoCore/Utils/VectoVersionCore.cs b/VectoCore/VectoCore/Utils/VectoVersionCore.cs
index c001707fe9fecfcd12713d61e326ef850576a856..bba38738193877e65f3670651632df55a4604a0d 100644
--- a/VectoCore/VectoCore/Utils/VectoVersionCore.cs
+++ b/VectoCore/VectoCore/Utils/VectoVersionCore.cs
@@ -44,25 +44,10 @@ namespace TUGraz.VectoCore.Utils
#endif
#endif
- public static string VersionNumber
- {
- get {
- return "0.7.3.2247" + SUFFIX;
- }
- }
+ public static string VersionNumber => "0.7.3.2247" + SUFFIX;
- public static string BranchSuffix
- {
- get {
- return "-DEV";
- }
- }
+ public static string BranchSuffix => "-DEV";
- public static string FullVersion
- {
- get {
- return string.Format("VectoCore{1} {0}", VersionNumber, BranchSuffix);
- }
- }
+ public static string FullVersion => string.Format("VectoCore{1} {0}", VersionNumber, BranchSuffix);
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Utils/XMLHelper.cs b/VectoCore/VectoCore/Utils/XMLHelper.cs
index 1e44881524766d936f31e5910ae2f30efd500723..1dcd5aa945f565b31ad9cef4eb1ef1e86f7ddebf 100644
--- a/VectoCore/VectoCore/Utils/XMLHelper.cs
+++ b/VectoCore/VectoCore/Utils/XMLHelper.cs
@@ -251,14 +251,10 @@ namespace TUGraz.VectoCore.Utils
return null;// new TableData(Path.Combine(basePath ?? "", filename), DataSourceType.Missing);
}
- private static string ExtCSVResourceQuery
- {
- get {
- return string.Format(
- "/*[local-name()='{0}' and @{1}='{2}']", XMLNames.ExternalResource, XMLNames.ExtResource_Type_Attr,
- XMLNames.ExtResource_Type_Value_CSV);
- }
- }
+ private static string ExtCSVResourceQuery =>
+ string.Format(
+ "/*[local-name()='{0}' and @{1}='{2}']", XMLNames.ExternalResource, XMLNames.ExtResource_Type_Attr,
+ XMLNames.ExtResource_Type_Value_CSV);
private static IEnumerable<T> Shim<T>(XmlNodeList nodes)
{
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index dcaca9ee12393ca50aed32d71e7b6bd424e2507a..1c4de777427b4bdc377976a27ae906c91f3bea42 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -101,8 +101,9 @@
<HintPath>..\..\packages\Ninject.3.3.4\lib\net45\Ninject.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="Ninject.Extensions.Factory, Version=3.3.3.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
- <HintPath>..\..\packages\Ninject.Extensions.Factory.3.3.3\lib\net45\Ninject.Extensions.Factory.dll</HintPath>
+ <Reference Include="Ninject.Extensions.Factory, Version=3.3.2.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Ninject.Extensions.Factory.3.3.2\lib\net45\Ninject.Extensions.Factory.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="Ninject.Extensions.NamedScope, Version=3.3.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Ninject.Extensions.NamedScope.3.3.0\lib\net45\Ninject.Extensions.NamedScope.dll</HintPath>
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
index 65ce70d494ecece738bdb9e2dc739fae153e40fa..491b793f18dc085d52c41d078260429eb7b5d70c 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
@@ -538,10 +538,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
public VectoSimulationJobType JobType { get; set; }
public IEngineEngineeringInputData EngineOnly { get; set; }
- IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle
- {
- get { return Vehicle; }
- }
+ IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle => Vehicle;
public string JobName { get; set; }
public string ShiftStrategy { get; set; }
diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
index 73ad66f37453b576db259c6a3cb51bd9c8de64f0..e7bf57aefb9d1a1f4dae78382f80fee9527143eb 100644
--- a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
@@ -939,10 +939,8 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
get;
set;
}
- public NewtonMeter EngineTorque
- {
- get { return null; }
- }
+ public NewtonMeter EngineTorque => null;
+
public Watt EngineStationaryFullPower(PerSecond angularSpeed)
{
throw new NotImplementedException();
@@ -967,10 +965,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
public PerSecond EngineRatedSpeed { get; }
public PerSecond EngineN95hSpeed { get; }
public PerSecond EngineN80hSpeed { get; }
- public bool EngineOn
- {
- get { return true; }
- }
+ public bool EngineOn => true;
}
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
index b17f338240e5d60bbd4607cd2d5386111e3bf7fd..991a0731a24c60d11b48e945a7fdb55b2ca0353c 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
@@ -178,42 +178,23 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
//JobName = Vehicle.VIN;
}
- public IDeclarationMultistageJobInputData JobInputData
- {
- get { return input.JobInputData; }
- }
+ public IDeclarationMultistageJobInputData JobInputData => input.JobInputData;
IDeclarationJobInputData IDeclarationInputDataProvider.JobInputData => null;
- public IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData
- {
- get { return input.PrimaryVehicleData; }
- }
- public XElement XMLHash { get; }
+ public IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData => input.PrimaryVehicleData;
+ public XElement XMLHash { get; }
- public bool SavedInDeclarationMode
- {
- get { return true; }
- }
+ public bool SavedInDeclarationMode => true;
- public IPrimaryVehicleInformationInputDataProvider PrimaryVehicle
- {
- get { return PrimaryVehicleData; }
- }
- public IList<IManufacturingStageInputData> ManufacturingStages
- {
- get { return input.JobInputData.ManufacturingStages; }
- }
- public IManufacturingStageInputData ConsolidateManufacturingStage
- {
- get { return input.JobInputData.ConsolidateManufacturingStage; }
- }
+ public IPrimaryVehicleInformationInputDataProvider PrimaryVehicle => PrimaryVehicleData;
- public VectoSimulationJobType JobType
- {
- get { return VectoSimulationJobType.ConventionalVehicle; }
- }
+ public IList<IManufacturingStageInputData> ManufacturingStages => input.JobInputData.ManufacturingStages;
+
+ public IManufacturingStageInputData ConsolidateManufacturingStage => input.JobInputData.ConsolidateManufacturingStage;
+
+ public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
public bool InputComplete { get; }
diff --git a/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs b/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs
index 47e8f8d7a33b641535fd9ff7c68e9e4126f8bdc4..e39ceeb87b508f2e21a3b47987f8e3d7156c55db 100644
--- a/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs
@@ -262,13 +262,13 @@ namespace TUGraz.VectoCore.Tests.Integration.RoadSweepers
#region Implementation of IInputDataProvider
- public DataSource DataSource { get { return new DataSource(); } }
+ public DataSource DataSource => new DataSource();
#endregion
#region Implementation of IEngineeringInputDataProvider
- public IEngineeringJobInputData JobInputData { get { return this; } }
+ public IEngineeringJobInputData JobInputData => this;
public IDriverEngineeringInputData DriverInputData { get; set; }
#endregion
@@ -281,14 +281,11 @@ namespace TUGraz.VectoCore.Tests.Integration.RoadSweepers
public IHybridStrategyParameters HybridStrategyParameters { get; }
public IList<ICycleData> Cycles { get; set; }
public VectoSimulationJobType JobType { get; }
- public bool EngineOnlyMode { get { return false; } }
- public IEngineEngineeringInputData EngineOnly { get { return null; } }
+ public bool EngineOnlyMode => false;
+ public IEngineEngineeringInputData EngineOnly => null;
public TableData PTOCycleWhileDrive { get; set; }
- IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle
- {
- get { return Vehicle; }
- }
+ IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle => Vehicle;
public string JobName { get; set; }
public string ShiftStrategy { get; }
@@ -297,10 +294,7 @@ namespace TUGraz.VectoCore.Tests.Integration.RoadSweepers
#region Implementation of IDeclarationJobInputData
- bool IDeclarationJobInputData.SavedInDeclarationMode
- {
- get { return _savedInDeclarationMode; }
- }
+ bool IDeclarationJobInputData.SavedInDeclarationMode => _savedInDeclarationMode;
#endregion
}
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
index d1689caf54db7d7f4eb34481798a2a80cc2c6d75..6a17fa00a854d0a252716708657d231dbfca1607 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
@@ -196,10 +196,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
public PerSecond EngineN95hSpeed { get; set; }
public PerSecond EngineN80hSpeed { get; set; }
- public bool EngineOn
- {
- get { throw new System.NotImplementedException(); }
- }
+ public bool EngineOn => throw new System.NotImplementedException();
protected override void DoWriteModalResults(Second time, Second simulationInterval, IModalDataContainer container)
{
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs
index 7bf16a1b137bb126a817deda375dddbf9ff70f2d..f51d0443de5e366a56a4d82829090a901a8252fe 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs
@@ -313,35 +313,17 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
#region Implementation of IVehicleInfo
- public MeterPerSecond VehicleSpeed
- {
- get { return 0.SI<MeterPerSecond>(); }
- }
+ public MeterPerSecond VehicleSpeed => 0.SI<MeterPerSecond>();
- public bool VehicleStopped
- {
- get { throw new System.NotImplementedException(); }
- }
+ public bool VehicleStopped => throw new System.NotImplementedException();
- public Kilogram VehicleMass
- {
- get { throw new System.NotImplementedException(); }
- }
+ public Kilogram VehicleMass => throw new System.NotImplementedException();
- public Kilogram VehicleLoading
- {
- get { throw new System.NotImplementedException(); }
- }
+ public Kilogram VehicleLoading => throw new System.NotImplementedException();
- public Kilogram TotalMass
- {
- get { throw new System.NotImplementedException(); }
- }
+ public Kilogram TotalMass => throw new System.NotImplementedException();
- public CubicMeter CargoVolume
- {
- get { throw new System.NotImplementedException(); }
- }
+ public CubicMeter CargoVolume => throw new System.NotImplementedException();
public Newton AirDragResistance(MeterPerSecond previousVelocity, MeterPerSecond nextVelocity)
{
@@ -358,10 +340,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
throw new System.NotImplementedException();
}
- public MeterPerSecond MaxVehicleSpeed
- {
- get { throw new System.NotImplementedException(); }
- }
+ public MeterPerSecond MaxVehicleSpeed => throw new System.NotImplementedException();
#endregion
}
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
index 891f0cd4d310aadc4519d3afef7395e7f653ec8d..f2a5b141995b56d23b7ba8b76353e267d834cc37 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
@@ -256,45 +256,24 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
#region Implementation of IDrivingCycleInfo
- public CycleData CycleData
- {
- get { throw new NotImplementedException(); }
- }
+ public CycleData CycleData => throw new NotImplementedException();
- public bool PTOActive
- {
- get { throw new NotImplementedException(); }
- }
+ public bool PTOActive => throw new NotImplementedException();
public DrivingCycleData.DrivingCycleEntry CycleLookAhead(Meter distance)
{
throw new NotImplementedException();
}
- public Meter Altitude
- {
- get { throw new NotImplementedException(); }
- }
+ public Meter Altitude => throw new NotImplementedException();
- public Radian RoadGradient
- {
- get { throw new NotImplementedException(); }
- }
+ public Radian RoadGradient => throw new NotImplementedException();
- public MeterPerSecond TargetSpeed
- {
- get { throw new NotImplementedException(); }
- }
+ public MeterPerSecond TargetSpeed => throw new NotImplementedException();
- public Second StopTime
- {
- get { throw new NotImplementedException(); }
- }
+ public Second StopTime => throw new NotImplementedException();
- public Meter CycleStartDistance
- {
- get { return 0.SI<Meter>(); }
- }
+ public Meter CycleStartDistance => 0.SI<Meter>();
public IReadOnlyList<DrivingCycleData.DrivingCycleEntry> LookAhead(Meter lookaheadDistance)
{
@@ -306,10 +285,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
throw new NotImplementedException();
}
- public SpeedChangeEntry LastTargetspeedChange
- {
- get { throw new NotImplementedException(); }
- }
+ public SpeedChangeEntry LastTargetspeedChange => throw new NotImplementedException();
public void FinishSimulation()
{
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
index 1e26aac4e0013a0d166f1c462cfeb46d2b671ed4..a1151ca3fa99b642a6ee5f0a593dfc0a4076fbb2 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
@@ -471,56 +471,32 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
#region 4 parent instance properties
[Required, System.ComponentModel.DataAnnotations.Range(11, 12)]
- private int private_parent_property
- {
- get { return 7; }
- }
+ private int private_parent_property => 7;
[Required, System.ComponentModel.DataAnnotations.Range(13, 14)]
- protected int protected_parent_property
- {
- get { return 7; }
- }
+ protected int protected_parent_property => 7;
[Required, System.ComponentModel.DataAnnotations.Range(15, 16)]
- internal int internal_parent_property
- {
- get { return 7; }
- }
+ internal int internal_parent_property => 7;
[Required, System.ComponentModel.DataAnnotations.Range(17, 18)]
- public int public_parent_property
- {
- get { return 7; }
- }
+ public int public_parent_property => 7;
#endregion
#region 4 parent static properties
[Required, System.ComponentModel.DataAnnotations.Range(19, 20)]
- private static int private_static_parent_property
- {
- get { return 7; }
- }
+ private static int private_static_parent_property => 7;
[Required, System.ComponentModel.DataAnnotations.Range(19, 20)]
- protected static int protected_static_parent_property
- {
- get { return 7; }
- }
+ protected static int protected_static_parent_property => 7;
[Required, System.ComponentModel.DataAnnotations.Range(19, 20)]
- internal static int internal_static_parent_property
- {
- get { return 7; }
- }
+ internal static int internal_static_parent_property => 7;
[Required, System.ComponentModel.DataAnnotations.Range(19, 20)]
- public static int public_static_parent_property
- {
- get { return 7; }
- }
+ public static int public_static_parent_property => 7;
#endregion
@@ -560,56 +536,32 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
#region 4 instance properties
[Required, System.ComponentModel.DataAnnotations.Range(11, 12)]
- private int private_property
- {
- get { return 7; }
- }
+ private int private_property => 7;
[Required, System.ComponentModel.DataAnnotations.Range(13, 14)]
- protected int protected_property
- {
- get { return 7; }
- }
+ protected int protected_property => 7;
[Required, System.ComponentModel.DataAnnotations.Range(15, 16)]
- internal int internal_property
- {
- get { return 7; }
- }
+ internal int internal_property => 7;
[Required, System.ComponentModel.DataAnnotations.Range(17, 18)]
- public int public_property
- {
- get { return 7; }
- }
+ public int public_property => 7;
#endregion
#region 4 static properties
[Required, System.ComponentModel.DataAnnotations.Range(19, 20)]
- private static int private_static_property
- {
- get { return 7; }
- }
+ private static int private_static_property => 7;
[Required, System.ComponentModel.DataAnnotations.Range(19, 20)]
- protected static int protected_static_property
- {
- get { return 7; }
- }
+ protected static int protected_static_property => 7;
[Required, System.ComponentModel.DataAnnotations.Range(19, 20)]
- internal static int internal_static_property
- {
- get { return 7; }
- }
+ internal static int internal_static_property => 7;
[Required, System.ComponentModel.DataAnnotations.Range(19, 20)]
- public static int public_static_property
- {
- get { return 7; }
- }
+ public static int public_static_property => 7;
#endregion
@@ -638,10 +590,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
public string AppVersion { get; set; }
public string TechnicalReportId { get; set; }
- public CertificationMethod CertificationMethod
- {
- get { return CertificationMethod.NotCertified; }
- }
+ public CertificationMethod CertificationMethod => CertificationMethod.NotCertified;
public string CertificationNumber { get; set; }
public DigestData DigestValue { get; set; }
diff --git a/VectoCore/VectoCoreTest/Utils/MockAuxiliaryDemand.cs b/VectoCore/VectoCoreTest/Utils/MockAuxiliaryDemand.cs
index 9512ad39fc2e65dc30f3e5b416f1c655ad04f6b7..6ba0f3433b0ce5589fcde090ebec169ef3368fe5 100644
--- a/VectoCore/VectoCoreTest/Utils/MockAuxiliaryDemand.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockAuxiliaryDemand.cs
@@ -60,17 +60,13 @@ namespace TUGraz.VectoCore.Tests.Utils
}
- public CycleData CycleData
- {
- get {
- return new CycleData {
- AbsTime = 0.SI<Second>(),
- AbsDistance = 0.SI<Meter>(),
- LeftSample = _left.Current,
- RightSample = _right.Current
- };
- }
- }
+ public CycleData CycleData =>
+ new CycleData {
+ AbsTime = 0.SI<Second>(),
+ AbsDistance = 0.SI<Meter>(),
+ LeftSample = _left.Current,
+ RightSample = _right.Current
+ };
public bool PTOActive { get; set; }
@@ -82,12 +78,9 @@ namespace TUGraz.VectoCore.Tests.Utils
};
}
- public Meter Altitude
- {
- get { return 0.SI<Meter>(); }
- }
+ public Meter Altitude => 0.SI<Meter>();
- public Radian RoadGradient { get { return 0.SI<Radian>(); } }
+ public Radian RoadGradient => 0.SI<Radian>();
public MeterPerSecond TargetSpeed { get; set; }
public Second StopTime { get; set; }
@@ -105,10 +98,7 @@ namespace TUGraz.VectoCore.Tests.Utils
_right.MoveNext();
}
- public Meter CycleStartDistance
- {
- get { return 0.SI<Meter>(); }
- }
+ public Meter CycleStartDistance => 0.SI<Meter>();
public IReadOnlyList<DrivingCycleData.DrivingCycleEntry> LookAhead(Meter lookaheadDistance)
{
diff --git a/VectoCore/VectoCoreTest/Utils/MockBattery.cs b/VectoCore/VectoCoreTest/Utils/MockBattery.cs
index da546f91f30fad4aa94874f0507d17df44a2959b..03343905049a3d04963e294f2cefc340a7178e37 100644
--- a/VectoCore/VectoCoreTest/Utils/MockBattery.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockBattery.cs
@@ -6,10 +6,7 @@ using TUGraz.VectoCore.Models.SimulationComponent;
namespace TUGraz.VectoCore.Tests.Utils {
public class MockBattery : IElectricEnergyStorage, IElectricEnergyStoragePort, IElectricAuxConnecor
{
- public Volt InternalVoltage
- {
- get { return 640.SI<Volt>(); }
- }
+ public Volt InternalVoltage => 640.SI<Volt>();
public IRESSResponse Request(Second absTime, Second dt, Watt powerdemand, bool dryRun = false)
{
@@ -26,15 +23,9 @@ namespace TUGraz.VectoCore.Tests.Utils {
public double StateOfCharge { get; set; }
- public WattSecond StoredEnergy
- {
- get { throw new System.NotImplementedException(); }
- }
+ public WattSecond StoredEnergy => throw new System.NotImplementedException();
- public Ampere MaxCurrent
- {
- get { return 375.SI<Ampere>(); }
- }
+ public Ampere MaxCurrent => 375.SI<Ampere>();
public Watt MaxChargePower(Second dt)
{
@@ -46,19 +37,11 @@ namespace TUGraz.VectoCore.Tests.Utils {
throw new System.NotImplementedException();
}
- public double MinSoC
- {
- get { return 0; }
- }
- public double MaxSoC
- {
- get { return 1; }
- }
+ public double MinSoC => 0;
- public IElectricEnergyStoragePort MainBatteryPort
- {
- get { return this; }
- }
+ public double MaxSoC => 1;
+
+ public IElectricEnergyStoragePort MainBatteryPort => this;
public IElectricAuxConnecor AuxBatteryPort()
{
diff --git a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
index aa367932f79de368166442fa0ad64adad3873a48..1d9dc6e7b47bb279cd82627db198d1f59cab70f6 100644
--- a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
@@ -17,7 +17,7 @@ namespace TUGraz.VectoCore.Tests.Utils {
public string Manufacturer { get; }
public string Model { get; }
public DateTime Date { get; }
- public string AppVersion { get { return "Mock-Class"; } }
+ public string AppVersion => "Mock-Class";
public CertificationMethod CertificationMethod { get; }
public string CertificationNumber { get; }
public DigestData DigestValue { get; }
@@ -35,7 +35,7 @@ namespace TUGraz.VectoCore.Tests.Utils {
public AxleConfiguration AxleConfiguration { get; }
public Kilogram CurbMassChassis { get; }
public Kilogram GrossVehicleMassRating { get; }
- public IList<ITorqueLimitInputData> TorqueLimits { get { return new List<ITorqueLimitInputData>(); } }
+ public IList<ITorqueLimitInputData> TorqueLimits => new List<ITorqueLimitInputData>();
public string ManufacturerAddress { get; }
public PerSecond EngineIdleSpeed { get; }
public bool VocationalVehicle { get; }
@@ -63,7 +63,7 @@ namespace TUGraz.VectoCore.Tests.Utils {
public Meter EntranceHeight { get; }
public ConsumerTechnology? DoorDriveTechnology { get; }
public VehicleDeclarationType VehicleDeclarationType { get; }
- public IVehicleComponentsDeclaration Components { get { return this; } }
+ public IVehicleComponentsDeclaration Components => this;
public XmlNode XMLSource { get; }
#endregion
@@ -99,7 +99,7 @@ namespace TUGraz.VectoCore.Tests.Utils {
public string Manufacturer { get; }
public string Model { get; }
public DateTime Date { get; }
- public string AppVersion { get { return "Mock-Class"; } }
+ public string AppVersion => "Mock-Class";
public CertificationMethod CertificationMethod { get; }
public string CertificationNumber { get; }
public DigestData DigestValue { get; }
@@ -130,14 +130,11 @@ namespace TUGraz.VectoCore.Tests.Utils {
public VehicleCode? VehicleCode { get; set; }
public bool? LowEntry { get; }
- IVehicleComponentsDeclaration IVehicleDeclarationInputData.Components
- {
- get { return _components; }
- }
+ IVehicleComponentsDeclaration IVehicleDeclarationInputData.Components => _components;
public XmlNode XMLSource { get; }
- public IVehicleComponentsEngineering Components { get { return this; } }
+ public IVehicleComponentsEngineering Components => this;
public string Identifier { get; }
public bool ExemptedVehicle { get; }
public string VIN { get; }
@@ -147,7 +144,7 @@ namespace TUGraz.VectoCore.Tests.Utils {
public AxleConfiguration AxleConfiguration { get; }
public Kilogram CurbMassChassis { get; }
public Kilogram GrossVehicleMassRating { get; }
- public IList<ITorqueLimitInputData> TorqueLimits { get { return new List<ITorqueLimitInputData>(); } }
+ public IList<ITorqueLimitInputData> TorqueLimits => new List<ITorqueLimitInputData>();
public string ManufacturerAddress { get; }
public PerSecond EngineIdleSpeed { get; }
public bool VocationalVehicle { get; }
@@ -155,10 +152,7 @@ namespace TUGraz.VectoCore.Tests.Utils {
public bool? AirdragModifiedMultistage { get; }
public TankSystem? TankSystem { get; }
- IAdvancedDriverAssistantSystemDeclarationInputData IVehicleDeclarationInputData.ADAS
- {
- get { return _adas; }
- }
+ IAdvancedDriverAssistantSystemDeclarationInputData IVehicleDeclarationInputData.ADAS => _adas;
public double InitialSOC { get; }
public VectoSimulationJobType VehicleType { get; }
diff --git a/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs b/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs
index a336da2924c0acc0c3c4d7fecef544d8362436f2..61bec7f47eb0e046e51c7cf6415b15e16619720f 100644
--- a/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs
@@ -50,9 +50,9 @@ namespace TUGraz.VectoCore.Tests.Utils
public string Model { get; set; }
public string Creator { get; set; }
public DateTime Date { get; set; }
- public string AppVersion { get { return "Mock-Class"; } }
+ public string AppVersion => "Mock-Class";
public string TechnicalReportId { get; set; }
- public CertificationMethod CertificationMethod { get{return CertificationMethod.NotCertified;} }
+ public CertificationMethod CertificationMethod => CertificationMethod.NotCertified;
public string CertificationNumber { get; set; }
public DigestData DigestValue { get; set; }
public CubicMeter Displacement { get; set; }
@@ -95,9 +95,6 @@ namespace TUGraz.VectoCore.Tests.Utils
public KilogramSquareMeter Inertia { get; set; }
public double WHTCEngineering { get; set; }
- public Second EngineStartTime
- {
- get { return DeclarationData.Engine.DefaultEngineStartTime; }
- }
+ public Second EngineStartTime => DeclarationData.Engine.DefaultEngineStartTime;
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Utils/MockGearbox.cs b/VectoCore/VectoCoreTest/Utils/MockGearbox.cs
index eedfc96df31bd72c6168c381c1c2d998ab63aa64..8f656aa0f2f11b41ab940f0c0c43e3ea5b921a6d 100644
--- a/VectoCore/VectoCoreTest/Utils/MockGearbox.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockGearbox.cs
@@ -68,27 +68,15 @@ namespace TUGraz.VectoCore.Tests.Utils
public bool TCLocked { get; set; }
public GearshiftPosition NextGear { get; private set; }
- public Second TractionInterruption
- {
- get { return 1.SI<Second>(); }
- }
+ public Second TractionInterruption => 1.SI<Second>();
public uint NumGears { get; set; }
- public MeterPerSecond StartSpeed
- {
- get { return 2.SI<MeterPerSecond>(); }
- }
+ public MeterPerSecond StartSpeed => 2.SI<MeterPerSecond>();
- public MeterPerSquareSecond StartAcceleration
- {
- get { return 0.6.SI<MeterPerSquareSecond>(); }
- }
+ public MeterPerSquareSecond StartAcceleration => 0.6.SI<MeterPerSquareSecond>();
- public NewtonMeter GearMaxTorque
- {
- get { return null; }
- }
+ public NewtonMeter GearMaxTorque => null;
public Watt GearboxLoss()
{
@@ -97,15 +85,9 @@ namespace TUGraz.VectoCore.Tests.Utils
public Second LastShift { get; private set; }
- public Second LastUpshift
- {
- get { throw new NotImplementedException(); }
- }
+ public Second LastUpshift => throw new NotImplementedException();
- public Second LastDownshift
- {
- get { throw new NotImplementedException(); }
- }
+ public Second LastDownshift => throw new NotImplementedException();
public GearData GetGearData(uint gear)
{
@@ -154,10 +136,7 @@ namespace TUGraz.VectoCore.Tests.Utils
return _clutchClosed;
}
- public Watt ClutchLosses
- {
- get { throw new NotImplementedException(); }
- }
+ public Watt ClutchLosses => throw new NotImplementedException();
public void SetClutch(bool closed)
{
@@ -200,10 +179,7 @@ namespace TUGraz.VectoCore.Tests.Utils
}
public Tuple<PerSecond, NewtonMeter> CurrentAxleDemand { get; }
- public double Ratio
- {
- get { return 1; }
- }
+ public double Ratio => 1;
protected override void DoWriteModalResults(Second time, Second simulationInterval, IModalDataContainer container)
{
diff --git a/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs b/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
index 2b6c8f979119c6687a0cb1d961df683138b885b9..5d2f6c1de1d9bd079dadf926f314ee62837b78ce 100644
--- a/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
@@ -105,10 +105,7 @@ namespace TUGraz.VectoCore.Tests.Utils
public ModalResults Data { get; set; }
public DataRow CurrentRow { get; set; }
- public string ModFileName
- {
- get { return ""; }
- }
+ public string ModFileName => "";
public object this[ModalResultField key, IFuelProperties fuel]
{
@@ -130,14 +127,14 @@ namespace TUGraz.VectoCore.Tests.Utils
public object this[ModalResultField key, PowertrainPosition pos]
{
- get { throw new NotImplementedException(); }
- set { throw new NotImplementedException(); }
+ get => throw new NotImplementedException();
+ set => throw new NotImplementedException();
}
public object this[string auxId]
{
- get { return CurrentRow[Auxiliaries[auxId]]; }
- set { CurrentRow[Auxiliaries[auxId]] = value; }
+ get => CurrentRow[Auxiliaries[auxId]];
+ set => CurrentRow[Auxiliaries[auxId]] = value;
}
public bool HasTorqueConverter { get; set; }
@@ -148,27 +145,15 @@ namespace TUGraz.VectoCore.Tests.Utils
CurrentRow = Data.NewRow();
}
- IList<IFuelProperties> IModalDataContainer.FuelData { get { return FuelColumns.Keys.ToList(); } }
+ IList<IFuelProperties> IModalDataContainer.FuelData => FuelColumns.Keys.ToList();
- public FuelData.Entry FuelData
- {
- get { return VectoCore.Models.Declaration.FuelData.Diesel; }
- }
+ public FuelData.Entry FuelData => VectoCore.Models.Declaration.FuelData.Diesel;
- public VectoRun.Status RunStatus
- {
- get { return VectoRun.Status.Success; }
- }
+ public VectoRun.Status RunStatus => VectoRun.Status.Success;
- public string Error
- {
- get { return null; }
- }
+ public string Error => null;
- public string StackTrace
- {
- get { return null; }
- }
+ public string StackTrace => null;
public void Finish(VectoRun.Status runStatus, Exception exception = null) {}
@@ -239,15 +224,9 @@ namespace TUGraz.VectoCore.Tests.Utils
}
- public Second Duration
- {
- get { return _duration; }
- }
+ public Second Duration => _duration;
- public Meter Distance
- {
- get { return _distance; }
- }
+ public Meter Distance => _distance;
public Func<Second, Joule, Joule> AuxHeaterDemandCalc { get; set; }
@@ -365,8 +344,8 @@ namespace TUGraz.VectoCore.Tests.Utils
public object this[ModalResultField key]
{
- get { return CurrentRow[key.GetName()]; }
- set { CurrentRow[key.GetName()] = value; }
+ get => CurrentRow[key.GetName()];
+ set => CurrentRow[key.GetName()] = value;
}
public void CommitSimulationStep(Second absTime, Second simulationInterval)
diff --git a/VectoCore/VectoCoreTest/Utils/MockPorts.cs b/VectoCore/VectoCoreTest/Utils/MockPorts.cs
index 65df8f6a22d61ed3bedf114c7b2001827792dfee..336f703fd6a558a0d9b2619d9829bdfbc6cb1ffc 100644
--- a/VectoCore/VectoCoreTest/Utils/MockPorts.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockPorts.cs
@@ -110,15 +110,9 @@ namespace TUGraz.VectoCore.Tests.Utils
AngularVelocity = null;
}
- public PerSecond EngineSpeed
- {
- get { return AngularVelocity; }
- }
+ public PerSecond EngineSpeed => AngularVelocity;
- public NewtonMeter EngineTorque
- {
- get { return Torque; }
- }
+ public NewtonMeter EngineTorque => Torque;
public Watt EngineStationaryFullPower(PerSecond angularSpeed)
{
@@ -140,24 +134,16 @@ namespace TUGraz.VectoCore.Tests.Utils
throw new NotImplementedException();
}
- public PerSecond EngineIdleSpeed
- {
- get { return 560.RPMtoRad(); }
- }
+ public PerSecond EngineIdleSpeed => 560.RPMtoRad();
- public PerSecond EngineRatedSpeed
- {
+ public PerSecond EngineRatedSpeed =>
// just a test value. not real.
- get { return 1600.SI<PerSecond>(); }
- }
+ 1600.SI<PerSecond>();
public PerSecond EngineN95hSpeed { get; set; }
public PerSecond EngineN80hSpeed { get; set; }
- public bool EngineOn
- {
- get { throw new NotImplementedException(); }
- }
+ public bool EngineOn => throw new NotImplementedException();
}
public class MockDrivingCycleOutPort : LoggingObject, IDrivingCycleOutPort
diff --git a/VectoCore/VectoCoreTest/Utils/MockVehicle.cs b/VectoCore/VectoCoreTest/Utils/MockVehicle.cs
index bf9741d401c0fc8c2b7162c20bd0f51d4064b66e..3e83a0ec1916b4a205acea74bdb5c28e889bfe8e 100644
--- a/VectoCore/VectoCoreTest/Utils/MockVehicle.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockVehicle.cs
@@ -66,30 +66,15 @@ namespace TUGraz.VectoCore.Tests.Utils
return this;
}
- public MeterPerSecond VehicleSpeed
- {
- get { return MyVehicleSpeed; }
- }
+ public MeterPerSecond VehicleSpeed => MyVehicleSpeed;
- public bool VehicleStopped
- {
- get { return MyVehicleSpeed.IsEqual(0.SI<MeterPerSecond>(), 0.01.SI<MeterPerSecond>()); }
- }
+ public bool VehicleStopped => MyVehicleSpeed.IsEqual(0.SI<MeterPerSecond>(), 0.01.SI<MeterPerSecond>());
- public Kilogram VehicleMass
- {
- get { return 7500.SI<Kilogram>(); }
- }
+ public Kilogram VehicleMass => 7500.SI<Kilogram>();
- public Kilogram VehicleLoading
- {
- get { return 0.SI<Kilogram>(); }
- }
+ public Kilogram VehicleLoading => 0.SI<Kilogram>();
- public Kilogram TotalMass
- {
- get { return VehicleMass; }
- }
+ public Kilogram TotalMass => VehicleMass;
public CubicMeter CargoVolume { get; set; }
@@ -108,7 +93,7 @@ namespace TUGraz.VectoCore.Tests.Utils
return 0.SI<Newton>();
}
- public MeterPerSecond MaxVehicleSpeed { get { return null; } }
+ public MeterPerSecond MaxVehicleSpeed => null;
public void Connect(IFvOutPort other)
{
@@ -144,9 +129,6 @@ namespace TUGraz.VectoCore.Tests.Utils
public Radian gradient;
}
- public Meter Distance
- {
- get { return 0.SI<Meter>(); }
- }
+ public Meter Distance => 0.SI<Meter>();
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
index c4a7bca1e3c615bfeda8a5a3ad477609c77eb611..d9e2dda5348e2a790f6400e9288e6a1f5e429425 100644
--- a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
@@ -58,47 +58,23 @@ namespace TUGraz.VectoCore.Tests.Utils
private ITorqueConverter _torqueConverter;
private IGearboxInfo _gearboxInfoImplementation;
- public IAxlegearInfo AxlegearInfo
- {
- get { return this; }
- }
+ public IAxlegearInfo AxlegearInfo => this;
public IEngineInfo EngineInfo { get; set; }
- public IEngineControl EngineCtl
- {
- get { return this; }
- }
+ public IEngineControl EngineCtl => this;
- public IVehicleInfo VehicleInfo
- {
- get { return this; }
- }
+ public IVehicleInfo VehicleInfo => this;
- public IClutchInfo ClutchInfo
- {
- get { return this; }
- }
+ public IClutchInfo ClutchInfo => this;
- public IBrakes Brakes
- {
- get { return this; }
- }
+ public IBrakes Brakes => this;
- public IWheelsInfo WheelsInfo
- {
- get { return this; }
- }
+ public IWheelsInfo WheelsInfo => this;
- public IDriverInfo DriverInfo
- {
- get { return this; }
- }
+ public IDriverInfo DriverInfo => this;
- public IDrivingCycleInfo DrivingCycleInfo
- {
- get { return this; }
- }
+ public IDrivingCycleInfo DrivingCycleInfo => this;
public GearboxType GearboxType { get; set; }
@@ -106,10 +82,7 @@ namespace TUGraz.VectoCore.Tests.Utils
public bool TCLocked { get; set; }
public GearshiftPosition NextGear { get; private set; }
- public Second TractionInterruption
- {
- get { return 1.SI<Second>(); }
- }
+ public Second TractionInterruption => 1.SI<Second>();
public uint NumGears { get; set; }
@@ -117,27 +90,15 @@ namespace TUGraz.VectoCore.Tests.Utils
public MeterPerSquareSecond StartAcceleration { get; set; }
public NewtonMeter GearMaxTorque { get; set; }
- public FuelType FuelType
- {
- get { return FuelType.DieselCI; }
- }
+ public FuelType FuelType => FuelType.DieselCI;
public Second AbsTime { get; set; }
- public IMileageCounter MileageCounter
- {
- get { return this; }
- }
+ public IMileageCounter MileageCounter => this;
- public IGearboxInfo GearboxInfo
- {
- get { return this; }
- }
+ public IGearboxInfo GearboxInfo => this;
- public IGearboxControl GearboxCtl
- {
- get { return this; }
- }
+ public IGearboxControl GearboxCtl => this;
public IElectricMotorInfo ElectricMotorInfo(PowertrainPosition pos)
{
@@ -150,30 +111,18 @@ namespace TUGraz.VectoCore.Tests.Utils
set;
}
- public ITorqueConverterInfo TorqueConverterInfo
- {
- get { return _torqueConverter; }
- }
+ public ITorqueConverterInfo TorqueConverterInfo => _torqueConverter;
- public ITorqueConverterControl TorqueConverterCtl
- {
- get { return _torqueConverter; }
- }
+ public ITorqueConverterControl TorqueConverterCtl => _torqueConverter;
- public IPowertainInfo PowertrainInfo
- {
- get { return this; }
- }
+ public IPowertainInfo PowertrainInfo => this;
public IHybridControllerInfo HybridControllerInfo { get; }
public IHybridControllerCtl HybridControllerCtl { get; }
public IAngledriveInfo AngledriveInfo { get; }
public IDCDCConverter DCDCConverter { get; }
- public bool IsTestPowertrain
- {
- get { return false; }
- }
+ public bool IsTestPowertrain => false;
public Watt GearboxLoss()
{
@@ -181,15 +130,9 @@ namespace TUGraz.VectoCore.Tests.Utils
}
public Second LastShift { get; set; }
- public Second LastUpshift
- {
- get { return _gearboxInfoImplementation.LastUpshift; }
- }
+ public Second LastUpshift => _gearboxInfoImplementation.LastUpshift;
- public Second LastDownshift
- {
- get { return _gearboxInfoImplementation.LastDownshift; }
- }
+ public Second LastDownshift => _gearboxInfoImplementation.LastDownshift;
public GearData GetGearData(uint gear)
{
@@ -219,30 +162,15 @@ namespace TUGraz.VectoCore.Tests.Utils
throw new NotImplementedException();
}
- public PerSecond EngineIdleSpeed
- {
- get { return EngineInfo.EngineIdleSpeed; }
- }
+ public PerSecond EngineIdleSpeed => EngineInfo.EngineIdleSpeed;
- public PerSecond EngineRatedSpeed
- {
- get { return EngineInfo.EngineRatedSpeed; }
- }
+ public PerSecond EngineRatedSpeed => EngineInfo.EngineRatedSpeed;
- public PerSecond EngineN95hSpeed
- {
- get { return EngineInfo.EngineN95hSpeed; }
- }
+ public PerSecond EngineN95hSpeed => EngineInfo.EngineN95hSpeed;
- public PerSecond EngineN80hSpeed
- {
- get { return EngineInfo.EngineN80hSpeed; }
- }
+ public PerSecond EngineN80hSpeed => EngineInfo.EngineN80hSpeed;
- public bool EngineOn
- {
- get { return EngineInfo.EngineOn; }
- }
+ public bool EngineOn => EngineInfo.EngineOn;
public MeterPerSecond VehicleSpeed { get; set; }
public Kilogram VehicleMass { get; set; }
@@ -265,13 +193,13 @@ namespace TUGraz.VectoCore.Tests.Utils
return 0.SI<Newton>();
}
- public MeterPerSecond MaxVehicleSpeed { get { return null; } }
+ public MeterPerSecond MaxVehicleSpeed => null;
public Meter Distance { get; set; }
public bool SetClutchClosed
{
- set { _clutchClosed = value; }
+ set => _clutchClosed = value;
}
public bool ClutchClosed(Second absTime)
@@ -279,10 +207,7 @@ namespace TUGraz.VectoCore.Tests.Utils
return _clutchClosed;
}
- public Watt ClutchLosses
- {
- get { throw new NotImplementedException(); }
- }
+ public Watt ClutchLosses => throw new NotImplementedException();
public Watt BrakePower { get; set; }
public Radian RoadGradient { get; set; }
@@ -354,7 +279,7 @@ namespace TUGraz.VectoCore.Tests.Utils
public Watt SetAxlegearLoss
{
- set { _axlegearLoss = value; }
+ set => _axlegearLoss = value;
}
public Watt AxlegearLoss()