Skip to content

Commit 7f67015

Browse files
committed
Removes the learning rate parameter from RandomForest as this parameter was not used
by the base class. This fixes dotnet#2237
1 parent 412e1f9 commit 7f67015

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

src/Microsoft.ML.FastTree/RandomForest.cs

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ private protected RandomForestTrainerBase(IHostEnvironment env,
3131
int numLeaves,
3232
int numTrees,
3333
int minDatapointsInLeaves,
34-
double learningRate,
3534
bool quantileEnabled = false)
3635
: base(env, label, featureColumn, weightColumn, null, numLeaves, numTrees, minDatapointsInLeaves)
3736
{

src/Microsoft.ML.FastTree/RandomForestClassification.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,14 @@ public sealed class Options : FastForestOptionsBase
143143
/// <param name="numLeaves">The max number of leaves in each regression tree.</param>
144144
/// <param name="numTrees">Total number of decision trees to create in the ensemble.</param>
145145
/// <param name="minDatapointsInLeaves">The minimal number of documents allowed in a leaf of a regression tree, out of the subsampled data.</param>
146-
/// <param name="learningRate">The learning rate.</param>
147146
internal FastForestClassification(IHostEnvironment env,
148147
string labelColumn = DefaultColumnNames.Label,
149148
string featureColumn = DefaultColumnNames.Features,
150149
string weightColumn = null,
151150
int numLeaves = Defaults.NumLeaves,
152151
int numTrees = Defaults.NumTrees,
153-
int minDatapointsInLeaves = Defaults.MinDocumentsInLeaves,
154-
double learningRate = Defaults.LearningRates)
155-
: base(env, TrainerUtils.MakeBoolScalarLabel(labelColumn), featureColumn, weightColumn, null, numLeaves, numTrees, minDatapointsInLeaves, learningRate)
152+
int minDatapointsInLeaves = Defaults.MinDocumentsInLeaves)
153+
: base(env, TrainerUtils.MakeBoolScalarLabel(labelColumn), featureColumn, weightColumn, null, numLeaves, numTrees, minDatapointsInLeaves)
156154
{
157155
Host.CheckNonEmpty(labelColumn, nameof(labelColumn));
158156
Host.CheckNonEmpty(featureColumn, nameof(featureColumn));

src/Microsoft.ML.FastTree/RandomForestRegression.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -271,16 +271,14 @@ public sealed class Options : FastForestOptionsBase
271271
/// <param name="numLeaves">The max number of leaves in each regression tree.</param>
272272
/// <param name="numTrees">Total number of decision trees to create in the ensemble.</param>
273273
/// <param name="minDatapointsInLeaves">The minimal number of documents allowed in a leaf of a regression tree, out of the subsampled data.</param>
274-
/// <param name="learningRate">The learning rate.</param>
275274
internal FastForestRegression(IHostEnvironment env,
276275
string labelColumn = DefaultColumnNames.Label,
277276
string featureColumn = DefaultColumnNames.Features,
278277
string weightColumn = null,
279278
int numLeaves = Defaults.NumLeaves,
280279
int numTrees = Defaults.NumTrees,
281-
int minDatapointsInLeaves = Defaults.MinDocumentsInLeaves,
282-
double learningRate = Defaults.LearningRates)
283-
: base(env, TrainerUtils.MakeR4ScalarColumn(labelColumn), featureColumn, weightColumn, null, numLeaves, numTrees, minDatapointsInLeaves, learningRate)
280+
int minDatapointsInLeaves = Defaults.MinDocumentsInLeaves)
281+
: base(env, TrainerUtils.MakeR4ScalarColumn(labelColumn), featureColumn, weightColumn, null, numLeaves, numTrees, minDatapointsInLeaves)
284282
{
285283
Host.CheckNonEmpty(labelColumn, nameof(labelColumn));
286284
Host.CheckNonEmpty(featureColumn, nameof(featureColumn));

src/Microsoft.ML.FastTree/TreeTrainersCatalog.cs

+4-8
Original file line numberDiff line numberDiff line change
@@ -257,19 +257,17 @@ public static FastTreeTweedieTrainer FastTreeTweedie(this RegressionCatalog.Regr
257257
/// <param name="numTrees">Total number of decision trees to create in the ensemble.</param>
258258
/// <param name="numLeaves">The maximum number of leaves per decision tree.</param>
259259
/// <param name="minDatapointsInLeaves">The minimal number of datapoints allowed in a leaf of the tree, out of the subsampled data.</param>
260-
/// <param name="learningRate">The learning rate.</param>
261260
public static FastForestRegression FastForest(this RegressionCatalog.RegressionTrainers catalog,
262261
string labelColumn = DefaultColumnNames.Label,
263262
string featureColumn = DefaultColumnNames.Features,
264263
string weights = null,
265264
int numLeaves = Defaults.NumLeaves,
266265
int numTrees = Defaults.NumTrees,
267-
int minDatapointsInLeaves = Defaults.MinDocumentsInLeaves,
268-
double learningRate = Defaults.LearningRates)
266+
int minDatapointsInLeaves = Defaults.MinDocumentsInLeaves)
269267
{
270268
Contracts.CheckValue(catalog, nameof(catalog));
271269
var env = CatalogUtils.GetEnvironment(catalog);
272-
return new FastForestRegression(env, labelColumn, featureColumn, weights, numLeaves, numTrees, minDatapointsInLeaves, learningRate);
270+
return new FastForestRegression(env, labelColumn, featureColumn, weights, numLeaves, numTrees, minDatapointsInLeaves);
273271
}
274272

275273
/// <summary>
@@ -297,19 +295,17 @@ public static FastForestRegression FastForest(this RegressionCatalog.RegressionT
297295
/// <param name="numTrees">Total number of decision trees to create in the ensemble.</param>
298296
/// <param name="numLeaves">The maximum number of leaves per decision tree.</param>
299297
/// <param name="minDatapointsInLeaves">The minimal number of datapoints allowed in a leaf of the tree, out of the subsampled data.</param>
300-
/// <param name="learningRate">The learning rate.</param>
301298
public static FastForestClassification FastForest(this BinaryClassificationCatalog.BinaryClassificationTrainers catalog,
302299
string labelColumn = DefaultColumnNames.Label,
303300
string featureColumn = DefaultColumnNames.Features,
304301
string weights = null,
305302
int numLeaves = Defaults.NumLeaves,
306303
int numTrees = Defaults.NumTrees,
307-
int minDatapointsInLeaves = Defaults.MinDocumentsInLeaves,
308-
double learningRate = Defaults.LearningRates)
304+
int minDatapointsInLeaves = Defaults.MinDocumentsInLeaves)
309305
{
310306
Contracts.CheckValue(catalog, nameof(catalog));
311307
var env = CatalogUtils.GetEnvironment(catalog);
312-
return new FastForestClassification(env, labelColumn, featureColumn, weights,numLeaves, numTrees, minDatapointsInLeaves, learningRate);
308+
return new FastForestClassification(env, labelColumn, featureColumn, weights,numLeaves, numTrees, minDatapointsInLeaves);
313309
}
314310

315311
/// <summary>

0 commit comments

Comments
 (0)