fixed some renamings

Author: artidoro

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnInfo.cs renamed to docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs

@@ -183,18 +183,18 @@ internal static IDataTransform Create(IHostEnvironment env, Options options, IDa
             host.CheckUserArg(Utils.Size(options.Columns) > 0, nameof(options.Columns));
             host.CheckUserArg(options.Count > 0, nameof(options.Count));
 
-            var columnOptionss = options.Columns.Select(inColName => new ColumnOptions(inColName, minCount: options.Count)).ToArray();
+            var columnOptions = options.Columns.Select(inColName => new ColumnOptions(inColName, minCount: options.Count)).ToArray();
 
-            return new CountFeatureSelectingEstimator(env, columnOptionss).Fit(input).Transform(input) as IDataTransform;
+            return new CountFeatureSelectingEstimator(env, columnOptions).Fit(input).Transform(input) as IDataTransform;
         }
 
-        private static void CreateDropAndCopyColumns(ColumnOptions[] columnOptionss, int size, long[][] scores,
+        private static void CreateDropAndCopyColumns(ColumnOptions[] columnOptions, int size, long[][] scores,
             out int[] selectedCount, out SlotsDroppingTransformer.ColumnOptions[] dropSlotsColumns, out (string outputColumnName, string inputColumnName)[] copyColumnsPairs)
         {
             Contracts.Assert(size > 0);
             Contracts.Assert(Utils.Size(scores) == size);
-            Contracts.AssertValue(columnOptionss);
-            Contracts.Assert(Utils.Size(columnOptionss) == size);
+            Contracts.AssertValue(columnOptions);
+            Contracts.Assert(Utils.Size(columnOptions) == size);
 
             selectedCount = new int[scores.Length];
             var dropSlotsCols = new List<SlotsDroppingTransformer.ColumnOptions>();
@@ -206,11 +206,11 @@ private static void CreateDropAndCopyColumns(ColumnOptions[] columnOptionss, int
                 selectedCount[i] = 0;
                 for (int j = 0; j < score.Length; j++)
                 {
-                    if (score[j] < columnOptionss[i].MinCount)
+                    if (score[j] < columnOptions[i].MinCount)
                     {
                         // Adjacent slots are combined into a single range.
                         int min = j;
-                        while (j < score.Length && score[j] < columnOptionss[i].MinCount)
+                        while (j < score.Length && score[j] < columnOptions[i].MinCount)
                             j++;
                         int max = j - 1;
                         slots.Add((min, max));
@@ -221,9 +221,9 @@ private static void CreateDropAndCopyColumns(ColumnOptions[] columnOptionss, int
                         selectedCount[i]++;
                 }
                 if (slots.Count <= 0)
-                    copyCols.Add((columnOptionss[i].Name, columnOptionss[i].InputColumnName));
+                    copyCols.Add((columnOptions[i].Name, columnOptions[i].InputColumnName));
                 else
-                    dropSlotsCols.Add(new SlotsDroppingTransformer.ColumnOptions(columnOptionss[i].Name, columnOptionss[i].InputColumnName, slots.ToArray()));
+                    dropSlotsCols.Add(new SlotsDroppingTransformer.ColumnOptions(columnOptions[i].Name, columnOptions[i].InputColumnName, slots.ToArray()));
             }
             dropSlotsColumns = dropSlotsCols.ToArray();
             copyColumnsPairs = copyCols.ToArray();

src/Microsoft.ML.Transforms/CountFeatureSelection.cs

@@ -106,7 +106,7 @@ internal bool TryUnparse(StringBuilder sb)
             }
         }
 
-        public sealed class ColumnOptionsEx
+        public sealed class ColumnOptions
         {
             // Either VBuffer<Key<U4>> or a single Key<U4>.
             // Note that if CustomSlotMap contains only one array, the output type of the transform will a single Key<U4>.
@@ -124,7 +124,7 @@ public int OutputValueCount
                 get { return OutputColumnType.GetValueCount(); }
             }
 
-            public ColumnOptionsEx(int[][] slotMap, int hashBits, uint hashSeed, bool ordered)
+            public ColumnOptions(int[][] slotMap, int hashBits, uint hashSeed, bool ordered)
             {
                 Contracts.CheckValueOrNull(slotMap);
                 Contracts.Check(NumBitsMin <= hashBits && hashBits < NumBitsLim);
@@ -173,7 +173,7 @@ private static VersionInfo GetVersionInfo()
                 loaderAssemblyName: typeof(HashJoiningTransform).Assembly.FullName);
         }
 
-        private readonly ColumnOptionsEx[] _exes;
+        private readonly ColumnOptions[] _exes;
 
         /// <summary>
         /// Initializes a new instance of <see cref="HashJoiningTransform"/>.
@@ -204,7 +204,7 @@ public HashJoiningTransform(IHostEnvironment env, Arguments args, IDataView inpu
             if (args.HashBits < NumBitsMin || args.HashBits >= NumBitsLim)
                 throw Host.ExceptUserArg(nameof(args.HashBits), "hashBits should be between {0} and {1} inclusive", NumBitsMin, NumBitsLim - 1);
 
-            _exes = new ColumnOptionsEx[Infos.Length];
+            _exes = new ColumnOptions[Infos.Length];
             for (int i = 0; i < Infos.Length; i++)
             {
                 var hashBits = args.Columns[i].HashBits ?? args.HashBits;
@@ -238,7 +238,7 @@ private HashJoiningTransform(IHost host, ModelLoadContext ctx, IDataView input)
 
             Host.AssertNonEmpty(Infos);
 
-            _exes = new ColumnOptionsEx[Infos.Length];
+            _exes = new ColumnOptions[Infos.Length];
             for (int i = 0; i < Infos.Length; i++)
             {
                 int hashBits = ctx.Reader.ReadInt32();
@@ -268,7 +268,7 @@ private HashJoiningTransform(IHost host, ModelLoadContext ctx, IDataView input)
                     }
                 }
 
-                _exes[i] = new ColumnOptionsEx(slotMap, hashBits, hashSeed, ordered);
+                _exes[i] = new ColumnOptions(slotMap, hashBits, hashSeed, ordered);
             }
 
             SetMetadata();
@@ -327,7 +327,7 @@ private protected override void SaveModel(ModelSaveContext ctx)
             }
         }
 
-        private ColumnOptionsEx CreateColumnOptionsEx(bool join, string customSlotMap, int hashBits, uint hashSeed, bool ordered, ColInfo colInfo)
+        private ColumnOptions CreateColumnOptionsEx(bool join, string customSlotMap, int hashBits, uint hashSeed, bool ordered, ColInfo colInfo)
         {
             int[][] slotMap = null;
             if (colInfo.TypeSrc is VectorType vectorType)
@@ -340,7 +340,7 @@ private ColumnOptionsEx CreateColumnOptionsEx(bool join, string customSlotMap, i
                 Host.Assert(Utils.Size(slotMap) >= 1);
             }
 
-            return new ColumnOptionsEx(slotMap, hashBits, hashSeed, ordered);
+            return new ColumnOptions(slotMap, hashBits, hashSeed, ordered);
         }
 
         private int[][] CompileSlotMap(string slotMapString, int srcSlotCount)