Merge pull request #260 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:develop to develop

* commit '42a1a13c':
  undo renaming of methods during refactoring, make static fields accessible

VECTO.sln.DotSettings

@@ -30,6 +30,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RP/@EntryIndexedValue">RP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SI/@EntryIndexedValue">SI</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WHTC/@EntryIndexedValue">WHTC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XML/@EntryIndexedValue">XML</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>

VECTO/GUI/VehicleForm.vb

@@ -359,9 +359,9 @@ Public Class VehicleForm
 
 
 		cbAngledriveType.SelectedValue = angledrive.Type
-		tbAngledriveRatio.Text = angledrive.IAngledriveInputData_Ratio.ToGUIFormat()
+		tbAngledriveRatio.Text = angledrive.Ratio.ToGUIFormat()
 		tbAngledriveLossMapPath.Text =
-			If(angledrive.IAngledriveInputData_LossMap Is Nothing, "", GetRelativePath(angledrive.IAngledriveInputData_LossMap.Source, basePath))
+			If(angledrive.LossMap Is Nothing, "", GetRelativePath(angledrive.LossMap.Source, basePath))
 
 		LvRRC.Items.Clear()
 		Dim i As Integer = 0

VECTO/Input Files/Vehicle.vb

@@ -437,36 +437,40 @@ Public Class Vehicle
 		End Get
 	End Property
 
-	Public ReadOnly Property IAngledriveInputData_Ratio As Double Implements IAngledriveInputData.IAngledriveInputData_Ratio
+	Public ReadOnly Property IRetarderInputData_Ratio As Double Implements IRetarderInputData.Ratio
 		Get
-			Return AngledriveRatio
+
+			Return RetarderRatio
 		End Get
 	End Property
 
-	Public ReadOnly Property AngledriveInputDataType As AngledriveType Implements IAngledriveInputData.Type
+	Public ReadOnly Property Ratio As Double Implements IAngledriveInputData.Ratio
 		Get
-			Return AngledriveType
+			Return AngledriveRatio
 		End Get
 	End Property
 
-	Public ReadOnly Property Ratio As Double Implements IRetarderInputData.Ratio
+	Public ReadOnly Property IRetarderInputData_LossMap As TableData Implements IRetarderInputData.LossMap
 		Get
-			Return RetarderRatio
+
+			Return VectoCSVFile.Read(RetarderLossMapFile.FullPath)
 		End Get
 	End Property
 
-	Public ReadOnly Property IAngledriveInputData_LossMap As TableData Implements IAngledriveInputData.IAngledriveInputData_LossMap
+	Public ReadOnly Property AngledriveInputDataType As AngledriveType Implements IAngledriveInputData.Type
 		Get
-			Return VectoCSVFile.Read(AngledriveLossMapFile.FullPath)
+			Return AngledriveType
 		End Get
 	End Property
 
-	Public ReadOnly Property LossMap As TableData Implements IRetarderInputData.LossMap
+
+	Public ReadOnly Property LossMap As TableData Implements IAngledriveInputData.LossMap
 		Get
-			Return VectoCSVFile.Read(RetarderLossMapFile.FullPath)
+			Return VectoCSVFile.Read(AngledriveLossMapFile.FullPath)
 		End Get
 	End Property
 
+
 	Public ReadOnly Property Efficiency As Double Implements IAngledriveInputData.Efficiency
 		Get
 			Return If(IsNumeric(AngledriveLossMapFile.OriginalPath), AngledriveLossMapFile.OriginalPath.ToDouble(), -1.0)
@@ -477,20 +481,20 @@ Public Class Vehicle
 
 	Public ReadOnly Property PTOTransmissionType As String Implements IPTOTransmissionInputData.PTOTransmissionType
 		Get
-			Return PTOType
+			Return PtoType
 		End Get
 	End Property
 
 	Public ReadOnly Property IPTOTransmissionInputData_PTOCycle As TableData Implements IPTOTransmissionInputData.PTOCycle
 		Get
-			Return VectoCSVFile.Read(PTOCycle.FullPath)
+			Return VectoCSVFile.Read(PtoCycle.FullPath)
 		End Get
 	End Property
 
 	Public ReadOnly Property IPTOTransmissionInputData_PTOLossMap As TableData _
 		Implements IPTOTransmissionInputData.PTOLossMap
 		Get
-			Return VectoCSVFile.Read(PTOLossMap.FullPath)
+			Return VectoCSVFile.Read(PtoLossMap.FullPath)
 		End Get
 	End Property
 End Class
\ No newline at end of file

VectoCommon/VectoCommon/InputData/DeclarationInputData.cs

