Skip to content

Commit e10cced

Browse files
committed
removing :
Microsoft.ML.Trainers.Ensemble.DiversityMeasure Microsoft.ML.Trainers.Ensemble.FeatureSelector Microsoft.ML.Trainers.Ensemble.SubModelSelector
1 parent 4420cc7 commit e10cced

23 files changed

+19
-40
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
using Microsoft.ML.EntryPoints;
66
using Microsoft.ML.Trainers.Ensemble;
7-
using Microsoft.ML.Trainers.Ensemble.DiversityMeasure;
87

98
[assembly: EntryPointModule(typeof(DisagreementDiversityFactory))]
109
[assembly: EntryPointModule(typeof(RegressionDisagreementDiversityFactory))]

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
using Microsoft.ML.EntryPoints;
66
using Microsoft.ML.Trainers.Ensemble;
7-
using Microsoft.ML.Trainers.Ensemble.FeatureSelector;
87

98
[assembly: EntryPointModule(typeof(AllFeatureSelectorFactory))]
109
[assembly: EntryPointModule(typeof(RandomFeatureSelector))]

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
using Microsoft.ML.EntryPoints;
66
using Microsoft.ML.Trainers.Ensemble;
7-
using Microsoft.ML.Trainers.Ensemble.SubModelSelector;
87

98
[assembly: EntryPointModule(typeof(AllSelectorFactory))]
109
[assembly: EntryPointModule(typeof(AllSelectorMultiClassFactory))]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Collections.Concurrent;
77
using System.Collections.Generic;
88

