Skip to content

Commit 80c0760

Browse files
committed
review changes
1 parent 815a687 commit 80c0760

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

src/Microsoft.ML.AutoML/Utils/StringEditDistance.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace Microsoft.ML.AutoML.Utils
44
{
5-
public static class StringEditDistance
5+
internal static class StringEditDistance
66
{
7-
public static int GetEditDistance(string first, string second)
7+
public static int GetLevenshteinDistance(string first, string second)
88
{
99
if (first is null)
1010
{

src/Microsoft.ML.AutoML/Utils/UserInputValidationUtil.cs

+7-4
Original file line numberDiff line numberDiff line change
@@ -249,12 +249,15 @@ private static void ValidateTrainDataColumn(IDataView trainData, string columnNa
249249
var nullableColumn = trainData.Schema.GetColumnOrNull(columnName);
250250
if (nullableColumn == null)
251251
{
252-
var closestNamed = ClosestNamed(trainData, columnName, 2);
252+
var closestNamed = ClosestNamed(trainData, columnName, 7);
253+
254+
var exceptionMessage = $"Provided {columnPurpose} column '{columnName}' not found in training data.";
253255
if (closestNamed != string.Empty)
254256
{
255-
throw new ArgumentException($"Provided {columnPurpose} column '{columnName}' not found in training data. Did you mean '{closestNamed}'.");
257+
exceptionMessage += $" Did you mean '{closestNamed}'.";
256258
}
257-
throw new ArgumentException($"Provided {columnPurpose} column '{columnName}' not found in training data.");
259+
260+
throw new ArgumentException(exceptionMessage);
258261
}
259262

260263
if(allowedTypes == null)
@@ -284,7 +287,7 @@ private static string ClosestNamed(IDataView trainData, string columnName, int m
284287
var closestNamed = string.Empty;
285288
foreach (var column in trainData.Schema)
286289
{
287-
var editDistance = StringEditDistance.GetEditDistance(column.Name, columnName);
290+
var editDistance = StringEditDistance.GetLevenshteinDistance(column.Name, columnName);
288291
if (editDistance < minEditDistance)
289292
{
290293
minEditDistance = editDistance;

test/Microsoft.ML.AutoML.Tests/UserInputValidationTests.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ public void ValidateExperimentExecuteLabelNotInTrain()
4444
{
4545
foreach (var task in new[] { TaskKind.Recommendation, TaskKind.Regression, TaskKind.Ranking })
4646
{
47+
const string columnName = "ReallyLongNonExistingColumnName";
4748
var ex = Assert.Throws<ArgumentException>(() => UserInputValidationUtil.ValidateExperimentExecuteArgs(_data,
48-
new ColumnInformation() { LabelColumnName = "L" }, null, task));
49+
new ColumnInformation() { LabelColumnName = columnName }, null, task));
4950

50-
Assert.Equal("Provided label column 'L' not found in training data.", ex.Message);
51+
Assert.Equal($"Provided label column '{columnName}' not found in training data.", ex.Message);
5152
}
5253
}
5354

0 commit comments

Comments
 (0)