SI Class comparison: tolerance has to have same SI unit

VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs

@@ -104,7 +104,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		IResponse ITnOutPort.Request(Second absTime, Second dt, NewtonMeter torque, PerSecond angularVelocity, bool dryRun)
 		{
-			Log.Debug("Engine Power Request: torque: {0}, angularVelocity: {1}, power: {2}", torque, angularVelocity, torque * angularVelocity);
+			Log.Debug("Engine Power Request: torque: {0}, angularVelocity: {1}, power: {2}", torque, angularVelocity,
+				torque * angularVelocity);
 			return DoHandleRequest(absTime, dt, torque, angularVelocity, dryRun);
 		}
 
@@ -550,7 +551,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 					var response = (ResponseDryRun)RequestPort.Request(absTime, dt, torque, nextAngularSpeed, true);
 					delta = response.DeltaDragLoad;
 					debug.Add(new { engineSpeed = nextAngularSpeed, searchInterval, delta });
-					if (delta.IsEqual(0, Constants.SimulationSettings.EnginePowerSearchTolerance)) {
+					if (delta.IsEqual(0.SI<Watt>(), Constants.SimulationSettings.EnginePowerSearchTolerance)) {
 						Log.Debug("found operating point in {0} iterations. engine speed: {1}, delta: {2}", retryCount, nextAngularSpeed,
 							delta);
 						return RequestPort.Request(absTime, dt, torque, nextAngularSpeed);

VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs

@@ -55,7 +55,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 					nextAction = GetNextDrivingAction(currentDistance);
 					if (nextAction != null) {
 						if (currentDistance.IsEqual(nextAction.ActionDistance,
-							Constants.SimulationSettings.DriverActionDistanceTolerance.Value())) {
+							Constants.SimulationSettings.DriverActionDistanceTolerance)) {
 							CurrentDrivingMode = DrivingMode.DrivingModeBrake;
 							DrivingModes[CurrentDrivingMode].ResetMode();
 							Log.Debug("Switching to DrivingMode BRAKE");
@@ -111,7 +111,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			// if the distance at the end of the simulation interval is smaller than the new ActionDistance
 			// we are safe - go ahead...
 			if ((Driver.DataBus.Distance + ds).IsSmallerOrEqual(nextAction.TriggerDistance - coastingDistance,
-				Constants.SimulationSettings.DriverActionDistanceTolerance.Value())) {
+				Constants.SimulationSettings.DriverActionDistanceTolerance)) {
 				return retVal;
 			}
 

VectoCore/Models/SimulationComponent/Impl/Driver.cs

@@ -368,7 +368,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			operatingPoint = SearchBrakingPower(absTime, operatingPoint.SimulationDistance, gradient,
 				operatingPoint.Acceleration, response);
 
-			if (!ds.IsEqual(operatingPoint.SimulationDistance, 1E-15)) {
+			if (!ds.IsEqual(operatingPoint.SimulationDistance, 1E-15.SI<Meter>())) {
 				Log.Info(
 					"SearchOperatingPoint Breaking reduced the max. distance: {0} -> {1}. Issue new request from driving cycle!",
 					operatingPoint.SimulationDistance, ds);
@@ -488,7 +488,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 						NextComponent.Request(absTime, operatingPoint.SimulationInterval, operatingPoint.Acceleration, gradient, true);
 				delta = DataBus.ClutchClosed(absTime) ? response.DeltaDragLoad : response.GearboxPowerRequest;
 
-				if (delta.IsEqual(0, Constants.SimulationSettings.EnginePowerSearchTolerance)) {
+				if (delta.IsEqual(0.SI<Watt>(), Constants.SimulationSettings.EnginePowerSearchTolerance)) {
 					LogManager.EnableLogging();
 					Log.Debug("found operating point in {0} iterations, delta: {1}", debug.Count, delta);
 					return operatingPoint;
@@ -602,7 +602,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 					(ResponseDryRun)NextComponent.Request(absTime, retVal.SimulationInterval, retVal.Acceleration, gradient, true);
 				delta = actionRoll ? response.GearboxPowerRequest : (coasting ? response.DeltaDragLoad : response.DeltaFullLoad);
 
-				if (delta.IsEqual(0, Constants.SimulationSettings.EnginePowerSearchTolerance)) {
+				if (delta.IsEqual(0.SI<Watt>(), Constants.SimulationSettings.EnginePowerSearchTolerance)) {
 					LogManager.EnableLogging();
 					Log.Debug("found operating point in {0} iterations. Engine Power req: {2}, Gearbox Power req: {3} delta: {1}",
 						debug.Count, delta, response.EnginePowerRequest, response.GearboxPowerRequest);

VectoCore/Models/SimulationComponent/Impl/Gearbox.cs

@@ -232,7 +232,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				};
 			}
 
-			if (outTorque.IsGreater(0, Constants.SimulationSettings.EnginePowerSearchTolerance)) {
+			if ((outTorque * outAngularVelocity).IsGreater(0.SI<Watt>(), Constants.SimulationSettings.EnginePowerSearchTolerance)) {
 				return new ResponseOverload {
 					Source = this,
 					Delta = outTorque * outAngularVelocity,
@@ -240,7 +240,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				};
 			}
 
-			if (outTorque.IsSmaller(0, Constants.SimulationSettings.EnginePowerSearchTolerance)) {
+			if ((outTorque * outAngularVelocity).IsSmaller(0.SI<Watt>(), Constants.SimulationSettings.EnginePowerSearchTolerance)) {
 				return new ResponseUnderload {
 					Source = this,
 					Delta = outTorque * outAngularVelocity,

VectoCore/Models/SimulationComponent/Impl/Vehicle.cs

@@ -149,7 +149,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				Log.Warn("distance field is not set!");
 			} else {
 				var distance = (SI)writer[ModalResultField.dist];
-				if (!distance.IsEqual(_currentState.Distance, 1e-12)) {
+				if (!distance.IsEqual(_currentState.Distance, 1e-12.SI<Meter>())) {
 					Log.Warn("distance diverges: {0}, distance: {1}", (distance - _currentState.Distance).Value(), distance);
 				}
 			}

VectoCore/Utils/SI.cs

@@ -1599,9 +1599,10 @@ namespace TUGraz.VectoCore.Utils
 		/// <param name="si">The si.</param>
 		/// <param name="tolerance">The tolerance.</param>
 		/// <returns></returns>
-		public bool IsEqual(SI si, double tolerance = DoubleExtensionMethods.Tolerance)
+		public bool IsEqual(SI si, SI tolerance = null)
 		{
-			return HasEqualUnit(si) && Val.IsEqual(si.Val, tolerance);
+			return (tolerance == null || HasEqualUnit(tolerance)) && HasEqualUnit(si) &&
+					Val.IsEqual(si.Val, tolerance == null ? DoubleExtensionMethods.Tolerance : tolerance.Value());
 		}
 
 		/// <summary>
@@ -1621,9 +1622,10 @@ namespace TUGraz.VectoCore.Utils
 		/// <param name="si">The si.</param>
 		/// <param name="tolerance">The tolerance.</param>
 		/// <returns></returns>
-		public bool IsSmaller(SI si, double tolerance = DoubleExtensionMethods.Tolerance)
+		public bool IsSmaller(SI si, SI tolerance = null)
 		{
-			return HasEqualUnit(si) && Val.IsSmaller(si.Val, tolerance);
+			return (tolerance == null || HasEqualUnit(tolerance)) && HasEqualUnit(si) &&
+					Val.IsSmaller(si.Val, tolerance == null ? DoubleExtensionMethods.Tolerance : tolerance.Value());
 		}
 
 		/// <summary>
@@ -1632,9 +1634,10 @@ namespace TUGraz.VectoCore.Utils
 		/// <param name="si">The si.</param>
 		/// <param name="tolerance">The tolerance.</param>
 		/// <returns></returns>
-		public bool IsSmallerOrEqual(SI si, double tolerance = DoubleExtensionMethods.Tolerance)
+		public bool IsSmallerOrEqual(SI si, SI tolerance = null)
 		{
-			return HasEqualUnit(si) && Val.IsSmallerOrEqual(si.Val, tolerance);
+			return (tolerance == null || HasEqualUnit(tolerance)) && HasEqualUnit(si) &&
+					Val.IsSmallerOrEqual(si.Val, tolerance == null ? DoubleExtensionMethods.Tolerance : tolerance.Value());
 		}
 
 		/// <summary>
@@ -1643,9 +1646,10 @@ namespace TUGraz.VectoCore.Utils
 		/// <param name="si">The si.</param>
 		/// <param name="tolerance">The tolerance.</param>
 		/// <returns></returns>
-		public bool IsGreater(SI si, double tolerance = DoubleExtensionMethods.Tolerance)
+		public bool IsGreater(SI si, SI tolerance = null)
 		{
-			return HasEqualUnit(si) && Val.IsGreater(si.Val, tolerance);
+			return (tolerance == null || HasEqualUnit(tolerance)) && HasEqualUnit(si) &&
+					Val.IsGreater(si.Val, tolerance == null ? DoubleExtensionMethods.Tolerance : tolerance.Value());
 		}
 
 		/// <summary>
@@ -1654,9 +1658,10 @@ namespace TUGraz.VectoCore.Utils
 		/// <param name="si">The si.</param>
 		/// <param name="tolerance">The tolerance.</param>
 		/// <returns></returns>
-		public bool IsGreaterOrEqual(SI si, double tolerance = DoubleExtensionMethods.Tolerance)
+		public bool IsGreaterOrEqual(SI si, SI tolerance = null)
 		{
-			return HasEqualUnit(si) && Val.IsGreaterOrEqual(si.Val, tolerance);
+			return (tolerance == null || HasEqualUnit(tolerance)) && HasEqualUnit(si) &&
+					Val.IsGreaterOrEqual(si.Val, tolerance == null ? DoubleExtensionMethods.Tolerance : tolerance.Value());
 		}
 
 		/// <summary>

VectoCoreTest/Models/SimulationComponent/DriverTest.cs

@@ -73,7 +73,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			Assert.AreEqual(4.9812, vehicleContainer.VehicleSpeed.Value(), Tolerance);
 			Assert.AreEqual(0.2004, response.SimulationInterval.Value(), Tolerance);
 			Assert.AreEqual(engine.PreviousState.FullDragPower.Value(), engine.PreviousState.EnginePower.Value(),
-				Constants.SimulationSettings.EnginePowerSearchTolerance);
+				Constants.SimulationSettings.EnginePowerSearchTolerance.Value());
 
 			while (vehicleContainer.VehicleSpeed > 1) {
 				response = driver.DrivingActionCoast(absTime, 1.SI<Meter>(), velocity, 0.SI<Radian>());
@@ -132,7 +132,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			Assert.AreEqual(4.9812, vehicleContainer.VehicleSpeed.Value(), Tolerance);
 			Assert.AreEqual(0.2004, response.SimulationInterval.Value(), Tolerance);
 			Assert.AreEqual(engine.PreviousState.FullDragPower.Value(), engine.PreviousState.EnginePower.Value(),
-				Constants.SimulationSettings.EnginePowerSearchTolerance);
+				Constants.SimulationSettings.EnginePowerSearchTolerance.Value());
 
 			while (vehicleContainer.VehicleSpeed > 1) {
 				response = driver.DrivingActionCoast(absTime, 1.SI<Meter>(), velocity, gradient);