Skip to content

Bring ensembles into codebase #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Jun 27, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert leaked changes from other PR.
fix test binary ensemble test
  • Loading branch information
Ivan Matantsev committed Jun 22, 2018
commit fd7c99e63be3afbbaa02d2b673e4a6d18faf86f8
2 changes: 1 addition & 1 deletion test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1781,7 +1781,7 @@ public void EntryPointLinearSVM()
[Fact]
public void EntryPointBinaryEnsemble()
{
TestEntryPointRoutine("iris.txt", "Trainers.BinaryEnsemble");
TestEntryPointRoutine("iris.txt", "Trainers.BinaryClassifierEnsemble");
}

[Fact]
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.ML.Predictor.Tests/TestPredictors.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1820,4 +1820,4 @@ public void TestFeatureHandlerModelReuse()
}
}
#endif
}
}
2 changes: 1 addition & 1 deletion test/Microsoft.ML.TestFramework/Datasets.cs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public static class TestDatasets
name = "wine",
trainFilename = "external/winequality-white.csv",
testFilename = "external/winequality-white.csv",
loaderSettings = "col=Label:R4:11 col=Features:R4:0-10 sep=semicolon header+"
loaderSettings = "col=Label:R4:11 col=Features:R4:0-10 sep=; header+"
};

public static TestDataset msm = new TestDataset
Expand Down
37 changes: 0 additions & 37 deletions test/Microsoft.ML.TestFramework/Learners.cs
Original file line number Diff line number Diff line change
Expand Up @@ -748,42 +748,5 @@ public static PredictorAndArgs DssmDefault(int qryFeaturesCount, int docFeatures
MamlArgs = new[] { "xf=Copy{col=DupFeatures:Features} xf=MinMax{col=Features col=DupFeatures} norm=No", "col[Feature]=DupFeatures" },
BaselineProgress = true
};

public static PredictorAndArgs EnsembleRegression = new PredictorAndArgs
{
Trainer = new SubComponent("EnsembleRegression"),
Tag = "Default",
};

public static PredictorAndArgs EnsembleRegressionNumModels = new PredictorAndArgs
{
Trainer = new SubComponent("EnsembleRegression", "bp=OGD bp=FTR"),
Tag = "NumModels",
};

public static PredictorAndArgs EnsembleRegressionDiverseSelector = new PredictorAndArgs
{
Trainer = new SubComponent("EnsembleRegression", "pt = BestDiverseSelectorRegression"),
Tag = "DiverseRegression",
};

public static PredictorAndArgs EnsembleRegressionPerformanceSelector = new PredictorAndArgs
{
Trainer = new SubComponent("EnsembleRegression", "pt = BestPerformanceRegressionSelector"),
Tag = "PerformanceSelector",
};

public static PredictorAndArgs EnsembleRegressionAverageCombiner = new PredictorAndArgs
{
Trainer = new SubComponent("EnsembleRegression", "oc=Average"),
Tag = "Average",
};

public static PredictorAndArgs EnsembleRegressionStackingCombiner = new PredictorAndArgs
{
Trainer = new SubComponent("EnsembleRegression", "oc=RegressionStacking"),
Tag = "RegressionStacking",
};

}
}