renamed MakeAndModel to ModelName

VectoCore/InputData/DeclarationInputData.cs

@@ -52,7 +52,7 @@ namespace TUGraz.VectoCore.InputData
 
 		string Vendor { get; }
 
-		string MakeAndModel { get; }
+		string ModelName { get; }
 
 		string Creator { get; }
 

VectoCore/InputData/FileIO/JSON/JSONEngineData.cs

@@ -115,7 +115,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return "N/A"; }
 		}
 
-		public string MakeAndModel
+		public string ModelName
 		{
 			get { return Body.GetEx<string>(JsonKeys.Engine_ModelName); }
 		}

VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs

@@ -89,11 +89,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		#region IGearboxInputData
 
-		public virtual string ModelName
-		{
-			get { return Body.GetEx<string>(JsonKeys.Gearbox_ModelName); }
-		}
-
 		public virtual GearboxType Type
 		{
 			get { return Body.GetEx<string>(JsonKeys.Gearbox_GearboxType).ParseEnum<GearboxType>(); }
@@ -225,9 +220,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return "N/A"; }
 		}
 
-		public string MakeAndModel
+		public string ModelName
 		{
-			get { return "N/A"; }
+			get { return Body.GetEx<string>(JsonKeys.Gearbox_ModelName); }
 		}
 
 		public string Creator

VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs

@@ -149,11 +149,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		#region IRetarderInputData
 
-		public string ModelName
-		{
-			get { return ""; }
-		}
-
 		public virtual RetarderData.RetarderType Type
 		{
 			get
@@ -183,7 +178,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return "N/A"; }
 		}
 
-		public string MakeAndModel
+		public string ModelName
 		{
 			get { return "N/A"; }
 		}

VectoCore/InputData/Impl/InputData.cs

@@ -100,7 +100,7 @@ namespace TUGraz.VectoCore.InputData.Impl
 
 		public string Vendor { get; internal set; }
 
-		public string MakeAndModel { get; internal set; }
+		public string ModelName { get; internal set; }
 
 		public string Creator { get; internal set; }
 

VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs

@@ -48,7 +48,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			var retVal = new VehicleData {
 				SavedInDeclarationMode = data.SavedInDeclarationMode,
 				Vendor = data.Vendor,
-				MakeAndModel = data.MakeAndModel,
+				ModelName = data.ModelName,
 				Creator = data.Creator,
 				Date = data.Date,
 				TypeId = data.TypeId,
@@ -76,7 +76,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			var retarder = new RetarderData {
 				SavedInDeclarationMode = data.SavedInDeclarationMode,
 				Vendor = data.Vendor,
-				MakeAndModel = data.MakeAndModel,
+				ModelName = data.ModelName,
 				Creator = data.Creator,
 				Date = data.Date,
 				TypeId = data.TypeId,
@@ -96,7 +96,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			var retVal = new CombustionEngineData {
 				SavedInDeclarationMode = data.SavedInDeclarationMode,
 				Vendor = data.Vendor,
-				MakeAndModel = data.MakeAndModel,
+				ModelName = data.ModelName,
 				Creator = data.Creator,
 				Date = data.Date,
 				TypeId = data.TypeId,
@@ -117,7 +117,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			return new GearboxData {
 				SavedInDeclarationMode = data.SavedInDeclarationMode,
 				Vendor = data.Vendor,
-				MakeAndModel = data.MakeAndModel,
+				ModelName = data.ModelName,
 				Creator = data.Creator,
 				Date = data.Date,
 				TypeId = data.TypeId,
@@ -133,7 +133,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			return new AxleGearData() {
 				SavedInDeclarationMode = data.SavedInDeclarationMode,
 				Vendor = data.Vendor,
-				MakeAndModel = data.MakeAndModel,
+				ModelName = data.ModelName,
 				Creator = data.Creator,
 				Date = data.Date,
 				TypeId = data.TypeId,

VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs

@@ -68,7 +68,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
 
 		protected bool Equals(CombustionEngineData other)
 		{
-			return Equals(FullLoadCurve, other.FullLoadCurve) && string.Equals(MakeAndModel, other.MakeAndModel) &&
+			return Equals(FullLoadCurve, other.FullLoadCurve) && string.Equals(ModelName, other.ModelName) &&
 					Equals(Displacement, other.Displacement) && Equals(IdleSpeed, other.IdleSpeed) && Equals(Inertia, other.Inertia) &&
 					Equals(WHTCUrban, other.WHTCUrban) && Equals(WHTCRural, other.WHTCRural) &&
 					Equals(WHTCMotorway, other.WHTCMotorway) && Equals(ConsumptionMap, other.ConsumptionMap);
@@ -92,7 +92,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
 		{
 			unchecked {
 				var hashCode = (FullLoadCurve != null ? FullLoadCurve.GetHashCode() : 0);
-				hashCode = (hashCode * 397) ^ (MakeAndModel != null ? MakeAndModel.GetHashCode() : 0);
+				hashCode = (hashCode * 397) ^ (ModelName != null ? ModelName.GetHashCode() : 0);
 				hashCode = (hashCode * 397) ^ (Displacement != null ? Displacement.GetHashCode() : 0);
 				hashCode = (hashCode * 397) ^ (IdleSpeed != null ? IdleSpeed.GetHashCode() : 0);
 				hashCode = (hashCode * 397) ^ (Inertia != null ? Inertia.GetHashCode() : 0);

VectoCore/Models/SimulationComponent/Data/GearboxData.cs

@@ -45,12 +45,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
 	[DataContract]
 	public class GearboxData : SimulationComponentData
 	{
-		/// <summary>
-		/// The name of the gearbox model.
-		/// </summary>
-		[Required]
-		public string ModelName { get; internal set; }
-
 		/// <summary>
 		/// The gear data.
 		/// </summary>

VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs

@@ -39,7 +39,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
 
 		public string Vendor { get; internal set; }
 
-		public string MakeAndModel { get; internal set; }
+		public string ModelName { get; internal set; }
 
 		public string Creator { get; internal set; }
 		public string Date { get; internal set; }

VectoCore/OutputData/PDF/PDFDeclarationReport.cs

@@ -91,7 +91,7 @@ namespace TUGraz.VectoCore.OutputData.PDF
 
 		protected override void DoInitializeReport(VectoRunData modelData, Segment segment)
 		{
-			EngineModel = modelData.EngineData.MakeAndModel;
+			EngineModel = modelData.EngineData.ModelName;
 			EngineStr = string.Format("{0} l, {1} kW",
 				modelData.EngineData.Displacement.ConvertTo().Cubic.Dezi.Meter.ToOutputFormat(1),
 				modelData.EngineData.FullLoadCurve.MaxPower.ConvertTo().Kilo.Watt.ToOutputFormat(0));

VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs

@@ -73,7 +73,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
 			fullLoad.Rows.Add("3", "3", "-3", "3");
 
 			var data = new CombustionEngineData {
-				MakeAndModel = "asdf",
+				ModelName = "asdf",
 				Displacement = 6374.SI().Cubic.Centi.Meter.Cast<CubicMeter>(),
 				IdleSpeed = 560.RPMtoRad(),
 				Inertia = 1.SI<KilogramSquareMeter>(),