Baseline comparisons with tolerance should not exit when values don't match (#218) (#1420)

* Fail when MatchNumberWithTolerance is not in range

* remove extra spaces

Author: feiyun0112

test/Microsoft.ML.TestFramework/BaseTestBaseline.cs

@@ -495,9 +495,9 @@ protected bool CheckEqualityFromPathsCore(string relPath, string basePath, strin
                     }
 
                     count++;
-                    GetNumbersFromFile(ref line1, ref line2, digitsOfPrecision);
+                    var inRange = GetNumbersFromFile(ref line1, ref line2, digitsOfPrecision);
 
-                    if (line1 != line2)
+                    if (!inRange || line1 != line2)
                     {
                         if (line1 == null || line2 == null)
                             Fail("Output and baseline different lengths: '{0}'", relPath);
@@ -509,19 +509,26 @@ protected bool CheckEqualityFromPathsCore(string relPath, string basePath, strin
             }
         }
 
-        private void GetNumbersFromFile(ref string firstString, ref string secondString, int digitsOfPrecision)
+        private bool GetNumbersFromFile(ref string firstString, ref string secondString, int digitsOfPrecision)
         {
-            
+
             MatchCollection firstCollection = MatchNumbers.Matches(firstString);
             MatchCollection secondCollection = MatchNumbers.Matches(secondString);
 
             if (firstCollection.Count == secondCollection.Count)
-                MatchNumberWithTolerance(firstCollection, secondCollection, digitsOfPrecision);
+            {
+                if(!MatchNumberWithTolerance(firstCollection, secondCollection, digitsOfPrecision))
+                {
+                    return false;
+                }
+            }
+                
             firstString = MatchNumbers.Replace(firstString, "%Number%");
             secondString = MatchNumbers.Replace(secondString, "%Number%");
+            return true;
         }
 
-        private void MatchNumberWithTolerance(MatchCollection firstCollection, MatchCollection secondCollection, int digitsOfPrecision)
+        private bool MatchNumberWithTolerance(MatchCollection firstCollection, MatchCollection secondCollection, int digitsOfPrecision)
         {
             for (int i = 0; i < firstCollection.Count; i++)
             {
@@ -547,9 +554,16 @@ private void MatchNumberWithTolerance(MatchCollection firstCollection, MatchColl
                 if (!inRange)
                 {
                     delta = Math.Round(f1 - f2, digitsOfPrecision);
-                    Assert.InRange(delta, -allowedVariance, allowedVariance);
+                    inRange = delta >= -allowedVariance && delta <= allowedVariance;
+                }
+
+                if(!inRange)
+                {
+                    return false;
                 }
             }
+
+            return true;
         }
 
         private static double Round(double value, int digitsOfPrecision)