Skip to content

Commit

Permalink
Refactored write to output file while minimizing write buffer.
Browse files Browse the repository at this point in the history
  • Loading branch information
@tsalh
tsalh committed Aug 23, 2020
1 parent a874434 commit 8e1ce89
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 15 deletions.
21 changes: 15 additions & 6 deletions psl-core/src/main/java/org/linqs/psl/model/rule/arithmetic/AbstractArithmeticRule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package org.linqs.psl.model.rule.arithmetic;

import org.linqs.psl.config.Options;
import org.linqs.psl.database.DatabaseQuery;
import org.linqs.psl.database.ResultList;
import org.linqs.psl.database.atom.AtomManager;
Expand Down Expand Up @@ -289,8 +290,10 @@ private void groundForNonSummation(Constant[] constants, Map<Variable, Integer>
groundSingleNonSummationRule(constants, variableMap, atomManager, resources);

results.addAll(resources.groundRules);
for (GroundRule groundRule : resources.groundRules) {
VizDataCollection.addGroundRule(this, groundRule, variableMap, constants);
if (Options.CLI_VIZ.getBoolean()) {
for (GroundRule groundRule : resources.groundRules) {
VizDataCollection.addGroundRule(this, groundRule, variableMap, constants);
}
}
resources.groundRules.clear();
resources.accessExceptionAtoms.clear();
Expand All @@ -313,8 +316,10 @@ private void groundForSummation(Constant[] constants, Map<Variable, Integer> var
groundSingleSummationRule(constants, variableMap, atomManager, resources);

results.addAll(resources.groundRules);
for (GroundRule groundRule : resources.groundRules) {
VizDataCollection.addGroundRule(this, groundRule, variableMap, constants);
if (Options.CLI_VIZ.getBoolean()) {
for (GroundRule groundRule : resources.groundRules) {
VizDataCollection.addGroundRule(this, groundRule, variableMap, constants);
}
}
resources.groundRules.clear();
resources.accessExceptionAtoms.clear();
Expand Down Expand Up @@ -346,7 +351,9 @@ private int groundAllNonSummationRule(AtomManager atomManager, GroundRuleStore g
for (int groundingIndex = 0; groundingIndex < results.size(); groundingIndex++) {
groundSingleNonSummationRule(results.get(groundingIndex), variableMap, atomManager, resources);
GroundRule groundRule = resources.groundRules.get(groundingIndex);
VizDataCollection.addGroundRule(this, groundRule, variableMap, results.get(groundingIndex));
if (Options.CLI_VIZ.getBoolean()) {
VizDataCollection.addGroundRule(this, groundRule, variableMap, results.get(groundingIndex));
}
}

int count = resources.groundRules.size();
Expand Down Expand Up @@ -422,7 +429,9 @@ private int groundAllSummationRule(AtomManager atomManager, GroundRuleStore grou
for (int groundingIndex = 0; groundingIndex < results.size(); groundingIndex++) {
groundSingleSummationRule(results.get(groundingIndex), variableMap, atomManager, resources);
GroundRule groundRule = resources.groundRules.get(groundingIndex);
VizDataCollection.addGroundRule(this, groundRule, variableMap, results.get(groundingIndex));
if (Options.CLI_VIZ.getBoolean()) {
VizDataCollection.addGroundRule(this, groundRule, variableMap, results.get(groundingIndex));
}
}

int count = resources.groundRules.size();
Expand Down
75 changes: 66 additions & 9 deletions psl-core/src/main/java/org/linqs/psl/util/VizDataCollection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.io.FilterOutputStream;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.zip.GZIPOutputStream;
Expand Down Expand Up @@ -48,28 +50,83 @@ private static synchronized void init() {
}

public static void outputJSON() {
String[] keyNames = {"truthMap", "rules", "groundRules", "groundAtoms"};
JSONObject fullJson = new JSONObject(vizData, keyNames);

PrintStream stream = System.out;

if (outputPath != null) {
try {
stream = new PrintStream(outputPath);
if (outputPath.endsWith(".gz")) {
GZIPOutputStream gzipStream = new GZIPOutputStream(stream, true);
byte[] jsonByteArray = fullJson.toString().getBytes();
gzipStream.write(jsonByteArray, 0, jsonByteArray.length);
writeToStream(gzipStream);
gzipStream.close();
} else {
stream.println(fullJson.toString());
writeToStream(stream);
}
stream.close();
} catch (IOException ex) {
throw new RuntimeException();
}
} else {
stream.println(fullJson.toString());
writeToStream(stream);
}
}
// Write to stream with JSON formatting.
private static void writeToStream(FilterOutputStream stream) {
// JSON format reference: https://www.json.org/json-en.html.
try {
stream.write("{".getBytes());
// Write each map as a JSON object, each JSON object is comma delimited.
writeMap(vizData.truthMap, stream, "truthMap");
stream.write(",".getBytes());
writeMap(stream, vizData.rules, "rules");
stream.write(",".getBytes());
writeMap(stream, vizData.groundRules, "groundRules");
stream.write(",".getBytes());
writeMap(stream, vizData.groundAtoms, "groundAtoms");

stream.write("}".getBytes());
} catch (IOException ex) {
throw new RuntimeException();
}
}
// Write map to stream with JSON formatting.
private static void writeMap(FilterOutputStream stream, Map<String, Map<String, Object>> map, String key) {
try {
// Each key must be string formatted.
stream.write((" \"" + key + "\" :{").getBytes());

Iterator<Map.Entry<String, Map<String, Object>>> iterator = map.entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry<String, Map<String, Object>> entry = iterator.next();
JSONObject jsonObject = new JSONObject(entry.getValue());
stream.write((" \"" + entry.getKey() + "\" :" + jsonObject.toString()).getBytes());
if (iterator.hasNext()) {
stream.write(",".getBytes());
}
}
stream.write("}".getBytes());
} catch (IOException ex) {
throw new RuntimeException();
}
}
// Write map to stream with JSON formatting.
private static void writeMap(Map<String, Float> map, FilterOutputStream stream, String key) {
try {
// Each key must be string formatted.
stream.write((" \"" + key + "\" :{").getBytes());

Iterator<Map.Entry<String, Float>> iterator = map.entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry<String, Float> entry = iterator.next();
stream.write((" \"" + entry.getKey() + "\" :" + entry.getValue()).getBytes());
if (iterator.hasNext()) {
stream.write(",".getBytes());
}
}

stream.write("}".getBytes());
} catch (IOException ex) {
throw new RuntimeException();
}
}

Expand Down Expand Up @@ -116,7 +173,7 @@ public static void dissatisfactionPerGroundRule(GroundRuleStore groundRuleStore)
}
}
}
// TODO: Arithmetic Ground Rules Collection

public static synchronized void addGroundRule(AbstractRule parentRule,
GroundRule groundRule, Map<Variable, Integer> variableMap, Constant[] constantsList) {
if (groundRule == null) {
Expand All @@ -136,7 +193,7 @@ public static synchronized void addGroundRule(AbstractRule parentRule,
atomCount++;
}

// Adds a rule element to RuleMap
// Adds a rule element to RuleMap.
String ruleStringID = Integer.toString(System.identityHashCode(parentRule));
Map<String, Object> rulesElementItem = new HashMap<String, Object>();
rulesElementItem.put("text", parentRule.getName());
Expand Down

0 comments on commit 8e1ce89

Please sign in to comment.