Skip to content

move regex to right place to reduce test time #1388

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

Merged
merged 3 commits into from
Oct 26, 2018
Merged

move regex to right place to reduce test time #1388

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bfb107
move regex to right place to reduce test time
Oct 26, 2018
ca276be
proper regex
Oct 26, 2018
152833d
and comments
Oct 26, 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
15 changes: 8 additions & 7 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,9 @@ 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;
// The Regex matches both positive and negative decimal point numbers present in a string.
// The numbers could be a part of a word. They can also be in Exponential form eg. 3E-9
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,16 +509,14 @@ protected bool CheckEqualityFromPathsCore(string relPath, string basePath, strin

private void GetNumbersFromFile(ref string firstString, ref string secondString, int digitsOfPrecision)
{
// The Regex matches both positive and negative decimal point numbers present in a string.
// The numbers could be a part of a word. They can also be in Exponential form eg. 3E-9
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);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you remove the extra line?

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