11
11
using Microsoft . ML ;
12
12
using Microsoft . ML . CommandLine ;
13
13
using Microsoft . ML . Data ;
14
- using Microsoft . ML . EntryPoints ;
15
14
using Microsoft . ML . Internal . Internallearn ;
16
15
using Microsoft . ML . Model . OnnxConverter ;
17
16
using Microsoft . ML . Model . Pfa ;
@@ -51,7 +50,7 @@ internal sealed partial class NormalizeTransform
51
50
public abstract class ColumnBase : OneToOneColumn
52
51
{
53
52
[ Argument ( ArgumentType . AtMostOnce , HelpText = "Max number of examples used to train the normalizer" , ShortName = "maxtrain" ) ]
54
- public long ? MaxTrainingExamples ;
53
+ public long ? MaximumExampleCount ;
55
54
56
55
private protected ColumnBase ( )
57
56
{
@@ -60,7 +59,7 @@ private protected ColumnBase()
60
59
private protected override bool TryUnparseCore ( StringBuilder sb )
61
60
{
62
61
Contracts . AssertValue ( sb ) ;
63
- if ( MaxTrainingExamples != null )
62
+ if ( MaximumExampleCount != null )
64
63
return false ;
65
64
return base . TryUnparseCore ( sb ) ;
66
65
}
@@ -291,7 +290,7 @@ internal static IDataTransform Create(IHostEnvironment env, MinMaxArguments args
291
290
. Select ( col => new NormalizingEstimator . MinMaxColumnOptions (
292
291
col . Name ,
293
292
col . Source ?? col . Name ,
294
- col . MaxTrainingExamples ?? args . MaxTrainingExamples ,
293
+ col . MaximumExampleCount ?? args . MaxTrainingExamples ,
295
294
col . FixZero ?? args . FixZero ) )
296
295
. ToArray ( ) ;
297
296
var normalizer = new NormalizingEstimator ( env , columns ) ;
@@ -306,10 +305,10 @@ internal static IDataTransform Create(IHostEnvironment env, MeanVarArguments arg
306
305
env . CheckValue ( args . Columns , nameof ( args . Columns ) ) ;
307
306
308
307
var columns = args . Columns
309
- . Select ( col => new NormalizingEstimator . MeanVarColumnOptions (
308
+ . Select ( col => new NormalizingEstimator . MeanVarianceColumnOptions (
310
309
col . Name ,
311
310
col . Source ?? col . Name ,
312
- col . MaxTrainingExamples ?? args . MaxTrainingExamples ,
311
+ col . MaximumExampleCount ?? args . MaxTrainingExamples ,
313
312
col . FixZero ?? args . FixZero ) )
314
313
. ToArray ( ) ;
315
314
var normalizer = new NormalizingEstimator ( env , columns ) ;
@@ -326,10 +325,10 @@ internal static IDataTransform Create(IHostEnvironment env, LogMeanVarArguments
326
325
env . CheckValue ( args . Columns , nameof ( args . Columns ) ) ;
327
326
328
327
var columns = args . Columns
329
- . Select ( col => new NormalizingEstimator . LogMeanVarColumnOptions (
328
+ . Select ( col => new NormalizingEstimator . LogMeanVarianceColumnOptions (
330
329
col . Name ,
331
330
col . Source ?? col . Name ,
332
- col . MaxTrainingExamples ?? args . MaxTrainingExamples ,
331
+ col . MaximumExampleCount ?? args . MaxTrainingExamples ,
333
332
args . UseCdf ) )
334
333
. ToArray ( ) ;
335
334
var normalizer = new NormalizingEstimator ( env , columns ) ;
@@ -349,7 +348,7 @@ internal static IDataTransform Create(IHostEnvironment env, BinArguments args, I
349
348
. Select ( col => new NormalizingEstimator . BinningColumnOptions (
350
349
col . Name ,
351
350
col . Source ?? col . Name ,
352
- col . MaxTrainingExamples ?? args . MaxTrainingExamples ,
351
+ col . MaximumExampleCount ?? args . MaxTrainingExamples ,
353
352
col . FixZero ?? args . FixZero ,
354
353
col . NumBins ?? args . NumBins ) )
355
354
. ToArray ( ) ;
@@ -926,7 +925,7 @@ public static IColumnFunctionBuilder CreateBuilder(MinMaxArguments args, IHost h
926
925
return CreateBuilder ( new NormalizingEstimator . MinMaxColumnOptions (
927
926
args . Columns [ icol ] . Name ,
928
927
args . Columns [ icol ] . Source ?? args . Columns [ icol ] . Name ,
929
- args . Columns [ icol ] . MaxTrainingExamples ?? args . MaxTrainingExamples ,
928
+ args . Columns [ icol ] . MaximumExampleCount ?? args . MaxTrainingExamples ,
930
929
args . Columns [ icol ] . FixZero ?? args . FixZero ) , host , srcIndex , srcType , cursor ) ;
931
930
}
932
931
@@ -959,15 +958,15 @@ public static IColumnFunctionBuilder CreateBuilder(MeanVarArguments args, IHost
959
958
Contracts . AssertValue ( host ) ;
960
959
host . AssertValue ( args ) ;
961
960
962
- return CreateBuilder ( new NormalizingEstimator . MeanVarColumnOptions (
961
+ return CreateBuilder ( new NormalizingEstimator . MeanVarianceColumnOptions (
963
962
args . Columns [ icol ] . Name ,
964
963
args . Columns [ icol ] . Source ?? args . Columns [ icol ] . Name ,
965
- args . Columns [ icol ] . MaxTrainingExamples ?? args . MaxTrainingExamples ,
964
+ args . Columns [ icol ] . MaximumExampleCount ?? args . MaxTrainingExamples ,
966
965
args . Columns [ icol ] . FixZero ?? args . FixZero ,
967
966
args . UseCdf ) , host , srcIndex , srcType , cursor ) ;
968
967
}
969
968
970
- public static IColumnFunctionBuilder CreateBuilder ( NormalizingEstimator . MeanVarColumnOptions column , IHost host ,
969
+ public static IColumnFunctionBuilder CreateBuilder ( NormalizingEstimator . MeanVarianceColumnOptions column , IHost host ,
971
970
int srcIndex , DataViewType srcType , DataViewRowCursor cursor )
972
971
{
973
972
Contracts . AssertValue ( host ) ;
@@ -999,14 +998,14 @@ public static IColumnFunctionBuilder CreateBuilder(LogMeanVarArguments args, IHo
999
998
Contracts . AssertValue ( host ) ;
1000
999
host . AssertValue ( args ) ;
1001
1000
1002
- return CreateBuilder ( new NormalizingEstimator . LogMeanVarColumnOptions (
1001
+ return CreateBuilder ( new NormalizingEstimator . LogMeanVarianceColumnOptions (
1003
1002
args . Columns [ icol ] . Name ,
1004
1003
args . Columns [ icol ] . Source ?? args . Columns [ icol ] . Name ,
1005
- args . Columns [ icol ] . MaxTrainingExamples ?? args . MaxTrainingExamples ,
1004
+ args . Columns [ icol ] . MaximumExampleCount ?? args . MaxTrainingExamples ,
1006
1005
args . UseCdf ) , host , srcIndex , srcType , cursor ) ;
1007
1006
}
1008
1007
1009
- public static IColumnFunctionBuilder CreateBuilder ( NormalizingEstimator . LogMeanVarColumnOptions column , IHost host ,
1008
+ public static IColumnFunctionBuilder CreateBuilder ( NormalizingEstimator . LogMeanVarianceColumnOptions column , IHost host ,
1010
1009
int srcIndex , DataViewType srcType , DataViewRowCursor cursor )
1011
1010
{
1012
1011
Contracts . AssertValue ( host ) ;
@@ -1041,7 +1040,7 @@ public static IColumnFunctionBuilder CreateBuilder(BinArguments args, IHost host
1041
1040
return CreateBuilder ( new NormalizingEstimator . BinningColumnOptions (
1042
1041
args . Columns [ icol ] . Name ,
1043
1042
args . Columns [ icol ] . Source ?? args . Columns [ icol ] . Name ,
1044
- args . Columns [ icol ] . MaxTrainingExamples ?? args . MaxTrainingExamples ,
1043
+ args . Columns [ icol ] . MaximumExampleCount ?? args . MaxTrainingExamples ,
1045
1044
args . Columns [ icol ] . FixZero ?? args . FixZero ,
1046
1045
args . Columns [ icol ] . NumBins ?? args . NumBins ) , host , srcIndex , srcType , cursor ) ;
1047
1046
}
@@ -1091,7 +1090,7 @@ public static IColumnFunctionBuilder CreateBuilder(SupervisedBinArguments args,
1091
1090
args . Columns [ icol ] . Name ,
1092
1091
args . Columns [ icol ] . Source ?? args . Columns [ icol ] . Name ,
1093
1092
args . LabelColumn ?? DefaultColumnNames . Label ,
1094
- args . Columns [ icol ] . MaxTrainingExamples ?? args . MaxTrainingExamples ,
1093
+ args . Columns [ icol ] . MaximumExampleCount ?? args . MaxTrainingExamples ,
1095
1094
args . Columns [ icol ] . FixZero ?? args . FixZero ,
1096
1095
args . Columns [ icol ] . NumBins ?? args . NumBins ,
1097
1096
args . MinBinSize ) ,
0 commit comments