diff --git a/resources/package/reforest-1.0-SNAPSHOT-jar-with-dependencies.jar b/resources/package/reforest-1.0-SNAPSHOT-jar-with-dependencies.jar index 918bd65..75243e5 100644 Binary files a/resources/package/reforest-1.0-SNAPSHOT-jar-with-dependencies.jar and b/resources/package/reforest-1.0-SNAPSHOT-jar-with-dependencies.jar differ diff --git a/resources/package/reforest-1.0-SNAPSHOT-reforest-project-maven.tar.gz b/resources/package/reforest-1.0-SNAPSHOT-reforest-project-maven.tar.gz index 1daf900..d2c835b 100644 Binary files a/resources/package/reforest-1.0-SNAPSHOT-reforest-project-maven.tar.gz and b/resources/package/reforest-1.0-SNAPSHOT-reforest-project-maven.tar.gz differ diff --git a/resources/package/reforest-1.0-SNAPSHOT-reforest-project-maven.zip b/resources/package/reforest-1.0-SNAPSHOT-reforest-project-maven.zip index eeac65b..4108c38 100644 Binary files a/resources/package/reforest-1.0-SNAPSHOT-reforest-project-maven.zip and b/resources/package/reforest-1.0-SNAPSHOT-reforest-project-maven.zip differ diff --git a/resources/package/reforest-1.0-SNAPSHOT-reforest.tar.gz b/resources/package/reforest-1.0-SNAPSHOT-reforest.tar.gz index abd8169..583b052 100644 Binary files a/resources/package/reforest-1.0-SNAPSHOT-reforest.tar.gz and b/resources/package/reforest-1.0-SNAPSHOT-reforest.tar.gz differ diff --git a/resources/package/reforest-1.0-SNAPSHOT-reforest.zip b/resources/package/reforest-1.0-SNAPSHOT-reforest.zip index b0c39f5..d194760 100644 Binary files a/resources/package/reforest-1.0-SNAPSHOT-reforest.zip and b/resources/package/reforest-1.0-SNAPSHOT-reforest.zip differ diff --git a/resources/package/reforest-1.0-SNAPSHOT.jar b/resources/package/reforest-1.0-SNAPSHOT.jar index ac10d95..b113421 100644 Binary files a/resources/package/reforest-1.0-SNAPSHOT.jar and b/resources/package/reforest-1.0-SNAPSHOT.jar differ diff --git a/src/main/scala/reforest/example/ReForeSt.scala b/src/main/scala/reforest/example/ReForeSt.scala index 786196c..198af5c 100644 --- a/src/main/scala/reforest/example/ReForeSt.scala +++ b/src/main/scala/reforest/example/ReForeSt.scala @@ -41,7 +41,7 @@ object ReForeSt { .addParameter(RFParameterType.SparkPartition, 4 * 4) .addParameter(RFParameterType.SparkExecutorMemory, "1096m") .addParameter(RFParameterType.SparkExecutorInstances, 1) - .addParameter(RFParameterType.SLCActive, false) + .addParameter(RFParameterType.SLCActive, true) .build val sc = CCUtil.getSparkContext(property) diff --git a/src/main/scala/reforest/example/ReForeStModelSelection.scala b/src/main/scala/reforest/example/ReForeStModelSelection.scala index 43cb2fa..e9532a6 100644 --- a/src/main/scala/reforest/example/ReForeStModelSelection.scala +++ b/src/main/scala/reforest/example/ReForeStModelSelection.scala @@ -35,6 +35,7 @@ object ReForeStModelSelection { .addParameter(RFParameterType.NumFeatures, 794) .addParameter(RFParameterType.NumClasses, 10) .addParameter(RFParameterType.ModelSelectionEpsilon, 0.001) + .addParameter(RFParameterType.ModelSelectionEpsilonRemove, 0.02) .addParameter(RFParameterType.NumTrees, Array(50, 80, 100)) .addParameter(RFParameterType.Depth, Array(5, 10)) .addParameter(RFParameterType.FeatureMultiplierPerNode, Array(1d, 2d)) @@ -46,8 +47,8 @@ object ReForeStModelSelection { .addParameter(RFParameterType.SparkExecutorInstances, 1) .addParameter(RFParameterType.SLCActive, true) .addParameter(RFParameterType.ModelSelection, true) -// .addParameter(RFParameterType.TestAll, true) -// .addParameter(RFParameterType.LogStat, true) + .addParameter(RFParameterType.TestAll, true) + .addParameter(RFParameterType.LogStat, true) .addStrategyFeature(new RFStrategyFeatureSQRT(794)) .build diff --git a/src/main/scala/reforest/rf/parameter/RFParameterType.scala b/src/main/scala/reforest/rf/parameter/RFParameterType.scala index c38b255..f14fd9f 100644 --- a/src/main/scala/reforest/rf/parameter/RFParameterType.scala +++ b/src/main/scala/reforest/rf/parameter/RFParameterType.scala @@ -50,7 +50,7 @@ object RFParameterType extends Enumeration { case object OutputTree extends RFParameterTypeBoolean(false) - case object SLCActive extends RFParameterTypeBoolean(false) + case object SLCActive extends RFParameterTypeBoolean(true) case object SLCActiveForce extends RFParameterTypeBoolean(false)