9-
namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure
9+
namespace Microsoft.ML.Trainers.Ensemble
1010
{
1111
internal abstract class BaseDisagreementDiversityMeasure<TOutput> : IDiversityMeasure<TOutput>
1212
{

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
using System;
66
using Microsoft.ML;
77
using Microsoft.ML.Trainers.Ensemble;
8-
using Microsoft.ML.Trainers.Ensemble.DiversityMeasure;
98

109
[assembly: LoadableClass(typeof(DisagreementDiversityMeasure), null, typeof(SignatureEnsembleDiversityMeasure),
1110
DisagreementDiversityMeasure.UserName, DisagreementDiversityMeasure.LoadName)]
1211

13-
namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure
12+
namespace Microsoft.ML.Trainers.Ensemble
1413
{
1514
internal sealed class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IBinaryDiversityMeasure
1615
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using System;
66

7-
namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure
7+
namespace Microsoft.ML.Trainers.Ensemble
88
{
99
internal sealed class ModelDiversityMetric<TOutput>
1010
{

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
using Microsoft.ML.Data;
88
using Microsoft.ML.Numeric;
99
using Microsoft.ML.Trainers.Ensemble;
10-
using Microsoft.ML.Trainers.Ensemble.DiversityMeasure;
1110

1211
[assembly: LoadableClass(typeof(MultiDisagreementDiversityMeasure), null, typeof(SignatureEnsembleDiversityMeasure),
1312
DisagreementDiversityMeasure.UserName, MultiDisagreementDiversityMeasure.LoadName)]
1413

15-
namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure
14+
namespace Microsoft.ML.Trainers.Ensemble
1615
{
1716
internal sealed class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<VBuffer<Single>>, IMulticlassDiversityMeasure
1817
{

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
using System;
66
using Microsoft.ML;
77
using Microsoft.ML.Trainers.Ensemble;
8-
using Microsoft.ML.Trainers.Ensemble.DiversityMeasure;
98

109
[assembly: LoadableClass(typeof(RegressionDisagreementDiversityMeasure), null, typeof(SignatureEnsembleDiversityMeasure),
1110
DisagreementDiversityMeasure.UserName, RegressionDisagreementDiversityMeasure.LoadName)]
1211

13-
namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure
12+
namespace Microsoft.ML.Trainers.Ensemble
1413
{
1514
internal sealed class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure<Single>, IRegressionDiversityMeasure
1615
{

src/Microsoft.ML.Ensemble/Selector/FeatureSelector/AllFeatureSelector.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
using Microsoft.ML;
77
using Microsoft.ML.Data;
88
using Microsoft.ML.Trainers.Ensemble;
9-
using Microsoft.ML.Trainers.Ensemble.FeatureSelector;
109

1110
[assembly: LoadableClass(typeof(AllFeatureSelector), null, typeof(SignatureEnsembleFeatureSelector),
1211
AllFeatureSelector.UserName, AllFeatureSelector.LoadName)]
1312

14-
namespace Microsoft.ML.Trainers.Ensemble.FeatureSelector
13+
namespace Microsoft.ML.Trainers.Ensemble
1514
{
1615
internal sealed class AllFeatureSelector : IFeatureSelector
1716
{

src/Microsoft.ML.Ensemble/Selector/FeatureSelector/RandomFeatureSelector.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
using Microsoft.ML.Data;
1010
using Microsoft.ML.EntryPoints;
1111
using Microsoft.ML.Trainers.Ensemble;
12-
using Microsoft.ML.Trainers.Ensemble.FeatureSelector;
1312
using Microsoft.ML.Training;
1413

1514
[assembly: LoadableClass(typeof(RandomFeatureSelector), typeof(RandomFeatureSelector.Arguments),
1615
typeof(SignatureEnsembleFeatureSelector), RandomFeatureSelector.UserName, RandomFeatureSelector.LoadName)]
1716

18-
namespace Microsoft.ML.Trainers.Ensemble.FeatureSelector
17+
namespace Microsoft.ML.Trainers.Ensemble
1918
{
2019
internal class RandomFeatureSelector : IFeatureSelector
2120
{

src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Collections.Generic;
88
using Microsoft.ML.Data;
99
using Microsoft.ML.EntryPoints;
10-
using Microsoft.ML.Trainers.Ensemble.DiversityMeasure;
1110

1211
namespace Microsoft.ML.Trainers.Ensemble
1312
{

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/AllSelector.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
using System;
66
using Microsoft.ML;
77
using Microsoft.ML.Trainers.Ensemble;
8-
using Microsoft.ML.Trainers.Ensemble.SubModelSelector;
98

109
[assembly: LoadableClass(typeof(AllSelector), null, typeof(SignatureEnsembleSubModelSelector), AllSelector.UserName, AllSelector.LoadName)]
1110

12-
namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector
11+
namespace Microsoft.ML.Trainers.Ensemble
1312
{
1413
internal sealed class AllSelector : BaseSubModelSelector<Single>, IBinarySubModelSelector, IRegressionSubModelSelector
1514
{

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/AllSelectorMultiClass.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
using Microsoft.ML;
77
using Microsoft.ML.Data;
88
using Microsoft.ML.Trainers.Ensemble;
9-
using Microsoft.ML.Trainers.Ensemble.SubModelSelector;
109

1110
[assembly: LoadableClass(typeof(AllSelectorMultiClass), null, typeof(SignatureEnsembleSubModelSelector),
1211
AllSelectorMultiClass.UserName, AllSelectorMultiClass.LoadName)]
1312

14-
namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector
13+
namespace Microsoft.ML.Trainers.Ensemble
1514
{
1615
internal sealed class AllSelectorMultiClass : BaseSubModelSelector<VBuffer<Single>>, IMulticlassSubModelSelector
1716
{

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseBestPerformanceSelector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Reflection;
99
using Microsoft.ML.CommandLine;
1010

11-
namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector
11+
namespace Microsoft.ML.Trainers.Ensemble
1212
{
1313
internal abstract class BaseBestPerformanceSelector<TOutput> : SubModelDataSelector<TOutput>
1414
{

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseDiverseSelector.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
using System.Collections.Generic;
88
using Microsoft.ML.Data;
99
using Microsoft.ML.Internal.Utilities;
10-
using Microsoft.ML.Trainers.Ensemble.DiversityMeasure;
1110
using Microsoft.ML.Training;
1211

13-
namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector
12+
namespace Microsoft.ML.Trainers.Ensemble
1413
{
1514
internal abstract class BaseDiverseSelector<TOutput, TDiversityMetric> : SubModelDataSelector<TOutput>
1615
where TDiversityMetric : class, IDiversityMeasure<TOutput>

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseSubModelSelector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using Microsoft.Data.DataView;
99
using Microsoft.ML.Data;
1010

11-
namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector
11+
namespace Microsoft.ML.Trainers.Ensemble
1212
{
1313
internal abstract class BaseSubModelSelector<TOutput> : ISubModelSelector<TOutput>
1414
{

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010
using Microsoft.ML.EntryPoints;
1111
using Microsoft.ML.Internal.Internallearn;
1212
using Microsoft.ML.Trainers.Ensemble;
13-
using Microsoft.ML.Trainers.Ensemble.DiversityMeasure;
14-
using Microsoft.ML.Trainers.Ensemble.SubModelSelector;
1513

1614
[assembly: LoadableClass(typeof(BestDiverseSelectorBinary), typeof(BestDiverseSelectorBinary.Arguments),
1715
typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorBinary.UserName, BestDiverseSelectorBinary.LoadName)]
1816

19-
namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector
17+
namespace Microsoft.ML.Trainers.Ensemble
2018
{
2119
internal sealed class BestDiverseSelectorBinary : BaseDiverseSelector<Single, DisagreementDiversityMeasure>, IBinarySubModelSelector
2220
{

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@
1111
using Microsoft.ML.EntryPoints;
1212
using Microsoft.ML.Internal.Internallearn;
1313
using Microsoft.ML.Trainers.Ensemble;
14-
using Microsoft.ML.Trainers.Ensemble.DiversityMeasure;
15-
using Microsoft.ML.Trainers.Ensemble.SubModelSelector;
1614

1715
[assembly: LoadableClass(typeof(BestDiverseSelectorMultiClass), typeof(BestDiverseSelectorMultiClass.Arguments),
1816
typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorMultiClass.UserName, BestDiverseSelectorMultiClass.LoadName)]
1917

20-
namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector
18+
namespace Microsoft.ML.Trainers.Ensemble
2119
{
2220
internal sealed class BestDiverseSelectorMultiClass : BaseDiverseSelector<VBuffer<Single>, IDiversityMeasure<VBuffer<Single>>>, IMulticlassSubModelSelector
2321
{

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010
using Microsoft.ML.EntryPoints;
1111
using Microsoft.ML.Internal.Internallearn;
1212
using Microsoft.ML.Trainers.Ensemble;
13-
using Microsoft.ML.Trainers.Ensemble.DiversityMeasure;
14-
using Microsoft.ML.Trainers.Ensemble.SubModelSelector;
1513

1614
[assembly: LoadableClass(typeof(BestDiverseSelectorRegression), typeof(BestDiverseSelectorRegression.Arguments),
1715
typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorRegression.UserName, BestDiverseSelectorRegression.LoadName)]
1816

19-
namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector
17+
namespace Microsoft.ML.Trainers.Ensemble
2018
{
2119
internal sealed class BestDiverseSelectorRegression : BaseDiverseSelector<Single, RegressionDisagreementDiversityMeasure>, IRegressionSubModelSelector
2220
{

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceRegressionSelector.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
using Microsoft.ML.EntryPoints;
1010
using Microsoft.ML.Internal.Internallearn;
1111
using Microsoft.ML.Trainers.Ensemble;
12-
using Microsoft.ML.Trainers.Ensemble.SubModelSelector;
1312

1413
[assembly: LoadableClass(typeof(BestPerformanceRegressionSelector), typeof(BestPerformanceRegressionSelector.Arguments),
1514
typeof(SignatureEnsembleSubModelSelector), BestPerformanceRegressionSelector.UserName, BestPerformanceRegressionSelector.LoadName)]
1615

17-
namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector
16+
namespace Microsoft.ML.Trainers.Ensemble
1817
{
1918
internal sealed class BestPerformanceRegressionSelector : BaseBestPerformanceSelector<Single>, IRegressionSubModelSelector
2019
{

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceSelector.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
using Microsoft.ML.EntryPoints;
1010
using Microsoft.ML.Internal.Internallearn;
1111
using Microsoft.ML.Trainers.Ensemble;
12-
using Microsoft.ML.Trainers.Ensemble.SubModelSelector;
1312

1413
[assembly: LoadableClass(typeof(BestPerformanceSelector), typeof(BestPerformanceSelector.Arguments),
1514
typeof(SignatureEnsembleSubModelSelector), BestPerformanceSelector.UserName, BestPerformanceSelector.LoadName)]
1615

17-
namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector
16+
namespace Microsoft.ML.Trainers.Ensemble
1817
{
1918
internal sealed class BestPerformanceSelector : BaseBestPerformanceSelector<Single>, IBinarySubModelSelector
2019
{

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceSelectorMultiClass.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
using Microsoft.ML.EntryPoints;
1010
using Microsoft.ML.Internal.Internallearn;
1111
using Microsoft.ML.Trainers.Ensemble;
12-
using Microsoft.ML.Trainers.Ensemble.SubModelSelector;
1312

1413
[assembly: LoadableClass(typeof(BestPerformanceSelectorMultiClass), typeof(BestPerformanceSelectorMultiClass.Arguments),
1514
typeof(SignatureEnsembleSubModelSelector), BestPerformanceSelectorMultiClass.UserName, BestPerformanceSelectorMultiClass.LoadName)]
1615

17-
namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector
16+
namespace Microsoft.ML.Trainers.Ensemble
1817
{
1918
internal sealed class BestPerformanceSelectorMultiClass : BaseBestPerformanceSelector<VBuffer<Single>>, IMulticlassSubModelSelector
2019
{

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/SubModelDataSelector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Microsoft.ML.CommandLine;
77
using Microsoft.ML.Internal.Internallearn;
88

9-
namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector
9+
namespace Microsoft.ML.Trainers.Ensemble
1010
{
1111
internal abstract class SubModelDataSelector<TOutput> : BaseSubModelSelector<TOutput>
1212
{

0 commit comments

Comments
 (0)