rebase fixes

Author: artidoro

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

@@ -229,33 +229,6 @@ public static ValueMappingEstimator ValueMap<TInputType, TOutputType>(
             params (string outputColumnName, string inputColumnName)[] columns)
             => new ValueMappingEstimator<TInputType, TOutputType[]>(CatalogUtils.GetEnvironment(catalog), keys, values, columns);
 
-        /// <summary>
-        /// <see cref="ValueMappingEstimator"/>
-        /// </summary>
-        /// <typeparam name="TInputType">The key type.</typeparam>
-        /// <typeparam name="TOutputType">The value type.</typeparam>
-        /// <param name="catalog">The categorical transform's catalog</param>
-        /// <param name="keys">The list of keys to use for the mapping. The mapping is 1-1 with values. This list must be the same length as values and
-        /// cannot contain duplicate keys.</param>
-        /// <param name="values">The list of values (an array) to pair with the keys for the mapping. This list must be equal to the same length as keys.</param>
-        /// <param name="columns">The columns to apply this transform on.</param>
-        /// <returns>An instance of the ValueMappingEstimator</returns>
-        /// <example>
-        /// <format type="text/markdown">
-        /// <![CDATA[
-        ///  [!code-csharp[ValueMappingEstimator](~/../docs/samples/docs/samples/Microsoft.ML.Samples/Dynamic/ValueMapping.cs)]
-        ///  [!code-csharp[ValueMappingEstimator](~/../docs/samples/docs/samples/Microsoft.ML.Samples/Dynamic/ValueMappingStringToKeyType.cs)]
-        ///  [!code-csharp[ValueMappingEstimator](~/../docs/samples/docs/samples/Microsoft.ML.Samples/Dynamic/ValueMappingFloatToString.cs)]
-        ///  [!code-csharp[ValueMappingEstimator](~/../docs/samples/docs/samples/Microsoft.ML.Samples/Dynamic/ValueMappingStringToArray.cs)]
-        /// ]]></format>
-        /// </example>
-        public static ValueMappingEstimator<TInputType, TOutputType> ValueMap<TInputType, TOutputType>(
-            this TransformsCatalog.ConversionTransforms catalog,
-            IEnumerable<TInputType> keys,
-            IEnumerable<TOutputType[]> values,
-            params (string outputColumnName, string inputColumnName)[] columns)
-            => new ValueMappingEstimator<TInputType, TOutputType>(CatalogUtils.GetEnvironment(catalog), keys, values, columns);
-
         /// <summary>
         /// <see cref="ValueMappingEstimator"/>
         /// </summary>

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

@@ -275,7 +275,7 @@ public static class SkipFilter
         /// <param name="env">Host Environment.</param>
         /// <param name="input">>Input <see cref="IDataView"/>. This is the output from previous transform or loader.</param>
         /// <param name="count">Number of rows to skip</param>
-        public static IDataTransform Create(IHostEnvironment env, IDataView input, long count = SkipTakeFilter.Options.DefaultSkip)
+        public static IDataView Create(IHostEnvironment env, IDataView input, long count = SkipTakeFilter.Options.DefaultSkip)
             => SkipTakeFilter.Create(env, new SkipTakeFilter.SkipOptions() { Count = count }, input);
     }
 
@@ -288,7 +288,7 @@ public static class TakeFilter
         /// <param name="env">Host Environment.</param>
         /// <param name="input">>Input <see cref="IDataView"/>. This is the output from previous transform or loader.</param>
         /// <param name="count">Number of rows to take</param>
-        public static IDataTransform Create(IHostEnvironment env, IDataView input, long count = SkipTakeFilter.Options.DefaultTake)
+        public static IDataView Create(IHostEnvironment env, IDataView input, long count = SkipTakeFilter.Options.DefaultTake)
             => SkipTakeFilter.Create(env, new SkipTakeFilter.TakeOptions() { Count = count }, input);
     }
 }