@@ -145,12 +145,12 @@ namespace TUGraz.VectoCommon.InputData
 		/// <summary>
 		/// P176
 		/// </summary>
-		double IAngledriveInputData_Ratio { get; }
+		double Ratio { get; }
 
 		/// <summary>
 		/// P173, P174, P175
 		/// </summary>
-		TableData IAngledriveInputData_LossMap { get; }
+		TableData LossMap { get; }
 
 		/// <summary>
 		/// P177

VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs

@@ -180,12 +180,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		double IAngledriveInputData.IAngledriveInputData_Ratio
+		double IAngledriveInputData.Ratio
 		{
 			get { return Body.GetEx(JsonKeys.Vehicle_Angledrive).GetEx<double>(JsonKeys.Vehicle_Angledrive_Ratio); }
 		}
 
-		TableData IAngledriveInputData.IAngledriveInputData_LossMap
+		TableData IAngledriveInputData.LossMap
 		{
 			get
 			{

VectoCore/VectoCore/InputData/Reader/ComponentData/PTOIdleLossMapReader.cs

@@ -54,7 +54,7 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
 				}).OrderBy(e => e.EngineSpeed).ToArray());
 		}
 
-		private static class Fields
+		public static class Fields
 		{
 			/// <summary>
 			///     [rpm]

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs

@@ -191,17 +191,17 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 							DigestValue = data.DigestValue,
 							IntegrityStatus = data.IntegrityStatus,
 							Type = type,
-							Angledrive = new TransmissionData { Ratio = data.IAngledriveInputData_Ratio }
+							Angledrive = new TransmissionData { Ratio = data.Ratio }
 						};
 						try {
-							angledriveData.Angledrive.LossMap = TransmissionLossMapReader.Create(data.IAngledriveInputData_LossMap,
-								data.IAngledriveInputData_Ratio, "Angledrive");
+							angledriveData.Angledrive.LossMap = TransmissionLossMapReader.Create(data.LossMap,
+								data.Ratio, "Angledrive");
 						} catch (VectoException ex) {
 							Log.Info("Angledrive Loss Map not found.");
 							if (useEfficiencyFallback) {
 								Log.Info("Angledrive Trying with Efficiency instead of Loss Map.");
 								angledriveData.Angledrive.LossMap = TransmissionLossMapReader.Create(data.Efficiency,
-									data.IAngledriveInputData_Ratio, "Angledrive");
+									data.Ratio, "Angledrive");
 							} else {
 								throw new VectoException("Angledrive: LossMap not found.", ex);
 							}

VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs

@@ -300,7 +300,7 @@ namespace TUGraz.VectoCore.InputData.Reader
 			return true;
 		}
 
-		private static class Fields
+		public static class Fields
 		{
 			public const string PTOTorque = "PTO Torque";
 			public const string EngineSpeedFull = "Engine Speed";

VectoCore/VectoCore/Models/Declaration/DeclarationData.cs

@@ -38,6 +38,7 @@ using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.Models.SimulationComponent.Data;
 using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
+using TUGraz.VectoCore.Utils;
 
 namespace TUGraz.VectoCore.Models.Declaration
 {
@@ -196,6 +197,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 				public const double DecisionFactorCoastingScaling = 1.5;
 				public const double LookAheadDistanceFactor = 10;
 				public static readonly MeterPerSecond MinimumSpeed = 50.KMPHtoMeterPerSecond();
+
 			}
 
 			public static class OverSpeedEcoRoll

VectoCore/VectoCore/Models/Declaration/LACDecisionFactor.cs

@@ -69,7 +69,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 			return _offset - _scaling * _vTarget.Lookup(targetVelocity) * _vDrop.Lookup(velocityDrop);
 		}
 
-		private sealed class LACDecisionFactorVdrop : LookupData<MeterPerSecond, double>
+		public sealed class LACDecisionFactorVdrop : LookupData<MeterPerSecond, double>
 		{
 			protected override string ResourceId
 			{
@@ -116,14 +116,14 @@ namespace TUGraz.VectoCore.Models.Declaration
 				}
 			}
 
-			private static class Fields
+			public static class Fields
 			{
 				public const string DecisionFactor = "decision_factor";
 				public const string VelocityDrop = "v_drop";
 			}
 		}
 
-		private sealed class LACDecisionFactorVTarget : LookupData<MeterPerSecond, double>
+		public sealed class LACDecisionFactorVTarget : LookupData<MeterPerSecond, double>
 		{
 			protected override string ResourceId
 			{
@@ -170,7 +170,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 				}
 			}
 
-			private static class Fields
+			public static class Fields
 			{
 				public const string TargetVelocity = "v_target";
 				public const string DecisionFactor = "decision_factor";