PSL-Viz

psl-cli/src/main/java/org/linqs/psl/cli/Launcher.java

@@ -45,10 +45,10 @@
 import org.linqs.psl.model.term.Constant;
 import org.linqs.psl.parser.ModelLoader;
 import org.linqs.psl.parser.CommandLineLoader;
+import org.linqs.psl.util.ModelDataCollector;
 import org.linqs.psl.util.Reflection;
 import org.linqs.psl.util.StringUtils;
 import org.linqs.psl.util.Version;
-import org.linqs.psl.util.VizDataCollection;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
@@ -252,15 +252,15 @@ private void modelDataCollection(Model model, InferenceApplication inferenceAppl
 
         // Collect prediction and truth values for each target.
         for (Map.Entry<RandomVariableAtom, ObservedAtom> entry : trainingMap.getLabelMap().entrySet()) {
-            VizDataCollection.addTruth(entry.getKey(), entry.getValue().getValue());
+            ModelDataCollector.addTruth(entry.getKey(), entry.getValue().getValue());
         }
 
         if (closePredictionDB) {
             predictionDatabase.close();
         }
         truthDatabase.close();
 
-        VizDataCollection.dissatisfactionPerGroundRule(inferenceApplication.getGroundRuleStore());
+        ModelDataCollector.dissatisfactionPerGroundRule(inferenceApplication.getGroundRuleStore());
     }
 
     private void outputResults(Database database, DataStore dataStore, Set<StandardPredicate> closedPredicates) {
@@ -442,7 +442,7 @@ private void run() {
 
         if (parsedOptions.hasOption(CommandLineLoader.OPTION_VISUALIZATION)) {
             Options.CLI_VIZ.set(true);
-            VizDataCollection.setOutputPath(parsedOptions.getOptionValue(CommandLineLoader.OPTION_VISUALIZATION));
+            ModelDataCollector.setOutputPath(parsedOptions.getOptionValue(CommandLineLoader.OPTION_VISUALIZATION));
         }
 
         // Inference

psl-core/src/main/java/org/linqs/psl/application/inference/InferenceApplication.java

@@ -38,7 +38,6 @@
 import org.linqs.psl.util.IteratorUtils;
 import org.linqs.psl.util.MathUtils;
 import org.linqs.psl.util.Reflection;
-import org.linqs.psl.util.VizDataCollection;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

psl-core/src/main/java/org/linqs/psl/model/rule/arithmetic/AbstractArithmeticRule.java

@@ -56,6 +56,7 @@
 import org.linqs.psl.model.term.Variable;
 import org.linqs.psl.model.term.VariableTypeMap;
 import org.linqs.psl.reasoner.function.FunctionComparator;
+import org.linqs.psl.util.ModelDataCollector;
 import org.linqs.psl.util.Parallel;
 
 import com.healthmarketscience.sqlbuilder.BinaryCondition;
@@ -289,6 +290,11 @@ private void groundForNonSummation(Constant[] constants, Map<Variable, Integer>
         groundSingleNonSummationRule(constants, variableMap, atomManager, resources);
 
         results.addAll(resources.groundRules);
+        if (Options.CLI_VIZ.getBoolean()) {
+            for (GroundRule groundRule : resources.groundRules) {
+                ModelDataCollector.addGroundRule(this, groundRule, variableMap, constants);
+            }
+        }
         resources.groundRules.clear();
         resources.accessExceptionAtoms.clear();
     }
@@ -310,6 +316,11 @@ private void groundForSummation(Constant[] constants, Map<Variable, Integer> var
         groundSingleSummationRule(constants, variableMap, atomManager, resources);
 
         results.addAll(resources.groundRules);
+        if (Options.CLI_VIZ.getBoolean()) {
+            for (GroundRule groundRule : resources.groundRules) {
+                ModelDataCollector.addGroundRule(this, groundRule, variableMap, constants);
+            }
+        }
         resources.groundRules.clear();
         resources.accessExceptionAtoms.clear();
     }
@@ -337,8 +348,18 @@ private int groundAllNonSummationRule(AtomManager atomManager, GroundRuleStore g
         ResultList results = atomManager.executeQuery(new DatabaseQuery(expression.getQueryFormula(), false));
         Map<Variable, Integer> variableMap = results.getVariableMap();
 
+        int priorResourcesSize = resources.groundRules.size();
         for (int groundingIndex = 0; groundingIndex < results.size(); groundingIndex++) {
             groundSingleNonSummationRule(results.get(groundingIndex), variableMap, atomManager, resources);
+            int postGroundingResourcesSize = resources.groundRules.size();
+            // Checking the size of the resources allows us to verify if a grounding occured or not.
+            if (Options.CLI_VIZ.getBoolean()) {
+                if (postGroundingResourcesSize != priorResourcesSize) {
+                    GroundRule groundRule = resources.groundRules.get(resources.groundRules.size()-1);
+                    ModelDataCollector.addGroundRule(this, groundRule, variableMap, results.get(groundingIndex));
+                }
+            }
+            priorResourcesSize = resources.groundRules.size();
         }
 
         int count = resources.groundRules.size();
@@ -411,8 +432,18 @@ private int groundAllSummationRule(AtomManager atomManager, GroundRuleStore grou
         ResultList results = database.executeQuery(rawQuery);
         Map<Variable, Integer> variableMap = results.getVariableMap();
 
+        int priorResourcesSize = resources.groundRules.size();
         for (int groundingIndex = 0; groundingIndex < results.size(); groundingIndex++) {
             groundSingleSummationRule(results.get(groundingIndex), variableMap, atomManager, resources);
+            int postGroundingResourcesSize = resources.groundRules.size();
+            // Checking the size of the resources allows us to verify if a grounding occured or not.
+            if (Options.CLI_VIZ.getBoolean()) {
+                if (postGroundingResourcesSize != priorResourcesSize) {
+                    GroundRule groundRule = resources.groundRules.get(resources.groundRules.size()-1);
+                    ModelDataCollector.addGroundRule(this, groundRule, variableMap, results.get(groundingIndex));
+                }
+            }
+            priorResourcesSize = resources.groundRules.size();
         }
 
         int count = resources.groundRules.size();

psl-core/src/main/java/org/linqs/psl/model/rule/logical/AbstractLogicalRule.java

@@ -42,9 +42,9 @@
 import org.linqs.psl.reasoner.function.GeneralFunction;
 import org.linqs.psl.util.HashCode;
 import org.linqs.psl.util.MathUtils;
+import org.linqs.psl.util.ModelDataCollector;
 import org.linqs.psl.util.Parallel;
 import org.linqs.psl.util.StringUtils;
-import org.linqs.psl.util.VizDataCollection;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -160,7 +160,7 @@ public void ground(Constant[] constants, Map<Variable, Integer> variableMap, Ato
 
         // Visualization runtime argument is specified.
         if (Options.CLI_VIZ.getBoolean()) {
-            VizDataCollection.addGroundRule(this, groundRule, variableMap, constants);
+            ModelDataCollector.addGroundRule(this, groundRule, variableMap, constants);
         }
 
         results.add(groundRule);