Fix commit a6643d1

Author: mikasoukhov

Algo/Strategies/StrategyParam.cs

@@ -89,91 +89,79 @@ public T Value
 			if (!this.IsValid(value))
 				throw new ArgumentOutOfRangeException(nameof(value), value, LocalizedStrings.InvalidValue);
 
-			if (_hasStep && !IsStepValid(value))
+			if (_hasStep && _hasStep && !IsValueMatchesStep(GetValueType(), value, _stepValue, _stepBaseValue))
 				throw new ArgumentOutOfRangeException(nameof(value), value, LocalizedStrings.InvalidValue);
 
 			_value = value;
 			NotifyChanged();
 		}
 	}
 
-	private bool IsStepValid(T value)
+	private static bool IsValueMatchesStep(Type type, T value, T step, T baseValue)
 	{
-		if (!_hasStep)
-			return true;
-
-		var type = GetValueType();
-
-		try
+		if (type == typeof(TimeSpan))
 		{
-			if (type == typeof(TimeSpan))
-			{
-				var v = value.To<TimeSpan>();
-				var b = _stepBaseValue.To<TimeSpan>();
-				var s = _stepValue.To<TimeSpan>();
+			var v = value.To<TimeSpan>();
+			var b = baseValue.To<TimeSpan>();
+			var s = step.To<TimeSpan>();
 
-				var diff = v - b;
+			var diff = v - b;
 
-				if (diff < TimeSpan.Zero)
-					return false;
+			if (diff < TimeSpan.Zero)
+				return false;
 
-				return diff.Ticks % s.Ticks == 0;
-			}
-			else if (type.IsNumericInteger())
-			{
-				var v = value.To<long>();
-				var b = _stepBaseValue.To<long>();
-				var s = _stepValue.To<long>();
+			return diff.Ticks % s.Ticks == 0;
+		}
+		else if (type.IsNumericInteger())
+		{
+			var v = value.To<long>();
+			var b = baseValue.To<long>();
+			var s = step.To<long>();
 
-				var diff = v - b;
+			var diff = v - b;
 
-				if (diff < 0)
-					return false;
+			if (diff < 0)
+				return false;
 
-				return diff % s == 0;
-			}
-			else if (type.IsNumeric())
-			{
-				var v = value.To<decimal>();
-				var b = _stepBaseValue.To<decimal>();
-				var s = _stepValue.To<decimal>();
+			return diff % s == 0;
+		}
+		else if (type.IsNumeric())
+		{
+			var v = value.To<decimal>();
+			var b = baseValue.To<decimal>();
+			var s = step.To<decimal>();
 
-				var diff = v - b;
+			var diff = v - b;
 
-				if (diff < 0)
-					return false;
+			if (diff < 0)
+				return false;
 
-				var q = diff / s;
-				var rq = Math.Round(q);
+			var q = diff / s;
+			var rq = Math.Round(q);
 
-				return (q - rq).Abs() < 1e-10m;
-			}
-			else if (type == typeof(Unit))
-			{
-				var v = value.To<Unit>();
-				var b = _stepBaseValue.To<Unit>();
-				var s = _stepValue.To<Unit>();
+			return (q - rq).Abs() < 1e-10m;
+		}
+		else if (type == typeof(Unit))
+		{
+			var v = value.To<Unit>();
+			var b = baseValue.To<Unit>();
+			var s = step.To<Unit>();
 
-				if (v.Type != b.Type || v.Type != s.Type)
-					return false;
+			if (v.Type != b.Type || v.Type != s.Type)
+				return false;
 
-				var diff = v.Value - b.Value;
+			var diff = v.Value - b.Value;
 
-				if (diff < 0)
-					return false;
+			if (diff < 0)
+				return false;
 
-				var q = diff / s.Value;
-				var rq = Math.Round(q);
+			var q = diff / s.Value;
+			var rq = Math.Round(q);
 
-				return (q - rq).Abs() < 1e-10m;
-			}
-			else
-				throw new NotSupportedException(type.FullName);
-		}
-		catch
-		{
-			return false;
+			return (q - rq).Abs() < 1e-10m;
 		}
+		else
+			throw new NotSupportedException(type.FullName);
 	}
 
 	/// <summary>
@@ -202,13 +190,12 @@ public StrategyParam<T> SetStep(T step, T baseValue = default)
 		if (invalid)
 			throw new ArgumentOutOfRangeException(nameof(step), step, LocalizedStrings.IntervalMustBePositive);
 
+		if (!IsValueMatchesStep(type, _value, step, baseValue))
+			throw new ArgumentOutOfRangeException(nameof(step), step, LocalizedStrings.InvalidValue);
+
 		_stepValue = step;
 		_stepBaseValue = baseValue;
 		_hasStep = true;
-
-		if (!IsStepValid(_value))
-			throw new ArgumentOutOfRangeException(nameof(step), step, LocalizedStrings.InvalidValue);
-
 		return this;
 	}