svi

stanford-futuredata · Jul 1, 2016 · 4e324d1 · 4e324d1
1 parent d38f2bb
commit 4e324d1
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/macrobase/analysis/stats/mixture/VariationalInference.java b/src/main/java/macrobase/analysis/stats/mixture/VariationalInference.java
@@ -70,13 +70,21 @@ public static void trainTestStochastic(VarGMM model, List<Datum> trainData, List
             }
 
             double oldLogLikelihood = logLikelihood;
-            logLikelihood = model.calculateLogLikelihood(testData, mixingComponents, clusters);
+            logLikelihood = model.calculateLogLikelihood(trainData, mixingComponents, clusters);
+            double testLogLikelihood = model.calculateLogLikelihood(testData, mixingComponents, clusters);
+            log.debug("test loglike = {}", testLogLikelihood);
             if (model.checkTermination(logLikelihood, oldLogLikelihood, iter)) {
                 log.debug("centers = {}", clusters.getMAPLocations());
                 log.debug("covariances = {}", clusters.getMAPCovariances());
                 log.debug("weights = {}", mixingComponents.getNormalizedClusterProportions());
                 return;
             }
+            if (Math.abs(oldLogLikelihood - logLikelihood) < 1e-8) {
+                log.debug("centers = {}", clusters.getMAPLocations());
+                log.debug("covariances = {}", clusters.getMAPCovariances());
+                log.debug("weights = {}", mixingComponents.getNormalizedClusterProportions());
+                return;
+            }
         }
     }