added support for Model Selection

alessandrolulli · Jul 25, 2017 · 47f19ee · 47f19ee
1 parent 9ff6eca
commit 47f19ee
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 4 deletions.
diff --git a/resources/package/reforest-1.0-SNAPSHOT-jar-with-dependencies.jar b/resources/package/reforest-1.0-SNAPSHOT-jar-with-dependencies.jar
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
diff --git a/resources/package/reforest-1.0-SNAPSHOT-reforest-project-maven.zip b/resources/package/reforest-1.0-SNAPSHOT-reforest-project-maven.zip
diff --git a/resources/package/reforest-1.0-SNAPSHOT-reforest.tar.gz b/resources/package/reforest-1.0-SNAPSHOT-reforest.tar.gz
diff --git a/resources/package/reforest-1.0-SNAPSHOT-reforest.zip b/resources/package/reforest-1.0-SNAPSHOT-reforest.zip
diff --git a/resources/package/reforest-1.0-SNAPSHOT.jar b/resources/package/reforest-1.0-SNAPSHOT.jar
diff --git 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
@@ -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
@@ -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)