Skip to content

Let's not create regex for every function call. #1384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Let's not create regex for every function call. #1384

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1c9e88
move regex out of function
Oct 25, 2018
0bea87a
right place, right attribute
Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions test/Microsoft.ML.TestFramework/BaseTestBaseline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ protected BaseTestBaseline(ITestOutputHelper output) : base(output)
private const string OutputRootUnixRegExp = @"\/[^\\\t ]+\/TestOutput" + @"\/[^\\\t ]+";
private static readonly string BinRegUnixExp = @"\/[^\\\t ]+\/bin\/" + Mode;
private static readonly string Bin64RegUnixExp = @"\/[^\\\t ]+\/bin\/x64\/" + Mode;
private static readonly Regex MatchNumbers = new Regex(@"\b[0-9]+\.?[0-9]*(E-[0-9]*)?\b", RegexOptions.IgnoreCase | RegexOptions.Compiled);

/// <summary>
/// When the progress log is appended to the end of output (in test runs), this line precedes the progress log.
Expand Down Expand Up @@ -506,14 +507,13 @@ protected bool CheckEqualityFromPathsCore(string relPath, string basePath, strin

private void GetNumbersFromFile(ref string firstString, ref string secondString, int digitsOfPrecision)
{
Regex _matchNumer = new Regex(@"\b[0-9]+\.?[0-9]*(E-[0-9]*)?\b", RegexOptions.IgnoreCase | RegexOptions.Compiled);
MatchCollection firstCollection = _matchNumer.Matches(firstString);
MatchCollection secondCollection = _matchNumer.Matches(secondString);
MatchCollection firstCollection = MatchNumbers.Matches(firstString);
MatchCollection secondCollection = MatchNumbers.Matches(secondString);

if (firstCollection.Count == secondCollection.Count)
MatchNumberWithTolerance(firstCollection, secondCollection, digitsOfPrecision);
firstString = _matchNumer.Replace(firstString, "%Number%");
secondString = _matchNumer.Replace(secondString, "%Number%");
firstString = MatchNumbers.Replace(firstString, "%Number%");
secondString = MatchNumbers.Replace(secondString, "%Number%");
}

private void MatchNumberWithTolerance(MatchCollection firstCollection, MatchCollection secondCollection, int digitsOfPrecision)
Expand Down