merge fix

artidoro · artidoro · commit aa2750705148 · 2019-02-14T17:28:36.000-08:00
diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/ImageAnalytics/ConvertToGrayScale.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/ImageAnalytics/ConvertToGrayScale.cs
@@ -23,7 +23,7 @@ public static void Example()
             // hotdog.jpg   hotdog
             // tomato.jpg   tomato
 
-            var data = mlContext.Data.CreateTextLoader(new TextLoader.Arguments()
+            var data = mlContext.Data.CreateTextLoader(new TextLoader.Options()
             {
                 Columns = new[]
                 {
diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/ImageAnalytics/ExtractPixels.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/ImageAnalytics/ExtractPixels.cs
@@ -24,7 +24,7 @@ public static void Example()
             // hotdog.jpg   hotdog
             // tomato.jpg   tomato
 
-            var data = mlContext.Data.CreateTextLoader(new TextLoader.Arguments()
+            var data = mlContext.Data.CreateTextLoader(new TextLoader.Options()
             {
                 Columns = new[]
                 {
diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/ImageAnalytics/LoadImages.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/ImageAnalytics/LoadImages.cs
@@ -23,7 +23,7 @@ public static void Example()
             // hotdog.jpg   hotdog
             // tomato.jpg   tomato
 
-            var data = mlContext.Data.CreateTextLoader(new TextLoader.Arguments()
+            var data = mlContext.Data.CreateTextLoader(new TextLoader.Options()
             {
                 Columns = new[]
                 {
diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/ImageAnalytics/ResizeImages.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/ImageAnalytics/ResizeImages.cs
@@ -23,7 +23,7 @@ public static void Example()
             // hotdog.jpg   hotdog
             // tomato.jpg   tomato
 
-            var data = mlContext.Data.CreateTextLoader(new TextLoader.Arguments()
+            var data = mlContext.Data.CreateTextLoader(new TextLoader.Options()
             {
                 Columns = new[]
                 {
diff --git a/src/Microsoft.ML.Data/DataLoadSave/Text/TextLoader.cs b/src/Microsoft.ML.Data/DataLoadSave/Text/TextLoader.cs
@@ -1303,7 +1303,7 @@ private static bool TryParseSchema(IHost host, IMultiStreamSource files,
         }
 
         /// <summary>
-        /// Checks whether the source contains the valid TextLoader.Arguments depiction.
+        /// Checks whether the source contains the valid TextLoader.Options depiction.
         /// </summary>
         internal static bool FileContainsValidSchema(IHostEnvironment env, IMultiStreamSource files, out Options options)
         {
@@ -1410,6 +1410,9 @@ void ICanSaveModel.Save(ModelSaveContext ctx)
             _bindings.Save(ctx);
         }
 
+        /// <summary>
+        /// The output <see cref="DataViewSchema"/> that will be produced by the reader.
+        /// </summary>
         public DataViewSchema GetOutputSchema() => _bindings.OutputSchema;
 
         /// <summary>
diff --git a/test/Microsoft.ML.Predictor.Tests/TestPredictors.cs b/test/Microsoft.ML.Predictor.Tests/TestPredictors.cs
@@ -1806,7 +1806,7 @@ public void CompareSvmPredictorResultsToLibSvm()
         {
             using (var env = new LocalEnvironment(1, conc: 1))
             {
-                IDataView trainView = new TextLoader(env, new TextLoader.Arguments(), new MultiFileSource(GetDataPath(TestDatasets.mnistOneClass.trainFilename)));
+                IDataView trainView = new TextLoader(env, new TextLoader.Options(), new MultiFileSource(GetDataPath(TestDatasets.mnistOneClass.trainFilename)));
                 trainView =
                     NormalizeTransform.Create(env,
                         new NormalizeTransform.MinMaxArguments()
@@ -1815,7 +1815,7 @@ public void CompareSvmPredictorResultsToLibSvm()
                         },
                      trainView);
                 var trainData = new RoleMappedData(trainView, "Label", "Features");
-                IDataView testView = new TextLoader(env, new TextLoader.Arguments(), new MultiFileSource(GetDataPath(TestDatasets.mnistOneClass.testFilename)));
+                IDataView testView = new TextLoader(env, new TextLoader.Options(), new MultiFileSource(GetDataPath(TestDatasets.mnistOneClass.testFilename)));
                 ApplyTransformUtils.ApplyAllTransformsToData(env, trainView, testView);
                 var testData = new RoleMappedData(testView, "Label", "Features");
 
diff --git a/test/Microsoft.ML.Tests/AnomalyDetectionTests.cs b/test/Microsoft.ML.Tests/AnomalyDetectionTests.cs
@@ -32,7 +32,7 @@ public void RandomizedPcaTrainerBaselineTest()
             var mlContext = new MLContext(seed: 1, conc: 1);
             string featureColumn = "NumericFeatures";
 
-            var reader = new TextLoader(Env, new TextLoader.Arguments()
+            var reader = new TextLoader(Env, new TextLoader.Options()
             {
                 HasHeader = true,
                 Separator = "\t",

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public static void Example()`
`23`	`23`	`// hotdog.jpg hotdog`
`24`	`24`	`// tomato.jpg tomato`
`25`	`25`
`26`		`- var data = mlContext.Data.CreateTextLoader(new TextLoader.Arguments()`
	`26`	`+ var data = mlContext.Data.CreateTextLoader(new TextLoader.Options()`
`27`	`27`	`{`
`28`	`28`	`Columns = new[]`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static void Example()`
`24`	`24`	`// hotdog.jpg hotdog`
`25`	`25`	`// tomato.jpg tomato`
`26`	`26`
`27`		`- var data = mlContext.Data.CreateTextLoader(new TextLoader.Arguments()`
	`27`	`+ var data = mlContext.Data.CreateTextLoader(new TextLoader.Options()`
`28`	`28`	`{`
`29`	`29`	`Columns = new[]`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1303,7 +1303,7 @@ private static bool TryParseSchema(IHost host, IMultiStreamSource files,`
`1303`	`1303`	`}`
`1304`	`1304`
`1305`	`1305`	`/// <summary>`
`1306`		`- /// Checks whether the source contains the valid TextLoader.Arguments depiction.`
	`1306`	`+ /// Checks whether the source contains the valid TextLoader.Options depiction.`
`1307`	`1307`	`/// </summary>`
`1308`	`1308`	`internal static bool FileContainsValidSchema(IHostEnvironment env, IMultiStreamSource files, out Options options)`
`1309`	`1309`	`{`
`@@ -1410,6 +1410,9 @@ void ICanSaveModel.Save(ModelSaveContext ctx)`
`1410`	`1410`	`_bindings.Save(ctx);`
`1411`	`1411`	`}`
`1412`	`1412`
	`1413`	`+ /// <summary>`
	`1414`	`+ /// The output <see cref="DataViewSchema"/> that will be produced by the reader.`
	`1415`	`+ /// </summary>`
`1413`	`1416`	`public DataViewSchema GetOutputSchema() => _bindings.OutputSchema;`
`1414`	`1417`
`1415`	`1418`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public void RandomizedPcaTrainerBaselineTest()`
`32`	`32`	`var mlContext = new MLContext(seed: 1, conc: 1);`
`33`	`33`	`string featureColumn = "NumericFeatures";`
`34`	`34`
`35`		`- var reader = new TextLoader(Env, new TextLoader.Arguments()`
	`35`	`+ var reader = new TextLoader(Env, new TextLoader.Options()`
`36`	`36`	`{`
`37`	`37`	`HasHeader = true,`
`38`	`38`	`Separator = "\t",`