Scrub scrub (#2863)

Author: Ivanidzo4ka

src/Microsoft.ML.Data/Transforms/ColumnConcatenatingEstimator.cs

@@ -28,7 +28,7 @@ public sealed class ColumnConcatenatingEstimator : IEstimator<ColumnConcatenatin
         internal ColumnConcatenatingEstimator(IHostEnvironment env, string outputColumnName, params string[] inputColumnNames)
         {
             Contracts.CheckValue(env, nameof(env));
-            _host = env.Register("ColumnConcatenatingEstimator ");
+            _host = env.Register(nameof(ColumnConcatenatingEstimator));
 
             _host.CheckNonEmpty(outputColumnName, nameof(outputColumnName));
             _host.CheckValue(inputColumnNames, nameof(inputColumnNames));

src/Microsoft.ML.Data/Transforms/ColumnConcatenatingTransformer.cs

@@ -10,9 +10,7 @@
 using Microsoft.ML;
 using Microsoft.ML.CommandLine;
 using Microsoft.ML.Data;
-using Microsoft.ML.EntryPoints;
 using Microsoft.ML.Internal.Utilities;
-using Microsoft.ML.Model;
 using Microsoft.ML.Model.OnnxConverter;
 using Microsoft.ML.Model.Pfa;
 using Microsoft.ML.Transforms;
@@ -223,7 +221,7 @@ internal ColumnOptions(ModelLoadContext ctx)
         /// <summary>
         /// The names of the output and input column pairs for the transformation.
         /// </summary>
-        public IReadOnlyCollection<(string outputColumnName, string[] inputColumnNames)> Columns
+        internal IReadOnlyCollection<(string outputColumnName, string[] inputColumnNames)> Columns
             => _columns.Select(col => (outputColumnName: col.Name, inputColumnNames: col.Sources.Select(source => source.name).ToArray())).ToArray().AsReadOnly();
 
         /// <summary>

src/Microsoft.ML.Data/Transforms/ColumnCopying.cs

@@ -80,7 +80,7 @@ public sealed class ColumnCopyingTransformer : OneToOneTransformerBase
         /// <summary>
         /// Names of output and input column pairs on which the transformation is applied.
         /// </summary>
-        public IReadOnlyCollection<(string outputColumnName, string inputColumnName)> Columns => ColumnPairs.AsReadOnly();
+        internal IReadOnlyCollection<(string outputColumnName, string inputColumnName)> Columns => ColumnPairs.AsReadOnly();
 
         private static VersionInfo GetVersionInfo()
         {

src/Microsoft.ML.Data/Transforms/ColumnSelecting.cs

@@ -9,9 +9,7 @@
 using Microsoft.ML;
 using Microsoft.ML.CommandLine;
 using Microsoft.ML.Data;
-using Microsoft.ML.EntryPoints;
 using Microsoft.ML.Internal.Utilities;
-using Microsoft.ML.Model;
 using Microsoft.ML.Transforms;
 
 [assembly: LoadableClass(ColumnSelectingTransformer.Summary, typeof(IDataTransform), typeof(ColumnSelectingTransformer),
@@ -140,12 +138,12 @@ public sealed class ColumnSelectingTransformer : ITransformer
 
         bool ITransformer.IsRowToRowMapper => true;
 
-        public IEnumerable<string> SelectColumns => _selectedColumns.AsReadOnly();
+        internal IEnumerable<string> SelectColumns => _selectedColumns.AsReadOnly();
 
-        public bool KeepColumns { get; }
+        internal bool KeepColumns { get; }
 
-        public bool KeepHidden { get; }
-        public bool IgnoreMissing { get; }
+        internal bool KeepHidden { get; }
+        internal bool IgnoreMissing { get; }
 
         private static VersionInfo GetVersionInfo()
         {

src/Microsoft.ML.Data/Transforms/ExtensionsCatalog.cs

@@ -97,16 +97,16 @@ public static ColumnConcatenatingEstimator Concatenate(this TransformsCatalog ca
         /// that you don't want to save, you can use <see cref="DropColumns"/> to remove them from the schema.
         /// </remarks>
         /// <param name="catalog">The transform's catalog.</param>
-        /// <param name="columnsToDrop">The array of column names to drop.</param>
+        /// <param name="columnNames">The array of column names to drop.</param>
         /// <example>
         /// <format type="text/markdown">
         /// <![CDATA[
         /// [!code-csharp[Concat](~/../docs/samples/docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/DropColumns.cs)]
         /// ]]>
         /// </format>
         /// </example>
-        public static ColumnSelectingEstimator DropColumns(this TransformsCatalog catalog, params string[] columnsToDrop)
-            => ColumnSelectingEstimator.DropColumns(CatalogUtils.GetEnvironment(catalog), columnsToDrop);
+        public static ColumnSelectingEstimator DropColumns(this TransformsCatalog catalog, params string[] columnNames)
+            => ColumnSelectingEstimator.DropColumns(CatalogUtils.GetEnvironment(catalog), columnNames);
 
         /// <summary>
         /// Select a list of columns to keep in a given <see cref="IDataView"/>.
@@ -121,7 +121,7 @@ public static ColumnSelectingEstimator DropColumns(this TransformsCatalog catalo
         /// </format>
         /// </remarks>
         /// <param name="catalog">The transform's catalog.</param>
-        /// <param name="keepColumns">The array of column names to keep.</param>
+        /// <param name="columnNames">The array of column names to keep.</param>
         /// <param name="keepHidden">If <see langword="true"/> will keep hidden columns and <see langword="false"/> will remove hidden columns.</param>
         /// <example>
         /// <format type="text/markdown">
@@ -131,10 +131,10 @@ public static ColumnSelectingEstimator DropColumns(this TransformsCatalog catalo
         /// </format>
         /// </example>
         public static ColumnSelectingEstimator SelectColumns(this TransformsCatalog catalog,
-            string[] keepColumns,
+            string[] columnNames,
             bool keepHidden)
             => new ColumnSelectingEstimator(CatalogUtils.GetEnvironment(catalog),
-                keepColumns, null, keepHidden, ColumnSelectingEstimator.Defaults.IgnoreMissing);
+                columnNames, null, keepHidden, ColumnSelectingEstimator.Defaults.IgnoreMissing);
 
         /// <summary>
         /// Select a list of columns to keep in a given <see cref="IDataView"/>.
@@ -146,7 +146,7 @@ public static ColumnSelectingEstimator SelectColumns(this TransformsCatalog cata
         /// ]]></format>
         /// </remarks>
         /// <param name="catalog">The transform's catalog.</param>
-        /// <param name="keepColumns">The array of column names to keep.</param>
+        /// <param name="columnNames">The array of column names to keep.</param>
         /// <example>
         /// <format type="text/markdown">
         /// <![CDATA[
@@ -155,6 +155,6 @@ public static ColumnSelectingEstimator SelectColumns(this TransformsCatalog cata
         /// </format>
         /// </example>
         public static ColumnSelectingEstimator SelectColumns(this TransformsCatalog catalog,
-            params string[] keepColumns) => catalog.SelectColumns(keepColumns, false);
+            params string[] columnNames) => catalog.SelectColumns(columnNames, false);
     }
 }