merge conflict resolved.

Author: codemzs

src/Microsoft.ML.TimeSeries/ExtensionsCatalog.cs

@@ -28,7 +28,7 @@ public static IidChangePointEstimator IidChangePointEstimator(this TransformsCat
         /// Create a new instance of <see cref="IidSpikeEstimator"/>
         /// </summary>
         /// <param name="catalog">The transform's catalog.</param>
-        /// <param name="outputColumnName">Name of the column resulting from the transformation of <paramref name="inputColumnName"/>.
+        /// <param name="outputColumnName">Name of the column resulting from the transformation of <paramref name="inputColumnName"/></param>.
         /// <param name="inputColumnName">Name of column to transform. If set to <see langword="null"/>, the value of the <paramref name="outputColumnName"/> will be used as source.</param>
         /// <param name="confidence">The confidence for spike detection in the range [0, 100].</param>
         /// <param name="pvalueHistoryLength">The size of the sliding window for computing the p-value.</param>

src/Microsoft.ML.TimeSeries/IidAnomalyDetectionBase.cs

@@ -131,14 +131,14 @@ public override Schema GetOutputSchema(Schema inputSchema)
 
             private protected override void SaveModel(ModelSaveContext ctx)
             {
-                Parent.SaveModel(ctx);
+                Parent.Save(ctx);
             }
 
             internal void SaveThis(ModelSaveContext ctx)
             {
                 ctx.CheckAtModel();
                 Host.Assert(InitialWindowSize == 0);
-                base.Save(ctx);
+                base.SaveModel(ctx);
 
                 // *** Binary format ***
                 // <base>

src/Microsoft.ML.TimeSeries/IidChangePointDetector.cs

@@ -32,7 +32,7 @@ namespace Microsoft.ML.TimeSeriesProcessing
     /// <summary>
     /// This class implements the change point detector transform for an i.i.d. sequence based on adaptive kernel density estimation and martingales.
     /// </summary>
-    public sealed class IidChangePointDetector : IidAnomalyDetectionBaseWrapper, IStatefulTransformer, ICanSaveModel
+    public sealed class IidChangePointDetector : IidAnomalyDetectionBaseWrapper, IStatefulTransformer
     {
         internal const string Summary = "This transform detects the change-points in an i.i.d. sequence using adaptive kernel density estimation and martingales.";
         internal const string LoaderSignature = "IidChangePointDetector";
@@ -174,7 +174,7 @@ private IidChangePointDetector(IHostEnvironment env, IidChangePointDetector tran
         {
         }
 
-        private protected override void SaveModel(ModelSaveContext ctx)
+        public override void Save(ModelSaveContext ctx)
         {
             InternalTransform.Host.CheckValue(ctx, nameof(ctx));
             ctx.CheckAtModel();
@@ -186,7 +186,7 @@ private protected override void SaveModel(ModelSaveContext ctx)
             // *** Binary format ***
             // <base>
 
-            base.SaveModel(ctx);
+            base.Save(ctx);
         }
 
         // Factory method for SignatureLoadRowMapper.

src/Microsoft.ML.TimeSeries/IidSpikeDetector.cs

@@ -155,7 +155,7 @@ private IidSpikeDetector(IHostEnvironment env, IidSpikeDetector transform)
         {
         }
 
-        private protected override void SaveModel(ModelSaveContext ctx)
+        public override void Save(ModelSaveContext ctx)
         {
             InternalTransform.Host.CheckValue(ctx, nameof(ctx));
             ctx.CheckAtModel();
@@ -166,7 +166,7 @@ private protected override void SaveModel(ModelSaveContext ctx)
             // *** Binary format ***
             // <base>
 
-            base.SaveModel(ctx);
+            base.Save(ctx);
         }
 
         // Factory method for SignatureLoadRowMapper.

src/Microsoft.ML.TimeSeries/SequentialAnomalyDetectionTransformBase.cs

@@ -350,7 +350,7 @@ public Func<int, bool> GetDependencies(Func<int, bool> activeOutput)
                         return col => false;
                 }
 
-                public void Save(ModelSaveContext ctx) => _parent.Save(ctx);
+                public void Save(ModelSaveContext ctx) => _parent.SaveModel(ctx);
 
                 public Delegate[] CreateGetters(Row input, Func<int, bool> activeOutput, out Action disposer)
                 {

src/Microsoft.ML.TimeSeries/SsaAnomalyDetectionBase.cs

@@ -257,7 +257,7 @@ public override Schema GetOutputSchema(Schema inputSchema)
 
             private protected override void SaveModel(ModelSaveContext ctx)
             {
-                Parent.SaveModel(ctx);
+                Parent.Save(ctx);
             }
 
             internal void SaveThis(ModelSaveContext ctx)

src/Microsoft.ML.TimeSeries/SsaChangePointDetector.cs

@@ -182,7 +182,7 @@ internal SsaChangePointDetector(IHostEnvironment env, ModelLoadContext ctx)
             InternalTransform.Host.CheckDecode(InternalTransform.IsAdaptive == false);
         }
 
-        private protected override void SaveModel(ModelSaveContext ctx)
+        public override void Save(ModelSaveContext ctx)
         {
             InternalTransform.Host.CheckValue(ctx, nameof(ctx));
             ctx.CheckAtModel();
@@ -196,7 +196,7 @@ private protected override void SaveModel(ModelSaveContext ctx)
             // *** Binary format ***
             // <base>
 
-            base.SaveModel(ctx);
+            base.Save(ctx);
         }
 
         // Factory method for SignatureLoadRowMapper.

src/Microsoft.ML.TimeSeries/SsaSpikeDetector.cs

@@ -164,7 +164,7 @@ internal SsaSpikeDetector(IHostEnvironment env, ModelLoadContext ctx)
             InternalTransform.Host.CheckDecode(InternalTransform.IsAdaptive == false);
         }
 
-        private protected override void SaveModel(ModelSaveContext ctx)
+        public override void Save(ModelSaveContext ctx)
         {
             InternalTransform.Host.CheckValue(ctx, nameof(ctx));
             ctx.CheckAtModel();
@@ -177,7 +177,7 @@ private protected override void SaveModel(ModelSaveContext ctx)
             // *** Binary format ***
             // <base>
 
-            base.SaveModel(ctx);
+            base.Save(ctx);
         }
 
         // Factory method for SignatureLoadRowMapper.