More namespace alignment

docs/samples/Microsoft.ML.Samples/Dynamic/Calibrator.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using Microsoft.ML.Calibrator;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.Data;
 
 namespace Microsoft.ML.Samples.Dynamic

docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/AveragedPerceptron.cs

@@ -1,6 +1,4 @@
-using Microsoft.ML;
-
-namespace Microsoft.ML.Samples.Dynamic.Trainers.BinaryClassification
+namespace Microsoft.ML.Samples.Dynamic.Trainers.BinaryClassification
 {
     public static class AveragedPerceptron
     {

src/Microsoft.ML.Core/Data/IEstimator.cs

@@ -7,7 +7,6 @@
 using System.Linq;
 using Microsoft.Data.DataView;
 using Microsoft.ML.Data;
-using Microsoft.ML.Model;
 
 namespace Microsoft.ML
 {

src/Microsoft.ML.Core/Data/ModelHeader.cs

@@ -8,7 +8,7 @@
 using System.Text;
 using Microsoft.ML.Internal.Utilities;
 
-namespace Microsoft.ML.Model
+namespace Microsoft.ML
 {
     [BestFriend]
     [StructLayout(LayoutKind.Explicit, Size = Size)]

src/Microsoft.ML.Core/Data/ModelLoadContext.cs

@@ -7,7 +7,7 @@
 using System.Text;
 using Microsoft.ML.Internal.Utilities;
 
-namespace Microsoft.ML.Model
+namespace Microsoft.ML
 {
     /// <summary>
     /// This is a convenience context object for loading models from a repository, for

src/Microsoft.ML.Core/Data/ModelLoading.cs

@@ -8,7 +8,7 @@
 using System.Text;
 using Microsoft.ML.Internal.Utilities;
 
-namespace Microsoft.ML.Model
+namespace Microsoft.ML
 {
     /// <summary>
     /// Signature for a repository based model loader. This is the dual of <see cref="ICanSaveModel"/>.

src/Microsoft.ML.Core/Data/ModelSaveContext.cs

@@ -7,7 +7,7 @@
 using System.Text;
 using Microsoft.ML.Internal.Utilities;
 
-namespace Microsoft.ML.Model
+namespace Microsoft.ML
 {
     /// <summary>
     /// This is a convenience context object for saving models to a repository, for

src/Microsoft.ML.Core/Data/ModelSaving.cs

@@ -6,7 +6,7 @@
 using System.IO;
 using System.Text;
 
-namespace Microsoft.ML.Model
+namespace Microsoft.ML
 {
     public sealed partial class ModelSaveContext : IDisposable
     {

src/Microsoft.ML.Core/Data/Repository.cs

@@ -8,7 +8,7 @@
 using System.IO.Compression;
 using Microsoft.ML.Internal.Utilities;
 
-namespace Microsoft.ML.Model
+namespace Microsoft.ML
 {
     /// <summary>
     /// For saving a model into a repository.

src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs

@@ -9,10 +9,10 @@
 using System.Threading.Tasks;
 using Microsoft.Data.DataView;
 using Microsoft.ML;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.Command;
 using Microsoft.ML.CommandLine;
 using Microsoft.ML.Data;
-using Microsoft.ML.Internal.Calibration;
 using Microsoft.ML.Internal.Utilities;
 using Microsoft.ML.Transforms;
 using Microsoft.ML.Transforms.Conversions;

src/Microsoft.ML.Data/Commands/TrainCommand.cs

@@ -8,11 +8,11 @@
 using System.Linq;
 using Microsoft.Data.DataView;
 using Microsoft.ML;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.Command;
 using Microsoft.ML.CommandLine;
 using Microsoft.ML.Data;
 using Microsoft.ML.Data.IO;
-using Microsoft.ML.Internal.Calibration;
 using Microsoft.ML.Internal.Utilities;
 using Microsoft.ML.Model;
 using Microsoft.ML.Transforms.Normalizers;

src/Microsoft.ML.Data/Commands/TrainTestCommand.cs

@@ -6,10 +6,10 @@
 using System.IO;
 using Microsoft.Data.DataView;
 using Microsoft.ML;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.Command;
 using Microsoft.ML.CommandLine;
 using Microsoft.ML.Data;
-using Microsoft.ML.Internal.Calibration;
 using Microsoft.ML.Internal.Utilities;
 using Microsoft.ML.Model;
 

src/Microsoft.ML.Data/DataLoadSave/Binary/UnsafeTypeOps.cs

@@ -7,7 +7,6 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.Data.DataView;
-using Microsoft.ML.Data;
 
 namespace Microsoft.ML.Internal.Internallearn
 {

src/Microsoft.ML.Data/Dirty/IniFileUtils.cs

@@ -4,7 +4,7 @@
 
 using System.Text;
 using System.Text.RegularExpressions;
-using Microsoft.ML.Internal.Calibration;
+using Microsoft.ML.Calibrators;
 
 namespace Microsoft.ML.Internal.Utilities
 {

src/Microsoft.ML.Data/Dirty/PredictorInterfaces.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.IO;
 using Microsoft.Data.DataView;
-using Microsoft.ML.Calibrator;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.Data;
 
 namespace Microsoft.ML.Internal.Internallearn

src/Microsoft.ML.Data/EntryPoints/EntryPointNode.cs

@@ -8,8 +8,6 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Microsoft.Data.DataView;
-using Microsoft.ML.Data;
-using Microsoft.ML.EntryPoints.JsonUtils;
 using Microsoft.ML.Internal.Utilities;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

src/Microsoft.ML.Data/EntryPoints/InputBase.cs

@@ -5,10 +5,10 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Data.DataView;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.CommandLine;
 using Microsoft.ML.Data;
 using Microsoft.ML.Data.IO;
-using Microsoft.ML.Internal.Calibration;
 
 namespace Microsoft.ML.EntryPoints
 {

src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs

@@ -11,7 +11,7 @@
 using Microsoft.ML.Internal.Utilities;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.ML.EntryPoints.JsonUtils
+namespace Microsoft.ML.EntryPoints
 {
     /// <summary>
     /// The class that creates and wraps around an instance of an input object and gradually populates all fields, keeping track of missing

src/Microsoft.ML.Data/EntryPoints/PredictorModelImpl.cs

@@ -7,9 +7,8 @@
 using System.IO;
 using System.Linq;
 using Microsoft.Data.DataView;
-using Microsoft.ML.Calibrator;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.Data;
-using Microsoft.ML.Internal.Calibration;
 using Microsoft.ML.Internal.Internallearn;
 using Microsoft.ML.Model;
 

src/Microsoft.ML.Data/EntryPoints/SummarizePredictor.cs

@@ -5,11 +5,10 @@
 using System.IO;
 using System.Text;
 using Microsoft.Data.DataView;
-using Microsoft.ML.Calibrator;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.CommandLine;
 using Microsoft.ML.Data;
 using Microsoft.ML.EntryPoints;
-using Microsoft.ML.Internal.Calibration;
 using Microsoft.ML.Internal.Internallearn;
 
 [assembly: EntryPointModule(typeof(SummarizePredictor))]

src/Microsoft.ML.Data/Evaluators/AnomalyDetectionEvaluator.cs

@@ -10,7 +10,6 @@
 using Microsoft.ML;
 using Microsoft.ML.CommandLine;
 using Microsoft.ML.Data;
-using Microsoft.ML.Data.Evaluators.Metrics;
 using Microsoft.ML.EntryPoints;
 using Microsoft.ML.Internal.Utilities;
 using Microsoft.ML.Transforms;

src/Microsoft.ML.Data/Evaluators/Metrics/AnomalyDetectionMetrics.cs

@@ -5,7 +5,7 @@
 using System;
 using Microsoft.Data.DataView;
 
-namespace Microsoft.ML.Data.Evaluators.Metrics
+namespace Microsoft.ML.Data
 {
     /// <summary>
     /// Evaluation results for anomaly detection.

src/Microsoft.ML.Data/Model/Onnx/ICanSaveOnnx.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.ML.Calibrator;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.Data;
 
 namespace Microsoft.ML.Model.OnnxConverter

src/Microsoft.ML.Data/Model/Pfa/ICanSavePfa.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.ML.Calibrator;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.Data;
 using Newtonsoft.Json.Linq;
 

src/Microsoft.ML.Data/Prediction/Calibrator.cs

@@ -10,11 +10,10 @@
 using System.Linq;
 using Microsoft.Data.DataView;
 using Microsoft.ML;
-using Microsoft.ML.Calibrator;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.CommandLine;
 using Microsoft.ML.Data;
 using Microsoft.ML.EntryPoints;
-using Microsoft.ML.Internal.Calibration;
 using Microsoft.ML.Internal.Internallearn;
 using Microsoft.ML.Internal.Utilities;
 using Microsoft.ML.Model;
@@ -80,7 +79,7 @@
 [assembly: EntryPointModule(typeof(PavCalibratorTrainerFactory))]
 [assembly: EntryPointModule(typeof(PlattCalibratorTrainerFactory))]
 
-namespace Microsoft.ML.Internal.Calibration
+namespace Microsoft.ML.Calibrators
 {
     /// <summary>
     /// Signature for the loaders of calibrators.

src/Microsoft.ML.Data/Prediction/CalibratorCatalog.cs

@@ -6,9 +6,8 @@
 using System.Linq;
 using Microsoft.Data.DataView;
 using Microsoft.ML;
-using Microsoft.ML.Calibrator;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.Data;
-using Microsoft.ML.Internal.Calibration;
 using Microsoft.ML.Model;
 using Microsoft.ML.Trainers;
 
@@ -21,7 +20,7 @@
 [assembly: LoadableClass(typeof(CalibratorTransformer<PavCalibrator>), typeof(PavCalibratorTransformer), null,
     typeof(SignatureLoadModel), "", PavCalibratorTransformer.LoadName)]
 
-namespace Microsoft.ML.Calibrator
+namespace Microsoft.ML.Calibrators
 {
 
     /// <summary>

src/Microsoft.ML.Data/Prediction/IPredictionTransformer.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.Data.DataView;
-using Microsoft.ML.Calibrator;
+using Microsoft.ML.Calibrators;
 
 namespace Microsoft.ML
 {

src/Microsoft.ML.Data/TrainCatalog.cs

@@ -6,7 +6,6 @@
 using System.Linq;
 using Microsoft.Data.DataView;
 using Microsoft.ML.Data;
-using Microsoft.ML.Data.Evaluators.Metrics;
 using Microsoft.ML.Transforms;
 using Microsoft.ML.Transforms.Conversions;
 

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

@@ -5,10 +5,10 @@
 using System.Collections.Generic;
 using Microsoft.Data.DataView;
 using Microsoft.ML;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.CommandLine;
 using Microsoft.ML.Data;
 using Microsoft.ML.EntryPoints;
-using Microsoft.ML.Internal.Calibration;
 using Microsoft.ML.Model;
 using Microsoft.ML.Transforms;
 

src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs

@@ -4,7 +4,6 @@
 
 using Microsoft.ML.EntryPoints;
 using Microsoft.ML.Trainers.Ensemble;
-using Microsoft.ML.Trainers.Ensemble.DiversityMeasure;
 
 [assembly: EntryPointModule(typeof(DisagreementDiversityFactory))]
 [assembly: EntryPointModule(typeof(RegressionDisagreementDiversityFactory))]

src/Microsoft.ML.Ensemble/EntryPoints/FeatureSelector.cs

@@ -4,7 +4,6 @@
 
 using Microsoft.ML.EntryPoints;
 using Microsoft.ML.Trainers.Ensemble;
-using Microsoft.ML.Trainers.Ensemble.FeatureSelector;
 
 [assembly: EntryPointModule(typeof(AllFeatureSelectorFactory))]
 [assembly: EntryPointModule(typeof(RandomFeatureSelector))]

src/Microsoft.ML.Ensemble/EntryPoints/PipelineEnsemble.cs

@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.Data.DataView;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.Data;
 using Microsoft.ML.EntryPoints;
-using Microsoft.ML.Internal.Calibration;
 using Microsoft.ML.Trainers.Ensemble;
 
 [assembly: EntryPointModule(typeof(PipelineEnsemble))]

src/Microsoft.ML.Ensemble/EntryPoints/SubModelSelector.cs

@@ -4,7 +4,6 @@
 
 using Microsoft.ML.EntryPoints;
 using Microsoft.ML.Trainers.Ensemble;
-using Microsoft.ML.Trainers.Ensemble.SubModelSelector;
 
 [assembly: EntryPointModule(typeof(AllSelectorFactory))]
 [assembly: EntryPointModule(typeof(AllSelectorMultiClassFactory))]

src/Microsoft.ML.Ensemble/PipelineEnsemble.cs

@@ -9,9 +9,9 @@
 using System.Text;
 using Microsoft.Data.DataView;
 using Microsoft.ML;
+using Microsoft.ML.Calibrators;
 using Microsoft.ML.Data;
 using Microsoft.ML.EntryPoints;
-using Microsoft.ML.Internal.Calibration;
 using Microsoft.ML.Internal.Internallearn;
 using Microsoft.ML.Internal.Utilities;
 using Microsoft.ML.Model;

src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/BaseDisagreementDiversityMeasure.cs

@@ -6,7 +6,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 
-namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure
+namespace Microsoft.ML.Trainers.Ensemble
 {
     internal abstract class BaseDisagreementDiversityMeasure<TOutput> : IDiversityMeasure<TOutput>
     {

src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/DisagreementDiversityMeasure.cs

@@ -5,12 +5,11 @@
 using System;
 using Microsoft.ML;
 using Microsoft.ML.Trainers.Ensemble;
-using Microsoft.ML.Trainers.Ensemble.DiversityMeasure;
 
 [assembly: LoadableClass(typeof(DisagreementDiversityMeasure), null, typeof(SignatureEnsembleDiversityMeasure),
     DisagreementDiversityMeasure.UserName, DisagreementDiversityMeasure.LoadName)]
 
-namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure
+namespace Microsoft.ML.Trainers.Ensemble
 {
     internal sealed class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IBinaryDiversityMeasure
     {

src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/ModelDiversityMetric.cs

@@ -4,7 +4,7 @@
 
 using System;
 
-namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure
+namespace Microsoft.ML.Trainers.Ensemble
 {
     internal sealed class ModelDiversityMetric<TOutput>
     {

src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/MultiDisagreementDiversityMeasure.cs

@@ -7,12 +7,11 @@
 using Microsoft.ML.Data;
 using Microsoft.ML.Numeric;
 using Microsoft.ML.Trainers.Ensemble;
-using Microsoft.ML.Trainers.Ensemble.DiversityMeasure;
 
 [assembly: LoadableClass(typeof(MultiDisagreementDiversityMeasure), null, typeof(SignatureEnsembleDiversityMeasure),
     DisagreementDiversityMeasure.UserName, MultiDisagreementDiversityMeasure.LoadName)]
 
-namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure
+namespace Microsoft.ML.Trainers.Ensemble
 {
     internal sealed class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>, IMulticlassDiversityMeasure
     {