Merge pull request #113 from sanity/classifiers

sped up optimizer
sanity · Mar 30, 2015 · 79d39ce · 79d39ce
2 parents a572f38 + 82c2b99
commit 79d39ce
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
         be accompanied by a bump in version number, regardless of how minor the change.
     -->
 
-    <version>0.7.8</version>
+    <version>0.7.9</version>
     <repositories>
         <repository>
             <id>sanity-maven-repo</id>

diff --git a/src/main/java/quickml/supervised/classifier/Classifiers.java b/src/main/java/quickml/supervised/classifier/Classifiers.java
@@ -52,7 +52,7 @@ public static <T extends ClassifierInstance> Pair<Map<String, Object>, Downsampl
                         .dataCycler(outOfTimeData)
                         .lossChecker(classifierInstanceClassifierLossChecker)
                         .valuesToTest(config)
-                        .iterations(4).build();
+                        .iterations(3).build();
         Map<String, Object> bestParams =  optimizer.determineOptimalConfig();
 
         RandomForestBuilder<T> randomForestBuilder = new RandomForestBuilder<T>(new TreeBuilder<T>().attributeIgnoringStrategy(new IgnoreAttributesWithConstantProbability(0.7))).numTrees(24);

diff --git a/src/main/java/quickml/supervised/predictiveModelOptimizer/PredictiveModelOptimizer.java b/src/main/java/quickml/supervised/predictiveModelOptimizer/PredictiveModelOptimizer.java
@@ -55,8 +55,15 @@ private void updateBestConfig() {
     private void findBestValueForField(String field) {
         FieldLosses losses = new FieldLosses();
         FieldValueRecommender fieldValueRecommender = valuesToTest.get(field);
+        if (fieldValueRecommender.getValues().size() == 1) {
+            return;
+        }
         //bestConfig is not actually bestConfig inth for loop
         for (Object value : fieldValueRecommender.getValues()) {
+            //TODO: make so it does not repeat a conf already seen in present iteration (e.g. keep a set of configs)
+            if (bestConfig.get(field).equals(value)) {
+                continue;
+            }
             bestConfig.put(field, value);
             losses.addFieldLoss(value, crossValidator.getLossForModel(bestConfig));
             if (!fieldValueRecommender.shouldContinue(losses.getLosses()))

diff --git a/.../quickml/supervised/predictiveModelOptimizer/PredictiveModelOptimizerIntegrationTest.java b/.../quickml/supervised/predictiveModelOptimizer/PredictiveModelOptimizerIntegrationTest.java
@@ -3,6 +3,7 @@
 import com.beust.jcommander.internal.Sets;
 import com.google.common.collect.Maps;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import quickml.data.ClassifierInstance;
 import quickml.data.OnespotDateTimeExtractor;
@@ -44,7 +45,7 @@ public void setUp() throws Exception {
                 .build();
     }
 
-
+    @Ignore
     @Test
     public void testOptimizer() throws Exception {
         System.out.println("optimalConfig = " + optimizer.determineOptimalConfig());