refactor: use type keyword

VectoCore/FileIO/Reader/DataObjectAdaper/DeclarationDataAdapter.cs

@@ -81,7 +81,7 @@ namespace TUGraz.VectoCore.FileIO.Reader.DataObjectAdaper
 			};
 			if (!DeclarationData.Driver.OverSpeedEcoRoll.AllowedModes.Contains(overspeedData.Mode)) {
 				throw new VectoSimulationException(
-					String.Format("Specified Overspeed/EcoRoll Mode not allowed in declaration mode! {0}", overspeedData.Mode));
+					string.Format("Specified Overspeed/EcoRoll Mode not allowed in declaration mode! {0}", overspeedData.Mode));
 			}
 			var startstopData = new VectoRunData.StartStopData() {
 				Enabled = data.StartStop.Enabled,
@@ -114,7 +114,7 @@ namespace TUGraz.VectoCore.FileIO.Reader.DataObjectAdaper
 
 			if (data.AxleConfig.Axles.Count < mission.AxleWeightDistribution.Length) {
 				throw new VectoException(
-					String.Format("Vehicle does not contain sufficient axles. {0} axles defined, {1} axles required",
+					string.Format("Vehicle does not contain sufficient axles. {0} axles defined, {1} axles required",
 						data.AxleConfig.Axles.Count, mission.AxleWeightDistribution.Count()));
 			}
 			retVal.AxleData = new List<Axle>();
@@ -190,7 +190,7 @@ namespace TUGraz.VectoCore.FileIO.Reader.DataObjectAdaper
 						TorqueConverterActive = false
 					};
 				} else {
-					var fullLoad = !String.IsNullOrEmpty(gearSettings.FullLoadCurve) && !gearSettings.FullLoadCurve.Equals("<NOFILE>")
+					var fullLoad = !string.IsNullOrEmpty(gearSettings.FullLoadCurve) && !gearSettings.FullLoadCurve.Equals("<NOFILE>")
 						? GearFullLoadCurve.ReadFromFile(Path.Combine(gearbox.BasePath, gearSettings.FullLoadCurve))
 						: null;
 					var shiftPolygon = DeclarationData.Gearbox.ComputeShiftPolygon(fullLoad, engine);

VectoCore/FileIO/Reader/DataObjectAdaper/EngineeringDataAdapter.cs

@@ -168,10 +168,10 @@ namespace TUGraz.VectoCore.FileIO.Reader.DataObjectAdaper
 				var lossMapPath = Path.Combine(gearbox.BasePath, gearSettings.LossMap);
 				TransmissionLossMap lossMap = TransmissionLossMap.ReadFromFile(lossMapPath, gearSettings.Ratio);
 
-				var shiftPolygon = !String.IsNullOrEmpty(gearSettings.ShiftPolygon)
+				var shiftPolygon = !string.IsNullOrEmpty(gearSettings.ShiftPolygon)
 					? ShiftPolygon.ReadFromFile(Path.Combine(gearbox.BasePath, gearSettings.ShiftPolygon))
 					: null;
-				var fullLoad = !String.IsNullOrEmpty(gearSettings.FullLoadCurve) && !gearSettings.FullLoadCurve.Equals("<NOFILE>")
+				var fullLoad = !string.IsNullOrEmpty(gearSettings.FullLoadCurve) && !gearSettings.FullLoadCurve.Equals("<NOFILE>")
 					? GearFullLoadCurve.ReadFromFile(Path.Combine(gearbox.BasePath, gearSettings.FullLoadCurve))
 					: null;
 

VectoCore/FileIO/Reader/DrivingCycleDataReader.cs

@@ -273,22 +273,22 @@ namespace TUGraz.VectoCore.FileIO.Reader
 						header.Where(
 							col => !(allowedCols.Contains(col) || col.StartsWith(Fields.AuxiliarySupplyPower)))
 					) {
-					throw new VectoException(String.Format("Column '{0}' is not allowed.", col));
+					throw new VectoException(string.Format("Column '{0}' is not allowed.", col));
 				}
 
 				if (!header.Contains(Fields.VehicleSpeed)) {
-					throw new VectoException(String.Format((string)"Column '{0}' is missing.",
+					throw new VectoException(string.Format((string)"Column '{0}' is missing.",
 						(object)Fields.VehicleSpeed));
 				}
 
 				if (!header.Contains(Fields.Distance)) {
-					throw new VectoException(String.Format((string)"Column '{0}' is missing.", (object)Fields.Distance));
+					throw new VectoException(string.Format((string)"Column '{0}' is missing.", (object)Fields.Distance));
 				}
 
 				if (header.Contains(Fields.AirSpeedRelativeToVehicle) ^
 					header.Contains(Fields.WindYawAngle)) {
 					throw new VectoException(
-						String.Format("Both Columns '{0}' and '{1}' must be defined, or none of them.",
+						string.Format("Both Columns '{0}' and '{1}' must be defined, or none of them.",
 							Fields.AirSpeedRelativeToVehicle, Fields.WindYawAngle));
 				}
 			}
@@ -343,18 +343,18 @@ namespace TUGraz.VectoCore.FileIO.Reader
 						header.Where(
 							col => !(allowedCols.Contains(col) || col.StartsWith(Fields.AuxiliarySupplyPower)))
 					) {
-					throw new VectoException(String.Format("Column '{0}' is not allowed.", col));
+					throw new VectoException(string.Format("Column '{0}' is not allowed.", col));
 				}
 
 				if (!header.Contains(Fields.VehicleSpeed)) {
-					throw new VectoException(String.Format((string)"Column '{0}' is missing.",
+					throw new VectoException(string.Format((string)"Column '{0}' is missing.",
 						(object)Fields.VehicleSpeed));
 				}
 
 				if (header.Contains(Fields.AirSpeedRelativeToVehicle) ^
 					header.Contains(Fields.WindYawAngle)) {
 					throw new VectoException(
-						String.Format("Both Columns '{0}' and '{1}' must be defined, or none of them.",
+						string.Format("Both Columns '{0}' and '{1}' must be defined, or none of them.",
 							Fields.AirSpeedRelativeToVehicle, Fields.WindYawAngle));
 				}
 			}
@@ -411,17 +411,17 @@ namespace TUGraz.VectoCore.FileIO.Reader
 				};
 
 				foreach (var col in header.Where(col => !allowedCols.Contains(col))) {
-					throw new VectoException(String.Format("Column '{0}' is not allowed.", col));
+					throw new VectoException(string.Format("Column '{0}' is not allowed.", col));
 				}
 
 				if (!header.Contains(Fields.EngineSpeed)) {
-					throw new VectoException(String.Format((string)"Column '{0}' is missing.",
+					throw new VectoException(string.Format((string)"Column '{0}' is missing.",
 						(object)Fields.EngineSpeed));
 				}
 
 				if (!(header.Contains(Fields.EngineTorque) || header.Contains(Fields.EnginePower))) {
 					throw new VectoException(
-						String.Format("Columns missing: Either column '{0}' or column '{1}' must be defined.",
+						string.Format("Columns missing: Either column '{0}' or column '{1}' must be defined.",
 							Fields.EngineTorque, Fields.EnginePower));
 				}
 

VectoCore/Models/Declaration/DeclarationData.cs

@@ -129,7 +129,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 		{
 			public static class LookAhead
 			{
-				public const Boolean Enabled = true;
+				public const bool Enabled = true;
 				public static readonly MeterPerSquareSecond Deceleration = 0.5.SI<MeterPerSquareSecond>();
 				public static readonly MeterPerSecond MinimumSpeed = 50.KMPHtoMeterPerSecond();
 			}

VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs

@@ -159,9 +159,9 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			//var modalData = new ModalDataWriter(string.Format("load_jump_{0}.csv", TestContext.DataRow["TestName"].ToString()));
 			var modalData = new MockModalDataWriter();
 
-			var idlePower = Double.Parse(TestContext.DataRow["initialIdleLoad"].ToString()).SI<Watt>();
+			var idlePower = double.Parse(TestContext.DataRow["initialIdleLoad"].ToString()).SI<Watt>();
 
-			var angularSpeed = Double.Parse(TestContext.DataRow["rpm"].ToString()).RPMtoRad();
+			var angularSpeed = double.Parse(TestContext.DataRow["rpm"].ToString()).RPMtoRad();
 
 			var t = 0.SI<Second>();
 			var dt = 0.1.SI<Second>();
@@ -175,7 +175,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			// dt = TimeSpan.FromSeconds(double.Parse(TestContext.DataRow["dt"].ToString(), CultureInfo.InvariantCulture));
 			// dt = TimeSpan.FromSeconds(expectedResults.Rows[i].ParseDouble(0)) - t;
 			var engineLoadPower = engineData.FullLoadCurve.FullLoadStationaryPower(angularSpeed);
-			idlePower = Double.Parse(TestContext.DataRow["finalIdleLoad"].ToString()).SI<Watt>();
+			idlePower = double.Parse(TestContext.DataRow["finalIdleLoad"].ToString()).SI<Watt>();
 			for (; t < 25; t += dt, i++) {
 				dt = (expectedResults.Rows[i + 1].ParseDouble(0) - expectedResults.Rows[i].ParseDouble(0)).SI<Second>();
 				if (t >= 10.SI<Second>()) {
@@ -188,7 +188,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 				// todo: compare results...
 				Assert.AreEqual(expectedResults.Rows[i].ParseDouble(0), t.Value(), 0.001, "Time");
 				Assert.AreEqual(expectedResults.Rows[i].ParseDouble(1), ((SI)modalData[ModalResultField.Pe_full]).Value(), 0.1,
-					String.Format("Load in timestep {0}", t));
+					string.Format("Load in timestep {0}", t));
 				modalData.CommitSimulationStep();
 			}
 			modalData.Finish();

VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs

@@ -49,7 +49,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
 				EngineeringModeSimulationDataReader.CreateGearboxDataFromFile(TestContext.DataRow["GearboxDataFile"].ToString());
 
 
-			var PvD = Double.Parse(TestContext.DataRow["PowerGbxOut"].ToString(), CultureInfo.InvariantCulture).SI<Watt>();
+			var PvD = double.Parse(TestContext.DataRow["PowerGbxOut"].ToString(), CultureInfo.InvariantCulture).SI<Watt>();
 
 			var torqueToWheels = Formulas.PowerToTorque(PvD, SpeedToAngularSpeed(speed, rdyn));
 			var torqueFromEngine = 0.SI<NewtonMeter>();
@@ -62,7 +62,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
 			var powerEngine = Formulas.TorqueToPower(torqueFromEngine, angSpeed);
 			var loss = powerEngine - PvD;
 
-			Assert.AreEqual(Double.Parse(TestContext.DataRow["GbxPowerLoss"].ToString(), CultureInfo.InvariantCulture),
+			Assert.AreEqual(double.Parse(TestContext.DataRow["GbxPowerLoss"].ToString(), CultureInfo.InvariantCulture),
 				loss.Value(), 0.1,
 				TestContext.DataRow["TestName"].ToString());
 		}