Internalize IEvaluator implementations.

TomFinley · TomFinley · commit 5f44e9bfe92f · 2019-02-06T16:53:45.000-08:00
diff --git a/src/Microsoft.ML.Data/Evaluators/AnomalyDetectionEvaluator.cs b/src/Microsoft.ML.Data/Evaluators/AnomalyDetectionEvaluator.cs
@@ -22,7 +22,8 @@
 
 namespace Microsoft.ML.Data
 {
-    public sealed class AnomalyDetectionEvaluator : EvaluatorBase<AnomalyDetectionEvaluator.Aggregator>
+    [BestFriend]
+    internal sealed class AnomalyDetectionEvaluator : EvaluatorBase<AnomalyDetectionEvaluator.Aggregator>
     {
         public sealed class Arguments
         {
@@ -577,7 +578,8 @@ public void Finish()
         }
     }
 
-    public sealed class AnomalyDetectionMamlEvaluator : MamlEvaluatorBase
+    [BestFriend]
+    internal sealed class AnomalyDetectionMamlEvaluator : MamlEvaluatorBase
     {
         public sealed class Arguments : ArgumentsBase
         {
diff --git a/src/Microsoft.ML.Data/Evaluators/AucAggregator.cs b/src/Microsoft.ML.Data/Evaluators/AucAggregator.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.ML.Data
 {
-    public abstract partial class EvaluatorBase<TAgg>
+    internal abstract partial class EvaluatorBase<TAgg>
     {
         internal abstract class AucAggregatorBase
         {
diff --git a/src/Microsoft.ML.Data/Evaluators/BinaryClassifierEvaluator.cs b/src/Microsoft.ML.Data/Evaluators/BinaryClassifierEvaluator.cs
@@ -28,7 +28,8 @@
 
 namespace Microsoft.ML.Data
 {
-    public sealed class BinaryClassifierEvaluator : RowToRowEvaluatorBase<BinaryClassifierEvaluator.Aggregator>
+    [BestFriend]
+    internal sealed class BinaryClassifierEvaluator : RowToRowEvaluatorBase<BinaryClassifierEvaluator.Aggregator>
     {
         public sealed class Arguments
         {
@@ -1116,7 +1117,8 @@ private void CheckInputColumnTypes(Schema schema)
         }
     }
 
-    public sealed class BinaryClassifierMamlEvaluator : MamlEvaluatorBase
+    [BestFriend]
+    internal sealed class BinaryClassifierMamlEvaluator : MamlEvaluatorBase
     {
         public class Arguments : ArgumentsBase
         {
diff --git a/src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs b/src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs
@@ -29,7 +29,8 @@ namespace Microsoft.ML.Data
 {
     using Conditional = System.Diagnostics.ConditionalAttribute;
 
-    public sealed class ClusteringEvaluator : RowToRowEvaluatorBase<ClusteringEvaluator.Aggregator>
+    [BestFriend]
+    internal sealed class ClusteringEvaluator : RowToRowEvaluatorBase<ClusteringEvaluator.Aggregator>
     {
         public sealed class Arguments
         {
@@ -758,7 +759,8 @@ private void CheckInputColumnTypes(Schema schema)
         }
     }
 
-    public sealed class ClusteringMamlEvaluator : MamlEvaluatorBase
+    [BestFriend]
+    internal sealed class ClusteringMamlEvaluator : MamlEvaluatorBase
     {
         public class Arguments : ArgumentsBase
         {
diff --git a/src/Microsoft.ML.Data/Evaluators/EvaluatorBase.cs b/src/Microsoft.ML.Data/Evaluators/EvaluatorBase.cs
@@ -17,7 +17,8 @@ namespace Microsoft.ML.Data
     ///  <see cref="GetPerInstanceMetricsCore"/>. Note that the input <see cref="RoleMappedData"/> is assumed to contain all the column
     /// roles needed for evaluation, including the score column.
     /// </summary>
-    public abstract partial class EvaluatorBase<TAgg> : IEvaluator
+    [BestFriend]
+    internal abstract partial class EvaluatorBase<TAgg> : IEvaluator
         where TAgg : EvaluatorBase<TAgg>.AggregatorBase
     {
         protected readonly IHost Host;
@@ -446,7 +447,8 @@ public override IEnumerable<TAgg> GetAll()
         }
     }
 
-    public abstract class RowToRowEvaluatorBase<TAgg> : EvaluatorBase<TAgg>
+    [BestFriend]
+    internal abstract class RowToRowEvaluatorBase<TAgg> : EvaluatorBase<TAgg>
         where TAgg : EvaluatorBase<TAgg>.AggregatorBase
     {
         [BestFriend]
diff --git a/src/Microsoft.ML.Data/Evaluators/MultiClassClassifierEvaluator.cs b/src/Microsoft.ML.Data/Evaluators/MultiClassClassifierEvaluator.cs
@@ -28,7 +28,8 @@
 
 namespace Microsoft.ML.Data
 {
-    public sealed class MultiClassClassifierEvaluator : RowToRowEvaluatorBase<MultiClassClassifierEvaluator.Aggregator>
+    [BestFriend]
+    internal sealed class MultiClassClassifierEvaluator : RowToRowEvaluatorBase<MultiClassClassifierEvaluator.Aggregator>
     {
         public sealed class Arguments
         {
@@ -822,7 +823,8 @@ private void CheckInputColumnTypes(Schema schema)
         }
     }
 
-    public sealed class MultiClassMamlEvaluator : MamlEvaluatorBase
+    [BestFriend]
+    internal sealed class MultiClassMamlEvaluator : MamlEvaluatorBase
     {
         public class Arguments : ArgumentsBase
         {
diff --git a/src/Microsoft.ML.Data/Evaluators/MultiOutputRegressionEvaluator.cs b/src/Microsoft.ML.Data/Evaluators/MultiOutputRegressionEvaluator.cs
@@ -28,7 +28,8 @@
 
 namespace Microsoft.ML.Data
 {
-    public sealed class MultiOutputRegressionEvaluator : RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>
+    [BestFriend]
+    internal sealed class MultiOutputRegressionEvaluator : RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>
     {
         public sealed class Arguments : ArgumentsBase
         {
@@ -609,7 +610,8 @@ private ValueGetter<VBuffer<ReadOnlyMemory<char>>> CreateSlotNamesGetter(Schema
         }
     }
 
-    public sealed class MultiOutputRegressionMamlEvaluator : MamlEvaluatorBase
+    [BestFriend]
+    internal sealed class MultiOutputRegressionMamlEvaluator : MamlEvaluatorBase
     {
         public sealed class Arguments : ArgumentsBase
         {
diff --git a/src/Microsoft.ML.Data/Evaluators/QuantileRegressionEvaluator.cs b/src/Microsoft.ML.Data/Evaluators/QuantileRegressionEvaluator.cs
@@ -25,7 +25,8 @@
 
 namespace Microsoft.ML.Data
 {
-    public sealed class QuantileRegressionEvaluator :
+    [BestFriend]
+    internal sealed class QuantileRegressionEvaluator :
         RegressionEvaluatorBase<QuantileRegressionEvaluator.Aggregator, VBuffer<Float>, VBuffer<Double>>
     {
         public sealed class Arguments : ArgumentsBase
@@ -457,7 +458,8 @@ private void CheckInputColumnTypes(Schema schema)
         }
     }
 
-    public sealed class QuantileRegressionMamlEvaluator : MamlEvaluatorBase
+    [BestFriend]
+    internal sealed class QuantileRegressionMamlEvaluator : MamlEvaluatorBase
     {
         public sealed class Arguments : ArgumentsBase
         {
diff --git a/src/Microsoft.ML.Data/Evaluators/RankerEvaluator.cs b/src/Microsoft.ML.Data/Evaluators/RankerEvaluator.cs
@@ -27,7 +27,8 @@
 
 namespace Microsoft.ML.Data
 {
-    public sealed class RankerEvaluator : EvaluatorBase<RankerEvaluator.Aggregator>
+    [BestFriend]
+    internal sealed class RankerEvaluator : EvaluatorBase<RankerEvaluator.Aggregator>
     {
         public sealed class Arguments
         {
@@ -836,7 +837,8 @@ public RowCursorState(int truncationLevel)
         }
     }
 
-    public sealed class RankerMamlEvaluator : MamlEvaluatorBase
+    [BestFriend]
+    internal sealed class RankerMamlEvaluator : MamlEvaluatorBase
     {
         public sealed class Arguments : ArgumentsBase
         {
diff --git a/src/Microsoft.ML.Data/Evaluators/RegressionEvaluator.cs b/src/Microsoft.ML.Data/Evaluators/RegressionEvaluator.cs
@@ -24,7 +24,8 @@
 
 namespace Microsoft.ML.Data
 {
-    public sealed class RegressionEvaluator :
+    [BestFriend]
+    internal sealed class RegressionEvaluator :
         RegressionEvaluatorBase<RegressionEvaluator.Aggregator, Float, Double>
     {
         public sealed class Arguments : ArgumentsBase
@@ -327,7 +328,8 @@ private void CheckInputColumnTypes(Schema schema)
         }
     }
 
-    public sealed class RegressionMamlEvaluator : MamlEvaluatorBase
+    [BestFriend]
+    internal sealed class RegressionMamlEvaluator : MamlEvaluatorBase
     {
         public sealed class Arguments : ArgumentsBase
         {
diff --git a/src/Microsoft.ML.Data/Evaluators/RegressionEvaluatorBase.cs b/src/Microsoft.ML.Data/Evaluators/RegressionEvaluatorBase.cs
@@ -10,7 +10,8 @@
 
 namespace Microsoft.ML.Data
 {
-    public abstract class RegressionLossEvaluatorBase<TAgg> : RowToRowEvaluatorBase<TAgg>
+    [BestFriend]
+    internal abstract class RegressionLossEvaluatorBase<TAgg> : RowToRowEvaluatorBase<TAgg>
         where TAgg : EvaluatorBase<TAgg>.AggregatorBase
     {
         public abstract class ArgumentsBase
@@ -35,7 +36,8 @@ protected RegressionLossEvaluatorBase(ArgumentsBase args, IHostEnvironment env,
         }
     }
 
-    public abstract class RegressionEvaluatorBase<TAgg, TScore, TMetrics> : RegressionLossEvaluatorBase<TAgg>
+    [BestFriend]
+    internal abstract class RegressionEvaluatorBase<TAgg, TScore, TMetrics> : RegressionLossEvaluatorBase<TAgg>
         where TAgg : RegressionEvaluatorBase<TAgg, TScore, TMetrics>.RegressionAggregatorBase
     {
         [BestFriend]

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@`
`22`	`22`
`23`	`23`	`namespace Microsoft.ML.Data`
`24`	`24`	`{`
`25`		`- public sealed class AnomalyDetectionEvaluator : EvaluatorBase<AnomalyDetectionEvaluator.Aggregator>`
	`25`	`+ [BestFriend]`
	`26`	`+ internal sealed class AnomalyDetectionEvaluator : EvaluatorBase<AnomalyDetectionEvaluator.Aggregator>`
`26`	`27`	`{`
`27`	`28`	`public sealed class Arguments`
`28`	`29`	`{`
`@@ -577,7 +578,8 @@ public void Finish()`
`577`	`578`	`}`
`578`	`579`	`}`
`579`	`580`
`580`		`- public sealed class AnomalyDetectionMamlEvaluator : MamlEvaluatorBase`
	`581`	`+ [BestFriend]`
	`582`	`+ internal sealed class AnomalyDetectionMamlEvaluator : MamlEvaluatorBase`
`581`	`583`	`{`
`582`	`584`	`public sealed class Arguments : ArgumentsBase`
`583`	`585`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace Microsoft.ML.Data`
`12`	`12`	`{`
`13`		`- public abstract partial class EvaluatorBase<TAgg>`
	`13`	`+ internal abstract partial class EvaluatorBase<TAgg>`
`14`	`14`	`{`
`15`	`15`	`internal abstract class AucAggregatorBase`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@`
`28`	`28`
`29`	`29`	`namespace Microsoft.ML.Data`
`30`	`30`	`{`
`31`		`- public sealed class BinaryClassifierEvaluator : RowToRowEvaluatorBase<BinaryClassifierEvaluator.Aggregator>`
	`31`	`+ [BestFriend]`
	`32`	`+ internal sealed class BinaryClassifierEvaluator : RowToRowEvaluatorBase<BinaryClassifierEvaluator.Aggregator>`
`32`	`33`	`{`
`33`	`34`	`public sealed class Arguments`
`34`	`35`	`{`
`@@ -1116,7 +1117,8 @@ private void CheckInputColumnTypes(Schema schema)`
`1116`	`1117`	`}`
`1117`	`1118`	`}`
`1118`	`1119`
`1119`		`- public sealed class BinaryClassifierMamlEvaluator : MamlEvaluatorBase`
	`1120`	`+ [BestFriend]`
	`1121`	`+ internal sealed class BinaryClassifierMamlEvaluator : MamlEvaluatorBase`
`1120`	`1122`	`{`
`1121`	`1123`	`public class Arguments : ArgumentsBase`
`1122`	`1124`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@ namespace Microsoft.ML.Data`
`29`	`29`	`{`
`30`	`30`	`using Conditional = System.Diagnostics.ConditionalAttribute;`
`31`	`31`
`32`		`- public sealed class ClusteringEvaluator : RowToRowEvaluatorBase<ClusteringEvaluator.Aggregator>`
	`32`	`+ [BestFriend]`
	`33`	`+ internal sealed class ClusteringEvaluator : RowToRowEvaluatorBase<ClusteringEvaluator.Aggregator>`
`33`	`34`	`{`
`34`	`35`	`public sealed class Arguments`
`35`	`36`	`{`
`@@ -758,7 +759,8 @@ private void CheckInputColumnTypes(Schema schema)`
`758`	`759`	`}`
`759`	`760`	`}`
`760`	`761`
`761`		`- public sealed class ClusteringMamlEvaluator : MamlEvaluatorBase`
	`762`	`+ [BestFriend]`
	`763`	`+ internal sealed class ClusteringMamlEvaluator : MamlEvaluatorBase`
`762`	`764`	`{`
`763`	`765`	`public class Arguments : ArgumentsBase`
`764`	`766`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ namespace Microsoft.ML.Data`
`17`	`17`	`/// <see cref="GetPerInstanceMetricsCore"/>. Note that the input <see cref="RoleMappedData"/> is assumed to contain all the column`
`18`	`18`	`/// roles needed for evaluation, including the score column.`
`19`	`19`	`/// </summary>`
`20`		`- public abstract partial class EvaluatorBase<TAgg> : IEvaluator`
	`20`	`+ [BestFriend]`
	`21`	`+ internal abstract partial class EvaluatorBase<TAgg> : IEvaluator`
`21`	`22`	`where TAgg : EvaluatorBase<TAgg>.AggregatorBase`
`22`	`23`	`{`
`23`	`24`	`protected readonly IHost Host;`
`@@ -446,7 +447,8 @@ public override IEnumerable<TAgg> GetAll()`
`446`	`447`	`}`
`447`	`448`	`}`
`448`	`449`
`449`		`- public abstract class RowToRowEvaluatorBase<TAgg> : EvaluatorBase<TAgg>`
	`450`	`+ [BestFriend]`
	`451`	`+ internal abstract class RowToRowEvaluatorBase<TAgg> : EvaluatorBase<TAgg>`
`450`	`452`	`where TAgg : EvaluatorBase<TAgg>.AggregatorBase`
`451`	`453`	`{`
`452`	`454`	`[BestFriend]`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@`
`25`	`25`
`26`	`26`	`namespace Microsoft.ML.Data`
`27`	`27`	`{`
`28`		`- public sealed class QuantileRegressionEvaluator :`
	`28`	`+ [BestFriend]`
	`29`	`+ internal sealed class QuantileRegressionEvaluator :`
`29`	`30`	`RegressionEvaluatorBase<QuantileRegressionEvaluator.Aggregator, VBuffer<Float>, VBuffer<Double>>`
`30`	`31`	`{`
`31`	`32`	`public sealed class Arguments : ArgumentsBase`
`@@ -457,7 +458,8 @@ private void CheckInputColumnTypes(Schema schema)`
`457`	`458`	`}`
`458`	`459`	`}`
`459`	`460`
`460`		`- public sealed class QuantileRegressionMamlEvaluator : MamlEvaluatorBase`
	`461`	`+ [BestFriend]`
	`462`	`+ internal sealed class QuantileRegressionMamlEvaluator : MamlEvaluatorBase`
`461`	`463`	`{`
`462`	`464`	`public sealed class Arguments : ArgumentsBase`
`463`	`465`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@`
`27`	`27`
`28`	`28`	`namespace Microsoft.ML.Data`
`29`	`29`	`{`
`30`		`- public sealed class RankerEvaluator : EvaluatorBase<RankerEvaluator.Aggregator>`
	`30`	`+ [BestFriend]`
	`31`	`+ internal sealed class RankerEvaluator : EvaluatorBase<RankerEvaluator.Aggregator>`
`31`	`32`	`{`
`32`	`33`	`public sealed class Arguments`
`33`	`34`	`{`
`@@ -836,7 +837,8 @@ public RowCursorState(int truncationLevel)`
`836`	`837`	`}`
`837`	`838`	`}`
`838`	`839`
`839`		`- public sealed class RankerMamlEvaluator : MamlEvaluatorBase`
	`840`	`+ [BestFriend]`
	`841`	`+ internal sealed class RankerMamlEvaluator : MamlEvaluatorBase`
`840`	`842`	`{`
`841`	`843`	`public sealed class Arguments : ArgumentsBase`
`842`	`844`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@`
`24`	`24`
`25`	`25`	`namespace Microsoft.ML.Data`
`26`	`26`	`{`
`27`		`- public sealed class RegressionEvaluator :`
	`27`	`+ [BestFriend]`
	`28`	`+ internal sealed class RegressionEvaluator :`
`28`	`29`	`RegressionEvaluatorBase<RegressionEvaluator.Aggregator, Float, Double>`
`29`	`30`	`{`
`30`	`31`	`public sealed class Arguments : ArgumentsBase`
`@@ -327,7 +328,8 @@ private void CheckInputColumnTypes(Schema schema)`
`327`	`328`	`}`
`328`	`329`	`}`
`329`	`330`
`330`		`- public sealed class RegressionMamlEvaluator : MamlEvaluatorBase`
	`331`	`+ [BestFriend]`
	`332`	`+ internal sealed class RegressionMamlEvaluator : MamlEvaluatorBase`
`331`	`333`	`{`
`332`	`334`	`public sealed class Arguments : ArgumentsBase`
`333`	`335`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@`
`10`	`10`
`11`	`11`	`namespace Microsoft.ML.Data`
`12`	`12`	`{`
`13`		`- public abstract class RegressionLossEvaluatorBase<TAgg> : RowToRowEvaluatorBase<TAgg>`
	`13`	`+ [BestFriend]`
	`14`	`+ internal abstract class RegressionLossEvaluatorBase<TAgg> : RowToRowEvaluatorBase<TAgg>`
`14`	`15`	`where TAgg : EvaluatorBase<TAgg>.AggregatorBase`
`15`	`16`	`{`
`16`	`17`	`public abstract class ArgumentsBase`
`@@ -35,7 +36,8 @@ protected RegressionLossEvaluatorBase(ArgumentsBase args, IHostEnvironment env,`
`35`	`36`	`}`
`36`	`37`	`}`
`37`	`38`
`38`		`- public abstract class RegressionEvaluatorBase<TAgg, TScore, TMetrics> : RegressionLossEvaluatorBase<TAgg>`
	`39`	`+ [BestFriend]`
	`40`	`+ internal abstract class RegressionEvaluatorBase<TAgg, TScore, TMetrics> : RegressionLossEvaluatorBase<TAgg>`
`39`	`41`	`where TAgg : RegressionEvaluatorBase<TAgg, TScore, TMetrics>.RegressionAggregatorBase`
`40`	`42`	`{`
`41`	`43`	`[BestFriend]`