From 877e5d524974648a62f7048a66cdbcedbc5f5b77 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 11 Feb 2025 17:12:20 -0800 Subject: [PATCH 001/100] [Terry N.] Announce the SUMO.tptp file has been generated --- src/java/com/articulate/sigma/KB.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/java/com/articulate/sigma/KB.java b/src/java/com/articulate/sigma/KB.java index a09da465..d75f7d40 100644 --- a/src/java/com/articulate/sigma/KB.java +++ b/src/java/com/articulate/sigma/KB.java @@ -3499,18 +3499,19 @@ public void loadVampire() { String vampex = KBmanager.getMgr().getPref("vampire"); KBmanager.getMgr().prover = KBmanager.Prover.VAMPIRE; if (StringUtil.emptyString(vampex)) { - System.err.println("Error in Vampire: no executable string in preferences"); + System.err.println("Error in KB.loadVampire(): no executable string in preferences"); return; } File executable = new File(vampex); if (!executable.exists()) { - System.err.println("Error in Vampire: no executable " + vampex); + System.err.println("Error in KB.loadVampire(): no executable " + vampex); return; } String lang = "tff"; if (SUMOKBtoTPTPKB.lang.equals("fof")) lang = "tptp"; String infFilename = KBmanager.getMgr().getPref("kbDir") + File.separator + this.name + "." + lang; + String fileWritten = null; if (!(new File(infFilename).exists()) || KBmanager.getMgr().infFileOld() || force) { System.out.println("INFO in KB.loadVampire(): generating " + lang + " file " + infFilename); try (PrintWriter pw = new PrintWriter(new FileWriter(infFilename))) { @@ -3521,28 +3522,34 @@ public void loadVampire() { if (lang.equals("tptp")) { SUMOKBtoTPTPKB skb = new SUMOKBtoTPTPKB(); skb.kb = this; - skb.writeFile(infFilename, null, false, pw); + fileWritten = skb.writeFile(infFilename, null, false, pw); } else { SUMOKBtoTFAKB stff = new SUMOKBtoTFAKB(); stff.kb = this; SUMOtoTFAform.initOnce(); stff.writeSorts(pw); - stff.writeFile(infFilename,null,false,pw); + fileWritten = stff.writeFile(infFilename,null,false, pw); System.out.println("INFO in KB.loadVampire(): CWA: " + SUMOKBtoTPTPKB.CWA); if (SUMOKBtoTPTPKB.CWA) pw.println(StringUtil.arrayListToCRLFString(CWAUNA.run(this))); stff.printTFFNumericConstants(pw); } - System.out.println("KB.loadVampire(): write " + lang + ", in seconds: " + (System.currentTimeMillis() - millis) / 1000); + System.out.println("INFO in KB.loadVampire(): write " + lang + ", in seconds: " + (System.currentTimeMillis() - millis) / 1000); } } catch (Exception e) { System.err.println(e.getMessage()); e.printStackTrace(); } + if (StringUtil.isNonEmptyString(fileWritten)) + System.out.println("File written: " + infFilename); + else + System.err.println("Could not write: " + infFilename); + } } + /*************************************************************** * Checks for a Leo executable, preprocesses all of the constituents */ From bc61676e7111407eee01371d2f788eeb964f46ca Mon Sep 17 00:00:00 2001 From: git Date: Tue, 11 Feb 2025 17:14:09 -0800 Subject: [PATCH 002/100] [Terry N.] use syserr for errors, minor edit to printHelp method --- src/java/com/articulate/sigma/KBmanager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/java/com/articulate/sigma/KBmanager.java b/src/java/com/articulate/sigma/KBmanager.java index 472fa29e..b7ca8748 100644 --- a/src/java/com/articulate/sigma/KBmanager.java +++ b/src/java/com/articulate/sigma/KBmanager.java @@ -156,20 +156,20 @@ public boolean infFileOld(String lang) { kb = getKB(kbname); file = new File(kbDir + File.separator + kbname + "." + lang); fileDate = new Date(file.lastModified()); - System.out.println("KBmanager.infFileOld(): file " + kbname + "." + lang + " was saved on " + fileDate); + System.out.println("INFO in KBmanager.infFileOld(lang): file " + kbname + "." + lang + " was saved on " + fileDate); if (fileDate.compareTo(configDate) < 0) { return true; } for (String f : kb.constituents) { // iterate through the constituents sfile = new File(f); sfileDate = new Date(sfile.lastModified()); - System.out.println("KBmanager.infFileOld(): file " + f + " was saved on " + sfileDate); + System.out.println("INFO in KBmanager.infFileOld(lang): file " + f + " was saved on " + sfileDate); if (fileDate.compareTo(sfileDate) < 0) { return true; } } } - System.out.println("KBmanager.infFileOld(config): returning false (not old)"); + System.out.println("INFO in KBmanager.infFileOld(lang): returning false (not old)"); return false; } @@ -179,7 +179,7 @@ public boolean infFileOld(String lang) { */ public boolean infFileOld() { - System.out.println("KBmanager.tptpOld(config): "); + System.out.println("INFO in KBmanager.infFileOld(): "); String lang = "tff"; if (SUMOKBtoTPTPKB.lang.equals("fof")) lang = "tptp"; @@ -1087,7 +1087,7 @@ public static void pythonServer() { KBmanager.getMgr().initializeOnce(); } catch (Exception e ) { - System.out.println(e.getMessage()); + System.err.println(e.getMessage()); } GatewayServer server = new GatewayServer(new PythonAPI()); server.start(); @@ -1098,7 +1098,7 @@ public static void pythonServer() { */ public static void printHelp() { - System.out.println("Sigma Knowledge Engineering Environment"); + System.out.println("KBmanager class"); System.out.println(" options:"); System.out.println(" -h - show this help screen"); System.out.println(" -p - demo Python interface"); From 9cb9c04fee95ef7a27a0f7fa8de0aaeac6d2827d Mon Sep 17 00:00:00 2001 From: git Date: Tue, 11 Feb 2025 17:14:50 -0800 Subject: [PATCH 003/100] [Terry N.] use syserr for errors, add printHelp method, extend capability of main method --- src/java/com/articulate/sigma/tp/Vampire.java | 83 ++++++++++++++----- 1 file changed, 60 insertions(+), 23 deletions(-) diff --git a/src/java/com/articulate/sigma/tp/Vampire.java b/src/java/com/articulate/sigma/tp/Vampire.java index e1507569..bb57cc7c 100644 --- a/src/java/com/articulate/sigma/tp/Vampire.java +++ b/src/java/com/articulate/sigma/tp/Vampire.java @@ -63,7 +63,7 @@ private static String[] createCommandList(File executable, int timeout, File kbF if (mode == ModeType.AVATAR) opts = "--proof tptp -t"; if (mode == ModeType.CASC) - opts = "--avatar off --mode casc --proof tptp -t"; + opts = "--mode casc -t"; // NOTE: [--mode casc] is a shortcut for [--mode portfolio --schedule casc --proof tptp] if (mode == ModeType.CUSTOM) opts = System.getenv("VAMPIRE_OPTS"); String[] optar = opts.split(" "); @@ -145,11 +145,11 @@ private void run(File kbFile, int timeout) throws Exception { String vampex = KBmanager.getMgr().getPref("vampire"); if (StringUtil.emptyString(vampex)) { - System.out.println("Error in Vampire.run(): no executable string in preferences"); + System.err.println("Error in Vampire.run(): no executable string in preferences"); } File executable = new File(vampex); if (!executable.exists()) { - System.out.println("Error in Vampire.run(): no executable " + vampex); + System.err.println("Error in Vampire.run(): no executable " + vampex); } String[] cmds = createCommandList(executable, timeout, kbFile); System.out.println("Vampire.run(): Initializing Vampire with:\n" + Arrays.toString(cmds)); @@ -168,7 +168,7 @@ private void run(File kbFile, int timeout) throws Exception { } int exitValue = _vampire.waitFor(); if (exitValue != 0) { - System.err.println("Vampire.run(): Abnormal process termination"); + System.err.println("Error in Vampire.run(): Abnormal process termination"); System.err.println(output); } System.out.println("Vampire.run() done executing"); @@ -263,7 +263,7 @@ public void run(KB kb, File kbFile, int timeout, Set stmts) throws Excep if (userAsserts != null && stmts != null) stmts.addAll(userAsserts); else { - System.out.println("Error in Vampire.run(): null query or user assertions set"); + System.err.println("Error in Vampire.run(): null query or user assertions set"); return; } writeStatements(stmts, lang); @@ -272,6 +272,19 @@ public void run(KB kb, File kbFile, int timeout, Set stmts) throws Excep run(comb,timeout); } + /** *************************************************************** + */ + public static void printHelp() { + + System.out.println(); + System.out.println("Vampire class"); + System.out.println(" options:"); + System.out.println(" -h - show this help screen"); + System.out.println(" -p - run Vampire on the default generated KB (tptp, fof or tff"); + System.out.println(" with no arguments, show this help screen and execute a test"); + System.out.println(); + } + /** ************************************************************* */ public static void main (String[] args) throws Exception { @@ -285,8 +298,8 @@ public static void main (String[] args) throws Exception { // System.out.print(vampire.assertFormula("(holds instance Adam Human)")); // System.out.print(vampire.submitQuery("(human ?X)", 1, 2)); // System.out.print(vampire.submitQuery("(holds instance ?X Human)", 5, 2)); - vampire.terminate(); */ + System.out.println("INFO in Vampire.main()"); KBmanager.getMgr().initializeOnce(); String kbName = KBmanager.getMgr().getPref("sumokbname"); KB kb = KBmanager.getMgr().getKB(kbName); @@ -294,40 +307,64 @@ public static void main (String[] args) throws Exception { String lang = "tff"; if (SUMOKBtoTPTPKB.lang.equals("fof")) lang = "tptp"; - String outfile = dir + "temp-comb." + lang; - String stmtFile = dir + "temp-stmt." + lang; - File f1 = new File(outfile); - f1.delete(); - File f2 = new File(stmtFile); - f2.delete(); - File f3 = new File(dir + kbName + KB._userAssertionsString); - f3.delete(); - File f4 = new File(dir + kbName + KB._userAssertionsTPTP); - f4.delete(); File s = new File(dir + kbName + "." + lang); - if (!s.exists()) - System.out.println("Vampire.main(): no such file: " + s); - else { + if (!s.exists()) { + System.err.println("Error in Vampire.main(): no KB file: " + s); + return; + } + + Vampire vampire = new Vampire(); + Vampire.mode = Vampire.ModeType.CASC; // default + TPTP3ProofProcessor tpp = new TPTP3ProofProcessor(); + + if (args == null || args.length == 0) { + printHelp(); + + String outfile = dir + "temp-comb." + lang; + String stmtFile = dir + "temp-stmt." + lang; + File f1 = new File(outfile); + f1.delete(); + File f2 = new File(stmtFile); + f2.delete(); + File f3 = new File(dir + kbName + KB._userAssertionsString); + f3.delete(); + File f4 = new File(dir + kbName + KB._userAssertionsTPTP); + f4.delete(); + System.out.println("Vampire.main(): first test"); Set query = new HashSet<>(); query.add("tff(conj1,conjecture,?[V__X, V__Y] : (s__subclass(V__X,V__Y)))."); System.out.println("Vampire.main(): calling Vampire with: " + s + ", 30, " + query); - Vampire vampire = new Vampire(); vampire.run(kb, s, 30, query); System.out.println("----------------\nVampire output\n"); for (String l : vampire.output) System.out.println(l); String queryStr = "(subclass ?X ?Y)"; - TPTP3ProofProcessor tpp = new TPTP3ProofProcessor(); tpp.parseProofOutput(vampire.output,queryStr,kb,vampire.qlist); System.out.println("Vampire.main(): bindings: " + tpp.bindings); System.out.println("Vampire.main(): proof: " + tpp.proof); System.out.println("-----------------\n"); - System.out.println("\n"); + System.out.println(); System.out.println("Vampire.main(): second test"); System.out.println(kb.askVampire("(subclass ?X Entity)",30,1)); - //vampire.terminate(); + } else { + if (args.length > 0 && args[0].equals("-h")) + printHelp(); + if (args.length > 0 && args[0].equals("-p")) { + vampire.run(s, 60); + + System.out.println("----------------\nVampire output\n"); + for (String l : vampire.output) { + System.out.println(l); + } + String queryStr = "(subclass ?X ?Y)"; + tpp.parseProofOutput(vampire.output, queryStr, kb, vampire.qlist); + System.out.println("Vampire.main(): bindings: " + tpp.bindings); + System.out.println("Vampire.main(): proof: " + tpp.proof); + System.out.println("-----------------\n"); + System.out.println(); + } } } } From 3976884711692c097e84756c0e19f37c9206bc2e Mon Sep 17 00:00:00 2001 From: git Date: Tue, 11 Feb 2025 17:15:43 -0800 Subject: [PATCH 004/100] [Terry N.] add external task to run vampire --- nbproject/ide-targets.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/nbproject/ide-targets.xml b/nbproject/ide-targets.xml index 1c992146..6cb1c950 100644 --- a/nbproject/ide-targets.xml +++ b/nbproject/ide-targets.xml @@ -577,4 +577,21 @@ + + + + + + + + + + + + + From 0111e63cd0066ee5a432a93f06fe54f7d0dd9874 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 11 Feb 2025 17:18:19 -0800 Subject: [PATCH 005/100] [Terry N.] thorough clean only on special occasions like after unit testing --- nbproject/project.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nbproject/project.xml b/nbproject/project.xml index bc68facb..84285fe4 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -60,11 +60,11 @@ auxiliary.show.customizer.message= - thorough.clean + clean - thorough.clean + clean dist @@ -290,7 +290,7 @@ auxiliary.show.customizer.message= folder - build/WEB-INF/classes + build/test/classes dist From 867835e6ca94102186b898b3b43a4b3815e30f3d Mon Sep 17 00:00:00 2001 From: git Date: Tue, 11 Feb 2025 17:18:54 -0800 Subject: [PATCH 006/100] [Terry N.] use syserr for errors --- src/java/com/articulate/sigma/trans/TPTPutil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/articulate/sigma/trans/TPTPutil.java b/src/java/com/articulate/sigma/trans/TPTPutil.java index 5b32e09c..980abd63 100644 --- a/src/java/com/articulate/sigma/trans/TPTPutil.java +++ b/src/java/com/articulate/sigma/trans/TPTPutil.java @@ -90,7 +90,7 @@ public static String htmlTPTPFormat(Formula f, String hyperlink, boolean traditi formString = formString.trim(); } else { - System.out.println("Error in Formula.htmlTPTPFormat(): empty TPTP formula: " + formString); + System.err.println("Error in Formula.htmlTPTPFormat(): empty TPTP formula: " + formString); continue; } formString = extractTPTPaxiom(formString); From 345e0c0224c90950f59cd48fd2519e3d2006ec46 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 11 Feb 2025 17:19:39 -0800 Subject: [PATCH 007/100] [Terry N.] lable various run.args --- nbproject/build.properties | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/nbproject/build.properties b/nbproject/build.properties index 3200cc6a..fb141209 100644 --- a/nbproject/build.properties +++ b/nbproject/build.properties @@ -101,7 +101,7 @@ source.encoding=UTF-8 # Specific SigmaKEE props #app.name=sigma -#web.app.name=${web.app.name}kee +#web.app.name=${app.name}kee ontologyportal.git=${workspace} #web.dir=web sigma_src=${basedir} @@ -126,8 +126,22 @@ kbs_home=../sumo project.license=LICENSE # Various runtime arguments here -#run.args=-g Transitway subclass -run.args=-t + +# Intentional empty arguments +#run.args= +run.args=-p + +# KIF, TPTP3ProofProcessor - run a test +#run.args=-t + +# Error checking a formula w/ com.articulate.sigma.KButilities +#run.args=-v ${formula} + +# Translate KB to TFF +# run com.articulate.sigma.trans.SUMOKBtoTFAKB + +# Translate KB to FOF +# run com.articulate.sigma.trans.SUMOKBtoTPTPKB # Tomcat Manager properties catalina.ops=-Xmx10g -Xss1m From 700d0a9ffb41b4e5a3cfddc75b3a70abf8e80864 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 11 Feb 2025 20:24:13 -0800 Subject: [PATCH 008/100] [Terry N.] var dec. outside of loops --- .../com/articulate/sigma/PredVarInst.java | 87 ++++++++++--------- 1 file changed, 48 insertions(+), 39 deletions(-) diff --git a/src/java/com/articulate/sigma/PredVarInst.java b/src/java/com/articulate/sigma/PredVarInst.java index 4e6ceb26..e2a32c52 100644 --- a/src/java/com/articulate/sigma/PredVarInst.java +++ b/src/java/com/articulate/sigma/PredVarInst.java @@ -23,10 +23,10 @@ public class PredVarInst { // The implied arity of a predicate variable from its use in a Formula - public static HashMap predVarArity = new HashMap(); + public static Map predVarArity = new HashMap<>(); // All predicates that meet that class membership and arity constraints for the given variable - private static HashMap> candidatePredicates = new HashMap>(); + private static Map> candidatePredicates = new HashMap<>(); //The list of logical terms that not related to arity check, will skip these predicates private static List logicalTerms = Arrays.asList(new String[]{"forall","exists","=>","and","or","<=>","not", "equal"}); @@ -71,7 +71,6 @@ protected static Map> addExplicitTypes(KB kb, Formula input, Set hs; for (String var : explicit.keySet()) { - hs = new HashSet<>(); if (types.containsKey(var)) { // only add keys from 'types' which contains all the pred vars hs = types.get(var); hs.addAll(explicit.get(var)); @@ -85,9 +84,7 @@ protected static Map> addExplicitTypes(KB kb, Formula input, */ private static boolean isTypeExpansion(String rel) { - if (rel.indexOf("__") == -1) - return false; - return true; + return rel.contains("__"); } /** *************************************************************** @@ -108,20 +105,24 @@ private static Set handleDouble1(KB kb) { String origForm = "(=> (and (instance ?REL1 Predicate) (instance ?REL2 Predicate) (disjointRelation ?REL1 ?REL2) (not (equal ?REL1 ?REL2)) (?REL1 @ROW2)) (not (?REL2 @ROW2)))"; if (debug) System.out.println("PredVarInst.handleDouble1(): " + origForm); - Set result = new HashSet(); + Set result = new HashSet<>(); + String arg1, arg2; + int arity1, arity2; + StringBuilder vars; + Formula newf, orig; for (String s : kb.kbCache.disjointRelations) { - String arg1 = s.substring(0,s.indexOf("\t")); - String arg2 = s.substring(s.indexOf("\t")+1); - int arity1 = kb.kbCache.getArity(arg1); - int arity2 = kb.kbCache.getArity(arg2); + arg1 = s.substring(0,s.indexOf("\t")); + arg2 = s.substring(s.indexOf("\t")+1); + arity1 = kb.kbCache.getArity(arg1); + arity2 = kb.kbCache.getArity(arg2); if (arity1 != arity2) continue; - StringBuffer vars = new StringBuffer(); + vars = new StringBuilder(); for (int i = 1; i <= arity1; i++) - vars.append(" ?ROW" + i); - Formula newf = new Formula("(=> (\" + arg1 + vars + \") (not (\" + arg2 + vars + \")))"); + vars.append(" ?ROW").append(i); + newf = new Formula("(=> (\" + arg1 + vars + \") (not (\" + arg2 + vars + \")))"); newf.sourceFile = "Merge.kif"; - Formula orig = kb.formulaMap.get(origForm); + orig = kb.formulaMap.get(origForm); if (orig != null) { newf.startLine = orig.startLine; newf.derivation.operator = "predvar"; @@ -147,7 +148,7 @@ private static Set handleDouble2(KB kb) { String origForm = "(=> (and (subrelation ?REL1 ?REL2) (instance ?REL1 Predicate) " + "(instance ?REL2 Predicate) (?REL1 @ROW)) (?REL2 @ROW))"; if (debug) System.out.println("PredVarInst.handleDouble2(): " + origForm); - Set result = new HashSet(); + Set result = new HashSet<>(); for (String r1 : kb.kbCache.relations) { if (debug) System.out.println("handleDouble2(): relation: " + r1); if (debug) System.out.println("handleDouble2(): subrelation children: " + kb.kbCache.children.get("subrelation")); @@ -157,15 +158,18 @@ private static Set handleDouble2(KB kb) { continue; Set children = kb.kbCache.children.get("subrelation").get(r1); if (children != null) { + int arity1, arity2; + StringBuilder vars; + Formula newf; for (String r2 : children) { - int arity1 = kb.kbCache.getArity(r1); - int arity2 = kb.kbCache.getArity(r2); + arity1 = kb.kbCache.getArity(r1); + arity2 = kb.kbCache.getArity(r2); if (arity1 != arity2) continue; - StringBuffer vars = new StringBuffer(); + vars = new StringBuilder(); for (int i = 1; i <= arity1; i++) - vars.append(" ?ROW" + i); - Formula newf = new Formula("(=> (" + r2 + vars + ") (" + r1 + vars + "))"); + vars.append(" ?ROW").append(i); + newf = new Formula("(=> (" + r2 + vars + ") (" + r1 + vars + "))"); newf.sourceFile = "Merge.kif"; Formula orig = kb.formulaMap.get(origForm); if (orig != null) { @@ -187,7 +191,7 @@ private static Set handleDouble2(KB kb) { */ protected static Set handleDoubles(KB kb) { - Set result = new HashSet(); + Set result = new HashSet<>(); Set result1 = handleDouble1(kb); if (result1 != null) result.addAll(result1); @@ -244,12 +248,16 @@ public static Set instantiatePredVars(Formula input, KB kb) { // 2. add explicitly defined types for predicate variables varTypes = addExplicitTypes(kb,input,varTypes); if (debug) System.out.println("instantiatePredVars(): types: " + varTypes); + Collection rels; + Integer arityInteger; + boolean ok; + Formula f, f2; for (String var : varTypes.keySet()) { if (predVarArity == null || var == null || predVarArity.get(var) == null) System.out.println("instantiatePredVars(): pred var arity null for: " + var + " in " + input); // 3.1 check: predVarArity should match arity of substituted relation - Collection rels = kb.kbCache.predicates; + rels = kb.kbCache.predicates; if (varTypes.get(var).contains("Function")) rels = kb.kbCache.functions; for (String rel : rels) { @@ -268,12 +276,12 @@ public static Set instantiatePredVars(Formula input, KB kb) { continue; } if (predVarArity == null || var == null) System.out.println("instantiatePredVars(): pred var arity null for: " + var); - Integer arityInteger = predVarArity.get(var); + arityInteger = predVarArity.get(var); int arity = 0; if (arityInteger != null) - arity = arityInteger.intValue(); + arity = arityInteger; if (kb.kbCache.valences.get(rel).equals(arity) || arity == 0) { // 0 arity means "any" - boolean ok = true; + ok = true; if (debug) System.out.println("instantiatePredVars(): types for var: " + varTypes.get(var)); for (String varType : varTypes.get(var)) { //if (debug) System.out.println("instantiatePredVars(): checking whether relation: " + rel + " is an instance of " + varType); @@ -288,12 +296,12 @@ public static Set instantiatePredVars(Formula input, KB kb) { if (debug) System.out.println("instantiatePredVars(): relation: " + rel + " is an instance of " + varType); } // 4. If ok, instantiate the predicate variable using the candidate relation - if (ok == true) { + if (ok) { if (debug) System.out.println("instantiatePredVars(): replacing: " + var + " with " + rel); - Formula f = input.deepCopy(); + f = input.deepCopy(); f = f.replaceVar(var, rel); if (debug) System.out.println("instantiatePredVars(): replaced: " + f); - Formula f2 = input.deepCopy(); + f2 = input.deepCopy(); f2.read(f.getFormula()); f.derivation.operator = "predvar"; f.derivation.parents.add(input); @@ -302,7 +310,7 @@ public static Set instantiatePredVars(Formula input, KB kb) { } } } - if (result.size() == 0) { // Return null if input contains predicate variables but cannot be initialized + if (result.isEmpty()) { // Return null if input contains predicate variables but cannot be initialized String errStr = "No predicate instantiations for "; errStr += input.getFormula(); input.errors.add(errStr); @@ -341,7 +349,7 @@ private static String hasCorrectArityRecurse(Formula f, KB kb) if (kb.kbCache != null && kb.kbCache.valences != null) intval= kb.kbCache.valences.get(rel); if (intval != null) - val = intval.intValue(); + val = intval; else { if (!logicalTerms.contains(rel) && !rel.startsWith("?")) { System.out.printf("INFO in PredVarInst.hasCorrectArityRecurse(): " + @@ -353,17 +361,18 @@ private static String hasCorrectArityRecurse(Formula f, KB kb) if (kb.kbCache == null || !kb.kbCache.transInstOf(rel, "VariableArityRelation")) { //System.out.println("INFO in PredVarInst.hasCorrectArityRecurse() variable arity: " + f); if (val > 0 && val != argList.size()) { - System.out.println("Error in PredVarInst.hasCorrectArityRecurse() expected arity " + + System.err.println("Error in PredVarInst.hasCorrectArityRecurse() expected arity " + val + " but found " + argList.size() + " for relation " + rel + " in formula: " + f); throw new IllegalArgumentException(rel); } } if (f.isSimpleClause(kb)) { //check if the clause has function clause and check arity of function clause + String result; for (Formula arg : argList) { if ((arg.atom() && kb.isFunction(arg.getFormula())) || (arg.listP() && kb.isFunctional(arg))) { - String result = hasCorrectArityRecurse(new Formula(arg), kb); + result = hasCorrectArityRecurse(new Formula(arg), kb); if (!StringUtil.emptyString(result)) return result; } @@ -375,10 +384,11 @@ private static String hasCorrectArityRecurse(Formula f, KB kb) return hasCorrectArityRecurse(f.cddrAsFormula(), kb); } } + String res; for (Formula k : argList) { if (k.atom()) continue; - String res = hasCorrectArityRecurse(k, kb); + res = hasCorrectArityRecurse(k, kb); if (!StringUtil.emptyString(res)) return res; } @@ -391,12 +401,12 @@ private static String hasCorrectArityRecurse(Formula f, KB kb) */ public static String hasCorrectArity(Formula f, KB kb) { - String res = null; + String res; try { res = hasCorrectArityRecurse(f,kb); } catch (IllegalArgumentException e){ - System.out.printf("FileName:%s\nLine number:%d\n",f.getSourceFile(),f.startLine); + System.err.printf("FileName:%s\nLine number:%d\n",f.getSourceFile(),f.startLine); return e.getMessage(); } return res; @@ -435,7 +445,7 @@ protected static Set gatherPredVarRecurse(KB kb, Formula f) { if (containsRowVariable(arglist)) predVarArity.put(arg0.getFormula(),0); // note that when expanding row vars we expand them to Formula.MAX_ARITY else - predVarArity.put(arg0.getFormula(),Integer.valueOf(arglist.size())); + predVarArity.put(arg0.getFormula(),arglist.size()); } else { if (debug) System.out.println("INFO in PredVarInst.gatherPredVarRecurse(): not a predicate var: " + arg0); @@ -495,7 +505,6 @@ public static Set gatherPredVars(KB kb, Formula f) { return f.predVarCache; } Set varlist = null; - Map> ans = new HashMap<>(); if (!StringUtil.emptyString(f.getFormula())) { varlist = gatherPredVarRecurse(kb,f); } @@ -578,7 +587,7 @@ public static void test() { */ public static void main(String[] args) { - //arityTest(); +// arityTest(); test(); /* KBmanager.getMgr().initializeOnce(); From e812cd5fd32c9d47a987e84b732362c4f125f413 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 11 Feb 2025 21:02:19 -0800 Subject: [PATCH 009/100] [Terry N.] add to compile path --- nbproject/project.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nbproject/project.xml b/nbproject/project.xml index 84285fe4..76a751fd 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -348,7 +348,7 @@ auxiliary.show.customizer.message= test/integration/java - build/WEB-INF/classes:build/test/classes:lib/commons-lang3-3.12.0.jar:lib/cos-09May2002.jar:lib/guava-19.0.jar:lib/h2-2.3.232.jar:lib/java-prolog-parser-2.0.2.jar:lib/json-simple-1.1.1.jar:lib/junit-4.13.2.jar:lib/kryo-5.6.2.jar:lib/py4j-0.10.6.jar:lib/sigmaUtils.jar:lib/stanford-corenlp-4.5.7.jar:lib/tptp.jar + build/WEB-INF/classes:build/test/classes:lib/antlr4-runtime-4.9.3.jar:lib/commons-lang3-3.12.0.jar:lib/cos-09May2002.jar:lib/guava-19.0.jar:lib/h2-2.3.232.jar:lib/java-prolog-parser-2.0.2.jar:lib/json-simple-1.1.1.jar:lib/junit-4.13.2.jar:lib/kryo-5.6.2.jar:lib/py4j-0.10.6.jar:lib/sigmaUtils.jar:lib/stanford-corenlp-4.5.7.jar:lib/tptp.jar build/test/classes 11 From 9900f5b3dbcee7cc2543379a26d487d0e84b46ed Mon Sep 17 00:00:00 2001 From: git Date: Tue, 11 Feb 2025 22:04:30 -0800 Subject: [PATCH 010/100] [Terry N.] turn on quite a few more integration tests --- .../sigma/IntegrationSigmaTestSuite.java | 4 ++-- .../sigma/IntegrationTestSuite.java | 6 ++--- .../sigma/KBmanagerInitIntegrationTest.java | 2 +- .../java/com/articulate/sigma/TPTP3Test.java | 23 ++++++++++++++----- .../VerbNet/IntegrationVerbNetTestSuite.java | 2 +- .../java/com/articulate/sigma/WSDwKBtest.java | 4 ++++ .../nlg/HtmlParaphraseIntegrationTest.java | 9 ++++++++ .../trans/IntegrationTransTestSuite.java | 2 +- .../sigma/trans/SUMOtoTFAformTest.java | 16 +++++++++++++ .../com/articulate/sigma/trans/THFtest.java | 2 ++ .../articulate/sigma/trans/TPTP2SUMOTest.java | 4 ---- 11 files changed, 56 insertions(+), 18 deletions(-) diff --git a/test/integration/java/com/articulate/sigma/IntegrationSigmaTestSuite.java b/test/integration/java/com/articulate/sigma/IntegrationSigmaTestSuite.java index 0d47cdf6..358f8427 100644 --- a/test/integration/java/com/articulate/sigma/IntegrationSigmaTestSuite.java +++ b/test/integration/java/com/articulate/sigma/IntegrationSigmaTestSuite.java @@ -20,8 +20,8 @@ KbIntegrationTest.class, PredVarInstIntegrationTest.class, SUMOformulaToTPTPformulaTest.class, // <- already tested in the UnitTestSuite -// TPTP3Test.class, -// WSDwKBtest.class + TPTP3Test.class, + WSDwKBtest.class }) public class IntegrationSigmaTestSuite extends IntegrationTestBase { diff --git a/test/integration/java/com/articulate/sigma/IntegrationTestSuite.java b/test/integration/java/com/articulate/sigma/IntegrationTestSuite.java index a39715ff..8e7612d3 100644 --- a/test/integration/java/com/articulate/sigma/IntegrationTestSuite.java +++ b/test/integration/java/com/articulate/sigma/IntegrationTestSuite.java @@ -10,9 +10,9 @@ @RunWith(Suite.class) @Suite.SuiteClasses({ IntegrationSigmaTestSuite.class, -// IntegrationVerbNetTestSuite.class, -// IntegrationNLGTestSuite.class, -// IntegrationTransTestSuite.class + IntegrationVerbNetTestSuite.class, + IntegrationNLGTestSuite.class, + IntegrationTransTestSuite.class }) public class IntegrationTestSuite extends IntegrationTestBase { diff --git a/test/integration/java/com/articulate/sigma/KBmanagerInitIntegrationTest.java b/test/integration/java/com/articulate/sigma/KBmanagerInitIntegrationTest.java index aab0aa09..776965af 100644 --- a/test/integration/java/com/articulate/sigma/KBmanagerInitIntegrationTest.java +++ b/test/integration/java/com/articulate/sigma/KBmanagerInitIntegrationTest.java @@ -107,7 +107,7 @@ else if (fileName.startsWith("SUMO_")) { @Test public void testInitializationTime() { - assertTrue("Actual time = " + IntegrationTestBase.totalKbMgrInitTime, IntegrationTestBase.totalKbMgrInitTime < 120000); + assertTrue("Actual time = " + IntegrationTestBase.totalKbMgrInitTime, IntegrationTestBase.totalKbMgrInitTime < 150000); // Just in case something whacky is going on, make sure it's greater than some minimum, too. assertTrue("Actual time = " + IntegrationTestBase.totalKbMgrInitTime, IntegrationTestBase.totalKbMgrInitTime > 10000); } diff --git a/test/integration/java/com/articulate/sigma/TPTP3Test.java b/test/integration/java/com/articulate/sigma/TPTP3Test.java index 10fb6e62..18125e48 100644 --- a/test/integration/java/com/articulate/sigma/TPTP3Test.java +++ b/test/integration/java/com/articulate/sigma/TPTP3Test.java @@ -7,17 +7,20 @@ import java.io.FileNotFoundException; import java.io.FileReader; +import java.io.IOException; import java.io.LineNumberReader; import java.io.StringReader; import org.junit.Test; import static org.junit.Assert.*; +import org.junit.Ignore; public class TPTP3Test extends IntegrationTestBase { /** *************************************************************** */ @Test + @Ignore public void testParseProofFile () { System.out.println("-----------------------testParseProofFile--------------------------"); @@ -45,6 +48,7 @@ public void testParseProofFile () { /** *************************************************************** */ @Test + @Ignore public void testE () { KBmanager.getMgr().prover = KBmanager.Prover.EPROVER; @@ -78,7 +82,7 @@ public void testE () { assertEquals(6,tpp.proof.size()); eprover.terminate(); } - catch (Exception e) { + catch (IOException e) { System.out.println(e.getMessage()); } System.out.println("\n\n"); @@ -87,6 +91,7 @@ public void testE () { /** *************************************************************** */ @Test + @Ignore public void testVampireAvatar () { KBmanager.getMgr().prover = KBmanager.Prover.VAMPIRE; @@ -117,6 +122,7 @@ public void testVampireAvatar () { /** *************************************************************** */ @Test + @Ignore public void testVampireCASC () { KBmanager.getMgr().prover = KBmanager.Prover.VAMPIRE; @@ -139,7 +145,7 @@ public void testVampireCASC () { System.out.println("Success"); else System.out.println("FAIL"); - assertEquals(10,tpp.proof.size()); + assertEquals(8,tpp.proof.size()); System.out.println("answers: " + result); assertEquals("false",tpp.proof.get(7).sumo); result = tpp.bindings.toString(); @@ -159,6 +165,7 @@ public void testVampireCASC () { /** *************************************************************** */ @Test + @Ignore public void testVampireCASCBindings () { KBmanager.getMgr().prover = KBmanager.Prover.VAMPIRE; @@ -190,6 +197,7 @@ public void testVampireCASCBindings () { /** *************************************************************** */ @Test + @Ignore public void testVampireCASCBindings2 () { KBmanager.getMgr().prover = KBmanager.Prover.VAMPIRE; @@ -223,6 +231,7 @@ public void testVampireCASCBindings2 () { /** *************************************************************** */ @Test + @Ignore public void testParseProofStep () { String ps1 = "fof(c_0_5, axiom, (s__subclass(s__Artifact,s__Object)), c_0_3)."; @@ -231,10 +240,10 @@ public void testParseProofStep () { String ps3 = "cnf(c_0_14,negated_conjecture,($false), " + "inference(eval_answer_literal,[status(thm)], [inference(spm,[status(thm)],[c_0_12, c_0_13, theory(equality)]), theory(answers)]), ['proof'])."; TPTP3ProofProcessor tpp = new TPTP3ProofProcessor(); - tpp.idTable.put("c_0_0", Integer.valueOf(0)); - tpp.idTable.put("c_0_3", Integer.valueOf(1)); - tpp.idTable.put("c_0_12", Integer.valueOf(2)); - tpp.idTable.put("c_0_13", Integer.valueOf(3)); + tpp.idTable.put("c_0_0", 0); + tpp.idTable.put("c_0_3", 1); + tpp.idTable.put("c_0_12", 2); + tpp.idTable.put("c_0_13", 3); System.out.println("----------------------testParseProofStep---------------------------"); String result = tpp.parseProofStep(ps1).toString().trim(); System.out.println(tpp.parseProofStep(ps1)); @@ -343,6 +352,7 @@ public void testParseProofStep4 () { /** *************************************************************** */ @Test + @Ignore public void testParseProofStep5 () { String ps1 = "cnf(c_0_8, negated_conjecture, ($false), " + @@ -370,6 +380,7 @@ public void testParseProofStep5 () { /** *************************************************************** */ @Test + @Ignore public void testParseProofStep6 () { String ps1 = "fof(f16682,plain,(\n" + diff --git a/test/integration/java/com/articulate/sigma/VerbNet/IntegrationVerbNetTestSuite.java b/test/integration/java/com/articulate/sigma/VerbNet/IntegrationVerbNetTestSuite.java index 5b9596cc..059e2039 100644 --- a/test/integration/java/com/articulate/sigma/VerbNet/IntegrationVerbNetTestSuite.java +++ b/test/integration/java/com/articulate/sigma/VerbNet/IntegrationVerbNetTestSuite.java @@ -12,7 +12,7 @@ @RunWith(Suite.class) @Suite.SuiteClasses({ - VerbNetTest.class +// VerbNetTest.class }) public class IntegrationVerbNetTestSuite extends IntegrationTestBase { diff --git a/test/integration/java/com/articulate/sigma/WSDwKBtest.java b/test/integration/java/com/articulate/sigma/WSDwKBtest.java index dfe91a4c..8eb01425 100644 --- a/test/integration/java/com/articulate/sigma/WSDwKBtest.java +++ b/test/integration/java/com/articulate/sigma/WSDwKBtest.java @@ -10,6 +10,7 @@ import org.junit.Test; import static junit.framework.TestCase.assertEquals; +import org.junit.Ignore; public class WSDwKBtest extends IntegrationTestBase { @@ -26,6 +27,7 @@ public void setUpInterpreter() throws IOException { /**************************************************************** */ @Test + @Ignore public void testHyundai() { System.out.println("---------------------------"); @@ -77,6 +79,7 @@ public void testSentenceWSD1() { /** *************************************************************** */ @Test + @Ignore public void testSentenceWSD2() { System.out.println("---------------------------"); @@ -107,6 +110,7 @@ public void testSentenceWSD3() { /** *************************************************************** */ @Test + @Ignore public void testSentenceWSD4() { System.out.println("---------------------------"); diff --git a/test/integration/java/com/articulate/sigma/nlg/HtmlParaphraseIntegrationTest.java b/test/integration/java/com/articulate/sigma/nlg/HtmlParaphraseIntegrationTest.java index 3ff7ac34..6af7a951 100644 --- a/test/integration/java/com/articulate/sigma/nlg/HtmlParaphraseIntegrationTest.java +++ b/test/integration/java/com/articulate/sigma/nlg/HtmlParaphraseIntegrationTest.java @@ -17,6 +17,7 @@ public class HtmlParaphraseIntegrationTest extends IntegrationTestBase { * Ideal: "The oldest customer enters an invalid card." */ @Test + @Ignore public void testOldestCustomerEntersCard() { String stmt = "(exists \n" + " (?card ?customer ?event ?salesperson) \n" + @@ -74,6 +75,7 @@ public void testHtmlParaphraseBellCreateTelephone() { * Ideal: "Bell created the telephone."; also "The telephone was created by Bell." */ @Test + @Ignore public void testHtmlParaphraseBlankenshipCreateTelephone() { String stmt = "(exists \n" + " (?event ?telephone) \n" + @@ -101,6 +103,7 @@ public void testHtmlParaphraseBlankenshipCreateTelephone() { } @Test + @Ignore public void testHtmlParaphraseBlankenshipProcessTelephone() { String stmt = "(exists \n" + " (?event ?telephone) \n" + @@ -131,6 +134,7 @@ public void testHtmlParaphraseBlankenshipProcessTelephone() { * Ideal: "If Mary gives John a book then he reads it." */ @Test + @Ignore public void testHtmlParaphraseIfMaryGivesBookJohnThenHeReads() { String stmt = "(forall \n" + " (?book ?event1) \n" + @@ -175,6 +179,7 @@ public void testHtmlParaphraseIfMaryGivesBookJohnThenHeReads() { * Ideal: "An old, tall, hungry and thirsty man went to the shop." */ @Test + @Ignore public void testHtmlParaphraseManGoToShop() { String stmt = "(exists \n" + " (?event ?man ?shop) \n" + @@ -313,6 +318,7 @@ public void testFishingFishIf() { * Ideal: FoodForFn animal is an industry product type of food manufacturing */ @Test + @Ignore public void testFoodManufacturing() { String stmt = "(industryProductType FoodManufacturing\n" + " (FoodForFn Animal))"; @@ -345,6 +351,7 @@ public void testAnimalShellIf() { } @Test + @Ignore public void testPlaintiff() { String stmt = "(exists (?P ?H)\n" + " (and\n" + @@ -390,6 +397,7 @@ public void testFlyingAircraft() { } @Test + @Ignore public void testWadingWater() { String stmt = "(=>\n" + " (instance ?P Wading)\n" + @@ -442,6 +450,7 @@ public void testAnimalBathes() { * Ideal: "A clean city was built." */ @Test + @Ignore public void testHtmlParaphraseCleanCityBeBuilt() { String stmt = "(exists \n" + " (?agent ?city ?event) \n" + diff --git a/test/integration/java/com/articulate/sigma/trans/IntegrationTransTestSuite.java b/test/integration/java/com/articulate/sigma/trans/IntegrationTransTestSuite.java index 2375c5de..35d8c6ff 100644 --- a/test/integration/java/com/articulate/sigma/trans/IntegrationTransTestSuite.java +++ b/test/integration/java/com/articulate/sigma/trans/IntegrationTransTestSuite.java @@ -12,7 +12,7 @@ @RunWith(Suite.class) @Suite.SuiteClasses({ - SUMOtoTFAKBTest.class, +// SUMOtoTFAKBTest.class, SUMOtoTFAformTest.class, THFtest.class, TPTP2SUMOTest.class diff --git a/test/integration/java/com/articulate/sigma/trans/SUMOtoTFAformTest.java b/test/integration/java/com/articulate/sigma/trans/SUMOtoTFAformTest.java index 921f916f..ba35ca15 100644 --- a/test/integration/java/com/articulate/sigma/trans/SUMOtoTFAformTest.java +++ b/test/integration/java/com/articulate/sigma/trans/SUMOtoTFAformTest.java @@ -127,6 +127,7 @@ public void testSorts() { /** ************************************************************* */ @Test + @Ignore public void testParents() { System.out.println(); @@ -153,6 +154,7 @@ public void testParents() { /** ************************************************************* */ @Test + @Ignore public void test1() { System.out.println(); @@ -172,6 +174,7 @@ public void test1() { /** ************************************************************* */ @Test + @Ignore public void test1_5() { System.out.println(); @@ -191,6 +194,7 @@ public void test1_5() { /** ************************************************************* */ @Test + @Ignore public void test2() { System.out.println(); @@ -217,6 +221,7 @@ public void test2() { /** ************************************************************* */ @Test + @Ignore public void test3() { System.out.println(); @@ -242,6 +247,7 @@ public void test3() { /** ************************************************************* */ @Test + @Ignore public void test4() { System.out.println(); @@ -292,6 +298,7 @@ public void test5() { /**************************************************************** */ @Test + @Ignore public void testFloorFn() { System.out.println(); @@ -320,6 +327,7 @@ public void testFloorFn() { /**************************************************************** */ @Test + @Ignore public void testNumericSubclass() { System.out.println(); @@ -457,6 +465,7 @@ public void testVariableArity2() { /**************************************************************** */ @Test + @Ignore public void testPredVarArity() { System.out.println(); @@ -568,6 +577,7 @@ public void testRemoveNumInst() { /**************************************************************** */ @Test + @Ignore public void testInstNum() { SUMOtoTFAform.debug = true; @@ -604,6 +614,7 @@ public void testInstNum() { /**************************************************************** */ @Test + @Ignore public void testTypeConflict() { //SUMOtoTFAform.debug = true; @@ -627,6 +638,7 @@ public void testTypeConflict() { /**************************************************************** */ @Test + @Ignore public void testTypeConflict2() { //SUMOtoTFAform.debug = true; @@ -653,6 +665,7 @@ public void testTypeConflict2() { * nonsense axiom just to check types */ @Test + @Ignore public void testTypeConflict3() { //SUMOtoTFAform.debug = true; @@ -696,6 +709,7 @@ public void testTransNum() { /**************************************************************** */ @Test + @Ignore public void testPropertyFn() { SUMOtoTFAform.debug = true; @@ -721,6 +735,7 @@ public void testPropertyFn() { /** *************************************************************** */ @Test + @Ignore public void testMemberTypeCount() { SUMOtoTFAform.debug = true; @@ -746,6 +761,7 @@ public void testMemberTypeCount() { /** *************************************************************** */ @Test + @Ignore public void testTypeConflict4() { // tff(kb_SUMO_283,axiom,(! [V__ROW1 : $i,V__ROW2 : $real,V__CLASS : $i,V__NUMBER : $int] : ((s__instance(V__ROW1, s__Human) & s__instance(V__CLASS, s__Class)) => (s__domain__2In(s__intelligenceQuotient__m, V__NUMBER, V__CLASS) & s__instance(s__intelligenceQuotient__m, s__Predicate) & s__intelligenceQuotient__2Re(V__ROW1, V__ROW2)) => s__instance(s__ListOrderFn__2InFn(s__ListFn__2ReFn(V__ROW1, V__ROW2), V__NUMBER), V__CLASS)))). diff --git a/test/integration/java/com/articulate/sigma/trans/THFtest.java b/test/integration/java/com/articulate/sigma/trans/THFtest.java index 5d0753d7..ccf78436 100644 --- a/test/integration/java/com/articulate/sigma/trans/THFtest.java +++ b/test/integration/java/com/articulate/sigma/trans/THFtest.java @@ -8,6 +8,7 @@ import org.junit.Test; import static junit.framework.TestCase.assertTrue; +import org.junit.Ignore; //This software is released under the GNU Public License //. @@ -46,6 +47,7 @@ public void test(String msg, String f, String expected) { /** ************************************************************* */ @Test + @Ignore public void testTrans1() { String f = "(=> (and (instance ?ROW3 Language) (instance ?ROW1 SymbolicString)) " + diff --git a/test/integration/java/com/articulate/sigma/trans/TPTP2SUMOTest.java b/test/integration/java/com/articulate/sigma/trans/TPTP2SUMOTest.java index 7ffae503..23de4f14 100644 --- a/test/integration/java/com/articulate/sigma/trans/TPTP2SUMOTest.java +++ b/test/integration/java/com/articulate/sigma/trans/TPTP2SUMOTest.java @@ -6,7 +6,6 @@ import static org.junit.Assert.*; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; public class TPTP2SUMOTest { @@ -20,7 +19,6 @@ public static void init() { /** ************************************************************* */ - @Ignore @Test public void testPartition() { @@ -49,7 +47,6 @@ public void testPartition() { /** ************************************************************* */ - @Ignore @Test public void testCollapse() { @@ -66,7 +63,6 @@ public void testCollapse() { /** ************************************************************* */ - @Ignore @Test public void testCollapse2() { From 5307dadfba159a56b1274de7fff3183c52308222 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 11 Feb 2025 22:05:41 -0800 Subject: [PATCH 011/100] [Terry N.] minor refactors --- test/unit/java/com/articulate/sigma/SigmaTestBase.java | 6 +++--- test/unit/java/com/articulate/sigma/UnitTestBase.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unit/java/com/articulate/sigma/SigmaTestBase.java b/test/unit/java/com/articulate/sigma/SigmaTestBase.java index 0df07729..afb95a2e 100644 --- a/test/unit/java/com/articulate/sigma/SigmaTestBase.java +++ b/test/unit/java/com/articulate/sigma/SigmaTestBase.java @@ -82,9 +82,9 @@ protected static void checkConfiguration() { * @param theClass * @return */ - protected static BufferedReader getXmlReader(String path, Class theClass) { + protected static Reader getXmlReader(String path, Class theClass) { - BufferedReader xmlReader = null; + Reader xmlReader = null; try { //URI uri = theClass.getClassLoader().getResource(path).toURI(); //URI uri = theClass.getResource(path).toURI(); @@ -102,7 +102,7 @@ protected static BufferedReader getXmlReader(String path, Class theClass) { //String msg = "Could not find " + path + " in " + uri.toString(); ex.printStackTrace(); System.err.println(ex.getMessage()); - System.err.println("SigmaTestBase.getXmlReader(): Could not find " + path); + System.err.println("SigmaTestBase.getXmlReader(): Could not find: " + path); //throw new IllegalStateException(msg); //} //catch (URISyntaxException e) { diff --git a/test/unit/java/com/articulate/sigma/UnitTestBase.java b/test/unit/java/com/articulate/sigma/UnitTestBase.java index 079551da..c8012aa8 100644 --- a/test/unit/java/com/articulate/sigma/UnitTestBase.java +++ b/test/unit/java/com/articulate/sigma/UnitTestBase.java @@ -18,7 +18,7 @@ public class UnitTestBase extends SigmaTestBase { private static final String CONFIG_FILE_PATH = CONFIG_FILE_DIR + File.separator + "config_topOnly.xml"; // private static final String CONFIG_FILE_PATH = System.getenv("SIGMA_HOME") + "/KBs/config.xml"; - private static final Class CLASS = UnitTestBase.class; + private static final Class CLASS = UnitTestBase.class; public static final int NUM_KIF_FILES = 3; // config_topOnly.xml // public static final int NUM_KIF_FILES = 45; // full config.xml From ea2f34acb9046f35a05a64fef6bbcba6e2b7747a Mon Sep 17 00:00:00 2001 From: git Date: Wed, 12 Feb 2025 07:27:09 -0800 Subject: [PATCH 012/100] [Terry N.] expand info --- src/java/com/articulate/sigma/KBmanager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/com/articulate/sigma/KBmanager.java b/src/java/com/articulate/sigma/KBmanager.java index b7ca8748..819ceb32 100644 --- a/src/java/com/articulate/sigma/KBmanager.java +++ b/src/java/com/articulate/sigma/KBmanager.java @@ -163,13 +163,13 @@ public boolean infFileOld(String lang) { for (String f : kb.constituents) { // iterate through the constituents sfile = new File(f); sfileDate = new Date(sfile.lastModified()); - System.out.println("INFO in KBmanager.infFileOld(lang): file " + f + " was saved on " + sfileDate); + System.out.println("INFO in KBmanager.infFileOld(lang): file " + sfile.getName() + " was saved on " + sfileDate); if (fileDate.compareTo(sfileDate) < 0) { return true; } } } - System.out.println("INFO in KBmanager.infFileOld(lang): returning false (not old)"); + System.out.println("INFO in KBmanager.infFileOld(lang): returning false (config and constituents are not old)"); return false; } From c4f7653fea8fadde5777663bcdfb8f3b792e0c62 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 12 Feb 2025 07:47:14 -0800 Subject: [PATCH 013/100] [Terry N.] expand info --- src/java/com/articulate/sigma/KBmanager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/com/articulate/sigma/KBmanager.java b/src/java/com/articulate/sigma/KBmanager.java index 819ceb32..6b246527 100644 --- a/src/java/com/articulate/sigma/KBmanager.java +++ b/src/java/com/articulate/sigma/KBmanager.java @@ -120,7 +120,7 @@ public static boolean serializedOld(SimpleElement configuration) { Date configDate = new Date(configFile.lastModified()); File serfile = new File(kbDir + File.separator + "kbmanager.ser"); Date saveDate = new Date(serfile.lastModified()); - System.out.println("KBmanager.serializedOld(config): save date: " + saveDate.toString()); + System.out.println("KBmanager.serializedOld(config): " + serfile.getName() + " save date: " + saveDate.toString()); if (saveDate.compareTo(configDate) < 0) return true; List> kbFilenames = kbFilenamesFromXML(configuration); @@ -130,7 +130,7 @@ public static boolean serializedOld(SimpleElement configuration) { for (String f : thekb) { // iterate through the constituents file = new File(f); fileDate = new Date(file.lastModified()); - System.out.println("serializedOld(): file " + f + " was saved on " + fileDate); + System.out.println("serializedOld(): file " + file.getName() + " was saved on " + fileDate); if (saveDate.compareTo(fileDate) < 0) { return true; } From 3dfbff3908be2736be288506d1b505e619b8c89f Mon Sep 17 00:00:00 2001 From: git Date: Wed, 12 Feb 2025 10:25:33 -0800 Subject: [PATCH 014/100] [Terry N.] use syserr for errors --- src/java/com/articulate/sigma/nlg/NLGUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/articulate/sigma/nlg/NLGUtils.java b/src/java/com/articulate/sigma/nlg/NLGUtils.java index d9cc906e..943e3dce 100644 --- a/src/java/com/articulate/sigma/nlg/NLGUtils.java +++ b/src/java/com/articulate/sigma/nlg/NLGUtils.java @@ -727,7 +727,7 @@ public static String expandStar(Formula f, String strFormat, String lang) { Iterator it = problems.iterator(); while (it.hasNext()) { str = it.next(); - System.out.println("Error in NLGUtils.expandStar(): "); + System.err.println("Error in NLGUtils.expandStar(): "); System.out.println(" " + str); errStr += ("\n
" + str + "\n
"); } From 2413e0f24d0b71d3db9d852f497cd65d4c904613 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 12 Feb 2025 12:21:11 -0800 Subject: [PATCH 015/100] [Terry N.] new target for tinySUMO --- nbproject/ide-targets.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nbproject/ide-targets.xml b/nbproject/ide-targets.xml index 6cb1c950..1449c0f3 100644 --- a/nbproject/ide-targets.xml +++ b/nbproject/ide-targets.xml @@ -528,18 +528,23 @@ - + + + + + + From 1167e9fa02ee56e04e2774074224fbf9871637ad Mon Sep 17 00:00:00 2001 From: git Date: Wed, 12 Feb 2025 12:50:27 -0800 Subject: [PATCH 016/100] [Terry N.] consolidate constructors --- src/java/com/articulate/sigma/KB.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/java/com/articulate/sigma/KB.java b/src/java/com/articulate/sigma/KB.java index d75f7d40..8aeb80d4 100644 --- a/src/java/com/articulate/sigma/KB.java +++ b/src/java/com/articulate/sigma/KB.java @@ -191,20 +191,8 @@ public KB() { */ public KB(String n, String dir) { - name = n; + this(n); kbDir = dir; - try { - KBmanager mgr = KBmanager.getMgr(); - if (mgr != null) { - String loadCelt = mgr.getPref("loadCELT"); - if ((loadCelt != null) && loadCelt.equalsIgnoreCase("yes")) - celt = new CELT(); - } - } - catch (IOException ioe) { - System.err.println("Error in KB(): " + ioe.getMessage()); - celt = null; - } } /*************************************************************** From d58c87284ce50d8d200f340f5a3f97edba64f36a Mon Sep 17 00:00:00 2001 From: git Date: Wed, 12 Feb 2025 15:17:28 -0800 Subject: [PATCH 017/100] [Terry N.] add output proof to menu --- src/java/com/articulate/sigma/tp/Vampire.java | 54 ++++++++++++------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/src/java/com/articulate/sigma/tp/Vampire.java b/src/java/com/articulate/sigma/tp/Vampire.java index bb57cc7c..e0dd1a44 100644 --- a/src/java/com/articulate/sigma/tp/Vampire.java +++ b/src/java/com/articulate/sigma/tp/Vampire.java @@ -22,6 +22,7 @@ portions copyright Teknowledge (c) 2003 and reused under the terms of the GNU li import java.io.*; import java.util.*; +import tptp_parser.TPTPFormula; /** * Class for invoking the latest research version of Vampire from Java @@ -280,7 +281,7 @@ public static void printHelp() { System.out.println("Vampire class"); System.out.println(" options:"); System.out.println(" -h - show this help screen"); - System.out.println(" -p - run Vampire on the default generated KB (tptp, fof or tff"); + System.out.println(" -p - run Vampire on the default generated KB (tptp) and output a proof"); System.out.println(" with no arguments, show this help screen and execute a test"); System.out.println(); } @@ -307,10 +308,10 @@ public static void main (String[] args) throws Exception { String lang = "tff"; if (SUMOKBtoTPTPKB.lang.equals("fof")) lang = "tptp"; - File s = new File(dir + kbName + "." + lang); - if (!s.exists()) { - System.err.println("Error in Vampire.main(): no KB file: " + s); - return; + File kbFile = new File(dir + kbName + "." + lang); + if (!kbFile.exists()) { + System.err.println("Error in Vampire.main(): no KB file: " + kbFile); + return; } Vampire vampire = new Vampire(); @@ -334,8 +335,8 @@ public static void main (String[] args) throws Exception { System.out.println("Vampire.main(): first test"); Set query = new HashSet<>(); query.add("tff(conj1,conjecture,?[V__X, V__Y] : (s__subclass(V__X,V__Y)))."); - System.out.println("Vampire.main(): calling Vampire with: " + s + ", 30, " + query); - vampire.run(kb, s, 30, query); + System.out.println("Vampire.main(): calling Vampire with: " + kbFile + ", 30, " + query); + vampire.run(kb, kbFile, 30, query); System.out.println("----------------\nVampire output\n"); for (String l : vampire.output) System.out.println(l); @@ -351,20 +352,33 @@ public static void main (String[] args) throws Exception { } else { if (args.length > 0 && args[0].equals("-h")) printHelp(); - if (args.length > 0 && args[0].equals("-p")) { - vampire.run(s, 60); - - System.out.println("----------------\nVampire output\n"); - for (String l : vampire.output) { - System.out.println(l); + else if (args.length > 0 && args[0].equals("-p")) { + vampire.run(kbFile, 60); + + String query = "(maximumPayloadCapacity ?X (MeasureFn ?Y ?Z))"; + StringBuilder answerVars = new StringBuilder("?X ?Y ?Z"); + System.out.println("input: " + vampire.output + "\n"); + tpp.parseProofOutput(vampire.output, query, kb, answerVars); + + String sep = File.separator; + dir = System.getenv("CATALINA_HOME") + sep + "webapps" + + sep + "sigma" + sep + "graph"; + File webGphDir = new File(dir); + if (!webGphDir.exists()) + webGphDir.mkdirs(); + + tpp.createProofDotGraph(); + System.out.println("Vampire.main(): " + tpp.proof.size() + " steps "); + Formula f; + for (TPTPFormula step : tpp.proof) { + System.out.println(":: " + step); + f = new Formula(step.sumo); + System.out.println(f.format("", " ", "\n")); } - String queryStr = "(subclass ?X ?Y)"; - tpp.parseProofOutput(vampire.output, queryStr, kb, vampire.qlist); - System.out.println("Vampire.main(): bindings: " + tpp.bindings); - System.out.println("Vampire.main(): proof: " + tpp.proof); - System.out.println("-----------------\n"); - System.out.println(); - } + System.out.println("TPTP3ProofProcessor.main() bindings: " + tpp.bindingMap); + System.out.println("TPTP3ProofProcessor.main() skolems: " + tpp.skolemTypes); + } else + System.err.println("Unknown option: " + args[0]); } } } From fa33c1caf7c757f4540203ab42753269bdf15cd7 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 12 Feb 2025 16:10:28 -0800 Subject: [PATCH 018/100] [Terry N.] base type stream --- src/java/com/articulate/sigma/KBmanager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/com/articulate/sigma/KBmanager.java b/src/java/com/articulate/sigma/KBmanager.java index 6b246527..9bb926c0 100644 --- a/src/java/com/articulate/sigma/KBmanager.java +++ b/src/java/com/articulate/sigma/KBmanager.java @@ -624,11 +624,11 @@ private void fromXML(SimpleElement configuration) { */ public static void copyFile(File in, File out) { - try (FileInputStream fis = new FileInputStream(in); - FileOutputStream fos = new FileOutputStream(out) + try (InputStream fis = new FileInputStream(in); + OutputStream fos = new FileOutputStream(out) ){ byte[] buf = new byte[1024]; - int i = 0; + int i; while ((i = fis.read(buf)) != -1) { fos.write(buf, 0, i); } From 06125801406adcbdb816859150189229fe3cfd52 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 10:14:19 -0800 Subject: [PATCH 019/100] [Terry N.] cast not necessary --- src/java/com/articulate/sigma/KB.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/java/com/articulate/sigma/KB.java b/src/java/com/articulate/sigma/KB.java index 8aeb80d4..52dc6a83 100644 --- a/src/java/com/articulate/sigma/KB.java +++ b/src/java/com/articulate/sigma/KB.java @@ -2841,7 +2841,7 @@ public String reload() { String cName; while (nci.hasNext()) { - cName = (String) nci.next(); + cName = nci.next(); addConstituent(cName); // addConstituent(cName, false, false, false); } @@ -3504,8 +3504,6 @@ public void loadVampire() { System.out.println("INFO in KB.loadVampire(): generating " + lang + " file " + infFilename); try (PrintWriter pw = new PrintWriter(new FileWriter(infFilename))) { if (!formulaMap.isEmpty()) { -// Set formulaStrings = new HashSet(); -// formulaStrings.addAll(formulaMap.keySet()); long millis = System.currentTimeMillis(); if (lang.equals("tptp")) { SUMOKBtoTPTPKB skb = new SUMOKBtoTPTPKB(); @@ -3534,7 +3532,6 @@ public void loadVampire() { System.out.println("File written: " + infFilename); else System.err.println("Could not write: " + infFilename); - } } From 21adc7b642a1456e223a4afba049597b7188c4ce Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 10:58:08 -0800 Subject: [PATCH 020/100] [Terry N.] add test for qlist resolution --- .../trans/SUMOformulaToTPTPformulaTest.java | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/test/unit/java/com/articulate/sigma/trans/SUMOformulaToTPTPformulaTest.java b/test/unit/java/com/articulate/sigma/trans/SUMOformulaToTPTPformulaTest.java index eeaa753e..2d136fc0 100644 --- a/test/unit/java/com/articulate/sigma/trans/SUMOformulaToTPTPformulaTest.java +++ b/test/unit/java/com/articulate/sigma/trans/SUMOformulaToTPTPformulaTest.java @@ -1,5 +1,6 @@ package com.articulate.sigma.trans; +import com.articulate.sigma.Formula; import com.articulate.sigma.utils.StringUtil; import org.junit.Ignore; import org.junit.Test; @@ -50,7 +51,7 @@ public void test(String kif, String expected, String label) { @Test public void string1() { - String kifstring, expectedRes, actualRes; + String kifstring, expectedRes; kifstring = "(=> " + "(instance ?X P)" + @@ -64,7 +65,7 @@ public void string1() { @Test public void string2() { - String kifstring, expectedRes, actualRes; + String kifstring, expectedRes; kifstring = "(=> " + "(or " + "(instance ?X Q)" + @@ -79,7 +80,7 @@ public void string2() { @Test public void string3() { - String kifstring, expectedRes, actualRes; + String kifstring, expectedRes; kifstring = "(or " + "(not " + "(instance ?X Q))" + @@ -93,7 +94,7 @@ public void string3() { @Test public void string4() { - String kifstring, expectedRes, actualRes; + String kifstring, expectedRes; kifstring = "(<=>\n" + " (instance ?NUMBER NegativeRealNumber)\n" + " (and\n" + @@ -111,7 +112,7 @@ public void string4() { @Test public void string5() { - String kifstring, expectedRes, actualRes; + String kifstring, expectedRes; kifstring = "(<=>\n" + " (instance ?NUMBER NegativeRealNumber)\n" + " (and\n" + @@ -129,7 +130,7 @@ public void string5() { @Test public void string6() { - String kifstring, expectedRes, actualRes; + String kifstring, expectedRes; kifstring = "(<=> (temporalPart ?POS (WhenFn ?THING)) (time ?THING ?POS))"; expectedRes = "( ( ! [V__POS,V__THING] : (((s__temporalPart(V__POS,s__WhenFn(V__THING)) => " + "s__time(V__THING,V__POS)) & (s__time(V__THING,V__POS) => s__temporalPart(V__POS,s__WhenFn(V__THING)))) ) ) )"; @@ -141,7 +142,7 @@ public void string6() { @Test public void hol() { - String kifstring, expectedRes, actualRes; + String kifstring, expectedRes; kifstring = "(=> (and (instance ?GUN Gun) (effectiveRange ?GUN ?LM) " + "(distance ?GUN ?O ?LM1) (instance ?O Organism) (not (exists (?O2) " + @@ -161,7 +162,7 @@ public void hol() { @Test public void string7() { - String kifstring, expectedRes, actualRes; + String kifstring, expectedRes; kifstring = "(<=> (exists (?BUILD) (and (instance ?BUILD Constructing) " + "(result ?BUILD ?ARTIFACT))) (instance ?ARTIFACT StationaryArtifact))"; expectedRes = "( ( ! [V__ARTIFACT] : (((( ? [V__BUILD] : ((s__instance(V__BUILD,s__Constructing) & " + @@ -174,10 +175,9 @@ public void string7() { /** *************************************************************** */ @Test - @Ignore public void embedded() { - String kifstring, expectedRes, actualRes; + String kifstring, expectedRes; //SUMOformulaToTPTPformula.debug = true; kifstring = "(instance equal BinaryPredicate)"; @@ -190,7 +190,7 @@ public void embedded() { @Test public void equality() { - String kifstring, expectedRes, actualRes; + String kifstring, expectedRes; //SUMOformulaToTPTPformula.debug = true; kifstring = "(=> (and (minValue minValue ?ARG ?N) (minValue ?ARGS2) " + @@ -199,4 +199,23 @@ public void equality() { "(V__VAL = s__ListOrderFn(s__List__Fn__1Fn(V__ARGS2),V__ARG))) => s__greaterThan(V__VAL,V__N)) ) ) )"; test(kifstring,expectedRes,"equality"); } + + /** *************************************************************** + */ + @Test + public void testGenerateQList() { + + Formula f = new Formula("(<=> (instance ?NUMBER NegativeRealNumber) (and (lessThan ?NUMBER 0) (instance ?NUMBER RealNumber)))"); + SUMOformulaToTPTPformula.generateQList(f); + assertEquals(SUMOformulaToTPTPformula.qlist.toString(),"V__NUMBER"); + + String kifstring = "(=> (and (instance ?GUN Gun) (effectiveRange ?GUN ?LM) " + + "(distance ?GUN ?O ?LM1) (instance ?O Organism) (not (exists (?O2) " + + "(between ?O ?O2 ?GUN))) (lessThanOrEqualTo ?LM1 ?LM)) " + + "(capability (KappaFn ?KILLING (and (instance ?KILLING Killing) " + + "(patient ?KILLING ?O))) instrument ?GUN))"; + f = new Formula(kifstring); + SUMOformulaToTPTPformula.generateQList(f); + assertEquals(SUMOformulaToTPTPformula.qlist.toString(), "V__LM,V__O,V__KILLING,V__GUN,V__LM1"); + } } From 99061e9d572013b1306f9468d5a84cddeaf74212 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 11:01:10 -0800 Subject: [PATCH 021/100] [Terry N.] fix AIOOB Exception --- .../sigma/trans/SUMOformulaToTPTPformula.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java index e3e14735..28e72d61 100644 --- a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java +++ b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java @@ -424,10 +424,9 @@ public static void generateQList(Formula f) { int count = 0; for (String s : UqVars) { oneVar = SUMOformulaToTPTPformula.translateWord(s,s.charAt(0),false); - if (count < sizeUqVars-1) - qlist.append(oneVar).append(","); - else - qlist.append(oneVar); // don't write a final comma + qlist.append(oneVar); // don't write a final comma + if (count < sizeUqVars-1 && sizeUqVars > 1) + qlist.append(","); count++; } @@ -440,7 +439,7 @@ public static void generateQList(Formula f) { */ public static String tptpParseSUOKIFString(String suoString, boolean query) { - if (debug) System.out.println("SUMOformulaToTPTPformula.process(): string,query,lang: " + suoString + ", " + query + ", " + SUMOKBtoTPTPKB.lang); + if (debug) System.out.println("tptpParseSUOKIFString.process(): string,query,lang: " + suoString + ", " + query + ", " + SUMOKBtoTPTPKB.lang); KB kb = KBmanager.getMgr().getKB(KBmanager.getMgr().getPref("sumokbname")); if (SUMOKBtoTPTPKB.lang.equals("tff")) return "( " + SUMOtoTFAform.process(suoString,query) + " )"; @@ -519,7 +518,7 @@ public void tptpParse(Formula input, boolean query, KB kb, Set preProce if (debug) System.out.println("INFO in SUMOformulaToTPTPformula.tptpParse(): preprocessed: " + processed); if (processed != null) { - _f.theTptpFormulas = new HashSet<>(); + _f.theTptpFormulas.clear(); //----Performs function on each current processed axiom String tptpStr; for (Formula f : processed) { From 1b50dd45e81ca4baf9ab2abc636cbe64f1135b01 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 14:49:15 -0800 Subject: [PATCH 022/100] [Terry N.] whitespace --- src/java/com/articulate/sigma/KBmanager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/articulate/sigma/KBmanager.java b/src/java/com/articulate/sigma/KBmanager.java index 9bb926c0..71657f46 100644 --- a/src/java/com/articulate/sigma/KBmanager.java +++ b/src/java/com/articulate/sigma/KBmanager.java @@ -267,7 +267,7 @@ public static void serialize() { //out.close(); //file.close(); encoder(manager); - System.out.println("KBmanager.serialize(): KBmanager has been serialized "); + System.out.println("KBmanager.serialize(): KBmanager has been serialized"); } catch (Exception ex) { System.err.println("Error in KBmanager.serialize(): IOException is caught"); From 2a49457f02a86e63a09ad0c72754e2c949a3ad88 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 14:50:09 -0800 Subject: [PATCH 023/100] [Terry N.] expand main output --- src/java/com/articulate/sigma/tp/Vampire.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/java/com/articulate/sigma/tp/Vampire.java b/src/java/com/articulate/sigma/tp/Vampire.java index e0dd1a44..dcbd4919 100644 --- a/src/java/com/articulate/sigma/tp/Vampire.java +++ b/src/java/com/articulate/sigma/tp/Vampire.java @@ -366,17 +366,14 @@ else if (args.length > 0 && args[0].equals("-p")) { File webGphDir = new File(dir); if (!webGphDir.exists()) webGphDir.mkdirs(); - tpp.createProofDotGraph(); + System.out.println("Vampire.main(): " + tpp.proof.size() + " steps "); - Formula f; - for (TPTPFormula step : tpp.proof) { - System.out.println(":: " + step); - f = new Formula(step.sumo); - System.out.println(f.format("", " ", "\n")); - } - System.out.println("TPTP3ProofProcessor.main() bindings: " + tpp.bindingMap); - System.out.println("TPTP3ProofProcessor.main() skolems: " + tpp.skolemTypes); + System.out.println("Vampire.main() bindings: " + tpp.bindingMap); + System.out.println("Vampire.main() skolems: " + tpp.skolemTypes); + System.out.println("Vampire.main() proof[3]: {"); + tpp.printProof(3); + System.out.println("}"); } else System.err.println("Unknown option: " + args[0]); } From 8b14182e12de5f800d75d86359a524d176e791da Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 14:51:18 -0800 Subject: [PATCH 024/100] [Terry N.] unused import --- src/java/com/articulate/sigma/trans/TPTPutil.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/TPTPutil.java b/src/java/com/articulate/sigma/trans/TPTPutil.java index 980abd63..d984b1df 100644 --- a/src/java/com/articulate/sigma/trans/TPTPutil.java +++ b/src/java/com/articulate/sigma/trans/TPTPutil.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; import java.util.List; import tptp_parser.TPTPFormula; @@ -265,7 +264,6 @@ public static String getCitationString(String sumoStep, String stepName, KB kb) public static void test() { Formula f = new Formula(); - f.theTptpFormulas = new HashSet(); //f.theTptpFormulas.add("fof(kb_ArabicCulture_20,axiom,(( s__subclass(s__Hajj,s__Translocation) )))."); f.theTptpFormulas.add("(! [V__P] : (s__instance(V__P,s__Agent) => ((s__attribute(V__P,s__Muslim) & s__capability(s__Hajj,s__agent__m,V__P)) => " + "s__modalAttribute('(? [V__H] : (s__instance(V__H,s__Process) & s__instance(V__H,s__Hajj) & s__agent(V__H,V__P)))',s__Obligation))))"); From 39f7a8688e9486a7c3677749b2f17dcd9c6996c7 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 16:00:25 -0800 Subject: [PATCH 025/100] [Terry N.] use dec. var --- src/java/com/articulate/sigma/Formula.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/java/com/articulate/sigma/Formula.java b/src/java/com/articulate/sigma/Formula.java index 9e234d75..76b21065 100644 --- a/src/java/com/articulate/sigma/Formula.java +++ b/src/java/com/articulate/sigma/Formula.java @@ -1972,9 +1972,7 @@ public Set collectQuantifiedVariables() { fcar.read(this.car()); if (fcar.empty()) return resultSet; - if (debug) - System.out.println("Formula.collectQuantifiedVariables(): car: " + fcar); - + if (debug) System.out.println("Formula.collectQuantifiedVariables(): car: " + fcar); if (fcar.theFormula.equals(UQUANT) || fcar.theFormula.equals(EQUANT)) { Formula remainder = new Formula(); remainder.read(this.cdr()); @@ -2116,7 +2114,7 @@ public String makeQuantifiersExplicit(boolean query) { public Formula renameVariableArityRelations(KB kb, Map relationMap) { Formula result = this; - if (this.listP()) { + if (result.listP()) { StringBuilder sb = new StringBuilder(); Formula f = new Formula(); f.read(this.theFormula); From b0ae06d75806c3e0c98d811173867026f70f54b8 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 20:12:25 -0800 Subject: [PATCH 026/100] [Terry N.] synchronize for threading work --- .../com/articulate/sigma/trans/SUMOformulaToTPTPformula.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java index 28e72d61..47438886 100644 --- a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java +++ b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java @@ -437,7 +437,7 @@ public static void generateQList(Formula f) { /** *************************************************************** * Parse a single formula into TPTP format */ - public static String tptpParseSUOKIFString(String suoString, boolean query) { + public static synchronized String tptpParseSUOKIFString(String suoString, boolean query) { if (debug) System.out.println("tptpParseSUOKIFString.process(): string,query,lang: " + suoString + ", " + query + ", " + SUMOKBtoTPTPKB.lang); KB kb = KBmanager.getMgr().getKB(KBmanager.getMgr().getPref("sumokbname")); From 942d1663b093da5583ed42c9fb32b95789cc0c19 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 20:13:49 -0800 Subject: [PATCH 027/100] [Terry N.] workable threaded writeFile. However, metadata out of order --- .../sigma/trans/SUMOKBtoTPTPKB.java | 428 +++++++++--------- 1 file changed, 221 insertions(+), 207 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java index cdc440da..e5e5fedc 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java @@ -30,6 +30,9 @@ public class SUMOKBtoTPTPKB { public Set alreadyWrittenTPTPs = new HashSet<>(); + // force regeneration of FOF file + public static boolean force = false; + /** ************************************************************* */ public SUMOKBtoTPTPKB() { @@ -147,8 +150,7 @@ protected void printVariableArityRelationContent(PrintWriter pr, Map it = relationMap.keySet().iterator(); - String key; - String value; + String key, value; List result; Formula f; String s; @@ -253,8 +255,31 @@ public void writeHeader(PrintWriter pw, String sanitizedKBName) { public String writeFile(String fileName, Formula conjecture, boolean isQuestion, PrintWriter pw) { - PredVarInst.init(); long millis = System.currentTimeMillis(); + String retVal; + + // Comment out for the threaded version and comment out the one below +// retVal = nonThreadedWriteFile(fileName, conjecture, isQuestion, pw); + + // Comment out for the non-threaded version and comment out the one above + retVal = threadedWriteFile(fileName, conjecture, isQuestion, pw); + + KB.axiomKey = axiomKey; + KBmanager.serialize(); + System.out.println("SUMOKBtoTPTPKB.writeFile(): axiomKey: " + axiomKey.size()); + System.out.println("SUMOKBtoTPTPKB.writeFile(): seconds: " + (System.currentTimeMillis() - millis) / 1000); + + axiomIndex = 1; // reset + counter = 0; // reset + formCount = 0; // reset + + return retVal; + } + + private String nonThreadedWriteFile(String fileName, Formula conjecture, + boolean isQuestion, PrintWriter pw) { + + PredVarInst.init(); if (!KBmanager.initialized) { System.err.println("Error in SUMOKBtoTPTPKB.writeFile(): KB initialization not completed"); return "Error in SUMOKBtoTPTPKB.writeFile(): KB initialization not completed"; @@ -265,18 +290,15 @@ public String writeFile(String fileName, Formula conjecture, OrderedFormulae orderedFormulae = new OrderedFormulae(); orderedFormulae.addAll(kb.formulaMap.values()); - //if (debug) pr.println("% INFO in SUMOKBtoTPTPKB.writeFile(): added formulas: " + orderedFormulae.size()); + //if (debug) System.out.println("INFO in SUMOKBtoTPTPKB.writeFile(): added formulas: " + orderedFormulae.size()); String result, name; - int axiomIndex = 1; // a count appended to axiom names to make a unique ID - int counter = 0; - int formCount = 0; int total = orderedFormulae.size(); - FormulaPreprocessor fp; + FormulaPreprocessor fp = new FormulaPreprocessor(); Set processed, withRelnRenames; SUMOtoTFAform stfa; for (Formula f : orderedFormulae) { - f.theTptpFormulas = new HashSet<>(); + f.theTptpFormulas.clear(); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : source line: " + f.startLine); if (!f.getFormula().startsWith("(documentation")) { pw.println("% f: " + f.format("", "", " ")); @@ -302,7 +324,6 @@ public String writeFile(String fileName, Formula conjecture, if (counter++ % 100 == 0) System.out.print("."); if ((counter % 4000) == 1) System.out.printf("%nSUMOKBtoTPTPKB.writeFile(%s) : still working. %d%% done.%n",fileName, counter*100/total); - fp = new FormulaPreprocessor(); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : process: " + f); processed = fp.preProcess(f,false,kb); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : processed: " + processed); @@ -318,7 +339,7 @@ public String writeFile(String fileName, Formula conjecture, } result = SUMOformulaToTPTPformula.tptpParseSUOKIFString(f3.getFormula(), false); if (debug) { - System.out.println("% INFO in SUMOKBtoTPTPKB.writeFile(): result: " + result); + System.out.println("INFO in SUMOKBtoTPTPKB.writeFile(): result: " + result); } if (result != null) { f.theTptpFormulas.add(result); @@ -359,8 +380,7 @@ public String writeFile(String fileName, Formula conjecture, !alreadyWrittenTPTPs.contains(sort)) { name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; axiomKey.put(name,f); - pw.print(lang + "(" + name); - pw.println(",axiom,(" + sort + "))."); + pw.println(lang + "(" + name + ",axiom,(" + sort + "))."); alreadyWrittenTPTPs.add(sort); } } @@ -371,8 +391,7 @@ public String writeFile(String fileName, Formula conjecture, if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : writing " + theTPTPFormula); name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; axiomKey.put(name,f); - pw.print(lang + "(" + name); - pw.println(",axiom,(" + theTPTPFormula + "))."); + pw.println(lang + "(" + name + ",axiom,(" + theTPTPFormula + "))."); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : finished writing " + theTPTPFormula + " with name " + name); alreadyWrittenTPTPs.add(theTPTPFormula); } @@ -401,189 +420,181 @@ public String writeFile(String fileName, Formula conjecture, System.err.println("Error in SUMOKBtoTPTPKB.writeFile(): " + ex.getMessage()); ex.printStackTrace(); } - KB.axiomKey = axiomKey; - KBmanager.serialize(); - System.out.println("SUMOKBtoTPTPKB.writeFile(): axiomKey: " + axiomKey.size()); - KB.axiomKey = axiomKey; - System.out.println("SUMOKBtoTPTPKB.writeFile(): seconds: " + (System.currentTimeMillis() - millis) / 1000); + return getInfFilename(); } - /** ************************************************************* - * Write all axioms in the KB to TPTP format. - * - * @param fileName - the full pathname of the file to write - */ -// public String writeFile(String fileName, Formula conjecture, -// boolean isQuestion, PrintWriter pw) { -// -// PredVarInst.init(); -// long millis = System.currentTimeMillis(); -// if (!KBmanager.initialized) { -// System.err.println("Error in SUMOKBtoTPTPKB.writeFile(): KB initialization not completed"); -// return "Error in SUMOKBtoTPTPKB.writeFile(): KB initialization not completed"; -// } -// try { -// int axiomIndex = 1; // a count appended to axiom names to make a unique ID -// Map relationMap = new TreeMap<>(); // A Map of variable arity relations keyed by new name -// writeHeader(pw,fileName); -// -// OrderedFormulae orderedFormulae = new OrderedFormulae(); -// orderedFormulae.addAll(kb.formulaMap.values()); -// //if (debug) pr.println("% INFO in SUMOKBtoTPTPKB.writeFile(): added formulas: " + orderedFormulae.size()); -// int counter = 0; -// int formCount = 0; -// int tCounter = 0; -// int total = orderedFormulae.size(); -// FormulaPreprocessor fp; -// Set processed; -// Set withRelnRenames; -//// SUMOtoTFAform stfa; -// Thread t; -// String /*result,*/ name; -// for (Formula f : orderedFormulae) { -// final Formula f1 = f; // Necessary evil for the lambda expression below -// f.theTptpFormulas = new HashSet<>(); -// if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : source line: " + f.startLine); -// if (!f.getFormula().startsWith("(documentation")) { -// pw.println("% f: " + f.format("", "", " ")); -// if (!f.derivation.parents.isEmpty()) { -// for (Formula derivF : f.derivation.parents) -// pw.println("% original f: " + derivF.format("", "", " ")); -// } -// pw.println("% " + formCount++ + " of " + total + -// " from file " + f.sourceFile + " at line " + f.startLine); -// } -// if (f.isHigherOrder(kb)) { -// pw.println("% is higher order"); -// if (lang.equals("thf")) { // TODO create a flag for adding modals (or not) -// f = Modals.processModals(f,kb); -// } -// if (removeHOL) -// continue; -// } -// else -// pw.println("% not higher order"); -// if (!KBmanager.getMgr().prefEquals("cache","yes") && f.isCached()) -// continue; -// if (counter++ % 100 == 0) System.out.print("."); -// if ((counter % 4000) == 1) -// System.out.printf("%nSUMOKBtoTPTPKB.writeFile(%s) : still working. %d%% done.%n",fileName, counter*100/total); -// fp = new FormulaPreprocessor(); -// if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : process: " + f); -// processed = fp.preProcess(f,false,kb); -// if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : processed: " + processed); -// if (!processed.isEmpty()) { -// withRelnRenames = new HashSet<>(); -// for (Formula f2 : processed) -// withRelnRenames.add(f2.renameVariableArityRelations(kb,relationMap)); -// for (Formula f3 : withRelnRenames) { -// Runnable r = () -> { -// String result; -// SUMOtoTFAform stfa; -// switch (lang) { -// case "fof": -// if (debug) { -// System.out.println("SUMOKBtoTPTPKB.writeFile() : % tptp input: " + f3.format("", "", " ")); -// } -// result = SUMOformulaToTPTPformula.tptpParseSUOKIFString(f3.getFormula(), false); -// if (debug) { -// System.out.println("% INFO in SUMOKBtoTPTPKB.writeFile(): result: " + result); -// } -// if (result != null) { -// f1.theTptpFormulas.add(result); -// } -// break; -// case "tff": -// stfa = new SUMOtoTFAform(); -// SUMOtoTFAform.kb = kb; -// pw.println("% tff input: " + f3.format("", "", " ")); -// if (debug) { -// System.out.println("SUMOKBtoTPTPKB.writeFile() : % tff input: " + f3.format("", "", " ")); -// } -// stfa.sorts = stfa.missingSorts(f3); -// if (stfa.sorts != null && !stfa.sorts.isEmpty()) { -// f3.tffSorts.addAll(stfa.sorts); -// } -// result = SUMOtoTFAform.process(f3.getFormula(), false); -// printTFFNumericConstants(pw); -// SUMOtoTFAform.initNumericConstantTypes(); -// if (!StringUtil.emptyString(result)) { -// f1.theTptpFormulas.add(result); -// } else if (!StringUtil.emptyString(SUMOtoTFAform.filterMessage)) { -// pw.println("% " + SUMOtoTFAform.filterMessage); -// } -// break; -// default: -// pw.println("% unhandled language option " + lang); -// break; -// } -// }; // end Runnable -// t = new Thread(r); -// t.setName("SUMOKBtoTPTPKB:writeFile" + (++tCounter)); -// t.setDaemon(true); -// t.start(); -// } -// tCounter = 0; // reset -// } -// else { -// //System.out.println("SUMOKBtoTPTPKB.writeFile() : % empty result from preprocess on " + f.getFormula().replace("\\n"," ")); -// pw.println("% empty result from preprocess on " + f.getFormula().replace("\\n"," ")); -// } -// for (String sort : f.tffSorts) { -// if (!StringUtil.emptyString(sort) && -// !alreadyWrittenTPTPs.contains(sort)) { -// name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; -// axiomKey.put(name,f); -// pw.print(lang + "(" + name); -// pw.println(",axiom,(" + sort + "))."); -// alreadyWrittenTPTPs.add(sort); -// } -// } -// for (String theTPTPFormula : f.theTptpFormulas) { -// if (!StringUtil.emptyString(theTPTPFormula) && -// !alreadyWrittenTPTPs.contains(theTPTPFormula) && -// !filterAxiom(f,theTPTPFormula,pw)) { -// if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : writing " + theTPTPFormula); -// name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; -// axiomKey.put(name,f); -// pw.print(lang + "(" + name); -// pw.println(",axiom,(" + theTPTPFormula + "))."); -// if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : finished writing " + theTPTPFormula + " with name " + name); -// alreadyWrittenTPTPs.add(theTPTPFormula); -// } -// else -// pw.println("% empty, already written or filtered formula, skipping : " + theTPTPFormula); -// } -// } // end outer for loop -// System.out.println(); -// printVariableArityRelationContent(pw,relationMap,getSanitizedKBname(),axiomIndex); -// printTFFNumericConstants(pw); -// System.out.println("SUMOKBtoTPTPKB.writeFile() CWA: " + CWA); -// if (CWA) -// pw.println(StringUtil.arrayListToCRLFString(CWAUNA.run(kb))); -// if (conjecture != null) { //----Print conjecture if one has been supplied -// // conjecture.getTheTptpFormulas() should return a -// // List containing only one String, so the iteration -// // below is probably unnecessary -// String type = "conjecture"; -// if (isQuestion) type = "question"; -// for (String theTPTPFormula : conjecture.theTptpFormulas) -// pw.println(lang + "(prove_from_" + getSanitizedKBname() + "," + type + ",(" + theTPTPFormula + "))."); -// } -// pw.flush(); -// } // a count appended to axiom names to make a unique ID -// catch (Exception ex) { -// System.err.println("Error in SUMOKBtoTPTPKB.writeFile(): " + ex.getMessage()); -// ex.printStackTrace(); -// } -// KB.axiomKey = axiomKey; -// KBmanager.serialize(); -// System.out.println("SUMOKBtoTPTPKB.writeFile(): axiomKey: " + axiomKey.size()); -// KB.axiomKey = axiomKey; -// System.out.println("SUMOKBtoTPTPKB.writeFile(): seconds: " + (System.currentTimeMillis() - millis) / 1000); -// return getInfFilename(); -// } + private int axiomIndex = 1; // a count appended to axiom names to make a unique ID + private int counter = 0; + private int formCount = 0; + + private String threadedWriteFile(String fileName, Formula conjecture, + boolean isQuestion, PrintWriter pw) { + + PredVarInst.init(); + if (!KBmanager.initialized) { + System.err.println("Error in SUMOKBtoTPTPKB.writeFile(): KB initialization not completed"); + return "Error in SUMOKBtoTPTPKB.writeFile(): KB initialization not completed"; + } + try { + Map relationMap = new TreeMap<>(); // A Map of variable arity relations keyed by new name + writeHeader(pw,fileName); + + OrderedFormulae orderedFormulae = new OrderedFormulae(); + orderedFormulae.addAll(kb.formulaMap.values()); + //if (debug) System.out.println("INFO in SUMOKBtoTPTPKB.writeFile(): added formulas: " + orderedFormulae.size()); + + int tCounter = 0; + int total = orderedFormulae.size(); + Thread t; + for (Formula formula : orderedFormulae) { + Runnable r = () -> { + Formula f = formula; + f.theTptpFormulas.clear(); + FormulaPreprocessor fp = new FormulaPreprocessor(); + Set processed, withRelnRenames = new HashSet<>();; + String name, result; + SUMOtoTFAform stfa; + if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : source line: " + f.startLine); + if (!f.getFormula().startsWith("(documentation")) { + pw.println("% f: " + f.format("", "", " ")); + if (!f.derivation.parents.isEmpty()) { + for (Formula derivF : f.derivation.parents) + pw.println("% original f: " + derivF.format("", "", " ")); + } + pw.println("% " + formCount++ + " of " + total + + " from file " + f.sourceFile + " at line " + f.startLine); + } + if (f.isHigherOrder(kb)) { + pw.println("% is higher order"); + if (lang.equals("thf")) { // TODO create a flag for adding modals (or not) + f = Modals.processModals(f,kb); + } + if (removeHOL) + return; + } + else + pw.println("% not higher order"); + if (!KBmanager.getMgr().prefEquals("cache","yes") && f.isCached()) + return; + if (counter++ % 100 == 0) System.out.print("."); + if ((counter % 4000) == 1) + System.out.printf("%nSUMOKBtoTPTPKB.writeFile(%s) : still working. %d%% done.%n",fileName, counter*100/total); + if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : process: " + f); + processed = fp.preProcess(f,false,kb); + if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : processed: " + processed); + if (!processed.isEmpty()) { + withRelnRenames.clear(); + for (Formula f2 : processed) + withRelnRenames.add(f2.renameVariableArityRelations(kb,relationMap)); + for (Formula f3 : withRelnRenames) { + switch (lang) { + case "fof": + if (debug) { + System.out.println("SUMOKBtoTPTPKB.writeFile() : % tptp input: " + f3.format("", "", " ")); + } + result = SUMOformulaToTPTPformula.tptpParseSUOKIFString(f3.getFormula(), false); + if (debug) { + System.out.println("INFO in SUMOKBtoTPTPKB.writeFile(): result: " + result); + } + if (result != null) { + f.theTptpFormulas.add(result); + } + break; + case "tff": + stfa = new SUMOtoTFAform(); + SUMOtoTFAform.kb = kb; + pw.println("% tff input: " + f3.format("", "", " ")); + if (debug) { + System.out.println("SUMOKBtoTPTPKB.writeFile() : % tff input: " + f3.format("", "", " ")); + } + stfa.sorts = stfa.missingSorts(f3); + if (stfa.sorts != null && !stfa.sorts.isEmpty()) { + f3.tffSorts.addAll(stfa.sorts); + } + result = SUMOtoTFAform.process(f3.getFormula(), false); + printTFFNumericConstants(pw); + SUMOtoTFAform.initNumericConstantTypes(); + if (!StringUtil.emptyString(result)) { + f.theTptpFormulas.add(result); + } else if (!StringUtil.emptyString(SUMOtoTFAform.filterMessage)) { + pw.println("% " + SUMOtoTFAform.filterMessage); + } + break; + default: + pw.println("% unhandled language option " + lang); + break; + } + } + } + else { + //System.out.println("SUMOKBtoTPTPKB.writeFile() : % empty result from preprocess on " + f.getFormula().replace("\\n"," ")); + pw.println("% empty result from preprocess on " + f.getFormula().replace("\\n"," ")); + } + for (String sort : f.tffSorts) { + if (!StringUtil.emptyString(sort) && + !alreadyWrittenTPTPs.contains(sort)) { + name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; + axiomKey.put(name,f); + pw.println(lang + "(" + name + ",axiom,(" + sort + "))."); + alreadyWrittenTPTPs.add(sort); + } + } + for (String theTPTPFormula : f.theTptpFormulas) { + if (!StringUtil.emptyString(theTPTPFormula) && + !alreadyWrittenTPTPs.contains(theTPTPFormula) && + !filterAxiom(f,theTPTPFormula,pw)) { + if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : writing " + theTPTPFormula); + name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; + axiomKey.put(name,f); + pw.println(lang + "(" + name + ",axiom,(" + theTPTPFormula + "))."); + if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : finished writing " + theTPTPFormula + " with name " + name); + alreadyWrittenTPTPs.add(theTPTPFormula); + } + else + pw.println("% empty, already written or filtered formula, skipping : " + theTPTPFormula); + } + }; // end Runnable + t = new Thread(r); + t.setName("SUMOKBtoTPTPKB:writeFile" + (++tCounter)); + t.setDaemon(true); + t.start(); + } // end outer loop + + // Wait for all spawned runnables to finish + Thread[] threads = new Thread[Thread.activeCount()]; + Thread.enumerate(threads); + for (Thread th : threads) { + try { + if (th != null && th.getName().contains("SUMOKBtoTPTPKB:writeFile")) + if (th != null) th.join(); + } catch (NullPointerException ex) {} // <- hack, but trap this + } + + System.out.println(); + printVariableArityRelationContent(pw,relationMap,getSanitizedKBname(),axiomIndex); + printTFFNumericConstants(pw); + System.out.println("SUMOKBtoTPTPKB.writeFile() CWA: " + CWA); + if (CWA) + pw.println(StringUtil.arrayListToCRLFString(CWAUNA.run(kb))); + if (conjecture != null) { //----Print conjecture if one has been supplied + // conjecture.getTheTptpFormulas() should return a + // List containing only one String, so the iteration + // below is probably unnecessary + String type = "conjecture"; + if (isQuestion) type = "question"; + for (String theTPTPFormula : conjecture.theTptpFormulas) + pw.println(lang + "(prove_from_" + getSanitizedKBname() + "," + type + ",(" + theTPTPFormula + "))."); + } + pw.flush(); + } + catch (InterruptedException ex) { + System.err.println("Error in SUMOKBtoTPTPKB.writeFile(): " + ex.getMessage()); + ex.printStackTrace(); + } + + return getInfFilename(); + } /** ************************************************************* * @return true if the given formula is simple clause, @@ -634,12 +645,13 @@ public boolean filterAxiom(Formula form, String tptp, PrintWriter pw) { } /** ************************************************************* - * Will first write out SUMO.tptp if it hasn't yet been written, - * then, will write out SUMO.fof. + * Will first write out SUMO.tptp, if it hasn't yet been written, + * or is old, then, will write out SUMO.fof if it hasn't yet been + * written, or is old. */ public static void main(String[] args) { - //debug = true; + force = true; KBmanager.getMgr().initializeOnce(); SUMOKBtoTPTPKB skbtptpkb = new SUMOKBtoTPTPKB(); @@ -647,15 +659,17 @@ public static void main(String[] args) { skbtptpkb.kb = KBmanager.getMgr().getKB(kbName); String filename = KBmanager.getMgr().getPref("kbDir") + File.separator + kbName + "." + SUMOKBtoTPTPKB.lang; String fileWritten = null; - try (PrintWriter pw = new PrintWriter(new BufferedWriter(new FileWriter(filename, true)))) { - fileWritten = skbtptpkb.writeFile(filename, null, false, pw); - } - catch (IOException e) { - e.printStackTrace(); + if (!(new File(filename).exists()) || KBmanager.getMgr().infFileOld() || force) { + try (PrintWriter pw = new PrintWriter(new BufferedWriter(new FileWriter(filename)))) { + fileWritten = skbtptpkb.writeFile(filename, null, false, pw); + } + catch (IOException e) { + e.printStackTrace(); + } + if (StringUtil.isNonEmptyString(fileWritten)) + System.out.println("File written: " + filename); + else + System.err.println("Could not write: " + filename); } - if (StringUtil.isNonEmptyString(fileWritten)) { - System.out.println("File written: " + filename); - } else - System.err.println("Could not write: " + filename); } } From 422e5a8616cfc38eeb3046be476cd88f5e27966d Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 20:14:12 -0800 Subject: [PATCH 028/100] [Terry N.] commentable tasks with diff. dependencies --- nbproject/ide-targets.xml | 107 +++++++++++++++++++++++++++++++------- 1 file changed, 89 insertions(+), 18 deletions(-) diff --git a/nbproject/ide-targets.xml b/nbproject/ide-targets.xml index 1449c0f3..92cf2dac 100644 --- a/nbproject/ide-targets.xml +++ b/nbproject/ide-targets.xml @@ -82,7 +82,59 @@ - + + + + + Must set property 'run.class' - + @@ -154,7 +206,7 @@ - + Must set property 'test.class' - + Must set property 'test.class' - + Must set property 'test.class' - + @@ -353,7 +405,7 @@ - + Must set property 'debug.class' @@ -362,7 +414,7 @@ classpathref="dcp" fork="true"> - + @@ -370,6 +422,23 @@ + @@ -393,7 +462,7 @@ ===================== --> - + Must set property 'test.class' @@ -438,7 +507,7 @@ - + Must set property 'test.class' @@ -533,14 +602,18 @@ + + + + + - - - - + + + @@ -591,11 +664,9 @@ - - - + - + From fe937ed2562acdd526bf0c93726c2b1b607cada7 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 20:16:44 -0800 Subject: [PATCH 029/100] [Terry N.] define debug.jvmargs --- nbproject/build.properties | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/nbproject/build.properties b/nbproject/build.properties index fb141209..512b0bbc 100644 --- a/nbproject/build.properties +++ b/nbproject/build.properties @@ -83,6 +83,7 @@ run.classpath=\ # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value. # To set system properties for unit tests define test-sys-prop.name=value: #run.jvmargs=-Xmx10g -Xss1m +debug.jvmargs=-Xmx15g -Xss4m run.modulepath=\ ${javac.modulepath} run.test.classpath=\ @@ -129,9 +130,11 @@ project.license=LICENSE # Intentional empty arguments #run.args= + +# Run vampire on SUMO.tptp and output proof run.args=-p -# KIF, TPTP3ProofProcessor - run a test +# KIF, TPTP3ProofProcessor, TPTPutl - run a test #run.args=-t # Error checking a formula w/ com.articulate.sigma.KButilities @@ -177,6 +180,15 @@ test.integration.resources.dir=${test.integration.dir}/resources #unit.test.suite=com.articulate.sigma.UnitTestSuite #integration.test.suite=com.articulate.sigma.IntegrationTestSuite +# Vampire + +# default timeout is 60 if -t is not specified +# NOTE: [- -mode casc] is a shortcut for [- -mode portfolio -sched casc -p tptp] +tptp.file=${workspace}/sigmakee/nbproject/private/resources/SUMO/SUMO.tptp +#tptp.file=${sigma_home}/KBs/SUMO.tptp +vamp.out.file=${sigma_home}/KBs/vamp-out.txt +vamp.args=--mode casc -t 900 ${tptp.file} &> ${vamp.out.file} + #System.out.println("PasswordService: "); #System.out.println("-h show this Help message"); #System.out.println("-l Login"); From a5df7c472781171ea9d7b397e5c6e8dcef61650f Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 20:17:59 -0800 Subject: [PATCH 030/100] [Terry N.] minor type cleanups --- web/jsp/CCheck.jsp | 28 +++++----- web/jsp/CELT.jsp | 7 ++- web/jsp/KBs.jsp | 2 +- web/jsp/Prelude.jsp | 2 +- web/jsp/SystemOnTPTP.jsp | 116 +++++++++++++++++++-------------------- web/jsp/login.jsp | 4 +- 6 files changed, 80 insertions(+), 79 deletions(-) diff --git a/web/jsp/CCheck.jsp b/web/jsp/CCheck.jsp index 7f5a9051..2b5e27e1 100644 --- a/web/jsp/CCheck.jsp +++ b/web/jsp/CCheck.jsp @@ -24,7 +24,7 @@ if (ccheckPage == null) String action = request.getParameter("action"); String override = request.getParameter("override"); -StringBuffer show = new StringBuffer(); // Variable to contain the HTML page generated. +StringBuilder show = new StringBuilder(); // Variable to contain the HTML page generated. String kbHref = null; String htmlDivider = "


\n"; String formattedFormula = null; @@ -33,18 +33,18 @@ HttpSession hsObj = request.getSession(); hsObj.setMaxInactiveInterval(-1); kbHref = HTMLformatter.createHrefStart() + "/sigma/Browse.jsp?lang=" + language + "&kb=" + kbName + "&flang=" + flang; InterfaceTPTP.init(); -ArrayList systemListBuiltIn = InterfaceTPTP.systemListBuiltIn; -ArrayList systemListLocal = InterfaceTPTP.systemListLocal; -ArrayList systemListRemote = InterfaceTPTP.systemListRemote; +List systemListBuiltIn = InterfaceTPTP.systemListBuiltIn; +List systemListLocal = InterfaceTPTP.systemListLocal; +List systemListRemote = InterfaceTPTP.systemListRemote; String defaultSystemBuiltIn = InterfaceTPTP.defaultSystemBuiltIn; String defaultSystemLocal = InterfaceTPTP.defaultSystemLocal; String defaultSystemRemote = InterfaceTPTP.defaultSystemRemote; - + %> - + Knowledge base Browser
@@ -84,7 +84,7 @@ String defaultSystemRemote = InterfaceTPTP.defaultSystemRemote; <%@include file="CommonHeader.jsp" %> <% -show = new StringBuffer(); +show = new StringBuilder(); int pageNum = Integer.parseInt(ccheckPage); boolean overrideValue = false; if (action != null && action != "") @@ -195,7 +195,7 @@ else show.append("
"); %> - +


<%=show.toString() %>
<%@ include file="Postlude.jsp" %> diff --git a/web/jsp/CELT.jsp b/web/jsp/CELT.jsp index 4258ba79..c83d855f 100644 --- a/web/jsp/CELT.jsp +++ b/web/jsp/CELT.jsp @@ -24,7 +24,7 @@ if (!role.equals("admin")) { System.out.println("INFO in CELT.jsp"); String result = null; -StringBuffer sbStatus = new StringBuffer(); +StringBuilder sbStatus = new StringBuilder(); String req = request.getParameter("request"); String stmt = request.getParameter("stmt"); @@ -91,7 +91,7 @@ if (req != null) { String pageString = "CELT"; %> <%@include file="CommonHeader.jsp" %> - +

Maximum answers: @@ -113,8 +113,9 @@ if (result != null && result.toString().length() > 0) { System.out.print("INFO in CELT.jsp: Number of XML elements: "); System.out.println(res.elements.size()); ProofProcessor pp = new ProofProcessor(res.elements); + List proofSteps; for (int i = 0; i < pp.numAnswers()-1; i++) { - ArrayList proofSteps = pp.getProofSteps(i); + proofSteps = pp.getProofSteps(i); proofSteps = new ArrayList(ProofStep.normalizeProofStepNumbers(proofSteps)); System.out.print("Proof steps: "); System.out.println(proofSteps.size()); diff --git a/web/jsp/KBs.jsp b/web/jsp/KBs.jsp index 0b08e08a..07730c9b 100644 --- a/web/jsp/KBs.jsp +++ b/web/jsp/KBs.jsp @@ -63,7 +63,7 @@ boolean odd = true; String kbName2 = null; while (kbNames.hasNext()) { - kbName2 = (String) kbNames.next(); + kbName2 = kbNames.next(); if (first) { defaultKB = kbName2; first = false; diff --git a/web/jsp/Prelude.jsp b/web/jsp/Prelude.jsp index 5794bebf..c21465a5 100644 --- a/web/jsp/Prelude.jsp +++ b/web/jsp/Prelude.jsp @@ -24,7 +24,7 @@ http://github.com/ontologyportal */ -ArrayList userPages = new ArrayList(); +List userPages = new ArrayList(); userPages.add("AllPictures.jsp"); userPages.add("Browse.jsp"); userPages.add("BrowseExtra.jsp"); diff --git a/web/jsp/SystemOnTPTP.jsp b/web/jsp/SystemOnTPTP.jsp index 00f46c0d..d0e2061a 100644 --- a/web/jsp/SystemOnTPTP.jsp +++ b/web/jsp/SystemOnTPTP.jsp @@ -24,7 +24,7 @@ boolean builtInExists = (new File(systemsDir)).exists() && (new File(systemsInfo)).exists(); String defaultSystemBuiltIn = ""; - ArrayList systemListBuiltIn = new ArrayList(); + List systemListBuiltIn = new ArrayList(); //----If built in Systems Directory exist, call built-in SystemOnTPTP if (builtInExists) { @@ -35,8 +35,8 @@ //----Check if SystemOnTPTP exists in a local copy of TPTPWorld String TPTPWorld = KBmanager.getMgr().getPref("tptpHomeDir"); InterfaceTPTP.init(); - ArrayList systemListLocal = InterfaceTPTP.systemListLocal; - ArrayList systemListRemote = InterfaceTPTP.systemListRemote; + List systemListLocal = InterfaceTPTP.systemListLocal; + List systemListRemote = InterfaceTPTP.systemListRemote; String defaultSystemLocal = InterfaceTPTP.defaultSystemLocal; String defaultSystemRemote = InterfaceTPTP.defaultSystemRemote; boolean tptpWorldExists = InterfaceTPTP.tptpWorldExists; @@ -76,30 +76,30 @@ if (systemChosenBuiltIn == null) systemChosenBuiltIn = defaultSystemBuiltIn; if (location == null) { - if (tptpWorldExists) + if (tptpWorldExists) location = "local"; - else if (builtInExists) + else if (builtInExists) location = "local"; - else - location = "remote"; + else + location = "remote"; } if (location.equals("local")) { - if (tptpWorldExists) + if (tptpWorldExists) systemChosen = systemChosenLocal; - else - systemChosen = systemChosenBuiltIn; - } - else - systemChosen = systemChosenRemote; + else + systemChosen = systemChosenBuiltIn; + } + else + systemChosen = systemChosenRemote; - if (tstpFormat == null) - tstpFormat = ""; - if (sanitize == null) - sanitize = "no"; - if (stmt == null || stmt.equalsIgnoreCase("null")) + if (tstpFormat == null) + tstpFormat = ""; + if (sanitize == null) + sanitize = "no"; + if (stmt == null || stmt.equalsIgnoreCase("null")) stmt = "(exists (?X) (instance ?X Relation))"; - else - System.out.println(stmt.trim()); + else + System.out.println(stmt.trim()); %> Sigma Knowledge Engineering Environment - TPTP @@ -254,13 +254,13 @@ + "/sigma/Browse.jsp?kb=" + kbName; out.println("Status: "); out.println(kb.tell(stmt) + "

\n" + statement.htmlFormat(kbHref)); - } + } else if (req.equalsIgnoreCase("test")) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb = sb.append(InferenceTestSuite.test(kb, systemChosen, out)); out.println(sb.toString()); - } + } else if (req.equalsIgnoreCase("Ask")) { String lineHtml = "

\n"; //----Code for doing the query @@ -317,7 +317,7 @@ result = ""; //----If we found a new set of answers, update query and axiom list if (lastAnswer != null) { - out.println("

"); //----Get symbols from lastAnswer + out.println("
"); //----Get symbols from lastAnswer TreeSet newSymbols = TPTPParser .getSymbolList(lastAnswer); //----Find uniqueSymbols from lastAnswer not in symbolsSoFar @@ -344,28 +344,28 @@ //----Copy original kb file kbFileName = kb.copyFile(originalKBFileName); //----Append ld axioms and conjecture to the end - kb.addToFile(kbFileName, ldAxiomsSoFar, conjectureTPTPFormula); + kb.addToFile(kbFileName, ldAxiomsSoFar, conjectureTPTPFormula); lastAnswer = null; //----Reset last answer - } - else { - kbFileName = kb.copyFile(originalKBFileName); //----Copy original kb file + } + else { + kbFileName = kb.copyFile(originalKBFileName); //----Copy original kb file kb.addToFile(kbFileName, null,conjectureTPTPFormula); //----Append conjecture to the end - } + } if (location.equals("remote")) { //----Call RemoteSoT - if (systemChosen.equals("Choose%20system")) + if (systemChosen.equals("Choose%20system")) out.println("No system chosen"); - else { //----Need to check the name exists + else { //----Need to check the name exists Hashtable URLParameters = new Hashtable(); URLParameters.put("NoHTML", "1"); if (quietFlag.equals("IDV")) { URLParameters.put("IDV", "-T"); URLParameters.put("QuietFlag", "-q4"); URLParameters.put("X2TPTP", tstpFormat); - } + } else if (quietFlag.equals("hyperlinkedKIF")) { URLParameters.put("QuietFlag", "-q3"); URLParameters.put("X2TPTP", "-S"); - } + } else { URLParameters.put("QuietFlag",quietFlag); URLParameters.put("X2TPTP", tstpFormat); @@ -400,29 +400,29 @@ out.println(""); reader.close(); } - } + } else if (location.equals("local") && tptpWorldExists) { //----Call local copy of TPTPWorld instead of using RemoteSoT if (systemChosen.equals("Choose%20system")) out.println("No system chosen"); else { - if (quietFlag.equals("hyperlinkedKIF")) + if (quietFlag.equals("hyperlinkedKIF")) command = SoTPTP + " " + "-q3" + " " + // quietFlag systemChosen + " " + timeout + " " + "-S" + " " + //tstpFormat - kbFileName; - else if (quietFlag.equals("IDV")) + kbFileName; + else if (quietFlag.equals("IDV")) command = SoTPTP + " " + "-q4" + " " + // quietFlag systemChosen + " " + timeout + " " + "-S" + " " + //tstpFormat - kbFileName; - else + kbFileName; + else command = SoTPTP + " " + quietFlag + " " + systemChosen + " " + timeout + " " + tstpFormat - + " " + kbFileName; + + " " + kbFileName; if (numAnswers == 0) out.println("(Local SystemOnTPTP call)"); proc = Runtime.getRuntime().exec(command); @@ -440,23 +440,23 @@ out.println(""); reader.close(); } - } + } else if (location.equals("local") && builtInExists && !tptpWorldExists) { //----Call built in SystemOnTPTP instead of using RemoteSoT or local if (systemChosen.equals("Choose%20system")) out.println("No system chosen"); - else { //----Set quiet flag + else { //----Set quiet flag String qq; String format; if (quietFlag.equals("IDV")) { qq = "-q4"; format = "-S"; - } + } else if (quietFlag.equals("hyperlinkedKIF")) { qq = "-q4"; format = "-S"; - } + } else { qq = quietFlag; format = tstpFormat; @@ -483,7 +483,7 @@ } out.println(""); } - } + } else out.println("INTERNAL ERROR: chosen option not valid: " + location @@ -506,7 +506,7 @@ ArrayList answer = SystemOnTPTP.getSZSBindings(conj, originalResult); lastAnswer = answer; newResult = TPTP2SUMO.convert(result, answer,false); - } + } else { //----Procedure if not SNARK (call one answer system: Metis) TPTPParser parser = TPTPParser.parse(new BufferedReader( @@ -523,10 +523,10 @@ out.println("No solution output by system. IDV tree unavaiable."); else out.println(idvResult); - } + } else out.println("Not a theorem. IDV tree unavailable."); - } + } else if (quietFlag.equals("IDV") && !location.equals("remote")) { if (SystemOnTPTP.isTheorem(originalResult)) { int size = SystemOnTPTP.getTPTPFormulaSize(result); @@ -544,15 +544,15 @@ + result + "\">"); out.println(" Hey, you cant see my applet!!!"); out.println(""); - } + } else out.println("No solution output by system. IDV tree unavaiable."); - } + } else out.println("Not a theorem. IDV tree unavailable."); - } + } else if (quietFlag.equals("hyperlinkedKIF")) { - if (originalAnswer == null) + if (originalAnswer == null) originalAnswer = lastAnswer; else { //----This is not the first answer, that means result has dummy ld predicates, bind conjecture with new answer, remove outside existential @@ -573,18 +573,18 @@ boolean proofExists = SystemOnTPTP.proofExists(originalResult); int timeUsed = SystemOnTPTP.timeUsed(originalResult); if (isTheorem) { - if (proofExists) + if (proofExists) out.println(HTMLformatter.formatProofResult( newResult, stmt, stmt, lineHtml,kbName, language)); - else //----Proof does not exist, but was a theorem + else //----Proof does not exist, but was a theorem out.println("Answer 1. Yes [Theorem]
"); - } + } else if (isCounterSatisfiable) out.println("Answer 1. No [CounterSatisfiable]
"); - else + else if (numAnswers == 0) - out.println("Answer 1. No
"); + out.println("Answer 1. No
"); out.flush(); } //----If lastAnswer != null (we found an answer) && there is an answer (lastAnswer.size() > 0) @@ -594,7 +594,7 @@ } while (numAnswers < maxAnswers && lastAnswer != null && lastAnswer.size() > 0); } - } + } catch (IOException ioe) { out.println(ioe.getMessage()); } diff --git a/web/jsp/login.jsp b/web/jsp/login.jsp index 40b34596..c3c7210a 100644 --- a/web/jsp/login.jsp +++ b/web/jsp/login.jsp @@ -18,7 +18,7 @@ import="com.articulate.sigma.*" Please cite the following article in any publication with references: - Pease A., and Benzmüller C. (2013). Sigma: An Integrated Development Environment + Pease A., and Benzm??ller C. (2013). Sigma: An Integrated Development Environment for Logical Theories. AI Communications 26, pp79-97. See also http://github.com/ontologyportal */ @@ -40,7 +40,7 @@ if (ps.userExists(userName)) { response.sendRedirect("KBs.jsp"); } else { - System.out.println("Bad login attempt in login.jsp - no matching password for " + u.username); + System.err.println("Bad login attempt in login.jsp - no matching password for " + u.username); response.sendRedirect("login.html"); } } From 2b031d4a1bb47fbdedde0e2a2e499feab0515d48 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 20:18:29 -0800 Subject: [PATCH 031/100] [Terry N.] use syserr for errors --- .../java/com/articulate/sigma/KbIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/java/com/articulate/sigma/KbIntegrationTest.java b/test/integration/java/com/articulate/sigma/KbIntegrationTest.java index eb37fe25..551e3c15 100644 --- a/test/integration/java/com/articulate/sigma/KbIntegrationTest.java +++ b/test/integration/java/com/articulate/sigma/KbIntegrationTest.java @@ -102,7 +102,7 @@ public void testIsHigherOrder3() { if (!f.isHigherOrder(SigmaTestBase.kb)) System.out.println("testIsHigherOrder3(): success!"); else - System.out.println("testIsHigherOrder3(): failure"); + System.err.println("testIsHigherOrder3(): failure"); assertTrue(!f.isHigherOrder(SigmaTestBase.kb)); } From 2aabd3686f2c5216e18b17f30deffdb30c5c54b6 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 20:23:09 -0800 Subject: [PATCH 032/100] [Terry N.] use syserr for errors, use diamond operators, var dec. out of loops, use StringBuilder append, try w/ resources, correct class names on systouts --- src/java/com/articulate/sigma/CCheck.java | 284 +++++++++--------- .../com/articulate/sigma/CCheckManager.java | 112 +++---- .../articulate/sigma/FormulaPreprocessor.java | 30 +- src/java/com/articulate/sigma/KIF.java | 1 + .../com/articulate/sigma/ProofProcessor.java | 15 +- src/java/com/articulate/sigma/ProofStep.java | 148 ++++----- .../com/articulate/sigma/nlg/CaseRole.java | 1 - .../articulate/sigma/nlg/NLGStringUtils.java | 10 +- .../com/articulate/sigma/nlg/NLGUtils.java | 6 +- .../com/articulate/sigma/trans/TPTP2SUMO.java | 4 +- .../sigma/trans/TPTP3ProofProcessor.java | 2 +- 11 files changed, 296 insertions(+), 317 deletions(-) diff --git a/src/java/com/articulate/sigma/CCheck.java b/src/java/com/articulate/sigma/CCheck.java index ca948165..f66ccc8a 100644 --- a/src/java/com/articulate/sigma/CCheck.java +++ b/src/java/com/articulate/sigma/CCheck.java @@ -26,37 +26,37 @@ public class CCheck implements Runnable { private PrintWriter pw; private String ccheck_kb; private String inferenceEngine; - private HashMap ieSettings; + private Map ieSettings; private int timeOut = 10; - private String lineHtml = "
" + + private String lineHtml = "
" + "

\n"; - + /** ************************************************************* */ public CCheck(KB kb, String filename) { - + this.kb = kb; try { - ccheckFile = new File(filename); + ccheckFile = new File(filename); fw = new FileWriter(ccheckFile); - pw = new PrintWriter(fw); + pw = new PrintWriter(fw); } - catch (Exception e) { - System.out.println(e.getMessage()); + catch (IOException e) { + System.err.println(e.getMessage()); e.printStackTrace(); } } - + /** ************************************************************* */ public CCheck(KB kb, String fileName, String chosenEngine, int timeout) throws Exception { - + this(kb, fileName); timeOut = timeout; if (setInferenceEngine(chosenEngine) == false) { - System.out.println("Unable to create CCheck for kb: " + kb.name + + System.out.println("Unable to create CCheck for kb: " + kb.name + "; Error setting up inference engine = " + inferenceEngine); - throw new Exception("Could not set inference engine with the following params for KB " + + throw new Exception("Could not set inference engine with the following params for KB " + kb.name + ". Inference Engine chosen = " + chosenEngine); } } @@ -65,25 +65,25 @@ public CCheck(KB kb, String fileName, String chosenEngine, int timeout) throws E */ public CCheck(KB kb, String fileName, String chosenEngine, String systemChosen, String quietFlag, String location, String language, int timeout) throws Exception { - + this (kb, fileName); timeOut = timeout; if (!setInferenceEngine(chosenEngine, systemChosen, location.toLowerCase(), quietFlag, language)) - throw new Exception("Could not set inference engine with the following params: {chosenEngine=" + + throw new Exception("Could not set inference engine with the following params: {chosenEngine=" + chosenEngine + ", systemChosen=" + systemChosen + ", location=" + location + "}"); - else System.out.println("Set up inference engine for Consistency Check of KB: " + kb.name + + else System.out.println("Set up inference engine for Consistency Check of KB: " + kb.name + ". Engine Chosen: " + chosenEngine); } /** ************************************************************* - * This sets the inference engine to be used for the consistency check. + * This sets the inference engine to be used for the consistency check. * This particular method sets it if chosenEngine == 'SoTPTP' - * - * @param chosenEngine - string describing the inference engine to be used. + * + * @param chosenEngine - string describing the inference engine to be used. * For this particular method, it should be 'SoTPTP' * @param systemChosen - the theorem prover to be used * @param location - if it's local or remote - * @param quietFlag - command option as to the verbosity of the result + * @param quietFlag - command option as to the verbosity of the result * @param language - language for formatting * @return true if there are no errors in setting the engine, false if errors are encountered. */ @@ -95,66 +95,65 @@ private boolean setInferenceEngine(String chosenEngine, String systemChosen, Str //String result = InterfaceTPTP.queryTPTP("(instance instance BinaryPredicate)", 10, 1, lineHtml, // systemChosen, location, quietFlag, kb.name, language); inferenceEngine = "SoTPTP"; - ieSettings = new HashMap(); + ieSettings = new HashMap<>(); ieSettings.put("systemChosen", systemChosen); - if (location == "" || location == null) + if ("".equals(location) || location == null) return false; - else ieSettings.put("location", location); - if (quietFlag == "" || quietFlag == null) + else ieSettings.put("location", location); + if ("".equals(quietFlag) || quietFlag == null) ieSettings.put("quietFlag", "hyperlinkedKIF"); else - ieSettings.put("quietFlag", quietFlag); - if (language == "" || language == null) + ieSettings.put("quietFlag", quietFlag); + if ("".equals(language) || language == null) language = "EnglishLanguage"; - ieSettings.put("language", language); - return true; + ieSettings.put("language", language); + return true; } - else + else setInferenceEngine(chosenEngine); } catch (Exception e) { - System.out.println("Error in setting up SystemOnTPTP: " + e.getMessage()); + System.err.println("Error in setting up SystemOnTPTP: " + e.getMessage()); return false; } return false; } - + /** ************************************************************* - * This sets the inference engine to be used for the consistency check. + * This sets the inference engine to be used for the consistency check. * It sends a test query to the inference engine to * ensure that the engine works. * @param chosenEngine - string describing the inference engine to be used. - * @return true if there are no errors in setting the engine, false if + * @return true if there are no errors in setting the engine, false if * errors are encountered - */ + */ private boolean setInferenceEngine(String chosenEngine) { - - String result = ""; + + String result; try { - if (chosenEngine.equals("EProver")) { - result = kb.askEProver("(instance instance BinaryPredicate)", 10, 1) + " "; - inferenceEngine = "EProver"; - return true; - } - else if (chosenEngine.equals("SInE")) { - result = kb.askSInE("(instance instance BinaryPredicate)", 10, 1); - inferenceEngine = "SInE"; - return true; - } - else if (chosenEngine.equals("LeoLocal")) { - LEO leo = kb.askLeo("(instance instance BinaryPredicate)", 10, 1); - inferenceEngine = "LeoLocal"; - return true; + switch (chosenEngine) { + case "EProver": + result = kb.askEProver("(instance instance BinaryPredicate)", 10, 1) + " "; + inferenceEngine = "EProver"; + return true; + case "SInE": + result = kb.askSInE("(instance instance BinaryPredicate)", 10, 1); + inferenceEngine = "SInE"; + return true; + case "LeoLocal": + LEO leo = kb.askLeo("(instance instance BinaryPredicate)", 10, 1); + inferenceEngine = "LeoLocal"; + return true; + default: + return false; } - else - return false; } catch (Exception e) { e.printStackTrace(); return false; } } - + /** ************************************************************* */ public String getKBName() { @@ -164,46 +163,41 @@ public String getKBName() { /** ************************************************************* */ private KB makeEmptyKB() { - + ccheck_kb = "CCheck_" + kb.name; String kbDir = (String) KBmanager.getMgr().getPref("kbDir"); - if (KBmanager.getMgr().existsKB(ccheck_kb)) - KBmanager.getMgr().removeKB(ccheck_kb); + if (KBmanager.getMgr().existsKB(ccheck_kb)) + KBmanager.getMgr().removeKB(ccheck_kb); File dir = new File( kbDir ); File emptyCFile = new File( dir, "emptyConstituent.txt" ); - String emptyCFilename = emptyCFile.getAbsolutePath(); - FileWriter fwriter = null; - PrintWriter pwriter = null; + String emptyCFilename = emptyCFile.getAbsolutePath(); KBmanager.getMgr().addKB(ccheck_kb, false); KB empty = KBmanager.getMgr().getKB(ccheck_kb); try { // Fails elsewhere if no constituents, or empty constituent, thus... empty.eprover = new EProver(KBmanager.getMgr().getPref("eprover")); - fwriter = new FileWriter( emptyCFile ); - pwriter = new PrintWriter(fwriter); - pwriter.println("(instance instance BinaryPredicate)\n"); - if (pwriter != null) pwriter.close(); - if (fwriter != null) fwriter.close(); - empty.addConstituent(emptyCFilename); - } - catch (java.io.IOException e) { - System.out.println("Error writing file " + emptyCFilename); - } - catch (Exception e) { - System.out.println(e.getMessage()); + try (Writer fwriter = new FileWriter(emptyCFile); PrintWriter pwriter = new PrintWriter(fwriter)) { + pwriter.println("(instance instance BinaryPredicate)\n"); + empty.addConstituent(emptyCFilename); + } catch (IOException e) { + System.err.println("Error writing file " + emptyCFilename); + } + + } catch (IOException e) { + System.err.println(e.getMessage()); e.printStackTrace(); } return empty; } - - /** ************************************************************* + + /** ************************************************************* */ private void printReport(Formula query, String processedQ, String sourceFile, boolean syntaxError, String proof, String testType) { - - pw.println(" "); - pw.println(" "); + + pw.println(" "); + pw.println(" "); pw.println(" " + query.getFormula()); pw.println(" "); pw.println(" "); @@ -221,57 +215,58 @@ private void printReport(Formula query, String processedQ, pw.println(" "); pw.println(" "); String[] split = proof.split("\n"); - for (int i = 0; i < split.length; i++) - pw.println(" " + split[i]); + for (String split1 : split) { + pw.println(" " + split1); + } pw.println(" "); pw.println(" "); } - + /** ************************************************************* - * This method saves the answer and proof for detected redundancies + * This method saves the answer and proof for detected redundancies * or inconsistencies into the file. - * - * @param proof - the proof presented that establishes the + * + * @param proof - the proof presented that establishes the * redundancy or inconsistency * @param query - the statement that caused the error * @param testType - whether it is a redundancy or inconsistency */ - private void reportAnswer(String proof, Formula query, String testType, + private void reportAnswer(String proof, Formula query, String testType, String processedQ, String sourceFile) { - if (proof.indexOf("Syntax error detected") != -1) - printReport(query,processedQ,sourceFile,true,proof,testType); + if (proof.contains("Syntax error detected")) + printReport(query,processedQ,sourceFile,true,proof,testType); else if (inferenceEngine.equals("EProver")) { StringReader sr = new StringReader(proof); LineNumberReader lnr = new LineNumberReader(sr); TPTP3ProofProcessor tpp = new TPTP3ProofProcessor(); tpp.parseProofOutput(lnr, kb); - if (tpp.proof != null && tpp.proof.size() > 0) - printReport(query,processedQ,sourceFile,false,proof,testType); + if (tpp.proof != null && !tpp.proof.isEmpty()) + printReport(query,processedQ,sourceFile,false,proof,testType); } else if (inferenceEngine.equals("SoTPTP")) { proof = proof.replaceAll("<", "%3C"); proof = proof.replaceAll(">", "%3E"); proof = proof.replaceAll("/n", ""); if (proof.contains("[yes]") || proof.contains("[Theorem]") - || proof.contains("[definite]")) - printReport(query,processedQ,sourceFile,false,proof,testType); + || proof.contains("[definite]")) + printReport(query,processedQ,sourceFile,false,proof,testType); } try { pw.flush(); fw.flush(); } - catch (Exception ex) { + catch (IOException ex) { System.out.println(ex.getMessage()); ex.printStackTrace(); } } - + /** ************************************************************* * This would save the error message for a formula in the CCheck results * file to inform the user that an error occurred while performing a * consistency check on one of the statements. - * + * * @param message * - error message * @param query @@ -282,9 +277,9 @@ else if (inferenceEngine.equals("SoTPTP")) { * - the source file where the formula being tested came from */ private void reportError(String message, Formula query, String processedQ, String sourceFile) { - + pw.println(" "); - pw.println(" "); + pw.println(" "); pw.println(" " + query.getFormula()); pw.println(" "); pw.println(" "); @@ -301,12 +296,12 @@ private void reportError(String message, Formula query, String processedQ, Strin pw.println(" " + message); pw.println(" "); pw.println(" "); - + try { pw.flush(); fw.flush(); } - catch (Exception ex) { + catch (IOException ex) { System.out.println(ex.getMessage()); ex.printStackTrace(); } @@ -316,29 +311,30 @@ private void reportError(String message, Formula query, String processedQ, Strin * This initiates the consistency check */ private void runConsistencyCheck() { - - String proof; + + String proof; KB empty = this.makeEmptyKB(); try { pw.println(""); pw.println(" "); pw.println(" " + kb.name); - pw.println(" "); + pw.println(" "); Collection allFormulas = kb.formulaMap.values(); Iterator it = allFormulas.iterator(); - pw.println(" "); + pw.println(" "); + Formula query; + FormulaPreprocessor fp; + Set processedQueries; + String processedQuery, sourceFile; + StringBuilder negatedQuery; while (it.hasNext()) { - Formula query = (Formula) it.next(); + query = (Formula) it.next(); System.out.println("CCheck.runConsistencyCheck: eprover: " + empty.eprover); - FormulaPreprocessor fp = new FormulaPreprocessor(); - Set processedQueries = fp.preProcess(query,false, kb); - - String processedQuery = null; - String sourceFile = null; - Iterator q = processedQueries.iterator(); - while(q.hasNext()) { - Formula f = q.next(); - processedQuery = f.makeQuantifiersExplicit(false); + fp = new FormulaPreprocessor(); + processedQueries = fp.preProcess(query,false, kb); + + for (Formula f : processedQueries) { + processedQuery = f.makeQuantifiersExplicit(false); sourceFile = f.sourceFile; sourceFile = sourceFile.replace("/", "/"); try { @@ -346,20 +342,20 @@ private void runConsistencyCheck() { reportAnswer(proof, query, "Redundancy", processedQuery, sourceFile); } catch(Exception e) { - reportError(e.getMessage(), query, processedQuery, sourceFile); + reportError(e.getMessage(), query, processedQuery, sourceFile); System.out.println("Error from inference engine: " + e.getMessage()); - } - StringBuffer negatedQuery = new StringBuffer(); - negatedQuery.append("(not " + processedQuery + ")"); + } + negatedQuery = new StringBuilder(); + negatedQuery.append("(not ").append(processedQuery).append(")"); try { proof = askInferenceEngine(empty, negatedQuery.toString()); - reportAnswer(proof, query ,"Inconsistency", processedQuery, sourceFile); + reportAnswer(proof, query ,"Inconsistency", processedQuery, sourceFile); } catch(Exception e) { - reportError(e.getMessage(), query, processedQuery, sourceFile); + reportError(e.getMessage(), query, processedQuery, sourceFile); System.out.println("Error from inference engine: " + e.getMessage()); } - } + } empty.tell(query.getFormula()); } pw.println(" "); @@ -369,9 +365,9 @@ private void runConsistencyCheck() { pw.println(" "); pw.print(" "); pw.print("Error encountered while running consistency check."); - pw.println(""); + pw.println(""); pw.print(""); - System.out.println(e.getMessage()); + System.err.println(e.getMessage()); e.printStackTrace(); } finally { @@ -384,7 +380,6 @@ private void runConsistencyCheck() { */ private void runConsistencyCheckNew() { - String proof; KB empty = this.makeEmptyKB(); try { pw.println(""); @@ -392,16 +387,16 @@ private void runConsistencyCheckNew() { pw.println(" " + kb.name); pw.println(" "); Collection allFormulas = kb.formulaMap.values(); - Collection allTPTP= new ArrayList(); + Collection allTPTP = new ArrayList<>(); for (Formula f : allFormulas) { allTPTP.addAll(f.theTptpFormulas); } Iterator it = allTPTP.iterator(); pw.println(" "); + String query; while (it.hasNext()) { - String query = (String) it.next(); + query = it.next(); System.out.println("CCheck.runConsistencyCheck: eprover: " + empty.eprover); - } pw.println(" "); pw.print(""); @@ -412,7 +407,7 @@ private void runConsistencyCheckNew() { pw.print("Error encountered while running consistency check."); pw.println(""); pw.print(""); - System.out.println(e.getMessage()); + System.err.println(e.getMessage()); e.printStackTrace(); } finally { @@ -423,7 +418,7 @@ private void runConsistencyCheckNew() { /** ************************************************************* * Picks the inference engine to use for the consistency check based on the * set-up inference engine. - * + * * @param empty * - the kb to be used for the check * @param query @@ -433,29 +428,32 @@ private void runConsistencyCheckNew() { private String askInferenceEngine(KB empty, String query) { String result = ""; - + try { - if (inferenceEngine.equals("EProver")) { - result = empty.askEProver(query, timeOut, 1) + " "; - } - else if (inferenceEngine.equals("SInE")) { - result = empty.askSInE(query, timeOut, 1); - } - else if (inferenceEngine.equals("LeoLocal")) { - LEO leo = empty.askLeo(query, timeOut, 1); + switch (inferenceEngine) { + case "EProver": + result = empty.askEProver(query, timeOut, 1) + " "; + break; + case "SInE": + result = empty.askSInE(query, timeOut, 1); + break; + case "LeoLocal": + LEO leo = empty.askLeo(query, timeOut, 1); + break; + //result = InterfaceTPTP.queryTPTP(query, timeOut, 1, lineHtml, + // ieSettings.get("systemChosen"), + // ieSettings.get("location"), + // ieSettings.get("quietFlag"), empty.name, + // ieSettings.get("language")); + case "SoTPTP": + break; + default: + throw new Exception("No inference engine."); } - else if (inferenceEngine.equals("SoTPTP")) { - //result = InterfaceTPTP.queryTPTP(query, timeOut, 1, lineHtml, - // ieSettings.get("systemChosen"), - // ieSettings.get("location"), - // ieSettings.get("quietFlag"), empty.name, - // ieSettings.get("language")); - } - else throw new Exception("No inference engine."); } catch (Exception e) { - System.out.println(e.getMessage()); - result = "ERROR [for query: " + query + "]: " + e.getMessage(); + System.err.println(e.getMessage()); + result = "ERROR [for query: " + query + "]: " + e.getMessage(); } return result; } diff --git a/src/java/com/articulate/sigma/CCheckManager.java b/src/java/com/articulate/sigma/CCheckManager.java index defeebd9..efa73c07 100644 --- a/src/java/com/articulate/sigma/CCheckManager.java +++ b/src/java/com/articulate/sigma/CCheckManager.java @@ -3,16 +3,18 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; +import java.io.Reader; import java.sql.Timestamp; import java.util.Date; import java.util.HashMap; +import java.util.Map; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.logging.Level; import java.util.logging.Logger; -import com.articulate.sigma.KB; /** This code is copyright Articulate Software (c) 2014. This software is released under the GNU Public License . @@ -27,7 +29,7 @@ */ /** *************************************************************** - * This class manages the threads that run consistency checks for the different + * This class manages the threads that run consistency checks for the different * KBs in the system. * @author Karen Joy Nomorosa, Rearden Commerce Inc. * @@ -40,19 +42,16 @@ public class CCheckManager extends ThreadPoolExecutor { public enum CCheckStatus { ONGOING, DONE, QUEUED, NOCCHECK, ERROR } - - private HashMap> checkedKBs = null; - private HashMap ccheckQueue= null; - private Logger logger = null; - + + private Map> checkedKBs = null; + private Map ccheckQueue= null; + private static final Logger logger = Logger.getLogger(CCheckManager.class.getName()); + public CCheckManager() { - super(3, 3, 50000L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(10)); + super(3, 3, 50000L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(10)); - if (logger == null) - logger = Logger.getLogger(this.getClass().getName()); - - ccheckQueue = new HashMap(); - checkedKBs = new HashMap>(); + ccheckQueue = new HashMap<>(); + checkedKBs = new HashMap<>(); } /** *************************************************************** @@ -63,12 +62,12 @@ public CCheckManager() { public Timestamp lastCCheck(String kbName) { if (checkedKBs.containsKey(kbName)) { - HashMap obj = checkedKBs.get(kbName); - + Map obj = checkedKBs.get(kbName); + if (obj.containsKey("timestamp")) return (Timestamp) obj.get("timestamp"); } - + return null; } @@ -81,65 +80,46 @@ public String ccheckResults(String kbName) { logger.entering("CCheckManager", "ccheckResults", "kbName = " + kbName); StringBuilder result = new StringBuilder(); - FileReader fr = null; - BufferedReader br = null; // These are the KBs that are still undergoing consistency checks if (ccheckQueue.containsKey(kbName)) { String filename = ccheckQueue.get(kbName); if (filename != null) { - try { - fr = new FileReader(filename); - br = new BufferedReader(fr); - - String line = null; + try (Reader fr = new FileReader(filename); + BufferedReader br = new BufferedReader(fr)) { + + String line; while ((line = br.readLine()) != null) - result.append(line + "\n"); - - // Need to append the closing tags because these probably have not been added by + result.append(line).append("\n"); + + // Need to append the closing tags because these probably have not been added by // CCheck.java yet, as the process is still ongoing. if (result.length() > 0) result.append(" \n"); logger.exiting("CCheckManager", "ccheckResults", result.toString()); return result.toString(); - } - catch (Exception ex) { - if (fr != null) - try { - fr.close(); - } - catch (Exception e1) { - logger.warning(e1.getMessage()); - } - if (br != null) - try { - br. close(); - } - catch (Exception e2) { - logger.warning(e2.getMessage()); - } + } catch (Exception ex){ logger.warning(ex.getMessage()); } - } + } } else if (checkedKBs.containsKey(kbName)) { - // These are for the consistency checks that are already done. - // Note that code in performing CChecks ensures that a KBName cannot be in + // These are for the consistency checks that are already done. + // Note that code in performing CChecks ensures that a KBName cannot be in // both checkedKBs and ccheckQueue at the same time. - HashMap value = checkedKBs.get(kbName); + Map value = checkedKBs.get(kbName); String filename = (String) value.get("filename"); - + if (filename != null) { - try { - fr = new FileReader(filename); - br = new BufferedReader(fr); - - String line = null; + try (Reader fr = new FileReader(filename); + BufferedReader br = new BufferedReader(fr)) { + + String line; while ((line = br.readLine()) != null) result.append(line); - - logger.exiting("CCheckManager", "ccheckResults", result.toString()); + + logger.exiting("CCheckManager", "ccheckResults", result.toString()); return result.toString(); } catch (Exception ex){ @@ -174,9 +154,9 @@ else if (checkedKBs.containsKey(kbName)) * @param kb - KB to be checked * @return the status of the check (whether it has been accepted or rejected) */ - public CCheckStatus performConsistencyCheck(KB kb, String chosenEngine, String systemChosen, + public CCheckStatus performConsistencyCheck(KB kb, String chosenEngine, String systemChosen, String location, String language, int timeout) { - + if (!ccheckQueue.containsKey(kb.name)) { try { String filename = "CCHECK_" + kb.name; @@ -190,40 +170,40 @@ public CCheckStatus performConsistencyCheck(KB kb, String chosenEngine, String s timeout)); else super.execute(new CCheck(kb, filename, chosenEngine, timeout)); - + ccheckQueue.put(kb.name, filename); - + // remove this KB from checkedKBs because a new consistency check is being run for it. if (checkedKBs.containsKey(kb.name)) checkedKBs.remove(kb.name); - - logger.info("KB " + kb.name + " has been added to the queue for consistency check."); + + logger.log(Level.INFO, "KB {0} has been added to the queue for consistency check.", kb.name); return CCheckStatus.QUEUED; } catch (RejectedExecutionException e) { logger.warning(e.getMessage()); return CCheckStatus.ERROR; - } + } catch (Exception e) { logger.warning(e.getMessage()); return CCheckStatus.ERROR; } } else { - logger.info("KB " + kb.name + "has been rejected for consistency check as it is already undergoing the check."); + logger.log(Level.INFO, "KB {0}has been rejected for consistency check as it is already undergoing the check.", kb.name); return CCheckStatus.ONGOING; } } /** *************************************************************** - * Removes the KB from the list of kbs currently being checked, and add it to the checkedKBs list. + * Removes the KB from the list of kbs currently being checked, and add it to the checkedKBs list. * This method is overridden from the parent class. - * @param r + * @param r * @param t */ protected void afterExecute(CCheck r, Throwable t) { - - HashMap value = new HashMap(); + + Map value = new HashMap<>(); value.put("timestamp", new Timestamp((new Date()).getTime())); value.put("filename", ccheckQueue.get(r.getKBName())); checkedKBs.put(r.getKBName(), value); diff --git a/src/java/com/articulate/sigma/FormulaPreprocessor.java b/src/java/com/articulate/sigma/FormulaPreprocessor.java index 096b55ff..f34a705c 100644 --- a/src/java/com/articulate/sigma/FormulaPreprocessor.java +++ b/src/java/com/articulate/sigma/FormulaPreprocessor.java @@ -83,11 +83,11 @@ public static String findType(int numarg, String pred, KB kb) { List sig = null; if (kb == null || kb.kbCache == null) { - System.out.println("Error in FormulaPreprocessor.findType(): null cache"); + System.err.println("Error in FormulaPreprocessor.findType(): null cache"); return null; } else if (kb.kbCache.signatures == null) - System.out.println("Error in FormulaPreprocessor.findType(): null cache signatures"); + System.err.println("Error in FormulaPreprocessor.findType(): null cache signatures"); if (kb.kbCache != null && kb.kbCache.signatures != null) sig = kb.kbCache.signatures.get(pred); if (sig == null) { @@ -443,7 +443,7 @@ else if (argstr.startsWith(Formula.LP)) { * ContentDevelopment, Writing] * return the most specific type Writing */ - protected String getMostRelevantType(KB kb, HashSet types) { + protected String getMostRelevantType(KB kb, Set types) { Set insts = new HashSet<>(); for (String type : types) { @@ -677,7 +677,7 @@ private void setEqualsVartype(KB kb, String arg0, String arg1, String type = kb.kbCache.getRange(fstr); if (type == null) { type = "Entity"; - System.out.println("Error in FormulaPreprocessor.setEqualsVartype() no function type for " + fstr); + System.err.println("Error in FormulaPreprocessor.setEqualsVartype() no function type for " + fstr); } MapUtils.addToMap(result,arg1,type); } @@ -693,7 +693,7 @@ private Map> computeVariableTypesRecurse(KB kb, Formula f, Map> input) { if (kb == null) - System.out.println("Error in FormulaPreprocessor.computeVariableTypesRecurse() kb = null found while processing: \n" + f); + System.err.println("Error in FormulaPreprocessor.computeVariableTypesRecurse() kb = null found while processing: \n" + f); Map> result = new HashMap<>(); if (f == null || StringUtil.emptyString(f.getFormula()) || f.empty() || f.isVariable() || f.atom()) return result; @@ -717,7 +717,7 @@ private Map> computeVariableTypesRecurse(KB kb, Formula f, if (f.getFormula().contains("?") && !Formula.isVariable(pred)) { List args = f.complexArgumentsToArrayList(1); if (args == null) - System.out.println("Error in FormulaPreprocessor.computeVariableTypesRecurse() args = null found while processing: \n" + f); + System.err.println("Error in FormulaPreprocessor.computeVariableTypesRecurse() args = null found while processing: \n" + f); if (pred.equals(Formula.EQUAL) && args.size() > 1) { if (args.get(0).isVariable() && args.get(1).listP() && kb.isFunctional(args.get(1))) @@ -782,7 +782,6 @@ private String preProcessRecurse(Formula f, String previousPred, boolean ignoreS boolean translateIneq, boolean translateMath, KB kb) { - if (debug) System.out.println("preProcessRecurse: " + f); StringBuilder result = new StringBuilder(); if (f.listP() && !f.empty()) { @@ -889,14 +888,14 @@ private String preProcessRecurse(Formula f, String previousPred, boolean ignoreS */ protected List replacePredVarsAndRowVars(Formula form, KB kb, boolean addHoldsPrefix) { - List result = new ArrayList(); + List result = new ArrayList<>(); if (debug) System.out.println("FormulaPreprocessor.replacePredVarsAndRowVars(): " + form); Formula startF = new Formula(); startF.read(form.getFormula()); Set predVars = PredVarInst.gatherPredVars(kb,startF); Set accumulator = new LinkedHashSet<>(); accumulator.add(startF); - List working = new ArrayList(); + List working = new ArrayList<>(); int prevAccumulatorSize = 0; Set instantiations; List ar; @@ -950,7 +949,7 @@ protected List replacePredVarsAndRowVars(Formula form, KB kb, boolean a else accumulator.addAll(ar); if (accumulator.size() > AXIOM_EXPANSION_LIMIT) { - System.out.println("Error in FormulaPreprocessor.replacePredVarsAndRowVars(): AXIOM_EXPANSION_LIMIT EXCEEDED: " + AXIOM_EXPANSION_LIMIT); + System.err.println("Error in FormulaPreprocessor.replacePredVarsAndRowVars(): AXIOM_EXPANSION_LIMIT EXCEEDED: " + AXIOM_EXPANSION_LIMIT); break; } } @@ -1094,7 +1093,7 @@ public Set preProcess(Formula form, boolean isQuery, KB kb) { KBmanager mgr = KBmanager.getMgr(); if (!form.isBalancedList()) { String errStr = "Unbalanced parentheses or quotes in: " + form.getFormula(); - System.out.println("Error in preProcess(): " + errStr); + System.err.println("Error in preProcess(): " + errStr); form.errors.add(errStr); return results; } @@ -1118,11 +1117,9 @@ public Set preProcess(Formula form, boolean isQuery, KB kb) { // Iterate over the formulae resulting from predicate variable instantiation and row variable expansion, // passing each to preProcessRecurse for further processing. if (!accumulator.isEmpty()) { - String theNewFormula = null; - FormulaPreprocessor fp; + String theNewFormula; for (Formula fnew : accumulator) { - fp = new FormulaPreprocessor(); - theNewFormula = fp.preProcessRecurse(fnew,"",ignoreStrings,translateIneq,translateMath,kb); + theNewFormula = preProcessRecurse(fnew,"",ignoreStrings,translateIneq,translateMath,kb); fnew.read(theNewFormula); //if (debug) System.out.println("preProcess: fnew: " + fnew); form.errors.addAll(fnew.getErrors()); @@ -1145,10 +1142,9 @@ public Set preProcess(Formula form, boolean isQuery, KB kb) { Formula fnew; for (Formula f : results) { if (debug) System.out.println("INFO in FormulaPreprocessor.preProcess(): form: " + f); - fp = new FormulaPreprocessor(); fnew = f; //if (addTypes) - fnew.read(fp.addTypeRestrictions(f,kb).getFormula()); + fnew.read(addTypeRestrictions(f,kb).getFormula()); //else // if (debug) System.out.println("preProcess(): not adding types"); f.read(fnew.getFormula()); diff --git a/src/java/com/articulate/sigma/KIF.java b/src/java/com/articulate/sigma/KIF.java index bd9057bd..9baddf7e 100644 --- a/src/java/com/articulate/sigma/KIF.java +++ b/src/java/com/articulate/sigma/KIF.java @@ -584,6 +584,7 @@ public static void tptpOutputTest(String filename) throws IOException { String msg = e1.getMessage(); if (e1 instanceof ParseException) msg = msg + (" in statement starting at line " + ((ParseException) e1).getErrorOffset()); + System.err.println(msg); } File outfile = new File(filename + ".tptp"); try (FileWriter fw = new FileWriter(outfile); diff --git a/src/java/com/articulate/sigma/ProofProcessor.java b/src/java/com/articulate/sigma/ProofProcessor.java index 17f0a778..f6469454 100644 --- a/src/java/com/articulate/sigma/ProofProcessor.java +++ b/src/java/com/articulate/sigma/ProofProcessor.java @@ -96,8 +96,9 @@ public static List returnSkolemStmt(String skolem, List pro Matcher match; List matches = new ArrayList<>(); + TPTPFormula step; for (int i = 0; i < proofSteps.size(); i++) { - TPTPFormula step = proofSteps.get(i); + step = proofSteps.get(i); match = pattern.matcher(step.sumo); while (match.find()) { for (int j = 1; j <= match.groupCount(); j++) { @@ -126,7 +127,7 @@ private static Formula removeNestedAnswerClauseRecurse(Formula f) { if (relation.equals("not")) { Formula fcdar = f.cdrAsFormula().carAsFormula(); if (fcdar == null) { - System.out.println("Error in ProofProcessor.removeNestedAnswerClauseRecurse(): bad arg to not: '" + f.getFormula() + "'"); + System.err.println("Error in ProofProcessor.removeNestedAnswerClauseRecurse(): bad arg to not: '" + f.getFormula() + "'"); return null; } Formula fnew = removeNestedAnswerClauseRecurse(fcdar); @@ -199,7 +200,7 @@ public int numAnswers() { return queryResponse.subelements.size()-1; // Note that there is a element under the queryResponse element that shouldn't be counted, hence the -1 else - System.out.println("Error in ProofProcessor.numAnswers(): Bad tag: " + queryResponse.tagname); + System.err.println("Error in ProofProcessor.numAnswers(): Bad tag: " + queryResponse.tagname); return 0; } @@ -299,15 +300,17 @@ public static void tallyAxioms(String file) { ex.printStackTrace(); } + String val; for (String key : axioms.keySet()) { - String val = axioms.get(key); + val = axioms.get(key); System.out.println(key + "\t" + val); } System.out.println(); + Integer vall; for (String key : counts.keySet()) { - Integer val = counts.get(key); - System.out.println(key + "\t" + val); + vall = counts.get(key); + System.out.println(key + "\t" + vall); } } diff --git a/src/java/com/articulate/sigma/ProofStep.java b/src/java/com/articulate/sigma/ProofStep.java index c08f70b9..2d2c0e93 100644 --- a/src/java/com/articulate/sigma/ProofStep.java +++ b/src/java/com/articulate/sigma/ProofStep.java @@ -4,11 +4,11 @@ copyright Teknowledge (c) 2003 and reused under the terms of the GNU license. This software is released under the GNU Public License . Users of this code also consent, by use of this code, to credit Articulate Software -and Teknowledge in any writings, briefings, publications, presentations, or -other representations of any software which incorporates, builds on, or uses this +and Teknowledge in any writings, briefings, publications, presentations, or +other representations of any software which incorporates, builds on, or uses this code. Please cite the following article in any publication with references: -Pease, A., (2003). The Sigma Ontology Development Environment, +Pease, A., (2003). The Sigma Ontology Development Environment, in Working Notes of the IJCAI-2003 Workshop on Ontology and Distributed Systems, August 9, Acapulco, Mexico. */ @@ -18,18 +18,20 @@ copyright Teknowledge (c) 2003 and reused under the terms of the GNU license. import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; /** A trivial structure to hold the elements of a proof step. */ public class ProofStep { public static boolean debug = false; - public static final String QUERY = "[Query]"; - public static final String NEGATED_QUERY = "[Negated Query]"; - public static final String INSTANTIATED_QUERY = "[Instantiated Query]"; + public static final String QUERY = "[Query]"; + public static final String NEGATED_QUERY = "[Negated Query]"; + public static final String INSTANTIATED_QUERY = "[Instantiated Query]"; - // the TPTP3 input - public String input = null; + // the TPTP3 input + public String input = null; /** A String giving the type of the clause or formula, such as 'conjecture', 'plain' or 'axiom' */ public String formulaType = null; @@ -55,41 +57,42 @@ public class ProofStep { * which this axiom is derived. Note that the numbering is what * the ProofProcessor assigns, not necessarily the proof * numbers returned directly from the inference engine. */ - public ArrayList premises = new ArrayList(); - + public List premises = new ArrayList(); + /** *************************************************************** * Take an ArrayList of ProofSteps and renumber them consecutively * starting at 1. Update the ArrayList of premises so that they * reflect the renumbering. */ - public static ArrayList normalizeProofStepNumbers(ArrayList proofSteps) { + public static List normalizeProofStepNumbers(List proofSteps) { // old number, new number - HashMap numberingMap = new HashMap<>(); + Map numberingMap = new HashMap<>(); System.out.println("INFO in ProofStep.normalizeProofStepNumbers(): begin with " + proofSteps.size() + " steps "); //if (debug) System.out.println("INFO in ProofStep.normalizeProofStepNumbers(): before: " + proofSteps); int newIndex = 1; + ProofStep ps; + Integer oldIndex, premiseNum, newNumber; for (int i = 0; i < proofSteps.size(); i++) { //System.out.println("INFO in ProofStep.normalizeProofStepNumbers(): numberingMap: " + numberingMap); - ProofStep ps = (ProofStep) proofSteps.get(i); + ps = (ProofStep) proofSteps.get(i); //System.out.println("INFO in ProofStep.normalizeProofStepNumbers(): Checking proof step: " + ps); - Integer oldIndex = Integer.valueOf(ps.number); - if (numberingMap.containsKey(oldIndex)) - ps.number = (Integer) numberingMap.get(oldIndex); + oldIndex = ps.number; + if (numberingMap.containsKey(oldIndex)) + ps.number = numberingMap.get(oldIndex); else { //System.out.println("INFO in ProofStep.normalizeProofStepNumbers(): adding new step: " + newIndex); - ps.number = Integer.valueOf(newIndex); - numberingMap.put(oldIndex,Integer.valueOf(newIndex++)); + ps.number = newIndex; + numberingMap.put(oldIndex, newIndex++); } for (int j = 0; j < ps.premises.size(); j++) { - Integer premiseNum = ps.premises.get(j); + premiseNum = ps.premises.get(j); //System.out.println("INFO in ProofStep.normalizeProofStepNumbers(): old premise num: " + premiseNum); - Integer newNumber = null; - if (numberingMap.get(premiseNum) != null) - newNumber = Integer.valueOf((Integer) numberingMap.get(premiseNum)); + if (numberingMap.get(premiseNum) != null) + newNumber = numberingMap.get(premiseNum); else { - newNumber = Integer.valueOf(newIndex++); - numberingMap.put(premiseNum,Integer.valueOf(newNumber)); + newNumber = newIndex++; + numberingMap.put(premiseNum, newNumber); } //System.out.println("INFO in ProofStep.normalizeProofStepNumbers(): new premise num: " + newNumber); ps.premises.set(j,newNumber); @@ -102,30 +105,33 @@ public static ArrayList normalizeProofStepNumbers(ArrayList removeDuplicates(ArrayList proofSteps) { + public static List removeDuplicates(List proofSteps) { if (debug) System.out.println("INFO in ProofStep.removeDuplicates(): before: " + proofSteps); // System.out.println("INFO in ProofSteps.removeDuplicates()"); // old number, new number - HashMap numberingMap = new HashMap(); - + Map numberingMap = new HashMap<>(); + // formula string, proof step number - HashMap formulaMap = new HashMap(); - + Map formulaMap = new HashMap<>(); + // proof step number, proof step - HashMap reverseFormulaMap = new HashMap(); - - ArrayList newProofSteps = new ArrayList(); - ArrayList dedupedProofSteps = new ArrayList(); - + Map reverseFormulaMap = new HashMap<>(); + + List newProofSteps = new ArrayList<>(); + List dedupedProofSteps = new ArrayList<>(); + int counter = 1; + ProofStep ps, psNew; + Integer index, fNum, newIndex, premiseNum, newNumber; + String s; for (int i = 0; i < proofSteps.size(); i++) { - ProofStep ps = proofSteps.get(i); - Integer index = ps.number; + ps = proofSteps.get(i); + index = ps.number; reverseFormulaMap.put(index,ps); - String s = Clausifier.normalizeVariables(ps.axiom); + s = Clausifier.normalizeVariables(ps.axiom); if (formulaMap.keySet().contains(s) && ps.premises.size() == 1) { // If the step is a duplicate, relate the current step number - Integer fNum = formulaMap.get(s); // to the existing number of the formula + fNum = formulaMap.get(s); // to the existing number of the formula numberingMap.put(index,fNum); } else { @@ -135,31 +141,31 @@ public static ArrayList removeDuplicates(ArrayList proofSt dedupedProofSteps.add(ps); } } - for (int i = 0; i < dedupedProofSteps.size(); i++) { - ProofStep ps = dedupedProofSteps.get(i); - Integer newIndex = Integer.valueOf(ps.number); - if (numberingMap.keySet().contains(newIndex)) - newIndex = numberingMap.get(newIndex); - ProofStep psNew = new ProofStep(); - psNew.formulaRole = ps.formulaRole; - psNew.formulaType = ps.formulaType; + List newPremises; + for (int i = 0; i < dedupedProofSteps.size(); i++) { + ps = dedupedProofSteps.get(i); + newIndex = ps.number; + if (numberingMap.keySet().contains(newIndex)) + newIndex = numberingMap.get(newIndex); + psNew = new ProofStep(); + psNew.formulaRole = ps.formulaRole; + psNew.formulaType = ps.formulaType; psNew.inferenceType = ps.inferenceType; - String s = Clausifier.normalizeVariables(ps.axiom); - psNew.axiom = s; - psNew.number = newIndex; - psNew.input = ps.input; - ArrayList newPremises = new ArrayList(); - for (int j = 0; j < ps.premises.size(); j++) { - Integer premiseNum = ps.premises.get(j); - Integer newNumber = null; - if (numberingMap.get(premiseNum) != null) - newNumber = Integer.valueOf((Integer) numberingMap.get(premiseNum)); - else - newNumber = Integer.valueOf(premiseNum); - newPremises.add(newNumber); - } - psNew.premises = newPremises; - newProofSteps.add(psNew); + s = Clausifier.normalizeVariables(ps.axiom); + psNew.axiom = s; + psNew.number = newIndex; + psNew.input = ps.input; + newPremises = new ArrayList(); + for (int j = 0; j < ps.premises.size(); j++) { + premiseNum = ps.premises.get(j); + if (numberingMap.get(premiseNum) != null) + newNumber = numberingMap.get(premiseNum); + else + newNumber = premiseNum; + newPremises.add(newNumber); + } + psNew.premises = newPremises; + newProofSteps.add(psNew); } if (debug) System.out.println("INFO in ProofStep.removeDuplicates(): after: " + newProofSteps); return newProofSteps; @@ -172,13 +178,14 @@ public static ArrayList removeDuplicates(ArrayList proofSt * (1) conjecture * (2) duplicate $false; */ - public static ArrayList removeUnnecessary(ArrayList proofSteps) { + public static List removeUnnecessary(List proofSteps) { if (debug) System.out.println("INFO in ProofStep.removeUnnecessary(): before: " + proofSteps); - ArrayList results = new ArrayList(); + List results = new ArrayList<>(); boolean firstTimeSeeFALSE = true; + ProofStep ps; for (int i = 0; i < proofSteps.size(); i++) { - ProofStep ps = proofSteps.get(i); + ps = proofSteps.get(i); if (ps.formulaType != null && !ps.formulaType.equals("conjecture") ) { // conjecture is not allowed in the proof step if (ps.axiom.equalsIgnoreCase("FALSE")) { @@ -202,25 +209,26 @@ else if (ps.formulaType.equals("negated_conjecture")) { // negated conjecture ha /** *************************************************************** */ + @Override public String toString() { - StringBuffer sb = new StringBuffer(); - sb.append(number + ". " + new Formula(axiom).format(""," ","\n") + " " + premises + " "); + StringBuilder sb = new StringBuilder(); + sb.append(number).append(". ").append(new Formula(axiom).format(""," ","\n")).append(" ").append(premises).append(" "); if (inferenceType.startsWith("kb_")) { Formula originalF = SUMOKBtoTPTPKB.axiomKey.get(inferenceType); if (originalF != null) { - sb.append(inferenceType + ":" + originalF.startLine + ":" + FileUtil.noPath(originalF.getSourceFile()) + "\n"); + sb.append(inferenceType).append(":").append(originalF.startLine).append(":").append(FileUtil.noPath(originalF.getSourceFile())).append("\n"); if (originalF.derivation != null && originalF.derivation.operator != null && !originalF.derivation.operator.equals("input")) sb.append(originalF.derivation.toString()); } else - sb.append(inferenceType + "\n"); + sb.append(inferenceType).append("\n"); } else - sb.append(inferenceType + "\n"); + sb.append(inferenceType).append("\n"); return sb.toString(); } } diff --git a/src/java/com/articulate/sigma/nlg/CaseRole.java b/src/java/com/articulate/sigma/nlg/CaseRole.java index 7205555e..22135b5a 100644 --- a/src/java/com/articulate/sigma/nlg/CaseRole.java +++ b/src/java/com/articulate/sigma/nlg/CaseRole.java @@ -1,7 +1,6 @@ package com.articulate.sigma.nlg; import com.articulate.sigma.KB; -import com.articulate.sigma.KBmanager; import java.util.Collection; diff --git a/src/java/com/articulate/sigma/nlg/NLGStringUtils.java b/src/java/com/articulate/sigma/nlg/NLGStringUtils.java index 3c85ff7a..6c0ecc15 100644 --- a/src/java/com/articulate/sigma/nlg/NLGStringUtils.java +++ b/src/java/com/articulate/sigma/nlg/NLGStringUtils.java @@ -43,10 +43,7 @@ else if (ct == input.size() - 2) { */ static boolean isVowel(char c) { - if (c == 'a' || c == 'e' || c == 'i' || c == 'o' || c == 'u') - return true; - else - return false; + return c == 'a' || c == 'e' || c == 'i' || c == 'o' || c == 'u'; } /************************************************************************************************************** @@ -55,9 +52,6 @@ static boolean isVowel(char c) { * @return */ public static boolean isVariable(String str) { - if(str.substring(0, 1).equals("?")) { - return true; - } - return false; + return str.substring(0, 1).equals("?"); } } diff --git a/src/java/com/articulate/sigma/nlg/NLGUtils.java b/src/java/com/articulate/sigma/nlg/NLGUtils.java index 943e3dce..66a35f8f 100644 --- a/src/java/com/articulate/sigma/nlg/NLGUtils.java +++ b/src/java/com/articulate/sigma/nlg/NLGUtils.java @@ -484,9 +484,9 @@ static List collectOrderedVariables(String form) { for (int i = 0; i < form.length(); i++) { char ch = form.charAt(i); switch (ch) { - case '"': inString = !inString; break; - case '?': if (!inString) inVar = true; break; - case '@': if (!inString) inVar = true; break; + case '"': inString = !inString; break; + case '?': if (!inString) inVar = true; break; + case '@': if (!inString) inVar = true; break; } if (inVar && !Character.isLetterOrDigit(ch) && ch != '?' && ch != '@') { if (!result.contains(var)) diff --git a/src/java/com/articulate/sigma/trans/TPTP2SUMO.java b/src/java/com/articulate/sigma/trans/TPTP2SUMO.java index 730baaff..f681b0c0 100644 --- a/src/java/com/articulate/sigma/trans/TPTP2SUMO.java +++ b/src/java/com/articulate/sigma/trans/TPTP2SUMO.java @@ -170,7 +170,7 @@ public static String toSUMO (String clause) { */ public static void showHelp() { - System.out.println("KB class"); + System.out.println("TPTP2SUMO class"); System.out.println(" options:"); System.out.println(" -h - show this help screen"); System.out.println(" -c - parse test clause"); @@ -216,7 +216,7 @@ public static void main (String args[]) { } } catch (Exception e) { - System.out.println("e: " + e); + System.err.println("e: " + e); } } } diff --git a/src/java/com/articulate/sigma/trans/TPTP3ProofProcessor.java b/src/java/com/articulate/sigma/trans/TPTP3ProofProcessor.java index 741d4117..6303f442 100644 --- a/src/java/com/articulate/sigma/trans/TPTP3ProofProcessor.java +++ b/src/java/com/articulate/sigma/trans/TPTP3ProofProcessor.java @@ -540,7 +540,7 @@ public void processAnswersFromProof(StringBuilder qlist, String query) { if (debug) { System.out.println("processAnswersFromProof(): bindingMap: " + bindingMap); } - bindingMap = new HashMap<>(); + bindingMap.clear(); if (qlist != null && qlist.length() > 0) { List qvarslist = Arrays.asList(qlist.toString().split(",")); for (String s : qvarslist) { From 9a432a69e96efa6caf642ef34533d07d0d42e98b Mon Sep 17 00:00:00 2001 From: git Date: Thu, 13 Feb 2025 20:25:16 -0800 Subject: [PATCH 033/100] [Terry N.] add to refresh.KBs a dependency for pull on SUMO --- build.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index dd27ea8a..ab419228 100644 --- a/build.xml +++ b/build.xml @@ -434,7 +434,7 @@ - + @@ -505,6 +505,14 @@ + + + + + + + + From 4830cc36b5ece20c8a42913f7a145357870e2bbc Mon Sep 17 00:00:00 2001 From: git Date: Fri, 14 Feb 2025 12:01:25 -0800 Subject: [PATCH 034/100] [Terry N.] whitespace --- src/java/com/articulate/sigma/KBmanager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/com/articulate/sigma/KBmanager.java b/src/java/com/articulate/sigma/KBmanager.java index 71657f46..7d78a988 100644 --- a/src/java/com/articulate/sigma/KBmanager.java +++ b/src/java/com/articulate/sigma/KBmanager.java @@ -728,10 +728,10 @@ public void initializeOnce(String configFileDir) { if (configuration == null) throw new Exception("Error reading configuration file in KBmanager.initializeOnce()"); if (serializedExists() && !serializedOld(configuration)) { - if (debug) System.out.println("KBmanager.initializeOnce(): serialized exists and is not old "); + if (debug) System.out.println("KBmanager.initializeOnce(): serialized exists and is not old"); loaded = loadSerialized(); if (loaded) { - if (debug) System.out.println("KBmanager.initializeOnce(): manager is loaded "); + if (debug) System.out.println("KBmanager.initializeOnce(): manager is loaded"); if (!prefEquals("loadLexicons","false")) { if (debug) System.out.println("KBmanager.initializeOnce(): here 1"); WordNet.initOnce(); From 38ad23aea8e62fa87ebaa7dcfd2b31fffd745ce3 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 14 Feb 2025 12:03:20 -0800 Subject: [PATCH 035/100] [Terry N.] capitalize final var --- src/java/com/articulate/sigma/PredVarInst.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/com/articulate/sigma/PredVarInst.java b/src/java/com/articulate/sigma/PredVarInst.java index e2a32c52..d0548a1a 100644 --- a/src/java/com/articulate/sigma/PredVarInst.java +++ b/src/java/com/articulate/sigma/PredVarInst.java @@ -26,10 +26,10 @@ public class PredVarInst { public static Map predVarArity = new HashMap<>(); // All predicates that meet that class membership and arity constraints for the given variable - private static Map> candidatePredicates = new HashMap<>(); +// private static Map> candidatePredicates = new HashMap<>(); //The list of logical terms that not related to arity check, will skip these predicates - private static List logicalTerms = Arrays.asList(new String[]{"forall","exists","=>","and","or","<=>","not", "equal"}); + private static final List LOGICAL_TERMS = Arrays.asList(new String[]{"forall","exists","=>","and","or","<=>","not", "equal"}); public static boolean debug = false; @@ -42,7 +42,7 @@ public class PredVarInst { public static void init() { doublesHandled = false; - candidatePredicates = new HashMap<>(); +// candidatePredicates = new HashMap<>(); predVarArity = new HashMap<>(); } @@ -351,7 +351,7 @@ private static String hasCorrectArityRecurse(Formula f, KB kb) if (intval != null) val = intval; else { - if (!logicalTerms.contains(rel) && !rel.startsWith("?")) { + if (!LOGICAL_TERMS.contains(rel) && !rel.startsWith("?")) { System.out.printf("INFO in PredVarInst.hasCorrectArityRecurse(): " + "Predicate %s does not have an arity defined in KB, " + "can't get the arity number!\n%s\n", rel, f, f.getSourceFile(), f.startLine); From 4731ba16bcbd0c5682a7fd28db9221f9f788eaf3 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 14 Feb 2025 12:34:18 -0800 Subject: [PATCH 036/100] [Terry N.] provide update (git pull) for sigmaUtils, TPTP-ANTLR --- build.xml | 62 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/build.xml b/build.xml index ab419228..4bc1a7f4 100644 --- a/build.xml +++ b/build.xml @@ -391,9 +391,9 @@ - - + + @@ -445,14 +445,22 @@ - - - + + + + + + + + + + + + + - - @@ -467,33 +475,30 @@ - - - + + - - - - - + + + - - + + - - + + - - + + @@ -505,11 +510,22 @@ - - + + + + + + + + + + + + + From ad19d6a9121fb291888acb41991c074e9a302eb7 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 14 Feb 2025 12:38:57 -0800 Subject: [PATCH 037/100] [Terry N.] print date serialized --- src/java/com/articulate/sigma/nlg/NLGUtils.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/java/com/articulate/sigma/nlg/NLGUtils.java b/src/java/com/articulate/sigma/nlg/NLGUtils.java index 66a35f8f..80ce4668 100644 --- a/src/java/com/articulate/sigma/nlg/NLGUtils.java +++ b/src/java/com/articulate/sigma/nlg/NLGUtils.java @@ -106,6 +106,7 @@ public static boolean serializedOld() { Date configDate = new Date(phrasesFile.lastModified()); File serfile = new File(kbDir + File.separator + "NLGUtils.ser"); Date saveDate = new Date(serfile.lastModified()); + System.out.println("NLGUtils.serializedOld(): " + serfile.getName() + " save date: " + saveDate.toString()); return saveDate.compareTo(configDate) < 0; } @@ -114,7 +115,6 @@ public static boolean serializedOld() { */ public static void loadSerialized() { - System.out.println("NLGUtils.loadSerialized()"); nlg = null; try { // Reading the object from a file @@ -123,12 +123,6 @@ public static void loadSerialized() { //ObjectInputStream in = new ObjectInputStream(file); // Method for deserialization of object nlg = decoder(); - if (serializedOld()) { - nlg = null; - System.out.println("NLGUtils.loadSerialized(): serialized file is older than sources, " + - "reloding from sources."); - return; - } //in.close(); //file.close(); System.out.println("NLGUtils.loadSerialized(): NLGUtils has been deserialized "); From b501b3cc18ecb4b81712a228e67e227751cc8495 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 14 Feb 2025 12:39:39 -0800 Subject: [PATCH 038/100] [Terry N.] serialize WN where it was supposed to be in WordNetMappings --- src/java/com/articulate/sigma/wordNet/WordNet.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/java/com/articulate/sigma/wordNet/WordNet.java b/src/java/com/articulate/sigma/wordNet/WordNet.java index c42ea934..198f7029 100644 --- a/src/java/com/articulate/sigma/wordNet/WordNet.java +++ b/src/java/com/articulate/sigma/wordNet/WordNet.java @@ -48,8 +48,6 @@ copyright Teknowledge (c) 2003 and reused under the terms of the GNU license. */ public class WordNet implements Serializable { - private static final String SIGMA_HOME = System.getenv("SIGMA_HOME"); - public static boolean disable = false; public static boolean debug = false; public static WordNet wn = new WordNet(); @@ -1682,8 +1680,7 @@ public Map collectCountedWordSenses(String sentence) { */ public static void encoder(Object object) { - String kbDir = SIGMA_HOME + File.separator + "KBs"; - Path path = Paths.get(kbDir, "wn.ser"); + Path path = Paths.get(baseDir, "wn.ser"); try (Output output = new Output(Files.newOutputStream(path))) { kryoLocal.get().writeObject(output, object); } @@ -1697,8 +1694,7 @@ public static void encoder(Object object) { public static T decoder() { WordNet ob = null; - String kbDir = SIGMA_HOME + File.separator + "KBs"; - Path path = Paths.get(kbDir, "wn.ser"); + Path path = Paths.get(baseDir, "wn.ser"); try (Input input = new Input(Files.newInputStream(path))) { ob = kryoLocal.get().readObject(input,WordNet.class); } @@ -1713,6 +1709,7 @@ public static T decoder() { public static boolean serializedExists() { File serfile = new File(baseDir + File.separator + "wn.ser"); + System.out.println("WordNet.serializedExists(): " + serfile.exists()); return serfile.exists(); } @@ -1723,6 +1720,7 @@ public static boolean serializedOld() { File serfile = new File(baseDir + File.separator + "wn.ser"); Date saveDate = new Date(serfile.lastModified()); + System.out.println("KBmanager.serializedOld(): " + serfile.getName() + " save date: " + saveDate.toString()); File file; Date fileDate; for (String f : wnFilenames.values()) { @@ -1743,7 +1741,7 @@ public static void loadSerialized() { wn = null; try { // Reading the object from a file - //FileInputStream file = new FileInputStream(baseDir + File.separator + "wn.ser"); + //FileInputStream file = new FileInputStream(baseDir + File.separator + " "); //ObjectInputStream in = new ObjectInputStream(file); // Method for deserialization of object wn = decoder(); @@ -1851,7 +1849,7 @@ public static void initOnce() { System.out.println("WordNet.initOnce(): 'disable' is: " + disable); if (disable) return; try { - if (initNeeded == true) { + if (initNeeded) { if (("".equals(WordNet.baseDir)) || (WordNet.baseDir == null)) WordNet.baseDir = KBmanager.getMgr().getPref("kbDir") + File.separator + "WordNetMappings"; System.out.println("WordNet.initOnce(): using baseDir = " + WordNet.baseDir); From af9830c7d3fe8b32dde22657870fa8578a980d17 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 14 Feb 2025 15:23:59 -0800 Subject: [PATCH 039/100] [Terry N.] better error validation output --- src/java/com/articulate/sigma/KButilities.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/java/com/articulate/sigma/KButilities.java b/src/java/com/articulate/sigma/KButilities.java index ff236334..9bc729cb 100755 --- a/src/java/com/articulate/sigma/KButilities.java +++ b/src/java/com/articulate/sigma/KButilities.java @@ -1503,7 +1503,12 @@ else if (args != null && args.length > 0 && args[0].equals("-f")) { } else if (args != null && args.length > 1 && args[0].equals("-v")) { SUMOtoTFAform.initOnce(); - System.out.println(isValidFormula(kb,args[1])); + System.out.print("Formula " + args[1] + "\nis valid: "); + boolean valid = isValidFormula(kb,args[1]); + if (valid) + System.out.println(valid); + else + System.err.println(valid); } else if (args != null && args.length > 1 && args[0].equals("-a")) { SUMOtoTFAform.initOnce(); From f24b407d22ac7135b1800e82efd5055defd1635a Mon Sep 17 00:00:00 2001 From: git Date: Fri, 14 Feb 2025 15:24:48 -0800 Subject: [PATCH 040/100] [Terry N.] run args for KButilities error check --- nbproject/build.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nbproject/build.properties b/nbproject/build.properties index 512b0bbc..9d06b1b7 100644 --- a/nbproject/build.properties +++ b/nbproject/build.properties @@ -132,11 +132,14 @@ project.license=LICENSE #run.args= # Run vampire on SUMO.tptp and output proof -run.args=-p +#run.args=-p # KIF, TPTP3ProofProcessor, TPTPutl - run a test #run.args=-t +# KButilities check for errors +run.args=-v '(=> (and (muscleInsertion ?MC ?BPC) (instance ?H Human) (attribute ?H Healthy)) (exists (?M ?BP) (and (instance ?M ?MC) (instance ?BP ?BPC) (part ?M ?H) (part ?BP ?H) (connects ?M ?BP))))' + # Error checking a formula w/ com.articulate.sigma.KButilities #run.args=-v ${formula} From c914c59b310f711bebf2657105a8ca5f9268a0d5 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 14 Feb 2025 16:13:57 -0800 Subject: [PATCH 041/100] [Terry N.] confirmed v3.0.0 --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 4bc1a7f4..c4d34af1 100644 --- a/build.xml +++ b/build.xml @@ -73,7 +73,7 @@ - + From 5b134afac0e3fa8447ac5c93007eed4419fe5535 Mon Sep 17 00:00:00 2001 From: git Date: Sat, 15 Feb 2025 07:25:17 -0800 Subject: [PATCH 042/100] [Terry N.] merge from the main repo --- src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java index 9825ce9e..5c25d670 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java @@ -223,6 +223,10 @@ public void writeSort(String t, PrintWriter pw) { String label; label = translateName(t) + "_sig"; pw.println("% writeSort(): term: " + t); + if (t.equals("True") || t.equals("False")) { + pw.println("% writeSort(): skipping terms True and False"); + return; + } String bareTerm = SUMOtoTFAform.getBareTerm(t); pw.println("% bare term: " + bareTerm); if (sortLabels.contains(label)) { @@ -289,8 +293,10 @@ public void writeRelationSort(String t, PrintWriter pw) { int endIndex = sig.size(); if (KButilities.isVariableArity(kb,SUMOtoTFAform.withoutSuffix(t))) endIndex = getVariableAritySuffix(t) + 1; - if (endIndex > 6) + if (endIndex > 8) { + pw.println("% SUMOKBtoTFAKB.writeRelationSort(): size too large: " + t); return; + } if (endIndex < 1) { System.err.println("Error in SUMOKBtoTFAKB.writeRelationSort(): " + t + " variable arity relation without suffix"); endIndex = sig.size(); @@ -669,7 +675,7 @@ else if (kb.isRelation(bareTerm) && !alreadyExtended(t) && !bareTerm.equals("Lis } } pw.flush(); - pw.println("% SUMOKBtoTFAKB.writeSorts(): finished"); + pw.println("% SUMOKBtoTFAKB.writeSorts(): finished\n"); } /** ************************************************************* From c59be1127b6accc0676348c7974d87d49ad75b24 Mon Sep 17 00:00:00 2001 From: git Date: Sat, 15 Feb 2025 07:36:21 -0800 Subject: [PATCH 043/100] [Terry N.] print where error came from --- src/java/com/articulate/sigma/trans/SUMOtoTFAform.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java b/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java index ec57d07b..9ea09bda 100644 --- a/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java +++ b/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java @@ -879,7 +879,7 @@ private static String mixedQuotient(Formula f, String op, } } if ("".equals(promote)) { - System.err.println("Error in mixedQuotient() with arg " + args + + System.err.println("Error in SUMOtoTFAform.mixedQuotient() with args: " + args + " and types " + argTypes); return "$quotient" + eSuffix + "(" + processRecurse(lhs,parentType) + " ," + processRecurse(rhs,parentType) + ")"; From 94351aee49041c6f7c0268eebd3540c6d428196a Mon Sep 17 00:00:00 2001 From: git Date: Sat, 15 Feb 2025 07:41:04 -0800 Subject: [PATCH 044/100] [Terry N.] catch IOException --- src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java index 5c25d670..4c745008 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java @@ -700,7 +700,7 @@ public static void main(String[] args) { System.out.println("SUMOKBtoTFAKB.main(): completed writing sorts"); fileWritten = skbtfakb.writeFile(filename, null, false, pw); } - catch (Exception e) { + catch (IOException e) { e.printStackTrace(); } if (StringUtil.isNonEmptyString(fileWritten)) { From 88606f8d85f63def36df44a4b2e303d167807709 Mon Sep 17 00:00:00 2001 From: git Date: Sat, 15 Feb 2025 15:39:56 -0800 Subject: [PATCH 045/100] [Terry N.] loadFresh has nothing to do with acct. mgmt --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 60d6280f..3e95e3d1 100644 --- a/README.md +++ b/README.md @@ -638,12 +638,11 @@ Default user/pw: admin/admin You can use Sigma without being administrator, but you'll have limited use of its functionality. -You'll also need to set a few parameters in your config.xml file. If you chose -user "admin", then your config.xml will need these 2 new lines added. +You'll also need to set a parameter in your config.xml file. If you chose +user "admin", then your config.xml will need this line added. ```xml - ``` To handle the account registration feature, you'll need to have an email account and supply the From 44f63c75678cbb27375e8724a2bdd7b2cd4a8da3 Mon Sep 17 00:00:00 2001 From: git Date: Sat, 15 Feb 2025 18:25:27 -0800 Subject: [PATCH 046/100] [Terry N.] edit note --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c4d34af1..75d8594b 100644 --- a/build.xml +++ b/build.xml @@ -375,7 +375,7 @@ - + From 4a29ed52dc0ed78b38791cc593d7f68e6a42f91f Mon Sep 17 00:00:00 2001 From: git Date: Sat, 15 Feb 2025 18:26:27 -0800 Subject: [PATCH 047/100] [Terry N.] consolidate constructors --- src/java/com/articulate/sigma/KB.java | 29 +++++++++++++-------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/java/com/articulate/sigma/KB.java b/src/java/com/articulate/sigma/KB.java index 52dc6a83..6f525034 100644 --- a/src/java/com/articulate/sigma/KB.java +++ b/src/java/com/articulate/sigma/KB.java @@ -191,8 +191,20 @@ public KB() { */ public KB(String n, String dir) { - this(n); + name = n; kbDir = dir; + try { + KBmanager mgr = KBmanager.getMgr(); + if (mgr != null) { + String loadCelt = mgr.getPref("loadCELT"); + if ((loadCelt != null) && loadCelt.equalsIgnoreCase("yes")) { + celt = new CELT(); + } + } + } catch (IOException ioe) { + System.err.println("Error in KB(): " + ioe.getMessage()); + celt = null; + } } /*************************************************************** @@ -268,20 +280,7 @@ public boolean isVisible() { */ public KB(String n) { - name = n; - try { - KBmanager mgr = KBmanager.getMgr(); - kbDir = mgr.getPref("kbDir"); - if (mgr != null) { - String loadCelt = mgr.getPref("loadCELT"); - if ((loadCelt != null) && loadCelt.equalsIgnoreCase("yes")) - celt = new CELT(); - } - } - catch (IOException ioe) { - System.err.println("Error in KB(): " + ioe.getMessage()); - celt = null; - } + this(n, KBmanager.getMgr().getPref("kbDir")); } /************************************************************** From 03ebd0cd75b19468cc5bb1dd3c8f4d64ec09bd75 Mon Sep 17 00:00:00 2001 From: git Date: Sat, 15 Feb 2025 19:12:28 -0800 Subject: [PATCH 048/100] [Terry N.] reduce object creation --- .../com/articulate/sigma/FormulaPreprocessor.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/java/com/articulate/sigma/FormulaPreprocessor.java b/src/java/com/articulate/sigma/FormulaPreprocessor.java index f34a705c..5ab9d0cd 100644 --- a/src/java/com/articulate/sigma/FormulaPreprocessor.java +++ b/src/java/com/articulate/sigma/FormulaPreprocessor.java @@ -740,8 +740,8 @@ private Map> computeVariableTypesRecurse(KB kb, Formula f, !pred.equals("equal")) { System.err.println("Error in FormulaPreprocessor.computeVariableTypesRecurse(): " + "no type information for arg " + argnum + " of relation " + pred + " in formula: \n" + f); - System.out.println("sig: " + kb.kbCache.getSignature(pred)); - System.out.println("sig count: " + kb.kbCache.signatures.keySet().size()); + System.err.println("sig: " + kb.kbCache.getSignature(pred)); + System.err.println("sig count: " + kb.kbCache.signatures.keySet().size()); } } else @@ -1089,6 +1089,7 @@ public Set preProcess(Formula form, boolean isQuery, KB kb) { if (debug) System.out.println("INFO in FormulaPreprocessor.preProcess(): form: " + form); Set results = new HashSet<>(); + FormulaPreprocessor fp = new FormulaPreprocessor(); if (!StringUtil.emptyString(form.getFormula())) { KBmanager mgr = KBmanager.getMgr(); if (!form.isBalancedList()) { @@ -1119,7 +1120,8 @@ public Set preProcess(Formula form, boolean isQuery, KB kb) { if (!accumulator.isEmpty()) { String theNewFormula; for (Formula fnew : accumulator) { - theNewFormula = preProcessRecurse(fnew,"",ignoreStrings,translateIneq,translateMath,kb); +// fp = new FormulaPreprocessor(); + theNewFormula = /*fp.*/preProcessRecurse(fnew,"",ignoreStrings,translateIneq,translateMath,kb); fnew.read(theNewFormula); //if (debug) System.out.println("preProcess: fnew: " + fnew); form.errors.addAll(fnew.getErrors()); @@ -1138,13 +1140,13 @@ public Set preProcess(Formula form, boolean isQuery, KB kb) { //System.out.println("INFO in FormulaPreprocessor.preProcess(): type prefix: " + typePrefix); //System.out.println("INFO in FormulaPreprocessor.preProcess(): !isQuery: " + !isQuery); if (typePrefix && !isQuery) { - FormulaPreprocessor fp; Formula fnew; for (Formula f : results) { +// fp = new FormulaPreprocessor(); if (debug) System.out.println("INFO in FormulaPreprocessor.preProcess(): form: " + f); fnew = f; //if (addTypes) - fnew.read(addTypeRestrictions(f,kb).getFormula()); + fnew.read(/*fp.*/addTypeRestrictions(f,kb).getFormula()); //else // if (debug) System.out.println("preProcess(): not adding types"); f.read(fnew.getFormula()); From 52d2d8604f2eb8562146080c2f6cf932bf78e164 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:07:55 -0800 Subject: [PATCH 049/100] [Terry N.] add path for z3 lib --- docker/sigma-ci/Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/docker/sigma-ci/Dockerfile b/docker/sigma-ci/Dockerfile index 8123781e..3683d3aa 100644 --- a/docker/sigma-ci/Dockerfile +++ b/docker/sigma-ci/Dockerfile @@ -35,6 +35,7 @@ RUN apt-get update && apt-get install -y --install-recommends \ cp build/vampire vampire ;\ ./checks/sanity vampire +# For a specific version of Vampire and z3 #RUN apt update && apt install -y --install-recommends \ # build-essential \ # clang \ @@ -69,6 +70,12 @@ RUN apt-get update && apt-get install -y --install-recommends \ # runtime image. FROM tomcat:9.0.97-jdk21-temurin-jammy AS runtime +RUN apt-get update && apt-get install -y --no-install-recommends \ + ant \ + ant-optional \ + git \ + graphviz + COPY --from=builder \ /usr/local/tomcat/E/PROVER/e_ltb_runner /usr/local/bin/e_ltb_runner @@ -87,8 +94,4 @@ COPY --from=builder \ COPY --from=builder \ /usr/local/tomcat/vampire/z3/build/libz3.* /usr/local/bin/ -RUN apt-get update && apt-get install -y --no-install-recommends \ - ant \ - ant-optional \ - git \ - graphviz +ENV LD_LIBRARY_PATH=/usr/local/bin:$LD_LIBRARY_PATH \ No newline at end of file From 9bca2ed927ffbb1680871362937dbc5c49f3763a Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:08:47 -0800 Subject: [PATCH 050/100] [Terry N.] move ThreadPoolExecutor and shutdown method here --- .../com/articulate/sigma/KButilities.java | 56 +++++++++++++++---- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/src/java/com/articulate/sigma/KButilities.java b/src/java/com/articulate/sigma/KButilities.java index 9bc729cb..6d9d9314 100755 --- a/src/java/com/articulate/sigma/KButilities.java +++ b/src/java/com/articulate/sigma/KButilities.java @@ -20,6 +20,9 @@ portions copyright Teknowledge (c) 2003 and reused under the termsof the GNU import java.net.HttpURLConnection; import java.net.URL; import java.util.*; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -44,10 +47,10 @@ public class KButilities { public static boolean debug = false; /** Errors found during processing formulas */ - public static TreeSet errors = new TreeSet<>(); + public static Set errors = new TreeSet<>(); /** Warnings found during processing formulas */ - public static TreeSet warnings = new TreeSet<>(); + public static Set warnings = new TreeSet<>(); /** ************************************************************* */ @@ -87,13 +90,13 @@ public static boolean hasCorrectTypes(KB kb, Formula f) { String error; if (SUMOtoTFAform.inconsistentVarTypes()) { error = "inconsistent types in " + SUMOtoTFAform.varmap; - System.out.println("hasCorrectTypes(): " + SUMOtoTFAform.errors); + System.out.println("hasCorrectTypes(): " + error); errors.addAll(SUMOtoTFAform.errors); return false; } if (SUMOtoTFAform.typeConflict(f)) { error = "Type conflict: " + SUMOtoTFAform.errors; - System.out.println("hasCorrectTypes(): " + SUMOtoTFAform.errors); + System.out.println("hasCorrectTypes(): " + error); errors.addAll(SUMOtoTFAform.errors); return false; } @@ -469,7 +472,7 @@ public String toJSONString() { public String semnetAsJSON3(KB kb, boolean cached, boolean strings) { Set s = generateSemanticNetwork(kb, cached, strings); - ArrayList al = new ArrayList(); + List al = new ArrayList(); for (String st : s) { String[] sp = st.split(" "); GraphArc ga = this.new GraphArc(sp[0],sp[1],sp[2]); @@ -485,8 +488,8 @@ public String semnetAsJSON3(KB kb, boolean cached, boolean strings) { public Set generateSemNetNeighbors(KB kb, boolean cached, boolean strings, boolean links, String term, int count) { if (debug) System.out.println("generateSemNetNeighbors(): term: " + term + " count: " + count); - TreeSet resultSet = new TreeSet<>(); - TreeSet targets = new TreeSet<>(); + Set resultSet = new TreeSet<>(); + Set targets = new TreeSet<>(); Set terms; GraphArc ga; String predicate, arg1, arg2; @@ -576,7 +579,7 @@ public Set generateSemNetNeighbors(KB kb, boolean cached, boolean stri */ private static Set generateSemanticNetwork(KB kb, boolean cached, boolean strings) { - TreeSet resultSet = new TreeSet<>(); + Set resultSet = new TreeSet<>(); Set terms; String predicate, arg1, arg2; List args; @@ -1025,12 +1028,12 @@ public static void generateRelationList() { */ public static int getCountNonLinguisticAxioms(KB kb) { - HashSet rels = new HashSet<>(); + Set rels = new HashSet<>(); rels.add("documentation"); rels.add("termFormat"); rels.add("format"); int counter = 0; - HashSet forms = new HashSet<>(); + Set forms = new HashSet<>(); forms.addAll(kb.formulaMap.values()); for (Formula f : forms) { if (!rels.contains(f.getArgument(0).toString())) @@ -1074,7 +1077,7 @@ public static void countStringWords(KB kb) { */ public static Set getAllFormulasOfTerm(KB kb, String term) { - HashSet result = new HashSet<>(); + Set result = new HashSet<>(); Pattern pattern = Pattern.compile("(\\s|\\()" + term + "(\\s|\\))"); for (String f : kb.formulaMap.keySet()){ Matcher matcher = pattern.matcher(f); @@ -1249,6 +1252,7 @@ private static void closeDocList(Map files) { /** ************************************************************* * Generate a HTML list of labels from termFormats + * TODO: Does this work? Only returning an empty List */ public static List getLabelsForTerm(KB kb, String term, String lang) { @@ -1406,6 +1410,35 @@ public static Map> mergeToMap(Map> map1, return result; } + private static final int CORE_POOL_SIZE = 10; + private static final int MAX_POOL_SIZE = 10; + private static final long KEEP_ALIVE_TIME = 10L; + private static final TimeUnit TIME_UNIT = TimeUnit.SECONDS; + public static final ThreadPoolExecutor executorService = new ThreadPoolExecutor( + CORE_POOL_SIZE, + MAX_POOL_SIZE, + KEEP_ALIVE_TIME, + TIME_UNIT, + new LinkedBlockingQueue<>() + ); + + /** *************************************************************** + * Must be called whenever a *.tptp, *.tff or *.fof file is written + * to allow for clean shutdown of the JVM. Call this at the bottom + * of any main class where the above write operation is invoked. + */ + public static void shutDownExecutorService() { + + executorService.shutdown(); + try { + if (!executorService.awaitTermination(30, TimeUnit.SECONDS)) { + executorService.shutdownNow(); + } + } catch (InterruptedException e) { + executorService.shutdownNow(); + } + } + /** *************************************************************** */ public static void showHelp() { @@ -1502,7 +1535,6 @@ else if (args != null && args.length > 0 && args[0].equals("-f")) { System.out.println(generateFormulasAndDoc(kb)); } else if (args != null && args.length > 1 && args[0].equals("-v")) { - SUMOtoTFAform.initOnce(); System.out.print("Formula " + args[1] + "\nis valid: "); boolean valid = isValidFormula(kb,args[1]); if (valid) From 0b4066d8bd4b2709e77c0244864dc9ed1d3a940a Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:09:34 -0800 Subject: [PATCH 051/100] [Terry N.] implement a ThreadPoolExecutor service for the tptpParseSUIKIFString method --- .../sigma/trans/SUMOformulaToTPTPformula.java | 51 ++++++++++++------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java index 47438886..f5cf3823 100644 --- a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java +++ b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java @@ -7,6 +7,9 @@ import java.io.StreamTokenizer; import java.text.ParseException; import java.util.*; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; public class SUMOformulaToTPTPformula { @@ -437,26 +440,38 @@ public static void generateQList(Formula f) { /** *************************************************************** * Parse a single formula into TPTP format */ - public static synchronized String tptpParseSUOKIFString(String suoString, boolean query) { + public static String tptpParseSUOKIFString(String suoString, boolean query) { + + Callable task = () -> { + if (debug) System.out.println("tptpParseSUOKIFString.process(): string,query,lang: " + suoString + ", " + query + ", " + SUMOKBtoTPTPKB.lang); + KB kb = KBmanager.getMgr().getKB(KBmanager.getMgr().getPref("sumokbname")); + if (SUMOKBtoTPTPKB.lang.equals("tff")) + return "( " + SUMOtoTFAform.process(suoString,query) + " )"; + if (SUMOKBtoTPTPKB.lang.equals("thf")) { + THF thf = new THF(); + Collection stmts = new ArrayList<>(); + Collection queries = new ArrayList<>(); + if (query) + queries.add(new Formula(suoString)); + else + stmts.add(new Formula(suoString)); + return "( " + thf.KIF2THF(stmts,queries,kb) + " )"; + } + if (SUMOKBtoTPTPKB.lang.equals("fof")) + return "( " + process(new Formula(suoString),query) + " )"; + System.err.println("Error in SUMOformulaToTPTPformula.tptpParseSUOKIFString(): unknown language type: " + SUMOKBtoTPTPKB.lang); + return "( " + process(new Formula(suoString),query) + " )"; + }; - if (debug) System.out.println("tptpParseSUOKIFString.process(): string,query,lang: " + suoString + ", " + query + ", " + SUMOKBtoTPTPKB.lang); - KB kb = KBmanager.getMgr().getKB(KBmanager.getMgr().getPref("sumokbname")); - if (SUMOKBtoTPTPKB.lang.equals("tff")) - return "( " + SUMOtoTFAform.process(suoString,query) + " )"; - if (SUMOKBtoTPTPKB.lang.equals("thf")) { - THF thf = new THF(); - Collection stmts = new ArrayList<>(); - Collection queries = new ArrayList<>(); - if (query) - queries.add(new Formula(suoString)); - else - stmts.add(new Formula(suoString)); - return "( " + thf.KIF2THF(stmts,queries,kb) + " )"; + Future future = KButilities.executorService.submit(task); + + String retVal = null; + try { + retVal = future.get(); // waits to complete the task + } catch (InterruptedException | ExecutionException ex) { + System.err.printf("Error in SUMOformulaToTPTPformula.tptpParseSUOKIFString(): %s", ex); } - if (SUMOKBtoTPTPKB.lang.equals("fof")) - return "( " + process(new Formula(suoString),query) + " )"; - System.err.println("ERROR in tptpParseSUOKIFString(): unknown language type: " + SUMOKBtoTPTPKB.lang); - return "( " + process(new Formula(suoString),query) + " )"; + return retVal; } /** ************************************************************* From dc4a2c9797025adee6ccd8d28be0622fdf49a15d Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:10:41 -0800 Subject: [PATCH 052/100] [Terry N.] save the manually threaded writeFile method for Hx purposes --- .../sigma/trans/SUMOKBtoTPTPKB.java | 261 +++++++++--------- 1 file changed, 130 insertions(+), 131 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java index e5e5fedc..c4faae22 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java @@ -30,9 +30,6 @@ public class SUMOKBtoTPTPKB { public Set alreadyWrittenTPTPs = new HashSet<>(); - // force regeneration of FOF file - public static boolean force = false; - /** ************************************************************* */ public SUMOKBtoTPTPKB() { @@ -102,7 +99,7 @@ public String copyFile(String fileName) { String outputPath = ""; try { - String sanitizedKBName = kb.name.replaceAll("\\W","_"); + String sanitizedKBName = getSanitizedKBname(); File inputFile = new File(fileName); File outputFile = File.createTempFile(sanitizedKBName, ".p", null); outputPath = outputFile.getCanonicalPath(); @@ -247,6 +244,10 @@ public void writeHeader(PrintWriter pw, String sanitizedKBName) { } } + private int axiomIndex = 1; // a count appended to axiom names to make a unique ID + private int counter = 0; + private int formCount = 1; + /** ************************************************************* * Write all axioms in the KB to TPTP format. * @@ -256,13 +257,11 @@ public String writeFile(String fileName, Formula conjecture, boolean isQuestion, PrintWriter pw) { long millis = System.currentTimeMillis(); - String retVal; - // Comment out for the threaded version and comment out the one below -// retVal = nonThreadedWriteFile(fileName, conjecture, isQuestion, pw); + String retVal = _writeFile(fileName, conjecture, isQuestion, pw); - // Comment out for the non-threaded version and comment out the one above - retVal = threadedWriteFile(fileName, conjecture, isQuestion, pw); + // Experimental manual threading of main loop +// String retVal = _tWriteFile(fileName, conjecture, isQuestion, pw); KB.axiomKey = axiomKey; KBmanager.serialize(); @@ -271,12 +270,12 @@ public String writeFile(String fileName, Formula conjecture, axiomIndex = 1; // reset counter = 0; // reset - formCount = 0; // reset + formCount = 1; // reset return retVal; } - private String nonThreadedWriteFile(String fileName, Formula conjecture, + private String _writeFile(String fileName, Formula conjecture, boolean isQuestion, PrintWriter pw) { PredVarInst.init(); @@ -292,10 +291,10 @@ private String nonThreadedWriteFile(String fileName, Formula conjecture, orderedFormulae.addAll(kb.formulaMap.values()); //if (debug) System.out.println("INFO in SUMOKBtoTPTPKB.writeFile(): added formulas: " + orderedFormulae.size()); - String result, name; int total = orderedFormulae.size(); FormulaPreprocessor fp = new FormulaPreprocessor(); - Set processed, withRelnRenames; + Set processed, withRelnRenames = new HashSet<>(); + String result, name; SUMOtoTFAform stfa; for (Formula f : orderedFormulae) { f.theTptpFormulas.clear(); @@ -306,7 +305,7 @@ private String nonThreadedWriteFile(String fileName, Formula conjecture, for (Formula derivF : f.derivation.parents) pw.println("% original f: " + derivF.format("", "", " ")); } - pw.println("% " + formCount++ + " of " + orderedFormulae.size() + + pw.println("% " + formCount + " of " + total + " from file " + f.sourceFile + " at line " + f.startLine); } if (f.isHigherOrder(kb)) { @@ -324,11 +323,12 @@ private String nonThreadedWriteFile(String fileName, Formula conjecture, if (counter++ % 100 == 0) System.out.print("."); if ((counter % 4000) == 1) System.out.printf("%nSUMOKBtoTPTPKB.writeFile(%s) : still working. %d%% done.%n",fileName, counter*100/total); +// fp = new FormulaPreprocessor(); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : process: " + f); processed = fp.preProcess(f,false,kb); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : processed: " + processed); if (!processed.isEmpty()) { - withRelnRenames = new HashSet<>(); + withRelnRenames.clear(); for (Formula f2 : processed) withRelnRenames.add(f2.renameVariableArityRelations(kb,relationMap)); for (Formula f3 : withRelnRenames) { @@ -398,6 +398,7 @@ private String nonThreadedWriteFile(String fileName, Formula conjecture, else pw.println("% empty, already written or filtered formula, skipping : " + theTPTPFormula); } + formCount++; } // end outer for loop System.out.println(); printVariableArityRelationContent(pw,relationMap,getSanitizedKBname(),axiomIndex); @@ -424,11 +425,7 @@ private String nonThreadedWriteFile(String fileName, Formula conjecture, return getInfFilename(); } - private int axiomIndex = 1; // a count appended to axiom names to make a unique ID - private int counter = 0; - private int formCount = 0; - - private String threadedWriteFile(String fileName, Formula conjecture, + private String _tWriteFile(String fileName, Formula conjecture, boolean isQuestion, PrintWriter pw) { PredVarInst.init(); @@ -449,111 +446,115 @@ private String threadedWriteFile(String fileName, Formula conjecture, Thread t; for (Formula formula : orderedFormulae) { Runnable r = () -> { - Formula f = formula; - f.theTptpFormulas.clear(); - FormulaPreprocessor fp = new FormulaPreprocessor(); - Set processed, withRelnRenames = new HashSet<>();; - String name, result; - SUMOtoTFAform stfa; - if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : source line: " + f.startLine); - if (!f.getFormula().startsWith("(documentation")) { - pw.println("% f: " + f.format("", "", " ")); - if (!f.derivation.parents.isEmpty()) { - for (Formula derivF : f.derivation.parents) - pw.println("% original f: " + derivF.format("", "", " ")); +// synchronized (pw) { // <- works only for small single file KBs like tinySUMO.kif + Formula f = formula; + f.theTptpFormulas.clear(); + FormulaPreprocessor fp = new FormulaPreprocessor(); + Set processed, withRelnRenames = new HashSet<>(); + String name, result; + SUMOtoTFAform stfa; + if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : source line: " + f.startLine); + if (!f.getFormula().startsWith("(documentation")) { + pw.println("% f(" + formCount + "): " + f.format("", "", " ")); + if (!f.derivation.parents.isEmpty()) { + for (Formula derivF : f.derivation.parents) + pw.println("% original f(" + formCount + ") " + derivF.format("", "", " ")); + } + pw.println("% f(" + formCount + ") of " + total + + " from file " + f.sourceFile + " at line " + f.startLine); } - pw.println("% " + formCount++ + " of " + total + - " from file " + f.sourceFile + " at line " + f.startLine); - } - if (f.isHigherOrder(kb)) { - pw.println("% is higher order"); - if (lang.equals("thf")) { // TODO create a flag for adding modals (or not) - f = Modals.processModals(f,kb); + if (f.isHigherOrder(kb)) { + pw.println("% f(" + formCount + ") is higher order"); + if (lang.equals("thf")) { // TODO create a flag for adding modals (or not) + f = Modals.processModals(f,kb); + } + if (removeHOL) + return; } - if (removeHOL) + else + pw.println("% f(" + formCount + ") not higher order"); + if (!KBmanager.getMgr().prefEquals("cache","yes") && f.isCached()) return; - } - else - pw.println("% not higher order"); - if (!KBmanager.getMgr().prefEquals("cache","yes") && f.isCached()) - return; - if (counter++ % 100 == 0) System.out.print("."); - if ((counter % 4000) == 1) - System.out.printf("%nSUMOKBtoTPTPKB.writeFile(%s) : still working. %d%% done.%n",fileName, counter*100/total); - if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : process: " + f); - processed = fp.preProcess(f,false,kb); - if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : processed: " + processed); - if (!processed.isEmpty()) { - withRelnRenames.clear(); - for (Formula f2 : processed) - withRelnRenames.add(f2.renameVariableArityRelations(kb,relationMap)); - for (Formula f3 : withRelnRenames) { - switch (lang) { - case "fof": - if (debug) { - System.out.println("SUMOKBtoTPTPKB.writeFile() : % tptp input: " + f3.format("", "", " ")); - } - result = SUMOformulaToTPTPformula.tptpParseSUOKIFString(f3.getFormula(), false); - if (debug) { - System.out.println("INFO in SUMOKBtoTPTPKB.writeFile(): result: " + result); - } - if (result != null) { - f.theTptpFormulas.add(result); - } - break; - case "tff": - stfa = new SUMOtoTFAform(); - SUMOtoTFAform.kb = kb; - pw.println("% tff input: " + f3.format("", "", " ")); - if (debug) { - System.out.println("SUMOKBtoTPTPKB.writeFile() : % tff input: " + f3.format("", "", " ")); - } - stfa.sorts = stfa.missingSorts(f3); - if (stfa.sorts != null && !stfa.sorts.isEmpty()) { - f3.tffSorts.addAll(stfa.sorts); - } - result = SUMOtoTFAform.process(f3.getFormula(), false); - printTFFNumericConstants(pw); - SUMOtoTFAform.initNumericConstantTypes(); - if (!StringUtil.emptyString(result)) { - f.theTptpFormulas.add(result); - } else if (!StringUtil.emptyString(SUMOtoTFAform.filterMessage)) { - pw.println("% " + SUMOtoTFAform.filterMessage); - } - break; - default: - pw.println("% unhandled language option " + lang); - break; + if (counter++ % 100 == 0) System.out.print("."); + if ((counter % 4000) == 1) + System.out.printf("%nSUMOKBtoTPTPKB.writeFile(%s) : still working. %d%% done.%n",fileName, counter*100/total); +// fp = new FormulaPreprocessor(); + if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : process: " + f); + processed = fp.preProcess(f,false,kb); + if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : processed: " + processed); + if (!processed.isEmpty()) { + withRelnRenames.clear(); + for (Formula f2 : processed) + withRelnRenames.add(f2.renameVariableArityRelations(kb,relationMap)); + for (Formula f3 : withRelnRenames) { + switch (lang) { + case "fof": + if (debug) { + System.out.println("SUMOKBtoTPTPKB.writeFile() : % tptp input: " + f3.format("", "", " ")); + } + result = SUMOformulaToTPTPformula.tptpParseSUOKIFString(f3.getFormula(), false); + if (debug) { + System.out.println("INFO in SUMOKBtoTPTPKB.writeFile(): result: " + result); + } + if (result != null) { + f.theTptpFormulas.add(result); + } + break; + case "tff": + stfa = new SUMOtoTFAform(); + SUMOtoTFAform.kb = kb; + pw.println("% tff input: " + f3.format("", "", " ")); + if (debug) { + System.out.println("SUMOKBtoTPTPKB.writeFile() : % tff input: " + f3.format("", "", " ")); + } + stfa.sorts = stfa.missingSorts(f3); + if (stfa.sorts != null && !stfa.sorts.isEmpty()) { + f3.tffSorts.addAll(stfa.sorts); + } + result = SUMOtoTFAform.process(f3.getFormula(), false); + printTFFNumericConstants(pw); + SUMOtoTFAform.initNumericConstantTypes(); + if (!StringUtil.emptyString(result)) { + f.theTptpFormulas.add(result); + } else if (!StringUtil.emptyString(SUMOtoTFAform.filterMessage)) { + pw.println("% " + SUMOtoTFAform.filterMessage); + } + break; + default: + pw.println("% f(" + formCount + ") unhandled language option " + lang); + break; + } } } - } - else { - //System.out.println("SUMOKBtoTPTPKB.writeFile() : % empty result from preprocess on " + f.getFormula().replace("\\n"," ")); - pw.println("% empty result from preprocess on " + f.getFormula().replace("\\n"," ")); - } - for (String sort : f.tffSorts) { - if (!StringUtil.emptyString(sort) && - !alreadyWrittenTPTPs.contains(sort)) { - name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; - axiomKey.put(name,f); - pw.println(lang + "(" + name + ",axiom,(" + sort + "))."); - alreadyWrittenTPTPs.add(sort); + else { + //System.out.println("SUMOKBtoTPTPKB.writeFile() : % empty result from preprocess on " + f.getFormula().replace("\\n"," ")); + pw.println("% f(" + formCount + ") empty result from preprocess on " + f.getFormula().replace("\\n"," ")); } - } - for (String theTPTPFormula : f.theTptpFormulas) { - if (!StringUtil.emptyString(theTPTPFormula) && - !alreadyWrittenTPTPs.contains(theTPTPFormula) && - !filterAxiom(f,theTPTPFormula,pw)) { - if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : writing " + theTPTPFormula); - name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; - axiomKey.put(name,f); - pw.println(lang + "(" + name + ",axiom,(" + theTPTPFormula + "))."); - if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : finished writing " + theTPTPFormula + " with name " + name); - alreadyWrittenTPTPs.add(theTPTPFormula); + for (String sort : f.tffSorts) { + if (!StringUtil.emptyString(sort) && + !alreadyWrittenTPTPs.contains(sort)) { + name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; + axiomKey.put(name,f); + pw.println(lang + "(" + name + ",axiom,(" + sort + "))."); + alreadyWrittenTPTPs.add(sort); + } } - else - pw.println("% empty, already written or filtered formula, skipping : " + theTPTPFormula); - } + for (String theTPTPFormula : f.theTptpFormulas) { + if (!StringUtil.emptyString(theTPTPFormula) && + !alreadyWrittenTPTPs.contains(theTPTPFormula) && + !filterAxiom(f,theTPTPFormula,pw)) { + if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : writing " + theTPTPFormula); + name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; + axiomKey.put(name,f); + pw.println(lang + "(" + name + ",axiom,(" + theTPTPFormula + "))."); + if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : finished writing " + theTPTPFormula + " with name " + name); + alreadyWrittenTPTPs.add(theTPTPFormula); + } + else + pw.println("% f(" + formCount + ") empty, already written or filtered formula, skipping : " + theTPTPFormula); + } + formCount++; +// } }; // end Runnable t = new Thread(r); t.setName("SUMOKBtoTPTPKB:writeFile" + (++tCounter)); @@ -620,7 +621,7 @@ public boolean filterAxiom(Formula form, String tptp, PrintWriter pw) { return removeNum; } if (removeStrings && (tptp.contains("'") || tptp.indexOf('"') >= 0)) { - pw.println("% f: " + form.format("", "", " ")); + pw.println("% f(" + formCount + "): " + form.format("", "", " ")); pw.println("% quoted thing"); return true; } @@ -651,7 +652,7 @@ public boolean filterAxiom(Formula form, String tptp, PrintWriter pw) { */ public static void main(String[] args) { - force = true; + System.out.println("SUMOKBtoTPTPKB.main():"); KBmanager.getMgr().initializeOnce(); SUMOKBtoTPTPKB skbtptpkb = new SUMOKBtoTPTPKB(); @@ -659,17 +660,15 @@ public static void main(String[] args) { skbtptpkb.kb = KBmanager.getMgr().getKB(kbName); String filename = KBmanager.getMgr().getPref("kbDir") + File.separator + kbName + "." + SUMOKBtoTPTPKB.lang; String fileWritten = null; - if (!(new File(filename).exists()) || KBmanager.getMgr().infFileOld() || force) { - try (PrintWriter pw = new PrintWriter(new BufferedWriter(new FileWriter(filename)))) { - fileWritten = skbtptpkb.writeFile(filename, null, false, pw); - } - catch (IOException e) { - e.printStackTrace(); - } - if (StringUtil.isNonEmptyString(fileWritten)) - System.out.println("File written: " + filename); - else - System.err.println("Could not write: " + filename); + try (PrintWriter pw = new PrintWriter(new BufferedWriter(new FileWriter(filename)))) { + fileWritten = skbtptpkb.writeFile(filename, null, false, pw); + } + catch (IOException e) { + e.printStackTrace(); } + if (StringUtil.isNonEmptyString(fileWritten)) + System.out.println("File written: " + filename); + else + System.err.println("Could not write: " + filename); } } From b9605f57f755efa5c53fff9c954152d6a98c4551 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:11:35 -0800 Subject: [PATCH 053/100] [Terry N.] cache of targets w/ differing dependencies --- nbproject/ide-targets.xml | 100 +++++++++++++++++++++++++++++++------- 1 file changed, 83 insertions(+), 17 deletions(-) diff --git a/nbproject/ide-targets.xml b/nbproject/ide-targets.xml index 92cf2dac..18c6906f 100644 --- a/nbproject/ide-targets.xml +++ b/nbproject/ide-targets.xml @@ -70,7 +70,7 @@ ================= --> - + @@ -79,9 +79,33 @@ - + + + - - - - + - + + @@ -402,10 +442,10 @@ - + - + + + + Must set property 'debug.class' + + + + + + + + + + + + + @@ -619,6 +676,7 @@ + @@ -629,13 +687,8 @@ - - - - - @@ -644,6 +697,19 @@ + + + + + + + + + + + + + From 982fb17474c12b06cec730ca571966de986d8159 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:11:53 -0800 Subject: [PATCH 054/100] [Terry N.] add various props --- nbproject/build.properties | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/nbproject/build.properties b/nbproject/build.properties index 9d06b1b7..00670c44 100644 --- a/nbproject/build.properties +++ b/nbproject/build.properties @@ -131,14 +131,20 @@ project.license=LICENSE # Intentional empty arguments #run.args= -# Run vampire on SUMO.tptp and output proof +# Default run for the KB +#run.args=-c Object Transaction + +# Load KB files (should regenerate the KB if cleaned) +run.args=-l + +# Run Vampire on SUMO.tptp and output proof #run.args=-p -# KIF, TPTP3ProofProcessor, TPTPutl - run a test +# KIF, TPTP3ProofProcessor, TPTPutil, SUMOtoTFAform - run a test #run.args=-t -# KButilities check for errors -run.args=-v '(=> (and (muscleInsertion ?MC ?BPC) (instance ?H Human) (attribute ?H Healthy)) (exists (?M ?BP) (and (instance ?M ?MC) (instance ?BP ?BPC) (part ?M ?H) (part ?BP ?H) (connects ?M ?BP))))' +# Formula check for errors +formula=-v '(=> (and (muscleInsertion ?MC ?BPC) (instance ?H Human) (attribute ?H Healthy)) (exists (?M ?BP) (and (instance ?M ?MC) (instance ?BP ?BPC) (part ?M ?H) (part ?BP ?H) (connects ?M ?BP))))' # Error checking a formula w/ com.articulate.sigma.KButilities #run.args=-v ${formula} @@ -189,8 +195,8 @@ test.integration.resources.dir=${test.integration.dir}/resources # NOTE: [- -mode casc] is a shortcut for [- -mode portfolio -sched casc -p tptp] tptp.file=${workspace}/sigmakee/nbproject/private/resources/SUMO/SUMO.tptp #tptp.file=${sigma_home}/KBs/SUMO.tptp -vamp.out.file=${sigma_home}/KBs/vamp-out.txt -vamp.args=--mode casc -t 900 ${tptp.file} &> ${vamp.out.file} +vamp.out=${sigma_home}/KBs/vamp-out.txt +vamp.args=--mode casc -t 900 ${tptp.file} &> ${vamp.out} #System.out.println("PasswordService: "); #System.out.println("-h show this Help message"); From 13eaecb0563f3c511d9a1e35b2840731140baca4 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:12:32 -0800 Subject: [PATCH 055/100] [Terry N.] add executor shutdown method at bottom of main --- src/java/com/articulate/sigma/KB.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/java/com/articulate/sigma/KB.java b/src/java/com/articulate/sigma/KB.java index 6f525034..f8f6b463 100644 --- a/src/java/com/articulate/sigma/KB.java +++ b/src/java/com/articulate/sigma/KB.java @@ -4040,5 +4040,6 @@ else if (KBmanager.getMgr().prover == KBmanager.Prover.LEO) { } } } + KButilities.shutDownExecutorService(); } } From 24f7fbe958d7fba432d462fbeda673616b30c923 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:18:00 -0800 Subject: [PATCH 056/100] [Terry N.] add executor shutdown for @AfterClass --- .../java/com/articulate/sigma/IntegrationTestSuite.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/integration/java/com/articulate/sigma/IntegrationTestSuite.java b/test/integration/java/com/articulate/sigma/IntegrationTestSuite.java index 8e7612d3..9606e4f4 100644 --- a/test/integration/java/com/articulate/sigma/IntegrationTestSuite.java +++ b/test/integration/java/com/articulate/sigma/IntegrationTestSuite.java @@ -3,6 +3,7 @@ import com.articulate.sigma.VerbNet.IntegrationVerbNetTestSuite; import com.articulate.sigma.nlg.IntegrationNLGTestSuite; import com.articulate.sigma.trans.IntegrationTransTestSuite; +import org.junit.AfterClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -16,4 +17,8 @@ }) public class IntegrationTestSuite extends IntegrationTestBase { + @AfterClass + public static void shutDown() { + KButilities.shutDownExecutorService(); + } } \ No newline at end of file From 2eb14e5ac04f3b06ced0a6ad2346bad975702bdb Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:18:27 -0800 Subject: [PATCH 057/100] [Terry N.] add executor shutdown for @AfterClass --- test/unit/java/com/articulate/sigma/UnitTestSuite.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/unit/java/com/articulate/sigma/UnitTestSuite.java b/test/unit/java/com/articulate/sigma/UnitTestSuite.java index 62f2e940..e75510de 100644 --- a/test/unit/java/com/articulate/sigma/UnitTestSuite.java +++ b/test/unit/java/com/articulate/sigma/UnitTestSuite.java @@ -1,9 +1,11 @@ package com.articulate.sigma; import com.articulate.sigma.trans.*; -import com.articulate.sigma.nlg.UnitNLGTestSuite; +import com.articulate.sigma.nlg.*; import com.articulate.sigma.wordNet.*; +import org.junit.AfterClass; + import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -21,4 +23,8 @@ }) public class UnitTestSuite extends UnitTestBase { + @AfterClass + public static void shutDown() { + KButilities.shutDownExecutorService(); + } } From 17a71ef92e8155dafa504a5e2bc258d5214e556b Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:19:05 -0800 Subject: [PATCH 058/100] [Terry N.] static var type dec. --- .../articulate/sigma/wordNet/MultiWordsTest.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/test/unit/java/com/articulate/sigma/wordNet/MultiWordsTest.java b/test/unit/java/com/articulate/sigma/wordNet/MultiWordsTest.java index 1075f454..fb3dabd9 100644 --- a/test/unit/java/com/articulate/sigma/wordNet/MultiWordsTest.java +++ b/test/unit/java/com/articulate/sigma/wordNet/MultiWordsTest.java @@ -24,7 +24,6 @@ import com.google.common.collect.Lists; import org.junit.Test; -import java.util.ArrayList; import java.util.List; import static org.junit.Assert.assertEquals; @@ -86,7 +85,7 @@ public void testVerbMultiWordCatsAndDogs2() { @Test public void testVerbMultiWordCatsAndDogs3() { - ArrayList input = Lists.newArrayList("cats", "and", "dogs", "and", "sheep"); + List input = Lists.newArrayList("cats", "and", "dogs", "and", "sheep"); List synset = Lists.newArrayList(); int endIndex = WordNet.wn.getMultiWords().findMultiWord("rain", "rain", input, synset); @@ -100,7 +99,7 @@ public void testVerbMultiWordCatsAndDogs3() { @Test public void testVerbMultiWordCatsAndDogs4() { - ArrayList input = Lists.newArrayList("cats", "and", "dogs", "and", "sheep"); + List input = Lists.newArrayList("cats", "and", "dogs", "and", "sheep"); List synset = Lists.newArrayList(); // Incorrect root form int endIndex = WordNet.wn.getMultiWords().findMultiWord("raining", "raining", input, synset); @@ -114,7 +113,7 @@ public void testVerbMultiWordCatsAndDogs4() { @Test public void testVerbMultiWordCatsAndDogs5() { - ArrayList input = Lists.newArrayList("raining", "cats", "and", "dogs", "and", "sheep"); + List input = Lists.newArrayList("raining", "cats", "and", "dogs", "and", "sheep"); List synset = Lists.newArrayList(); // Incorrect root form String result = WordNet.wn.getMultiWords().findMultiWord(input); @@ -128,8 +127,8 @@ public void testVerbMultiWordCatsAndDogs5() { @Test public void testNounMultiWord1() { - ArrayList input = Lists.newArrayList("father"); - ArrayList synset = Lists.newArrayList(); + List input = Lists.newArrayList("father"); + List synset = Lists.newArrayList(); // Incorrect root form int endIndex = WordNet.wn.getMultiWords().findMultiWord("found", "found", input, synset); @@ -142,8 +141,8 @@ public void testNounMultiWord1() { @Test public void testNounMultiWord2() { - ArrayList input = Lists.newArrayList("father"); - ArrayList synset = Lists.newArrayList(); + List input = Lists.newArrayList("father"); + List synset = Lists.newArrayList(); int endIndex = WordNet.wn.getMultiWords().findMultiWord("founding", "founding", input, synset); assertEquals(2, endIndex); From c3a57c49dc4052bd048a9060a973b3b4ede7db43 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:35:00 -0800 Subject: [PATCH 059/100] [Terry N.] identify class in sysout --- .../com/articulate/sigma/trans/SUMOtoTFAform.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java b/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java index 9ea09bda..d1232fbf 100644 --- a/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java +++ b/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java @@ -2856,7 +2856,7 @@ public static void main(String[] args) throws IOException { System.out.println("INFO in SUMOtoTFAform.main()"); System.out.println("args:" + args.length + " : " + Arrays.toString(args)); if (args == null) { - System.out.println("no command given"); + System.err.println("no command given, see help:"); showHelp(); } else if (args != null && args.length > 0 && args[0].equals("-h")) @@ -2864,12 +2864,11 @@ else if (args != null && args.length > 0 && args[0].equals("-h")) else { SUMOKBtoTFAKB skbtfakb = new SUMOKBtoTFAKB(); skbtfakb.initOnce(); - initOnce(); System.out.println("INFO in SUMOtoTFAform.main(): completed initialization"); if (args != null && args.length > 2 && args[0].equals("-c")) { String t1 = args[1]; String t2 = args[2]; - System.out.println("main() best of " + t1 + " and " + t2 + " : " + constrainTerm(t1,t2)); + System.out.println("SUMOtoTFAform.main(): best of " + t1 + " and " + t2 + " : " + constrainTerm(t1,t2)); List argTypeMap = new ArrayList<>(); argTypeMap.add("RealNumber"); argTypeMap.add("RealNumber"); @@ -2878,21 +2877,21 @@ else if (args != null && args.length > 0 && args[0].equals("-h")) predTypes.add("RealNumber"); System.out.println(); List best = bestSignature(argTypeMap,predTypes); - System.out.println("main() best: " + best); + System.out.println("SUMOtoTFAform.main(): best: " + best); System.out.println(); List constrained = mostSpecificSignature(argTypeMap,predTypes); - System.out.println("main() most specific for (argTypeMap, predType) " + + System.out.println("SUMOtoTFAform.main(): most specific for (argTypeMap, predType) " + argTypeMap + ", " + predTypes + " : " + constrained); System.out.println(); constrained = mostSpecificSignature(predTypes,predTypes); - System.out.println("main() most specific for (argTypeMap, predType) " + + System.out.println("SUMOtoTFAform.main(): most specific for (argTypeMap, predType) " + predTypes + ", " + predTypes + " : " + constrained); } else if (args != null && args.length > 1 && args[0].equals("-f")) { debug = true; SUMOformulaToTPTPformula.debug = true; Formula f = new Formula(args[1]); - System.out.println("in TFA: " + process(f,false)); + System.out.println("SUMOtoTFAform.main(): in TFA: " + process(f,false)); } else if (args != null && args.length > 0 && args[0].equals("-t")) { String bare = getBareTerm("s__refers__1En2In"); From 3664bae82761eec868dcdb99c0f27f4f3d52bd44 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:36:15 -0800 Subject: [PATCH 060/100] [Terry N.] add FIXME note about having to loadFresh every startup even though wn.ser is created --- .../com/articulate/sigma/wordNet/WordNet.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/java/com/articulate/sigma/wordNet/WordNet.java b/src/java/com/articulate/sigma/wordNet/WordNet.java index 198f7029..d8134aea 100644 --- a/src/java/com/articulate/sigma/wordNet/WordNet.java +++ b/src/java/com/articulate/sigma/wordNet/WordNet.java @@ -346,7 +346,7 @@ public void compileRegexPatterns() { for (int i = 0; i < regexPatternStrings.length; i++) { regexPatterns[i] = Pattern.compile(regexPatternStrings[i]); if (!(regexPatterns[i] instanceof Pattern)) - System.out.println("ERROR in WordNet.compileRegexPatterns(): could not compile \"" + System.err.println("Error in WordNet.compileRegexPatterns(): could not compile \"" + regexPatternStrings[i] + "\""); } } @@ -632,7 +632,7 @@ public String getSUMOMapping(String synset) { * Use a default filename and path unless a non-null string is * provided, in which case assume it is a full path. */ - private void readNouns() throws java.io.IOException { + private void readNouns() throws IOException { System.out.println("INFO in WordNet.readNouns(): Reading WordNet noun files"); @@ -664,7 +664,7 @@ private void readNouns() throws java.io.IOException { // System.out.println("INFO in WordNet.readNouns(): Reading WordNet noun exceptions"); nounFile = getWnFile("noun_exceptions",null); if (nounFile == null) { - System.err.println("ERROR in WordNet.readNouns(): " + System.err.println("Error in WordNet.readNouns(): " + "The noun mapping exceptions file does not exist in " + baseDir); return; } @@ -1741,16 +1741,15 @@ public static void loadSerialized() { wn = null; try { // Reading the object from a file - //FileInputStream file = new FileInputStream(baseDir + File.separator + " "); + //FileInputStream file = new FileInputStream(baseDir + File.separator + "wn.ser"); //ObjectInputStream in = new ObjectInputStream(file); // Method for deserialization of object - wn = decoder(); if (serializedOld()) { - wn = null; System.out.println("WordNet.loadSerialized(): serialized file is older than sources, " + "reloding from sources."); return; } + wn = decoder(); //in.close(); //file.close(); System.out.println("WordNet.loadSerialized(): WN has been deserialized "); @@ -1855,16 +1854,19 @@ public static void initOnce() { System.out.println("WordNet.initOnce(): using baseDir = " + WordNet.baseDir); System.out.println("WordNet.initOnce(): disable: " + disable); baseDirFile = new File(WordNet.baseDir); - if (KBmanager.getMgr().getPref("loadFresh").equals("true") || !serializedExists()) { +// if (KBmanager.getMgr().getPref("loadFresh").equals("true") || !serializedExists()) { System.out.println("WordNet.initOnce(): loading WordNet source files "); - loadFresh(); - initNeeded = false; - } - else { - loadSerialized(); - if (wn == null) - loadFresh(); - } + loadFresh(); // <- will serialize + // FIXME: a deserialized WN instance does not load the MultiWords.multiWord map. + // only a loadFresh() does this, so, even though we have a serialized + // WN file, we must do a loadFresh() to get the mappings anyway. + // 2/15/25 tdn +// } +// else { +// loadSerialized(); +// if (wn == null) +// loadFresh(); +// } DB.readSentimentArray(); } } From 6b20e1405567dd7cfc711e3ec28e633c9fa85b5d Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:36:51 -0800 Subject: [PATCH 061/100] [Terry N.] var dec. out of loops --- .../articulate/sigma/wordNet/MultiWords.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/java/com/articulate/sigma/wordNet/MultiWords.java b/src/java/com/articulate/sigma/wordNet/MultiWords.java index 1e721f50..ebbf9692 100755 --- a/src/java/com/articulate/sigma/wordNet/MultiWords.java +++ b/src/java/com/articulate/sigma/wordNet/MultiWords.java @@ -49,7 +49,7 @@ public void addMultiWord(String word, char wordDelimit) { if (debug) System.out.println("INFO in WordNet.addMultiWord(): word: " + word); if (StringUtil.emptyString(word)) { - System.out.println("Error in MultiWords.addMultiWord(): word is null"); + System.err.println("Error in MultiWords.addMultiWord(): word is null"); return; } if (word.indexOf(wordDelimit) >= 0) { @@ -77,7 +77,7 @@ public String findMultiWord(List text) { List synset = new ArrayList<>(); int endIndex = findMultiWord(text, 0, synset); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (endIndex != 0) { for (int i = 0; i < endIndex; i++) { if (i != 0) @@ -119,11 +119,13 @@ public int findMultiWord(String multiWordKey, String nonRoot, List multi if (multiWord.containsKey(multiWordKey) && !multiWordTail.isEmpty()) { String foundMultiWord = multiWordKey + "_" + multiWordTail.get(wordIndex); Collection candidates = multiWord.get(multiWordKey); - while (candidates.size() > 0) { - ArrayList newCandidates = new ArrayList(); + List newCandidates; + String sense; + while (!candidates.isEmpty()) { + newCandidates = new ArrayList<>(); for (String candidate : candidates) { if (candidate.equals(foundMultiWord)) { - String sense = WSD.getBestDefaultSense(foundMultiWord); + sense = WSD.getBestDefaultSense(foundMultiWord); if (!StringUtil.emptyString(sense)) { // only declare success if the multiword has a synset (trapping errors in the DB) synset.add(sense); return wordIndex + 2; @@ -133,9 +135,9 @@ else if (candidate.startsWith(foundMultiWord)) { newCandidates.add(candidate); } } - if (newCandidates.size() > 0) { + if (!newCandidates.isEmpty()) { if (wordIndex > multiWordTail.size() - 1) { - candidates = new ArrayList(); // ran out of words, trigger an exit + candidates.clear(); // ran out of words, trigger an exit } else { candidates = newCandidates; @@ -145,7 +147,7 @@ else if (candidate.startsWith(foundMultiWord)) { } } else { - candidates = new ArrayList(); + candidates.clear(); } } } From 7cc085118f2a71e2f63684176a417b20480b59bd Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:40:47 -0800 Subject: [PATCH 062/100] [Terry N.] reduce object creation --- src/java/com/articulate/sigma/FormulaPreprocessor.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/java/com/articulate/sigma/FormulaPreprocessor.java b/src/java/com/articulate/sigma/FormulaPreprocessor.java index 5ab9d0cd..fd2570a4 100644 --- a/src/java/com/articulate/sigma/FormulaPreprocessor.java +++ b/src/java/com/articulate/sigma/FormulaPreprocessor.java @@ -1120,8 +1120,7 @@ public Set preProcess(Formula form, boolean isQuery, KB kb) { if (!accumulator.isEmpty()) { String theNewFormula; for (Formula fnew : accumulator) { -// fp = new FormulaPreprocessor(); - theNewFormula = /*fp.*/preProcessRecurse(fnew,"",ignoreStrings,translateIneq,translateMath,kb); + theNewFormula = preProcessRecurse(fnew,"",ignoreStrings,translateIneq,translateMath,kb); fnew.read(theNewFormula); //if (debug) System.out.println("preProcess: fnew: " + fnew); form.errors.addAll(fnew.getErrors()); @@ -1142,11 +1141,10 @@ public Set preProcess(Formula form, boolean isQuery, KB kb) { if (typePrefix && !isQuery) { Formula fnew; for (Formula f : results) { -// fp = new FormulaPreprocessor(); if (debug) System.out.println("INFO in FormulaPreprocessor.preProcess(): form: " + f); fnew = f; //if (addTypes) - fnew.read(/*fp.*/addTypeRestrictions(f,kb).getFormula()); + fnew.read(addTypeRestrictions(f,kb).getFormula()); //else // if (debug) System.out.println("preProcess(): not adding types"); f.read(fnew.getFormula()); From 4aa96d4a9a55c0e20acbd5833c5657c1c79403c1 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 09:43:34 -0800 Subject: [PATCH 063/100] [Terry N.] whitespace --- src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java index c4faae22..e0fa1203 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java @@ -323,7 +323,6 @@ private String _writeFile(String fileName, Formula conjecture, if (counter++ % 100 == 0) System.out.print("."); if ((counter % 4000) == 1) System.out.printf("%nSUMOKBtoTPTPKB.writeFile(%s) : still working. %d%% done.%n",fileName, counter*100/total); -// fp = new FormulaPreprocessor(); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : process: " + f); processed = fp.preProcess(f,false,kb); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : processed: " + processed); @@ -478,7 +477,6 @@ private String _tWriteFile(String fileName, Formula conjecture, if (counter++ % 100 == 0) System.out.print("."); if ((counter % 4000) == 1) System.out.printf("%nSUMOKBtoTPTPKB.writeFile(%s) : still working. %d%% done.%n",fileName, counter*100/total); -// fp = new FormulaPreprocessor(); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : process: " + f); processed = fp.preProcess(f,false,kb); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : processed: " + processed); From 2d0bae0bbb90c0cb9cb3dacbf315b1d39aa9e0aa Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 10:07:44 -0800 Subject: [PATCH 064/100] [Terry N.] orig. filterAxiom format --- src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java index e0fa1203..255a7b97 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java @@ -619,7 +619,8 @@ public boolean filterAxiom(Formula form, String tptp, PrintWriter pw) { return removeNum; } if (removeStrings && (tptp.contains("'") || tptp.indexOf('"') >= 0)) { - pw.println("% f(" + formCount + "): " + form.format("", "", " ")); + pw.println("% f: " + form.format("", "", " ")); +// pw.println("% f(" + formCount + "): " + form.format("", "", " ")); // <- for manually threaded experiment (tdn) pw.println("% quoted thing"); return true; } From 70553e60898512d0d109d43f36d2c803ff6b1f62 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 10:15:04 -0800 Subject: [PATCH 065/100] [Terry N.] syserr for errors --- src/java/com/articulate/sigma/trans/SUMOtoTFAform.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java b/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java index d1232fbf..385739cf 100644 --- a/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java +++ b/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java @@ -1814,7 +1814,7 @@ private static String getOpReturnType(String arg) { * new list from two of equal size that has the most specific type * at each index. */ - private static List mostSpecificArgType(ArrayList args1, ArrayList args2) { + private static List mostSpecificArgType(List args1, List args2) { if (args1 == null || args1.size() < 1) return args2; @@ -2368,7 +2368,7 @@ public static String process(Formula f, boolean query) { //if (debug) System.out.println("SUMOtoTFAform.process(): f so far: " + f); varmap = fp.findAllTypeRestrictions(f, kb); if (inconsistentVarTypes()) { - System.out.println("SUMOtoTFAform.process(): rejected inconsistent variable types: " + varmap + " in : " + f); + System.err.println("SUMOtoTFAform.process(): rejected inconsistent variable types: " + varmap + " in : " + f); return ""; } counter = 0; From 4847b396cb66a6ad74048c3ab4dee03b1f198a51 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 11:42:24 -0800 Subject: [PATCH 066/100] [Terry N.] note on experimental manual threading of main loop --- src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java index 255a7b97..521b09a8 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java @@ -260,7 +260,9 @@ public String writeFile(String fileName, Formula conjecture, String retVal = _writeFile(fileName, conjecture, isQuestion, pw); - // Experimental manual threading of main loop + // Experimental manual threading of main loop writes big SUMO in half + // the time as the sequential method above, but produces out of order + // metadata. 2/15/25 tdn // String retVal = _tWriteFile(fileName, conjecture, isQuestion, pw); KB.axiomKey = axiomKey; @@ -552,7 +554,7 @@ private String _tWriteFile(String fileName, Formula conjecture, pw.println("% f(" + formCount + ") empty, already written or filtered formula, skipping : " + theTPTPFormula); } formCount++; -// } +// } // end synchronized }; // end Runnable t = new Thread(r); t.setName("SUMOKBtoTPTPKB:writeFile" + (++tCounter)); From 9213c1f7960ba23c37a485f286a7b9d9ab27dcdd Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 14:39:32 -0800 Subject: [PATCH 067/100] [Terry N.] note on experimental manual threading of main loop --- .../articulate/sigma/trans/SUMOKBtoTPTPKB.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java index 521b09a8..21e3a103 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java @@ -247,6 +247,7 @@ public void writeHeader(PrintWriter pw, String sanitizedKBName) { private int axiomIndex = 1; // a count appended to axiom names to make a unique ID private int counter = 0; private int formCount = 1; + private long millis = 0;; /** ************************************************************* * Write all axioms in the KB to TPTP format. @@ -256,8 +257,7 @@ public void writeHeader(PrintWriter pw, String sanitizedKBName) { public String writeFile(String fileName, Formula conjecture, boolean isQuestion, PrintWriter pw) { - long millis = System.currentTimeMillis(); - + // Default sequential processing String retVal = _writeFile(fileName, conjecture, isQuestion, pw); // Experimental manual threading of main loop writes big SUMO in half @@ -273,6 +273,7 @@ public String writeFile(String fileName, Formula conjecture, axiomIndex = 1; // reset counter = 0; // reset formCount = 1; // reset + millis = 0; // reset return retVal; } @@ -281,6 +282,7 @@ private String _writeFile(String fileName, Formula conjecture, boolean isQuestion, PrintWriter pw) { PredVarInst.init(); + millis = System.currentTimeMillis(); if (!KBmanager.initialized) { System.err.println("Error in SUMOKBtoTPTPKB.writeFile(): KB initialization not completed"); return "Error in SUMOKBtoTPTPKB.writeFile(): KB initialization not completed"; @@ -307,7 +309,7 @@ private String _writeFile(String fileName, Formula conjecture, for (Formula derivF : f.derivation.parents) pw.println("% original f: " + derivF.format("", "", " ")); } - pw.println("% " + formCount + " of " + total + + pw.println("% " + formCount++ + " of " + total + " from file " + f.sourceFile + " at line " + f.startLine); } if (f.isHigherOrder(kb)) { @@ -399,7 +401,6 @@ private String _writeFile(String fileName, Formula conjecture, else pw.println("% empty, already written or filtered formula, skipping : " + theTPTPFormula); } - formCount++; } // end outer for loop System.out.println(); printVariableArityRelationContent(pw,relationMap,getSanitizedKBname(),axiomIndex); @@ -426,10 +427,15 @@ private String _writeFile(String fileName, Formula conjecture, return getInfFilename(); } + /** ************************************************************* + * Experimental manual threading of the main loop + * @return the result of the KB translation to TPTP + */ private String _tWriteFile(String fileName, Formula conjecture, boolean isQuestion, PrintWriter pw) { PredVarInst.init(); + millis = System.currentTimeMillis(); if (!KBmanager.initialized) { System.err.println("Error in SUMOKBtoTPTPKB.writeFile(): KB initialization not completed"); return "Error in SUMOKBtoTPTPKB.writeFile(): KB initialization not completed"; @@ -456,7 +462,7 @@ private String _tWriteFile(String fileName, Formula conjecture, SUMOtoTFAform stfa; if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : source line: " + f.startLine); if (!f.getFormula().startsWith("(documentation")) { - pw.println("% f(" + formCount + "): " + f.format("", "", " ")); + pw.println("% f(" + formCount++ + "): " + f.format("", "", " ")); if (!f.derivation.parents.isEmpty()) { for (Formula derivF : f.derivation.parents) pw.println("% original f(" + formCount + ") " + derivF.format("", "", " ")); @@ -553,7 +559,6 @@ private String _tWriteFile(String fileName, Formula conjecture, else pw.println("% f(" + formCount + ") empty, already written or filtered formula, skipping : " + theTPTPFormula); } - formCount++; // } // end synchronized }; // end Runnable t = new Thread(r); From ba5954280836c74e6b7b6d92023630af4471b7aa Mon Sep 17 00:00:00 2001 From: git Date: Sun, 16 Feb 2025 14:44:00 -0800 Subject: [PATCH 068/100] [Terry N.] note on experimental thread pool executor --- .../sigma/trans/SUMOformulaToTPTPformula.java | 55 +++++++++++++------ 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java index f5cf3823..b82eb1ad 100644 --- a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java +++ b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java @@ -442,25 +442,44 @@ public static void generateQList(Formula f) { */ public static String tptpParseSUOKIFString(String suoString, boolean query) { - Callable task = () -> { - if (debug) System.out.println("tptpParseSUOKIFString.process(): string,query,lang: " + suoString + ", " + query + ", " + SUMOKBtoTPTPKB.lang); - KB kb = KBmanager.getMgr().getKB(KBmanager.getMgr().getPref("sumokbname")); - if (SUMOKBtoTPTPKB.lang.equals("tff")) - return "( " + SUMOtoTFAform.process(suoString,query) + " )"; - if (SUMOKBtoTPTPKB.lang.equals("thf")) { - THF thf = new THF(); - Collection stmts = new ArrayList<>(); - Collection queries = new ArrayList<>(); - if (query) - queries.add(new Formula(suoString)); - else - stmts.add(new Formula(suoString)); - return "( " + thf.KIF2THF(stmts,queries,kb) + " )"; - } - if (SUMOKBtoTPTPKB.lang.equals("fof")) - return "( " + process(new Formula(suoString),query) + " )"; - System.err.println("Error in SUMOformulaToTPTPformula.tptpParseSUOKIFString(): unknown language type: " + SUMOKBtoTPTPKB.lang); + // Default sequential processing +// return _tptpParseSUOKIFString(suoString, query); + + // Experimental use of a thread pool executor + return _tTptpParseSUOKIFString(suoString, query); + } + + private static String _tptpParseSUOKIFString(String suoString, boolean query) { + + if (debug) System.out.println("tptpParseSUOKIFString.process(): string,query,lang: " + suoString + ", " + query + ", " + SUMOKBtoTPTPKB.lang); + KB kb = KBmanager.getMgr().getKB(KBmanager.getMgr().getPref("sumokbname")); + if (SUMOKBtoTPTPKB.lang.equals("tff")) + return "( " + SUMOtoTFAform.process(suoString,query) + " )"; + if (SUMOKBtoTPTPKB.lang.equals("thf")) { + THF thf = new THF(); + Collection stmts = new ArrayList<>(); + Collection queries = new ArrayList<>(); + if (query) + queries.add(new Formula(suoString)); + else + stmts.add(new Formula(suoString)); + return "( " + thf.KIF2THF(stmts,queries,kb) + " )"; + } + if (SUMOKBtoTPTPKB.lang.equals("fof")) return "( " + process(new Formula(suoString),query) + " )"; + System.err.println("Error in SUMOformulaToTPTPformula.tptpParseSUOKIFString(): unknown language type: " + SUMOKBtoTPTPKB.lang); + return "( " + process(new Formula(suoString),query) + " )"; + } + + /** ************************************************************* + * Experimental use of a ThreadPoolExecutor to parse the formula + * to TPTP + * @return the result of the formula parse + */ + private static String _tTptpParseSUOKIFString(String suoString, boolean query) { + + Callable task = () -> { + return _tptpParseSUOKIFString(suoString, query); }; Future future = KButilities.executorService.submit(task); From 7b1b11336645aff6a7789870afdaa89fe82b201a Mon Sep 17 00:00:00 2001 From: git Date: Mon, 17 Feb 2025 07:05:53 -0800 Subject: [PATCH 069/100] [Terry N.] javadoc update --- .../sigma/trans/SUMOformulaToTPTPformula.java | 38 +++---------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java index b82eb1ad..f0eb32f7 100644 --- a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java +++ b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java @@ -438,18 +438,12 @@ public static void generateQList(Formula f) { } /** *************************************************************** - * Parse a single formula into TPTP format + * Parse a single formula into TPTP format. Synchronized to keep + * order when writing to file during threaded operations. + * @param suoString the SUO entry to parse + * @param query true if the suoString is a query */ - public static String tptpParseSUOKIFString(String suoString, boolean query) { - - // Default sequential processing -// return _tptpParseSUOKIFString(suoString, query); - - // Experimental use of a thread pool executor - return _tTptpParseSUOKIFString(suoString, query); - } - - private static String _tptpParseSUOKIFString(String suoString, boolean query) { + public static synchronized String tptpParseSUOKIFString(String suoString, boolean query) { if (debug) System.out.println("tptpParseSUOKIFString.process(): string,query,lang: " + suoString + ", " + query + ", " + SUMOKBtoTPTPKB.lang); KB kb = KBmanager.getMgr().getKB(KBmanager.getMgr().getPref("sumokbname")); @@ -471,28 +465,6 @@ private static String _tptpParseSUOKIFString(String suoString, boolean query) { return "( " + process(new Formula(suoString),query) + " )"; } - /** ************************************************************* - * Experimental use of a ThreadPoolExecutor to parse the formula - * to TPTP - * @return the result of the formula parse - */ - private static String _tTptpParseSUOKIFString(String suoString, boolean query) { - - Callable task = () -> { - return _tptpParseSUOKIFString(suoString, query); - }; - - Future future = KButilities.executorService.submit(task); - - String retVal = null; - try { - retVal = future.get(); // waits to complete the task - } catch (InterruptedException | ExecutionException ex) { - System.err.printf("Error in SUMOformulaToTPTPformula.tptpParseSUOKIFString(): %s", ex); - } - return retVal; - } - /** ************************************************************* * This is the primary method of the class. It takes a SUO-KIF * formula and returns a TPTP formula. From fc99de34124a669d0f2ea955d2cb40974fe02d73 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 17 Feb 2025 07:16:57 -0800 Subject: [PATCH 070/100] [Terry N.] javadoc update --- .../com/articulate/sigma/trans/SUMOformulaToTPTPformula.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java index f0eb32f7..deeac095 100644 --- a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java +++ b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java @@ -7,9 +7,6 @@ import java.io.StreamTokenizer; import java.text.ParseException; import java.util.*; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; public class SUMOformulaToTPTPformula { @@ -440,7 +437,7 @@ public static void generateQList(Formula f) { /** *************************************************************** * Parse a single formula into TPTP format. Synchronized to keep * order when writing to file during threaded operations. - * @param suoString the SUO entry to parse + * @param suoString the formula entry to parse * @param query true if the suoString is a query */ public static synchronized String tptpParseSUOKIFString(String suoString, boolean query) { From f4abede8c400060a5826aeb963cdce45980070d6 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 17 Feb 2025 07:43:16 -0800 Subject: [PATCH 071/100] [Terry N.] javadoc update --- .../com/articulate/sigma/KButilities.java | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/java/com/articulate/sigma/KButilities.java b/src/java/com/articulate/sigma/KButilities.java index 6d9d9314..75c4cb0b 100755 --- a/src/java/com/articulate/sigma/KButilities.java +++ b/src/java/com/articulate/sigma/KButilities.java @@ -20,8 +20,8 @@ portions copyright Teknowledge (c) 2003 and reused under the termsof the GNU import java.net.HttpURLConnection; import java.net.URL; import java.util.*; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -1410,28 +1410,19 @@ public static Map> mergeToMap(Map> map1, return result; } - private static final int CORE_POOL_SIZE = 10; - private static final int MAX_POOL_SIZE = 10; - private static final long KEEP_ALIVE_TIME = 10L; - private static final TimeUnit TIME_UNIT = TimeUnit.SECONDS; - public static final ThreadPoolExecutor executorService = new ThreadPoolExecutor( - CORE_POOL_SIZE, - MAX_POOL_SIZE, - KEEP_ALIVE_TIME, - TIME_UNIT, - new LinkedBlockingQueue<>() - ); + /** Uses the number of available processors to set the thread pool count */ + public static final ExecutorService executorService = Executors.newWorkStealingPool(); /** *************************************************************** * Must be called whenever a *.tptp, *.tff or *.fof file is written * to allow for clean shutdown of the JVM. Call this at the bottom - * of any main class where the above write operation is invoked. + * of any main class where the executor is invoked. */ public static void shutDownExecutorService() { executorService.shutdown(); try { - if (!executorService.awaitTermination(30, TimeUnit.SECONDS)) { + if (!executorService.awaitTermination(10, TimeUnit.SECONDS)) { executorService.shutdownNow(); } } catch (InterruptedException e) { @@ -1473,7 +1464,7 @@ public static void main(String[] args) { else { KBmanager.getMgr().initializeOnce(); KB kb = KBmanager.getMgr().getKB(KBmanager.getMgr().getPref("sumokbname")); - System.out.println("KBmutilities.main(): completed init"); + System.out.println("KButilities.main(): completed init"); //countRelations(kb); //checkURLs(kb); //validatePictureList(); @@ -1535,12 +1526,14 @@ else if (args != null && args.length > 0 && args[0].equals("-f")) { System.out.println(generateFormulasAndDoc(kb)); } else if (args != null && args.length > 1 && args[0].equals("-v")) { - System.out.print("Formula " + args[1] + "\nis valid: "); boolean valid = isValidFormula(kb,args[1]); + String s = "Formula " + args[1] + "\nis valid: "; + StringBuilder sb = new StringBuilder(); + sb.append(s); if (valid) - System.out.println(valid); + System.out.println(sb.append(valid)); else - System.err.println(valid); + System.err.println(sb.append(valid)); } else if (args != null && args.length > 1 && args[0].equals("-a")) { SUMOtoTFAform.initOnce(); From 51298fc3f1ac5dbbefc13595dcc71b6cee765bc5 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 17 Feb 2025 16:32:17 -0800 Subject: [PATCH 072/100] [Terry N.] final var convention --- src/java/com/articulate/sigma/KButilities.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/java/com/articulate/sigma/KButilities.java b/src/java/com/articulate/sigma/KButilities.java index 75c4cb0b..1a4e46af 100755 --- a/src/java/com/articulate/sigma/KButilities.java +++ b/src/java/com/articulate/sigma/KButilities.java @@ -1411,7 +1411,7 @@ public static Map> mergeToMap(Map> map1, } /** Uses the number of available processors to set the thread pool count */ - public static final ExecutorService executorService = Executors.newWorkStealingPool(); + public static final ExecutorService EXECUTOR_SERVICE = Executors.newWorkStealingPool(); /** *************************************************************** * Must be called whenever a *.tptp, *.tff or *.fof file is written @@ -1420,13 +1420,13 @@ public static Map> mergeToMap(Map> map1, */ public static void shutDownExecutorService() { - executorService.shutdown(); + EXECUTOR_SERVICE.shutdown(); try { - if (!executorService.awaitTermination(10, TimeUnit.SECONDS)) { - executorService.shutdownNow(); + if (!EXECUTOR_SERVICE.awaitTermination(10, TimeUnit.SECONDS)) { + EXECUTOR_SERVICE.shutdownNow(); } } catch (InterruptedException e) { - executorService.shutdownNow(); + EXECUTOR_SERVICE.shutdownNow(); } } From 9904261801edc0581af69493ba385533a78cf9b9 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 17 Feb 2025 17:05:09 -0800 Subject: [PATCH 073/100] [Terry N.] final var convention --- src/java/com/articulate/sigma/KButilities.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/com/articulate/sigma/KButilities.java b/src/java/com/articulate/sigma/KButilities.java index 1a4e46af..5b7efbf3 100755 --- a/src/java/com/articulate/sigma/KButilities.java +++ b/src/java/com/articulate/sigma/KButilities.java @@ -44,6 +44,9 @@ portions copyright Teknowledge (c) 2003 and reused under the termsof the GNU */ public class KButilities { + /** Uses the number of available processors to set the thread pool count */ + public static final ExecutorService EXECUTOR_SERVICE = Executors.newWorkStealingPool(); + public static boolean debug = false; /** Errors found during processing formulas */ @@ -1410,9 +1413,6 @@ public static Map> mergeToMap(Map> map1, return result; } - /** Uses the number of available processors to set the thread pool count */ - public static final ExecutorService EXECUTOR_SERVICE = Executors.newWorkStealingPool(); - /** *************************************************************** * Must be called whenever a *.tptp, *.tff or *.fof file is written * to allow for clean shutdown of the JVM. Call this at the bottom From 565ad3343b4a32f1a035a87568282e03644ff15e Mon Sep 17 00:00:00 2001 From: git Date: Mon, 17 Feb 2025 17:59:37 -0800 Subject: [PATCH 074/100] [Terry N.] consolidate similar constructors --- src/java/com/articulate/sigma/tp/EProver.java | 38 ++++--------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/src/java/com/articulate/sigma/tp/EProver.java b/src/java/com/articulate/sigma/tp/EProver.java index 5b6315c5..c5c020ff 100644 --- a/src/java/com/articulate/sigma/tp/EProver.java +++ b/src/java/com/articulate/sigma/tp/EProver.java @@ -157,37 +157,13 @@ public static void addBatchConfig(String inputFilename, int timeout) { */ public EProver (String executable, String kbFile) throws IOException { - if (this._eprover != null) - this.terminate(); - kbdir = KBmanager.getMgr().getPref("kbDir"); - writeBatchConfig(kbFile, 60); - System.out.println("INFO in EProver(): executable: " + executable); + this(executable); System.out.println("INFO in EProver(): kbFile: " + kbFile); + writeBatchConfig(kbFile, 60); if (!(new File(kbFile)).exists()) { System.out.println("EProver(): no such file: " + kbFile + ". Creating it."); - KB kb = KBmanager.getMgr().getKB(kbFile); - + KBmanager.getMgr().getKB(kbFile); } - // To make sigma work on windows. - //If OS is not detected as Windows it will use the same directory as set in "inferenceEngine". - String eproverPath = null; - String _OS = System.getProperty("os.name"); - if (StringUtil.isNonEmptyString(_OS) && _OS.matches("(?i).*win.*")){ - eproverPath=KBmanager.getMgr().getPref("eproverPath"); - } - eproverPath = eproverPath != null && eproverPath.length() != 0 ? eproverPath - : executable.substring(0, executable.lastIndexOf(File.separator)) + File.separator + "eprover"; - List commands = new ArrayList<>(Arrays.asList( - executable, "--interactive", kbdir + File.separator + "EBatchConfig.txt", - eproverPath)); - - System.out.println("EProver(): command: " + commands); - _builder = new ProcessBuilder(commands); - _builder.redirectErrorStream(false); - _eprover = _builder.start(); - System.out.println("EProver(): new process: " + _eprover); - _reader = new BufferedReader(new InputStreamReader(_eprover.getInputStream())); - _writer = new BufferedWriter(new OutputStreamWriter(_eprover.getOutputStream())); } /** ************************************************************* @@ -200,6 +176,7 @@ public EProver (String executable, String kbFile) throws IOException { */ public EProver (String executable) throws IOException { + System.out.println("INFO in EProver(): executable: " + executable); if (this._eprover != null) this.terminate(); @@ -207,14 +184,13 @@ public EProver (String executable) throws IOException { // To make sigma work on windows //If OS is not detected as Windows it will use the same directory as set in "inferenceEngine". - String eproverPath = null; String _OS = System.getProperty("os.name"); if (StringUtil.isNonEmptyString(_OS) && _OS.matches("(?i).*win.*")){ eproverPath=KBmanager.getMgr().getPref("eproverPath"); } - eproverPath = eproverPath != null && eproverPath.length() != 0 ? eproverPath - : executable.substring(0, executable.lastIndexOf(File.separator)) + File.separator + "eprover"; + eproverPath = eproverPath != null && eproverPath.length() != 0 ? eproverPath + : executable.substring(0, executable.lastIndexOf(File.separator)) + File.separator + "eprover"; List commands = new ArrayList<>(Arrays.asList( executable, "--interactive", kbdir + File.separator + "EBatchConfig.txt", eproverPath)); @@ -235,7 +211,7 @@ public EProver (String executable) throws IOException { * * @param executable A File object denoting the platform-specific * EProver executable. - * @param maxAnswers - Limit the answers upto maxAnswers only + * @param maxAnswers - Limit the answers up to maxAnswers only * @throws IOException */ public EProver (String executable,int maxAnswers) throws IOException { From f07cea7cd84aef379dcf6499b2abb7f3ec2e2f1c Mon Sep 17 00:00:00 2001 From: git Date: Mon, 17 Feb 2025 18:16:24 -0800 Subject: [PATCH 075/100] [Terry N.] var dec. out of loops --- .../com/articulate/sigma/BasicXMLparser.java | 78 ++++++++++--------- 1 file changed, 42 insertions(+), 36 deletions(-) diff --git a/src/java/com/articulate/sigma/BasicXMLparser.java b/src/java/com/articulate/sigma/BasicXMLparser.java index 95d9f80d..33eae84a 100644 --- a/src/java/com/articulate/sigma/BasicXMLparser.java +++ b/src/java/com/articulate/sigma/BasicXMLparser.java @@ -2,11 +2,11 @@ copyright Teknowledge (c) 2003 and reused under the terms of the GNU license. This software is released under the GNU Public License . Users of this code also consent, by use of this code, to credit Articulate Software -and Teknowledge in any writings, briefings, publications, presentations, or -other representations of any software which incorporates, builds on, or uses this +and Teknowledge in any writings, briefings, publications, presentations, or +other representations of any software which incorporates, builds on, or uses this code. Please cite the following article in any publication with references: -Pease, A., (2003). The Sigma Ontology Development Environment, +Pease, A., (2003). The Sigma Ontology Development Environment, in Working Notes of the IJCAI-2003 Workshop on Ontology and Distributed Systems, August 9, Acapulco, Mexico. */ @@ -15,9 +15,11 @@ copyright Teknowledge (c) 2003 and reused under the terms of the GNU license. import java.io.IOException; import java.io.LineNumberReader; +import java.io.Reader; import java.io.StringReader; import java.text.ParseException; import java.util.ArrayList; +import java.util.List; /** *************************************************************** * Parses simple XML into a hierarchy of BasicXMLelement (s). Used @@ -30,7 +32,7 @@ copyright Teknowledge (c) 2003 and reused under the terms of the GNU license. public class BasicXMLparser { /** An ArrayList of BasicXMLelement(s). */ - public ArrayList elements = new ArrayList(); + public List elements = new ArrayList<>(); /** *************************************************************** * Constructor that parses an XML-formatted string, with one tag per @@ -38,9 +40,9 @@ public class BasicXMLparser { */ public BasicXMLparser(String xml) { - StringReader sr = new StringReader(xml); - LineNumberReader lnr = new LineNumberReader(sr); - try { + + try (Reader sr = new StringReader(xml); + LineNumberReader lnr = new LineNumberReader(sr)) { BasicXMLelement el = new BasicXMLelement(); parse(lnr,el); elements = el.subelements; @@ -61,51 +63,55 @@ public BasicXMLparser(String xml) { * Assume that each line has only one tag. */ private void parse(LineNumberReader lnr, BasicXMLelement element) throws ParseException, IOException { - - String newTag = null; - boolean inQuote = false; + + String newTag; + boolean inQuote; + String line, endTagString, nameString, valueString; + int tagStart, tagEnd, name, value; + BasicXMLelement newElement; + char valueEnd; while (lnr.ready()) { - String line = lnr.readLine(); + line = lnr.readLine(); inQuote = false; if (line == null) { System.out.println("INFO in BasicXMLparser.parse: Exiting with line = null."); return; } line = line.trim(); - int tagStart = line.indexOf('<'); + tagStart = line.indexOf('<'); if (tagStart != 0) { // It's not a tag - element.contents = element.contents + (new String(line.trim())); + element.contents = element.contents + (line.trim()); System.out.println("INFO in BasicXMLparser.parse: Adding contents: " + line); continue; } if (line.charAt(tagStart+1) == '/') { // Found a closing tag - String endTagString = line.substring(tagStart+2,line.indexOf('>')); + endTagString = line.substring(tagStart+2,line.indexOf('>')); if (element.tagname == null) - throw new ParseException("Error in BasicXMLparser.parse(): Closing tag " + line + " without open tag, at line: ", lnr.getLineNumber()); - if (endTagString.equalsIgnoreCase(element.tagname)) - return; + throw new ParseException("Error in BasicXMLparser.parse(): Closing tag " + line + " without open tag, at line: ", lnr.getLineNumber()); + if (endTagString.equalsIgnoreCase(element.tagname)) + return; else throw new ParseException("Error in BasicXMLparser.parse(): Close tag " + endTagString + " doesn't match open tag " + element.tagname, lnr.getLineNumber()); } else { // An opening or combined open/close tag - like - int tagEnd = tagStart + 1; - while (tagEnd < line.length() && Character.isJavaIdentifierPart(line.charAt(tagEnd))) + tagEnd = tagStart + 1; + while (tagEnd < line.length() && Character.isJavaIdentifierPart(line.charAt(tagEnd))) tagEnd++; newTag = line.substring(line.indexOf('<') + 1,tagEnd); - BasicXMLelement newElement = new BasicXMLelement(); + newElement = new BasicXMLelement(); newElement.tagname = newTag; if (line.charAt(tagEnd) == ' ') { // The tag has attributes do { tagEnd++; - int name = tagEnd; - while (tagEnd < line.length() && Character.isJavaIdentifierPart(line.charAt(tagEnd))) + name = tagEnd; + while (tagEnd < line.length() && Character.isJavaIdentifierPart(line.charAt(tagEnd))) tagEnd++; - String nameString = line.substring(name,tagEnd); - if (line.charAt(tagEnd) != '=') + nameString = line.substring(name,tagEnd); + if (line.charAt(tagEnd) != '=') throw new ParseException("Error in BasicXMLparser.parse(): Name without value: " + nameString, lnr.getLineNumber()); tagEnd++; - int value = tagEnd; - char valueEnd = ' '; + value = tagEnd; + valueEnd = ' '; if (line.charAt(value) == '\'') { value++; tagEnd++; @@ -118,15 +124,15 @@ private void parse(LineNumberReader lnr, BasicXMLelement element) throws ParseEx valueEnd = '\"'; inQuote = !inQuote; } - while (tagEnd < line.length() && line.charAt(tagEnd) != valueEnd && + while (tagEnd < line.length() && line.charAt(tagEnd) != valueEnd && (line.charAt(tagEnd) != '>' || inQuote)) { tagEnd++; - if (line.charAt(tagEnd) == '\"' || line.charAt(tagEnd) == '\'') + if (line.charAt(tagEnd) == '\"' || line.charAt(tagEnd) == '\'') inQuote = !inQuote; } - String valueString = line.substring(value,tagEnd); + valueString = line.substring(value,tagEnd); - if (line.charAt(tagEnd) == valueEnd) + if (line.charAt(tagEnd) == valueEnd) tagEnd++; newElement.attributes.put(nameString,valueString); } while (line.charAt(tagEnd) == ' '); @@ -136,24 +142,24 @@ private void parse(LineNumberReader lnr, BasicXMLelement element) throws ParseEx parse(lnr,newElement); element.subelements.add(newElement); } - else if (line.charAt(tagEnd) == '/' && + else if (line.charAt(tagEnd) == '/' && (line.charAt(tagEnd + 1) == '>' && !inQuote)) { newTag = ""; element.subelements.add(newElement); } } } - return; } - + /** *************************************************************** * Convert the XML hierarchy to a String. */ public String toString() { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); + BasicXMLelement element; for (int i = 0; i < elements.size(); i++) { - BasicXMLelement element = elements.get(i); + element = elements.get(i); result = result.append(element.toString()); } return result.toString(); @@ -188,7 +194,7 @@ public static void main(String[] args) { System.out.println(bp.elements.size()); System.out.println(bp.toString()); - /* + /* From 83610b0cd686f610a1d6bad7e5ca0a23089d03c9 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 17 Feb 2025 19:05:31 -0800 Subject: [PATCH 076/100] [Terry N.] add switch (-R) in KB for rapid TPTP translation processing. However, this will produce interleaved metadata (documentation), but speeds up processing by a factor of 2. With no (-R), then orig. sequential processing with ordered metadata --- .../com/articulate/sigma/CELTTestSuite.java | 4 +- src/java/com/articulate/sigma/DB.java | 2 +- src/java/com/articulate/sigma/KB.java | 6 ++ .../sigma/trans/SUMOKBtoTPTPKB.java | 72 +++++++++++-------- .../sigma/trans/SUMOformulaToTPTPformula.java | 23 +++++- .../sigma/wordNet/WNdiagnostics.java | 2 +- 6 files changed, 71 insertions(+), 38 deletions(-) diff --git a/src/java/com/articulate/sigma/CELTTestSuite.java b/src/java/com/articulate/sigma/CELTTestSuite.java index 44c02385..c7c994d9 100644 --- a/src/java/com/articulate/sigma/CELTTestSuite.java +++ b/src/java/com/articulate/sigma/CELTTestSuite.java @@ -6,8 +6,6 @@ import java.io.IOException; import java.util.Iterator; -import com.articulate.sigma.KB; - /** This code is copyright Articulate Software (c) 2003. Some portions copyright Teknowledge (c) 2003 and reused under the terms of the GNU license. This software is released under the GNU Public License . @@ -73,7 +71,7 @@ public static String test(KB kb) { while (it.hasNext()) { String formula = (String) it.next(); - if (formula.indexOf(";") != -1) + if (formula.contains(";")) formula = formula.substring(0,formula.indexOf(";")); System.out.println("INFO in CELTTestSuite.test(): Formula: " + formula); if (formula.startsWith("(sentence")) { diff --git a/src/java/com/articulate/sigma/DB.java b/src/java/com/articulate/sigma/DB.java index 2a9ec357..de380286 100644 --- a/src/java/com/articulate/sigma/DB.java +++ b/src/java/com/articulate/sigma/DB.java @@ -1883,7 +1883,7 @@ public static void testSentimentCorpus() { } catch (Exception ex) { System.out.println(ex.getMessage()); } - WordNet.wn.initOnce(); + WordNet.initOnce(); readSentimentArray(); //System.out.println(DB.computeConceptSentiment("This hotel is really bad.")); textFileSentiment("rt-polarity.neg",true); diff --git a/src/java/com/articulate/sigma/KB.java b/src/java/com/articulate/sigma/KB.java index f8f6b463..07267bef 100644 --- a/src/java/com/articulate/sigma/KB.java +++ b/src/java/com/articulate/sigma/KB.java @@ -3929,6 +3929,7 @@ public static void showHelp() { System.out.println(" o - set the query timeout"); System.out.println(" c - compare term depth"); System.out.println(" s - show statistics"); + System.out.println(" R - rapid parsing of KB to TPTP"); } /** *************************************************************** @@ -3939,6 +3940,11 @@ public static void main(String[] args) throws IOException { if (args != null && args.length > 0 && args[0].equals("-h")) showHelp(); else { + + // Check for "R" before initializing the KBmanager + if (args != null && args.length > 1 && args[0].contains("R") || args[1].contains("R")) + SUMOKBtoTPTPKB.rapidParsing = true; + //KBmanager.prefOverride.put("loadLexicons","false"); //System.out.println("KB.main(): Note! Not loading lexicons."); KBmanager.getMgr().initializeOnce(); diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java index 21e3a103..ffbe57f9 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java @@ -5,6 +5,10 @@ import java.io.*; import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; public class SUMOKBtoTPTPKB { @@ -17,6 +21,9 @@ public class SUMOKBtoTPTPKB { public static boolean removeNum = true; // remove numbers public static boolean removeStrings = true; + /** Flag to enable rapid parsing via multiple threads coordinated by an ExecutorService */ + public static boolean rapidParsing = false; + public static boolean debug = false; public static String lang = "fof"; // or thf @@ -30,10 +37,13 @@ public class SUMOKBtoTPTPKB { public Set alreadyWrittenTPTPs = new HashSet<>(); + /** Prevents interleaving of PrintWriter writes in writeFile() */ + private final ReadWriteLock lock; + /** ************************************************************* */ public SUMOKBtoTPTPKB() { - + lock = new ReentrantReadWriteLock(true); buildExcludedPredicates(); } @@ -257,13 +267,13 @@ public void writeHeader(PrintWriter pw, String sanitizedKBName) { public String writeFile(String fileName, Formula conjecture, boolean isQuestion, PrintWriter pw) { - // Default sequential processing - String retVal = _writeFile(fileName, conjecture, isQuestion, pw); + // Default (orig) sequential processing +// String retVal = _writeFile(fileName, conjecture, isQuestion, pw); - // Experimental manual threading of main loop writes big SUMO in half - // the time as the sequential method above, but produces out of order - // metadata. 2/15/25 tdn -// String retVal = _tWriteFile(fileName, conjecture, isQuestion, pw); + // Experimental threading of main loop writes big SUMO in half + // the time as the sequential method above if not synchronized, + // but interleaves metadata. 2/17/25 tdn + String retVal = _tWriteFile(fileName, conjecture, isQuestion, pw); KB.axiomKey = axiomKey; KBmanager.serialize(); @@ -401,7 +411,7 @@ private String _writeFile(String fileName, Formula conjecture, else pw.println("% empty, already written or filtered formula, skipping : " + theTPTPFormula); } - } // end outer for loop + } // end outer (main) for loop System.out.println(); printVariableArityRelationContent(pw,relationMap,getSanitizedKBname(),axiomIndex); printTFFNumericConstants(pw); @@ -428,8 +438,8 @@ private String _writeFile(String fileName, Formula conjecture, } /** ************************************************************* - * Experimental manual threading of the main loop - * @return the result of the KB translation to TPTP + * Experimental threading of the main loop + * @return the name of the KB translation to TPTP file */ private String _tWriteFile(String fileName, Formula conjecture, boolean isQuestion, PrintWriter pw) { @@ -448,12 +458,14 @@ private String _tWriteFile(String fileName, Formula conjecture, orderedFormulae.addAll(kb.formulaMap.values()); //if (debug) System.out.println("INFO in SUMOKBtoTPTPKB.writeFile(): added formulas: " + orderedFormulae.size()); - int tCounter = 0; + Future future; int total = orderedFormulae.size(); - Thread t; + List> futures = new ArrayList<>(); for (Formula formula : orderedFormulae) { Runnable r = () -> { -// synchronized (pw) { // <- works only for small single file KBs like tinySUMO.kif + try { + if (!rapidParsing) + lock.writeLock().lock(); Formula f = formula; f.theTptpFormulas.clear(); FormulaPreprocessor fp = new FormulaPreprocessor(); @@ -462,7 +474,7 @@ private String _tWriteFile(String fileName, Formula conjecture, SUMOtoTFAform stfa; if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : source line: " + f.startLine); if (!f.getFormula().startsWith("(documentation")) { - pw.println("% f(" + formCount++ + "): " + f.format("", "", " ")); + pw.println("% f(" + formCount + "): " + f.format("", "", " ")); if (!f.derivation.parents.isEmpty()) { for (Formula derivF : f.derivation.parents) pw.println("% original f(" + formCount + ") " + derivF.format("", "", " ")); @@ -559,23 +571,23 @@ private String _tWriteFile(String fileName, Formula conjecture, else pw.println("% f(" + formCount + ") empty, already written or filtered formula, skipping : " + theTPTPFormula); } -// } // end synchronized + } finally { + formCount++; + + if (!rapidParsing) + lock.writeLock().unlock(); + } }; // end Runnable - t = new Thread(r); - t.setName("SUMOKBtoTPTPKB:writeFile" + (++tCounter)); - t.setDaemon(true); - t.start(); - } // end outer loop - - // Wait for all spawned runnables to finish - Thread[] threads = new Thread[Thread.activeCount()]; - Thread.enumerate(threads); - for (Thread th : threads) { + future = KButilities.EXECUTOR_SERVICE.submit(r); + futures.add(future); + } // end outer (main) loop + + for (Future f : futures) try { - if (th != null && th.getName().contains("SUMOKBtoTPTPKB:writeFile")) - if (th != null) th.join(); - } catch (NullPointerException ex) {} // <- hack, but trap this - } + f.get(); // waits for task completion + } catch (InterruptedException | ExecutionException ex) { + System.err.printf("Error in SUMOKBtoTPTPKB.writeFile(): %s", ex); + } System.out.println(); printVariableArityRelationContent(pw,relationMap,getSanitizedKBname(),axiomIndex); @@ -594,7 +606,7 @@ private String _tWriteFile(String fileName, Formula conjecture, } pw.flush(); } - catch (InterruptedException ex) { + catch (Exception ex) { System.err.println("Error in SUMOKBtoTPTPKB.writeFile(): " + ex.getMessage()); ex.printStackTrace(); } diff --git a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java index deeac095..6c88d901 100644 --- a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java +++ b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java @@ -435,12 +435,20 @@ public static void generateQList(Formula f) { } /** *************************************************************** - * Parse a single formula into TPTP format. Synchronized to keep - * order when writing to file during threaded operations. + * Parse a single formula into TPTP format. * @param suoString the formula entry to parse * @param query true if the suoString is a query */ - public static synchronized String tptpParseSUOKIFString(String suoString, boolean query) { + public static String tptpParseSUOKIFString(String suoString, boolean query) { + + if (!SUMOKBtoTPTPKB.rapidParsing) + return _tptpParseSUOKIFString(suoString, query); + else + // This must be used for threaded parsing to keep axiom variables synchronized + return _tTptpParseSUOKIFString(suoString, query); + } + + private static String _tptpParseSUOKIFString(String suoString, boolean query) { if (debug) System.out.println("tptpParseSUOKIFString.process(): string,query,lang: " + suoString + ", " + query + ", " + SUMOKBtoTPTPKB.lang); KB kb = KBmanager.getMgr().getKB(KBmanager.getMgr().getPref("sumokbname")); @@ -462,6 +470,15 @@ public static synchronized String tptpParseSUOKIFString(String suoString, boolea return "( " + process(new Formula(suoString),query) + " )"; } + /** *************************************************************** + * Synchronized to keep axiom variable order when writing to file + * during threaded operations. + */ + private static synchronized String _tTptpParseSUOKIFString(String suoString, boolean query) { + + return _tptpParseSUOKIFString(suoString, query); + } + /** ************************************************************* * This is the primary method of the class. It takes a SUO-KIF * formula and returns a TPTP formula. diff --git a/src/java/com/articulate/sigma/wordNet/WNdiagnostics.java b/src/java/com/articulate/sigma/wordNet/WNdiagnostics.java index 4b03df95..6c769151 100644 --- a/src/java/com/articulate/sigma/wordNet/WNdiagnostics.java +++ b/src/java/com/articulate/sigma/wordNet/WNdiagnostics.java @@ -318,7 +318,7 @@ public static void main (String[] args) { KBmanager.getMgr().initializeOnce(); } catch (Exception ex) { - System.out.println(ex.getMessage()); + System.err.println(ex.getMessage()); } WordNet.initOnce(); System.out.println(nonRelationTermsWithoutSynsets()); From 7707625cb006b426eddcd4ee18c5d5a0aa610769 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 17 Feb 2025 19:06:38 -0800 Subject: [PATCH 077/100] [Terry N.] whitespace --- nbproject/ide-targets.xml | 138 ++------------------------------------ 1 file changed, 6 insertions(+), 132 deletions(-) diff --git a/nbproject/ide-targets.xml b/nbproject/ide-targets.xml index 18c6906f..77091f9f 100644 --- a/nbproject/ide-targets.xml +++ b/nbproject/ide-targets.xml @@ -70,8 +70,8 @@ ================= --> - - + @@ -82,70 +82,7 @@ - - - - - - - + - - + @@ -445,41 +353,7 @@ - - - + Must set property 'debug.class' From 41394dc2e83604ae79f272e8168f5dab85840f36 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 17 Feb 2025 19:09:42 -0800 Subject: [PATCH 078/100] [Terry N.] set run.class --- nbproject/ide-targets.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nbproject/ide-targets.xml b/nbproject/ide-targets.xml index 77091f9f..e32d911f 100644 --- a/nbproject/ide-targets.xml +++ b/nbproject/ide-targets.xml @@ -341,7 +341,7 @@ - From 4900cf0a3426400f11913ec5216ff4eb3ce44362 Mon Sep 17 00:00:00 2001 From: git Date: Mon, 17 Feb 2025 19:09:48 -0800 Subject: [PATCH 079/100] [Terry N.] set run.class --- nbproject/build.properties | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/nbproject/build.properties b/nbproject/build.properties index 00670c44..83426fa5 100644 --- a/nbproject/build.properties +++ b/nbproject/build.properties @@ -66,7 +66,6 @@ javadoc.splitindex=true javadoc.use=true javadoc.version=false javadoc.windowtitle= -#main.class=com.articulate.sigma.KB #manifest.mf=MANIFEST.MF platform.active=default_platform run.classpath=\ @@ -126,6 +125,11 @@ kbs_home=../sumo #spec.vendor=Adam Pease project.license=LICENSE +# Can't override immutable props +#main.class=com.articulate.sigma.KB +#run.class=com.articulate.sigma.KButilities +run.class=${main.class} + # Various runtime arguments here # Intentional empty arguments @@ -134,17 +138,17 @@ project.license=LICENSE # Default run for the KB #run.args=-c Object Transaction -# Load KB files (should regenerate the KB if cleaned) -run.args=-l +# Load KB files w/ KButilities (should regenerate the KB if cleaned) +run.args=-l -R # Run Vampire on SUMO.tptp and output proof #run.args=-p -# KIF, TPTP3ProofProcessor, TPTPutil, SUMOtoTFAform - run a test +# KB, KIF, TPTP3ProofProcessor, TPTPutil, SUMOtoTFAform - run a test #run.args=-t # Formula check for errors -formula=-v '(=> (and (muscleInsertion ?MC ?BPC) (instance ?H Human) (attribute ?H Healthy)) (exists (?M ?BP) (and (instance ?M ?MC) (instance ?BP ?BPC) (part ?M ?H) (part ?BP ?H) (connects ?M ?BP))))' +formula='(=> (and (muscleInsertion ?MC ?BPC) (instance ?H Human) (attribute ?H Healthy)) (exists (?M ?BP) (and (instance ?M ?MC) (instance ?BP ?BPC) (part ?M ?H) (part ?BP ?H) (connects ?M ?BP))))' # Error checking a formula w/ com.articulate.sigma.KButilities #run.args=-v ${formula} From f4fa87a756b0a09d215612c6c7393dfc3661b4b8 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 18 Feb 2025 12:08:24 -0800 Subject: [PATCH 080/100] [Terry N.] runtime hook to terminate the ExecutorService on JVM shutdown so that we don't have to manually do this --- src/java/com/articulate/sigma/KBmanager.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/java/com/articulate/sigma/KBmanager.java b/src/java/com/articulate/sigma/KBmanager.java index 7d78a988..b9cca97b 100644 --- a/src/java/com/articulate/sigma/KBmanager.java +++ b/src/java/com/articulate/sigma/KBmanager.java @@ -690,10 +690,18 @@ protected SimpleElement readConfiguration(String configDirPath) { /** *************************************************************** * Reads in the KBs and other parameters defined in the XML - * configuration file, or uses the default parameters. + * configuration file, or uses the default parameters. Entry point + * for the web app (Prelude.jsp). */ public void initializeOnce() { + if (!initialized) + Runtime.getRuntime().addShutdownHook(new Thread(() -> { + System.out.println("Shutdown hook executed"); + // Perform cleanup tasks here + KButilities.shutDownExecutorService(); + })); + System.out.println("Info in KBmanager.initializeOnce()"); //Thread.dumpStack(); String base = SIGMA_HOME; From 06c43e8754a93043c3c5a98e7d590fd95928d5a6 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 18 Feb 2025 13:31:39 -0800 Subject: [PATCH 081/100] [Terry N.] expand "done" monitors to other loops --- src/java/com/articulate/sigma/KB.java | 55 ++++++++++++++++++--------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/src/java/com/articulate/sigma/KB.java b/src/java/com/articulate/sigma/KB.java index 07267bef..3e5684c3 100644 --- a/src/java/com/articulate/sigma/KB.java +++ b/src/java/com/articulate/sigma/KB.java @@ -74,6 +74,8 @@ portions copyright Teknowledge (c) 2003 and reused under the terms of the GNU import java.io.*; import java.text.ParseException; import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; @@ -166,7 +168,7 @@ public class KB implements Serializable { /* If true, assertions of the form (predicate x x) will be included in the * relation cache tables. */ - private boolean cacheReflexiveAssertions = false; +// private boolean cacheReflexiveAssertions = false; public KBcache kbCache = null; @@ -415,6 +417,8 @@ public Set removeSuperClasses(Set set) { return returnSet; } + private int counter = 0; + /*************************************************************** * Arity errors should already have been trapped in addConstituent() unless a * relation is used before it is defined. This routine is a comprehensive @@ -423,23 +427,38 @@ public Set removeSuperClasses(Set set) { public void checkArity() { long millis = System.currentTimeMillis(); - List toRemove = new ArrayList<>(); +// List toRemove = new ArrayList<>(); System.out.print("INFO in KB.checkArity(): Performing Arity Check"); - String term; +// String term; if (formulaMap != null && !formulaMap.isEmpty()) { - int counter = 0; +// int counter = 0; + Future future; + List> futures = new ArrayList<>(); + int total = formulaMap.values().size(); for (Formula f : formulaMap.values()) { - if (counter++ % 10 == 0) - System.out.print("."); - if (counter % 400 == 0) - System.out.print("\nINFO in KB.checkArity(): Still performing Arity Check"); - term = PredVarInst.hasCorrectArity(f, this); - if (!StringUtil.emptyString(term)) { - errors.add("Formula in " + f.sourceFile + " rejected due to arity error of predicate " + term - + " in formula: \n" + f.getFormula()); - toRemove.add(f.getFormula()); - } + Runnable r = () -> { + if (counter++ % 10 == 0) + System.out.print("."); + if (counter % 400 == 0) + System.out.printf("%nINFO in KB.checkArity(): Still performing Arity Check. %d%% done%n", counter*100/total); + String term = PredVarInst.hasCorrectArity(f, this); + if (!StringUtil.emptyString(term)) { + errors.add("Formula in " + f.sourceFile + " rejected due to arity error of predicate " + term + + " in formula: \n" + f.getFormula()); + // toRemove.add(f.getFormula()); + } + }; + future = KButilities.EXECUTOR_SERVICE.submit(r); + futures.add(future); } + for (Future f : futures) + try { + f.get(); // waits for task completion + } catch (InterruptedException | ExecutionException ex) { + System.err.printf("Error in KB.checkArity(): %s", ex); + } + + counter = 0; // reset System.out.println(); } System.out.println("KB.checkArity(): seconds: " + (System.currentTimeMillis() - millis) / 1000); @@ -2762,11 +2781,12 @@ public void addConstituentInfo(KIF file) { int count = 2; //System.out.println("INFO in KB.addConstituent(): add keys"); List newlist, list; + int total = file.formulas.keySet().size(); for (String key : file.formulas.keySet()) { // Iterate through keys. if ((count++ % 100) == 1) System.out.print("."); if ((count % 4000) == 1) - System.out.println("\nINFO in KB.addConstituent(): still adding keys"); + System.out.printf("%nINFO in KB.addConstituent(): still adding keys. %d%% done.%n", count*100/total); newlist = file.formulas.get(key); list = formulas.get(key); if (list != null) { @@ -2786,7 +2806,7 @@ public void addConstituentInfo(KIF file) { if ((count++ % 100) == 1) System.out.print("."); if ((count % 4000) == 1) - System.out.println("\nINFO in KB.addConstituent(): still adding values"); + System.out.printf("\nINFO in KB.addConstituent(): still adding values. %d%% done.%n", count*100/total); if (!formulaMap.containsKey(internedFormula)) formulaMap.put(internedFormula, f); } @@ -3945,6 +3965,8 @@ public static void main(String[] args) throws IOException { if (args != null && args.length > 1 && args[0].contains("R") || args[1].contains("R")) SUMOKBtoTPTPKB.rapidParsing = true; + System.out.println("KB.main(): SUMOKBtoTPTPKB.rapidParsing==" + SUMOKBtoTPTPKB.rapidParsing); + //KBmanager.prefOverride.put("loadLexicons","false"); //System.out.println("KB.main(): Note! Not loading lexicons."); KBmanager.getMgr().initializeOnce(); @@ -4046,6 +4068,5 @@ else if (KBmanager.getMgr().prover == KBmanager.Prover.LEO) { } } } - KButilities.shutDownExecutorService(); } } From 04c46b1763f8934ba68c8b58e4f3830f000ad877 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 18 Feb 2025 13:43:47 -0800 Subject: [PATCH 082/100] [Terry N.] newline for info output --- src/java/com/articulate/sigma/PredVarInst.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/com/articulate/sigma/PredVarInst.java b/src/java/com/articulate/sigma/PredVarInst.java index d0548a1a..f8ca36e4 100644 --- a/src/java/com/articulate/sigma/PredVarInst.java +++ b/src/java/com/articulate/sigma/PredVarInst.java @@ -352,7 +352,7 @@ private static String hasCorrectArityRecurse(Formula f, KB kb) val = intval; else { if (!LOGICAL_TERMS.contains(rel) && !rel.startsWith("?")) { - System.out.printf("INFO in PredVarInst.hasCorrectArityRecurse(): " + + System.out.printf("%nINFO in PredVarInst.hasCorrectArityRecurse(): " + "Predicate %s does not have an arity defined in KB, " + "can't get the arity number!\n%s\n", rel, f, f.getSourceFile(), f.startLine); //throw new IllegalArgumentException(); @@ -422,10 +422,10 @@ private static boolean containsRowVariable(List arglist) { return false; } - /** *************************************************************** + /** *************************************************************** * Get a set of all the predicate variables in the formula. If - * the argument list has a row variable, return 0 as the value, meaning - * any possible arity of 1 - maxArity + * the argument list has a row variable, return 0 as the value, meaning + * any possible arity of 1 - maxArity */ protected static Set gatherPredVarRecurse(KB kb, Formula f) { From 5d629161b1c24775f005ffffb2d860aa30edf203 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 18 Feb 2025 13:44:24 -0800 Subject: [PATCH 083/100] [Terry N.] add debug.sigma.web.app target --- nbproject/ide-targets.xml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/nbproject/ide-targets.xml b/nbproject/ide-targets.xml index e32d911f..88fead75 100644 --- a/nbproject/ide-targets.xml +++ b/nbproject/ide-targets.xml @@ -70,7 +70,7 @@ ================= --> - + @@ -286,8 +286,22 @@ - + + + + + + + + + + + + + + From a31dd574babc73f5e6fb8a3cb694e5e95ba0e939 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 18 Feb 2025 13:44:47 -0800 Subject: [PATCH 084/100] [Terry N.] update note --- nbproject/build.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nbproject/build.properties b/nbproject/build.properties index 83426fa5..3a8ef0bb 100644 --- a/nbproject/build.properties +++ b/nbproject/build.properties @@ -138,7 +138,8 @@ run.class=${main.class} # Default run for the KB #run.args=-c Object Transaction -# Load KB files w/ KButilities (should regenerate the KB if cleaned) +# Load KB files w/ KButilities (should regenerate the KB if cleaned). -R for +# rapid (threaded) processing run.args=-l -R # Run Vampire on SUMO.tptp and output proof From 06d8db93c172c37d18fe1bb0372902a5434a611c Mon Sep 17 00:00:00 2001 From: git Date: Tue, 18 Feb 2025 23:34:26 -0800 Subject: [PATCH 085/100] [Terry N.] split out the process method into synchronized for threaded ops, and default unsynchronized. --- .../articulate/sigma/trans/SUMOtoTFAform.java | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java b/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java index 385739cf..7b5ae5cb 100644 --- a/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java +++ b/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java @@ -2407,9 +2407,21 @@ public static String process(Formula f, boolean query) { return ""; } - /** ************************************************************* + /** *************************************************************** + * Parse a single formula into TPTP format. + * @param suoString the formula entry to parse + * @param query true if the suoString is a query */ - public static String process(String s, boolean query) { + public static String process(String suoString, boolean query) { + + if (!SUMOKBtoTPTPKB.rapidParsing) + return _process(suoString, query); + else + // This must be used for threaded parsing to deep recursion synchronized + return _tProcess(suoString, query); + } + + private static String _process(String s, boolean q) { filterMessage = ""; if (s.contains("ListFn")) @@ -2418,8 +2430,11 @@ public static String process(String s, boolean query) { if (StringUtil.emptyString(s)) // || numConstAxioms.contains(s)) return ""; Formula f = new Formula(s); - String res = process(f,query); - return res; + return process(f,q); + } + + private static synchronized String _tProcess(String s, boolean q) { + return _process(s, q); } /** ************************************************************* From 89c5e728e171d4f3805349cf6fcb58b4dd110dc9 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 18 Feb 2025 23:37:58 -0800 Subject: [PATCH 086/100] [Terry N.] javadoc --- src/java/com/articulate/sigma/trans/SUMOtoTFAform.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java b/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java index 7b5ae5cb..78e34ae3 100644 --- a/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java +++ b/src/java/com/articulate/sigma/trans/SUMOtoTFAform.java @@ -2417,7 +2417,7 @@ public static String process(String suoString, boolean query) { if (!SUMOKBtoTPTPKB.rapidParsing) return _process(suoString, query); else - // This must be used for threaded parsing to deep recursion synchronized + // This must be used for threaded parsing to keep deep recursion synchronized return _tProcess(suoString, query); } @@ -2433,6 +2433,10 @@ private static String _process(String s, boolean q) { return process(f,q); } + /** *************************************************************** + * Synchronized to keep to keep deep recursion synchronized during + * threaded operations. + */ private static synchronized String _tProcess(String s, boolean q) { return _process(s, q); } From ed0b91ec874b0ec9b9971c1f53e4b4f108925a48 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 18 Feb 2025 23:38:34 -0800 Subject: [PATCH 087/100] [Terry N.] split out the tptpParseSUOKIFString method into synchronized for threaded ops, and default unsynchronized. --- .../sigma/trans/SUMOformulaToTPTPformula.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java index 6c88d901..69265422 100644 --- a/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java +++ b/src/java/com/articulate/sigma/trans/SUMOformulaToTPTPformula.java @@ -448,35 +448,35 @@ public static String tptpParseSUOKIFString(String suoString, boolean query) { return _tTptpParseSUOKIFString(suoString, query); } - private static String _tptpParseSUOKIFString(String suoString, boolean query) { + private static String _tptpParseSUOKIFString(String s, boolean q) { - if (debug) System.out.println("tptpParseSUOKIFString.process(): string,query,lang: " + suoString + ", " + query + ", " + SUMOKBtoTPTPKB.lang); + if (debug) System.out.println("tptpParseSUOKIFString.process(): string,query,lang: " + s + ", " + q + ", " + SUMOKBtoTPTPKB.lang); KB kb = KBmanager.getMgr().getKB(KBmanager.getMgr().getPref("sumokbname")); if (SUMOKBtoTPTPKB.lang.equals("tff")) - return "( " + SUMOtoTFAform.process(suoString,query) + " )"; + return "( " + SUMOtoTFAform.process(s,q) + " )"; if (SUMOKBtoTPTPKB.lang.equals("thf")) { THF thf = new THF(); Collection stmts = new ArrayList<>(); Collection queries = new ArrayList<>(); - if (query) - queries.add(new Formula(suoString)); + if (q) + queries.add(new Formula(s)); else - stmts.add(new Formula(suoString)); + stmts.add(new Formula(s)); return "( " + thf.KIF2THF(stmts,queries,kb) + " )"; } if (SUMOKBtoTPTPKB.lang.equals("fof")) - return "( " + process(new Formula(suoString),query) + " )"; + return "( " + process(new Formula(s),q) + " )"; System.err.println("Error in SUMOformulaToTPTPformula.tptpParseSUOKIFString(): unknown language type: " + SUMOKBtoTPTPKB.lang); - return "( " + process(new Formula(suoString),query) + " )"; + return "( " + process(new Formula(s),q) + " )"; } /** *************************************************************** * Synchronized to keep axiom variable order when writing to file * during threaded operations. */ - private static synchronized String _tTptpParseSUOKIFString(String suoString, boolean query) { + private static synchronized String _tTptpParseSUOKIFString(String s, boolean query) { - return _tptpParseSUOKIFString(suoString, query); + return _tptpParseSUOKIFString(s, query); } /** ************************************************************* From 77fee022e5782d79f99fba36e37bb20850015021 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2025 10:14:27 -0800 Subject: [PATCH 088/100] [Terry N.] refactor for capturing the whole formula string complete w/ documentation before submitting to the PrintWriter. Keeps order during threaded ops --- .../sigma/trans/SUMOKBtoTPTPKB.java | 213 +++++++++++------- 1 file changed, 136 insertions(+), 77 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java index ffbe57f9..c14b611d 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java @@ -7,8 +7,7 @@ import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.concurrent.atomic.AtomicInteger; public class SUMOKBtoTPTPKB { @@ -37,13 +36,9 @@ public class SUMOKBtoTPTPKB { public Set alreadyWrittenTPTPs = new HashSet<>(); - /** Prevents interleaving of PrintWriter writes in writeFile() */ - private final ReadWriteLock lock; - /** ************************************************************* */ public SUMOKBtoTPTPKB() { - lock = new ReentrantReadWriteLock(true); buildExcludedPredicates(); } @@ -71,8 +66,7 @@ public static Set buildExcludedPredicates() { */ public String getSanitizedKBname() { - String sanitizedKBName = kb.name.replaceAll("\\W","_"); - return sanitizedKBName; + return kb.name.replaceAll("\\W","_"); } /** ************************************************************* @@ -98,9 +92,8 @@ public static String extensionToLang(String l) { public String getInfFilename() { String sanitizedKBName = getSanitizedKBname(); - String filename = KBmanager.getMgr().getPref("kbDir") + File.separator + + return KBmanager.getMgr().getPref("kbDir") + File.separator + sanitizedKBName + "." + langToExtension(lang); - return filename; } /** ************************************************************* @@ -128,7 +121,7 @@ public String copyFile(String fileName) { /** ************************************************************* */ - public static void addToFile (String fileName, ArrayList axioms, String conjecture) { + public static void addToFile (String fileName, List axioms, String conjecture) { boolean append = true; try (OutputStream file = new FileOutputStream(fileName, append); @@ -154,7 +147,7 @@ public static void addToFile (String fileName, ArrayList axioms, String * value is the original name. */ protected void printVariableArityRelationContent(PrintWriter pr, Map relationMap, - String sanitizedKBName, int axiomIndex) { + String sanitizedKBName, AtomicInteger axiomIndex) { Iterator it = relationMap.keySet().iterator(); String key, value; @@ -169,17 +162,18 @@ protected void printVariableArityRelationContent(PrintWriter pr, Map fileContents) { + + int size = SUMOtoTFAform.numericConstantTypes.keySet().size(); + if (size == SUMOtoTFAform.numericConstantCount) + return; + String type; + for (String t : SUMOtoTFAform.numericConstantTypes.keySet()) { + if (SUMOtoTFAform.numericConstantValues.keySet().contains(t)) + continue; + type = SUMOtoTFAform.numericConstantTypes.get(t); + if (debug) System.out.println("SUMOKBtoTPTPKB.printTFFNumericConstants(): term, type: " + t + ", " + type); + fileContents.add("tff(" + SUMOformulaToTPTPformula.translateWord(t, StreamTokenizer.TT_WORD,false) + + "_sig,type," + SUMOformulaToTPTPformula.translateWord(t, StreamTokenizer.TT_WORD,false) + + ":" + SUMOKBtoTFAKB.translateSort(kb,type) + ")."); + } + } + /** ************************************************************* * Sets isQuestion and calls writeTPTPFile() below @@ -254,10 +269,10 @@ public void writeHeader(PrintWriter pw, String sanitizedKBName) { } } - private int axiomIndex = 1; // a count appended to axiom names to make a unique ID - private int counter = 0; - private int formCount = 1; - private long millis = 0;; + private final AtomicInteger axiomIndex = new AtomicInteger(1); // a count appended to axiom names to make a unique ID + private final AtomicInteger formCount = new AtomicInteger(0); + private int counter = 0; + private long millis = 0L; /** ************************************************************* * Write all axioms in the KB to TPTP format. @@ -268,26 +283,32 @@ public String writeFile(String fileName, Formula conjecture, boolean isQuestion, PrintWriter pw) { // Default (orig) sequential processing -// String retVal = _writeFile(fileName, conjecture, isQuestion, pw); - - // Experimental threading of main loop writes big SUMO in half - // the time as the sequential method above if not synchronized, - // but interleaves metadata. 2/17/25 tdn - String retVal = _tWriteFile(fileName, conjecture, isQuestion, pw); + String retVal; + if (!rapidParsing) + retVal = _writeFile(fileName, conjecture, isQuestion, pw); + else + /* Experimental threading of main loop writes big SUMO in half + * the time as the sequential method. 2/17/25 tdn + */ + retVal = _tWriteFile(fileName, conjecture, isQuestion, pw); KB.axiomKey = axiomKey; KBmanager.serialize(); System.out.println("SUMOKBtoTPTPKB.writeFile(): axiomKey: " + axiomKey.size()); System.out.println("SUMOKBtoTPTPKB.writeFile(): seconds: " + (System.currentTimeMillis() - millis) / 1000); - axiomIndex = 1; // reset - counter = 0; // reset - formCount = 1; // reset - millis = 0; // reset + axiomIndex.set(1); // reset + counter = 0; // reset + formCount.set(0); // reset + millis = 0L; // reset return retVal; } + /** ************************************************************* + * @deprecated + */ + @Deprecated private String _writeFile(String fileName, Formula conjecture, boolean isQuestion, PrintWriter pw) { @@ -307,7 +328,7 @@ private String _writeFile(String fileName, Formula conjecture, int total = orderedFormulae.size(); FormulaPreprocessor fp = new FormulaPreprocessor(); - Set processed, withRelnRenames = new HashSet<>(); + Set processed, withRelnRenames; String result, name; SUMOtoTFAform stfa; for (Formula f : orderedFormulae) { @@ -319,7 +340,7 @@ private String _writeFile(String fileName, Formula conjecture, for (Formula derivF : f.derivation.parents) pw.println("% original f: " + derivF.format("", "", " ")); } - pw.println("% " + formCount++ + " of " + total + + pw.println("% " + formCount.getAndIncrement() + " of " + total + " from file " + f.sourceFile + " at line " + f.startLine); } if (f.isHigherOrder(kb)) { @@ -341,7 +362,7 @@ private String _writeFile(String fileName, Formula conjecture, processed = fp.preProcess(f,false,kb); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : processed: " + processed); if (!processed.isEmpty()) { - withRelnRenames.clear(); + withRelnRenames = new HashSet<>(); // somehow makes a diff. in tff doc. ordering for (Formula f2 : processed) withRelnRenames.add(f2.renameVariableArityRelations(kb,relationMap)); for (Formula f3 : withRelnRenames) { @@ -391,7 +412,7 @@ private String _writeFile(String fileName, Formula conjecture, for (String sort : f.tffSorts) { if (!StringUtil.emptyString(sort) && !alreadyWrittenTPTPs.contains(sort)) { - name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; + name = "kb_" + getSanitizedKBname() + "_" + axiomIndex.getAndIncrement(); axiomKey.put(name,f); pw.println(lang + "(" + name + ",axiom,(" + sort + "))."); alreadyWrittenTPTPs.add(sort); @@ -402,7 +423,7 @@ private String _writeFile(String fileName, Formula conjecture, !alreadyWrittenTPTPs.contains(theTPTPFormula) && !filterAxiom(f,theTPTPFormula,pw)) { if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : writing " + theTPTPFormula); - name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; + name = "kb_" + getSanitizedKBname() + "_" + axiomIndex.getAndIncrement(); axiomKey.put(name,f); pw.println(lang + "(" + name + ",axiom,(" + theTPTPFormula + "))."); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : finished writing " + theTPTPFormula + " with name " + name); @@ -463,35 +484,35 @@ private String _tWriteFile(String fileName, Formula conjecture, List> futures = new ArrayList<>(); for (Formula formula : orderedFormulae) { Runnable r = () -> { + Formula f = formula; + f.theTptpFormulas.clear(); + FormulaPreprocessor fp = new FormulaPreprocessor(); + Set processed = null, withRelnRenames; + List fileContents = new ArrayList<>(); + String name, result; + SUMOtoTFAform stfa; + if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : source line: " + f.startLine); try { - if (!rapidParsing) - lock.writeLock().lock(); - Formula f = formula; - f.theTptpFormulas.clear(); - FormulaPreprocessor fp = new FormulaPreprocessor(); - Set processed, withRelnRenames = new HashSet<>(); - String name, result; - SUMOtoTFAform stfa; - if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : source line: " + f.startLine); if (!f.getFormula().startsWith("(documentation")) { - pw.println("% f(" + formCount + "): " + f.format("", "", " ")); + fileContents.add("% f: " + f.format("", "", " ")); if (!f.derivation.parents.isEmpty()) { - for (Formula derivF : f.derivation.parents) - pw.println("% original f(" + formCount + ") " + derivF.format("", "", " ")); + for (Formula derivF : f.derivation.parents) { + fileContents.add("% original f: " + derivF.format("", "", " ")); + } } - pw.println("% f(" + formCount + ") of " + total + + fileContents.add("% " + formCount.getAndIncrement() + " of " + total + " from file " + f.sourceFile + " at line " + f.startLine); } if (f.isHigherOrder(kb)) { - pw.println("% f(" + formCount + ") is higher order"); - if (lang.equals("thf")) { // TODO create a flag for adding modals (or not) + fileContents.add("% is higher order"); + if (lang.equals("thf")) // TODO create a flag for adding modals (or not) f = Modals.processModals(f,kb); - } if (removeHOL) return; } else - pw.println("% f(" + formCount + ") not higher order"); + fileContents.add("% not higher order"); + if (!KBmanager.getMgr().prefEquals("cache","yes") && f.isCached()) return; if (counter++ % 100 == 0) System.out.print("."); @@ -501,7 +522,7 @@ private String _tWriteFile(String fileName, Formula conjecture, processed = fp.preProcess(f,false,kb); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : processed: " + processed); if (!processed.isEmpty()) { - withRelnRenames.clear(); + withRelnRenames = new HashSet<>(); // somehow makes a diff. in tff doc. ordering for (Formula f2 : processed) withRelnRenames.add(f2.renameVariableArityRelations(kb,relationMap)); for (Formula f3 : withRelnRenames) { @@ -514,68 +535,68 @@ private String _tWriteFile(String fileName, Formula conjecture, if (debug) { System.out.println("INFO in SUMOKBtoTPTPKB.writeFile(): result: " + result); } - if (result != null) { + if (result != null) f.theTptpFormulas.add(result); - } break; case "tff": stfa = new SUMOtoTFAform(); - SUMOtoTFAform.kb = kb; - pw.println("% tff input: " + f3.format("", "", " ")); + SUMOtoTFAform.kb = kb; // Already set in init? + fileContents.add("% tff input: " + f3.format("", "", " ")); if (debug) { System.out.println("SUMOKBtoTPTPKB.writeFile() : % tff input: " + f3.format("", "", " ")); } stfa.sorts = stfa.missingSorts(f3); - if (stfa.sorts != null && !stfa.sorts.isEmpty()) { + if (stfa.sorts != null && !stfa.sorts.isEmpty()) f3.tffSorts.addAll(stfa.sorts); - } result = SUMOtoTFAform.process(f3.getFormula(), false); - printTFFNumericConstants(pw); + printTFFNumericConstants(fileContents); SUMOtoTFAform.initNumericConstantTypes(); - if (!StringUtil.emptyString(result)) { + if (!StringUtil.emptyString(result)) f.theTptpFormulas.add(result); - } else if (!StringUtil.emptyString(SUMOtoTFAform.filterMessage)) { - pw.println("% " + SUMOtoTFAform.filterMessage); - } + else if (!StringUtil.emptyString(SUMOtoTFAform.filterMessage)) + fileContents.add("% " + SUMOtoTFAform.filterMessage); break; default: - pw.println("% f(" + formCount + ") unhandled language option " + lang); + fileContents.add("% unhandled language option " + lang); break; } } } else { //System.out.println("SUMOKBtoTPTPKB.writeFile() : % empty result from preprocess on " + f.getFormula().replace("\\n"," ")); - pw.println("% f(" + formCount + ") empty result from preprocess on " + f.getFormula().replace("\\n"," ")); + fileContents.add("% empty result from preprocess on " + f.getFormula().replace("\\n"," ")); } for (String sort : f.tffSorts) { if (!StringUtil.emptyString(sort) && !alreadyWrittenTPTPs.contains(sort)) { - name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; + name = "kb_" + getSanitizedKBname() + "_" + axiomIndex.getAndIncrement(); axiomKey.put(name,f); - pw.println(lang + "(" + name + ",axiom,(" + sort + "))."); + fileContents.add(lang + "(" + name + ",axiom,(" + sort + "))."); alreadyWrittenTPTPs.add(sort); } } for (String theTPTPFormula : f.theTptpFormulas) { if (!StringUtil.emptyString(theTPTPFormula) && !alreadyWrittenTPTPs.contains(theTPTPFormula) && - !filterAxiom(f,theTPTPFormula,pw)) { + !filterAxiom(f,theTPTPFormula, fileContents)) { if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : writing " + theTPTPFormula); - name = "kb_" + getSanitizedKBname() + "_" + axiomIndex++; + name = "kb_" + getSanitizedKBname() + "_" + axiomIndex.getAndIncrement(); axiomKey.put(name,f); - pw.println(lang + "(" + name + ",axiom,(" + theTPTPFormula + "))."); + fileContents.add(lang + "(" + name + ",axiom,(" + theTPTPFormula + "))."); if (debug) System.out.println("SUMOKBtoTPTPKB.writeFile() : finished writing " + theTPTPFormula + " with name " + name); alreadyWrittenTPTPs.add(theTPTPFormula); } else - pw.println("% f(" + formCount + ") empty, already written or filtered formula, skipping : " + theTPTPFormula); + fileContents.add("% empty, already written or filtered formula, skipping : " + theTPTPFormula); } - } finally { - formCount++; - if (!rapidParsing) - lock.writeLock().unlock(); + // Write file content to file + for (String content : fileContents) + pw.println(content); + } finally { + if (processed != null) + processed.clear(); + fileContents.clear(); } }; // end Runnable future = KButilities.EXECUTOR_SERVICE.submit(r); @@ -586,7 +607,8 @@ private String _tWriteFile(String fileName, Formula conjecture, try { f.get(); // waits for task completion } catch (InterruptedException | ExecutionException ex) { - System.err.printf("Error in SUMOKBtoTPTPKB.writeFile(): %s", ex); + System.err.printf("Error in SUMOKBtoTPTPKB.writeFile(): %s", ex.getMessage()); + ex.printStackTrace(); } System.out.println(); @@ -605,6 +627,10 @@ private String _tWriteFile(String fileName, Formula conjecture, pw.println(lang + "(prove_from_" + getSanitizedKBname() + "," + type + ",(" + theTPTPFormula + "))."); } pw.flush(); + + relationMap.clear(); + orderedFormulae.clear(); + futures.clear(); } catch (Exception ex) { System.err.println("Error in SUMOKBtoTPTPKB.writeFile(): " + ex.getMessage()); @@ -628,7 +654,9 @@ public boolean filterExcludePredicates(Formula formula) { } /** ************************************************************* + * @deprecated */ + @Deprecated public boolean filterAxiom(Formula form, String tptp, PrintWriter pw) { //----Don't output ""ed ''ed and numbers @@ -639,7 +667,6 @@ public boolean filterAxiom(Formula form, String tptp, PrintWriter pw) { } if (removeStrings && (tptp.contains("'") || tptp.indexOf('"') >= 0)) { pw.println("% f: " + form.format("", "", " ")); -// pw.println("% f(" + formCount + "): " + form.format("", "", " ")); // <- for manually threaded experiment (tdn) pw.println("% quoted thing"); return true; } @@ -663,6 +690,38 @@ public boolean filterAxiom(Formula form, String tptp, PrintWriter pw) { } } + public boolean filterAxiom(Formula form, String tptp, List fileContents) { + + //----Don't output ""ed ''ed and numbers + if (tptp.matches(".*'[a-z][a-zA-Z0-9_]*\\(.*") && + this.getClass().equals(SUMOKBtoTPTPKB.class)) { // only filter numbers in TPTP, not TFF + fileContents.add("% number: " + tptp); + return removeNum; + } + if (removeStrings && (tptp.contains("'") || tptp.indexOf('"') >= 0)) { + fileContents.add("% f: " + form.format("", "", " ")); + fileContents.add("% quoted thing"); + return true; + } + + if (form.isHigherOrder(kb)) + if (removeHOL) + return true; + if (!filterExcludePredicates(form)) { + if (!alreadyWrittenTPTPs.contains(tptp)) { + return false; + } + else { + fileContents.add("% already written: " + tptp); + return true; + } + } + else { + fileContents.add("% filtered predicate: " + form.getArgument(0)); + return true; + } + } + /** ************************************************************* * Will first write out SUMO.tptp, if it hasn't yet been written, * or is old, then, will write out SUMO.fof if it hasn't yet been From a15f66453c3f1cac1ba1eb130e2352d94d91b0a6 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2025 10:16:27 -0800 Subject: [PATCH 089/100] [Terry N.] set flag in main for rapid parsing (threaded) --- src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java index c14b611d..f1d779fa 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java @@ -729,9 +729,9 @@ public boolean filterAxiom(Formula form, String tptp, List fileContents) */ public static void main(String[] args) { + SUMOKBtoTPTPKB.rapidParsing = true; // TODO: write algo. to set this from the command line and show in printHelp System.out.println("SUMOKBtoTPTPKB.main():"); KBmanager.getMgr().initializeOnce(); - SUMOKBtoTPTPKB skbtptpkb = new SUMOKBtoTPTPKB(); String kbName = KBmanager.getMgr().getPref("sumokbname"); skbtptpkb.kb = KBmanager.getMgr().getKB(kbName); From af8fe1df5d1e769662072c79798130eaef60529a Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2025 10:16:46 -0800 Subject: [PATCH 090/100] [Terry N.] set flag in main for rapid parsing (threaded) --- src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java index 4c745008..6f2b72b8 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java @@ -682,6 +682,7 @@ else if (kb.isRelation(bareTerm) && !alreadyExtended(t) && !bareTerm.equals("Lis */ public static void main(String[] args) { + SUMOKBtoTPTPKB.rapidParsing = true; // TODO: write algo. to set this from the command line and show in printHelp System.out.println("SUMOKBtoTFAKB.main():"); SUMOKBtoTFAKB skbtfakb = new SUMOKBtoTFAKB(); skbtfakb.initOnce(); From f14eb41d6060c85a2bd622151ff9d4c908a5b46e Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2025 10:17:34 -0800 Subject: [PATCH 091/100] [Terry N.] common classpath refs --- nbproject/ide-targets.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nbproject/ide-targets.xml b/nbproject/ide-targets.xml index 88fead75..718dc8b3 100644 --- a/nbproject/ide-targets.xml +++ b/nbproject/ide-targets.xml @@ -72,7 +72,7 @@ @@ -82,7 +82,7 @@ - + Must set property 'run.class' @@ -351,7 +351,7 @@ =================== --> - + @@ -367,7 +367,7 @@ - + Must set property 'debug.class' @@ -389,7 +389,7 @@ From d405ae7f0d029ae8f34ccac5c17fe5ddfb79dc85 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2025 10:18:05 -0800 Subject: [PATCH 092/100] [Terry N.] var dec. out of loop --- src/java/com/articulate/sigma/FormulaPreprocessor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/java/com/articulate/sigma/FormulaPreprocessor.java b/src/java/com/articulate/sigma/FormulaPreprocessor.java index fd2570a4..104c0b60 100644 --- a/src/java/com/articulate/sigma/FormulaPreprocessor.java +++ b/src/java/com/articulate/sigma/FormulaPreprocessor.java @@ -705,8 +705,9 @@ private Map> computeVariableTypesRecurse(KB kb, Formula f, int start = 1; if (Formula.isQuantifier(carstr)) // skip the quantified variable list start = 2; + Formula farg; for (int i = start; i <= f.listLength(); i++) { - Formula farg = f.getArgument(i); + farg = f.getArgument(i); if (farg != null) result = KButilities.mergeToMap(result, computeVariableTypesRecurse(kb, new Formula(f.getArgument(i)), input), kb); } From 71204bddc1fc3e7da3bc50a318d34a122c54342d Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2025 10:18:47 -0800 Subject: [PATCH 093/100] [Terry N.] confirm ExecServ shutdown --- src/java/com/articulate/sigma/KButilities.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/java/com/articulate/sigma/KButilities.java b/src/java/com/articulate/sigma/KButilities.java index 5b7efbf3..a374488a 100755 --- a/src/java/com/articulate/sigma/KButilities.java +++ b/src/java/com/articulate/sigma/KButilities.java @@ -1428,6 +1428,7 @@ public static void shutDownExecutorService() { } catch (InterruptedException e) { EXECUTOR_SERVICE.shutdownNow(); } + System.out.println("KButilities.shutDownExecutorService(): ExecutorService shutdown"); } /** *************************************************************** From 8c38f77cf7f191624440dfc3f31616f2daaf6601 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2025 10:19:56 -0800 Subject: [PATCH 094/100] [Terry N.] set flag in startup for rapid parsing (threaded) --- .../java/com/articulate/sigma/IntegrationTestBase.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/integration/java/com/articulate/sigma/IntegrationTestBase.java b/test/integration/java/com/articulate/sigma/IntegrationTestBase.java index ec91538c..1406239c 100644 --- a/test/integration/java/com/articulate/sigma/IntegrationTestBase.java +++ b/test/integration/java/com/articulate/sigma/IntegrationTestBase.java @@ -1,5 +1,6 @@ package com.articulate.sigma; +import com.articulate.sigma.trans.SUMOKBtoTPTPKB; import org.junit.BeforeClass; import java.io.File; @@ -48,6 +49,9 @@ public class IntegrationTestBase extends SigmaTestBase { @BeforeClass public static void setup() throws IOException { + SUMOKBtoTPTPKB.rapidParsing = true; + System.out.println("UnitTestSuite.startUp(): SUMOKBtoTPTPKB.rapidParsing==" + SUMOKBtoTPTPKB.rapidParsing); + long startTime = System.currentTimeMillis(); //SigmaTestBase.doSetUp(xmlReader); From 1c0359e77956dab8de2069e66ea4a2c96bd8c628 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2025 10:20:26 -0800 Subject: [PATCH 095/100] [Terry N.] move flag to startup for rapid parsing (threaded) --- .../java/com/articulate/sigma/IntegrationTestSuite.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/integration/java/com/articulate/sigma/IntegrationTestSuite.java b/test/integration/java/com/articulate/sigma/IntegrationTestSuite.java index 9606e4f4..8e7612d3 100644 --- a/test/integration/java/com/articulate/sigma/IntegrationTestSuite.java +++ b/test/integration/java/com/articulate/sigma/IntegrationTestSuite.java @@ -3,7 +3,6 @@ import com.articulate.sigma.VerbNet.IntegrationVerbNetTestSuite; import com.articulate.sigma.nlg.IntegrationNLGTestSuite; import com.articulate.sigma.trans.IntegrationTransTestSuite; -import org.junit.AfterClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -17,8 +16,4 @@ }) public class IntegrationTestSuite extends IntegrationTestBase { - @AfterClass - public static void shutDown() { - KButilities.shutDownExecutorService(); - } } \ No newline at end of file From 87744898a4a0468189f2b29b637d59cf0141b4c6 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2025 10:20:50 -0800 Subject: [PATCH 096/100] [Terry N.] move flag to startup for rapid parsing (threaded) --- test/unit/java/com/articulate/sigma/UnitTestSuite.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/unit/java/com/articulate/sigma/UnitTestSuite.java b/test/unit/java/com/articulate/sigma/UnitTestSuite.java index e75510de..eb457bf5 100644 --- a/test/unit/java/com/articulate/sigma/UnitTestSuite.java +++ b/test/unit/java/com/articulate/sigma/UnitTestSuite.java @@ -4,8 +4,6 @@ import com.articulate.sigma.nlg.*; import com.articulate.sigma.wordNet.*; -import org.junit.AfterClass; - import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -23,8 +21,4 @@ }) public class UnitTestSuite extends UnitTestBase { - @AfterClass - public static void shutDown() { - KButilities.shutDownExecutorService(); - } } From 85a88e57468672f9a83b7ad4d113a528b0fe3a5b Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2025 10:25:27 -0800 Subject: [PATCH 097/100] [Terry N.] confirm flag set for rapid parsing (threaded) --- .../com/articulate/sigma/trans/SUMOKBtoTFAKB.java | 2 +- .../articulate/sigma/trans/SUMOKBtoTPTPKB.java | 2 +- .../com/articulate/sigma/IntegrationTestBase.java | 2 +- .../java/com/articulate/sigma/UnitTestBase.java | 5 +++++ web/jsp/Prelude.jsp | 15 +++++++++------ 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java index 6f2b72b8..84ce1aa3 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTFAKB.java @@ -683,7 +683,7 @@ else if (kb.isRelation(bareTerm) && !alreadyExtended(t) && !bareTerm.equals("Lis public static void main(String[] args) { SUMOKBtoTPTPKB.rapidParsing = true; // TODO: write algo. to set this from the command line and show in printHelp - System.out.println("SUMOKBtoTFAKB.main():"); + System.out.println("SUMOKBtoTFAKB.main(): SUMOKBtoTPTPKB.rapidParsing==" + SUMOKBtoTPTPKB.rapidParsing); SUMOKBtoTFAKB skbtfakb = new SUMOKBtoTFAKB(); skbtfakb.initOnce(); System.out.println("SUMOKBtoTFAKB.main(): completed init"); diff --git a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java index f1d779fa..f9f038e5 100644 --- a/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java +++ b/src/java/com/articulate/sigma/trans/SUMOKBtoTPTPKB.java @@ -730,7 +730,7 @@ public boolean filterAxiom(Formula form, String tptp, List fileContents) public static void main(String[] args) { SUMOKBtoTPTPKB.rapidParsing = true; // TODO: write algo. to set this from the command line and show in printHelp - System.out.println("SUMOKBtoTPTPKB.main():"); + System.out.println("SUMOKBtoTPTPKB.main(): SUMOKBtoTPTPKB.rapidParsing==" + SUMOKBtoTPTPKB.rapidParsing); KBmanager.getMgr().initializeOnce(); SUMOKBtoTPTPKB skbtptpkb = new SUMOKBtoTPTPKB(); String kbName = KBmanager.getMgr().getPref("sumokbname"); diff --git a/test/integration/java/com/articulate/sigma/IntegrationTestBase.java b/test/integration/java/com/articulate/sigma/IntegrationTestBase.java index 1406239c..aecaf91d 100644 --- a/test/integration/java/com/articulate/sigma/IntegrationTestBase.java +++ b/test/integration/java/com/articulate/sigma/IntegrationTestBase.java @@ -50,7 +50,7 @@ public class IntegrationTestBase extends SigmaTestBase { public static void setup() throws IOException { SUMOKBtoTPTPKB.rapidParsing = true; - System.out.println("UnitTestSuite.startUp(): SUMOKBtoTPTPKB.rapidParsing==" + SUMOKBtoTPTPKB.rapidParsing); + System.out.println("IntegrationTestBase.startUp(): SUMOKBtoTPTPKB.rapidParsing==" + SUMOKBtoTPTPKB.rapidParsing); long startTime = System.currentTimeMillis(); diff --git a/test/unit/java/com/articulate/sigma/UnitTestBase.java b/test/unit/java/com/articulate/sigma/UnitTestBase.java index c8012aa8..1624c8c5 100644 --- a/test/unit/java/com/articulate/sigma/UnitTestBase.java +++ b/test/unit/java/com/articulate/sigma/UnitTestBase.java @@ -1,5 +1,7 @@ package com.articulate.sigma; +import com.articulate.sigma.trans.SUMOKBtoTPTPKB; + import org.junit.AfterClass; import org.junit.BeforeClass; @@ -38,6 +40,9 @@ public class UnitTestBase extends SigmaTestBase { @BeforeClass public static void setup() { + SUMOKBtoTPTPKB.rapidParsing = true; + System.out.println("UnitTestSuite.startUp(): SUMOKBtoTPTPKB.rapidParsing==" + SUMOKBtoTPTPKB.rapidParsing); + System.out.println("UnitTestBase.setup(): reading test config file: " + CONFIG_FILE_PATH); System.out.println("***** UnitTestBase.setup(): warning! Note that only KB files in the test config file will be loaded! ***** "); // System.out.println("***** UnitTestBase.setup(): Note that all KB files will be loaded! ***** "); // full config.xml diff --git a/web/jsp/Prelude.jsp b/web/jsp/Prelude.jsp index c21465a5..f25156e7 100644 --- a/web/jsp/Prelude.jsp +++ b/web/jsp/Prelude.jsp @@ -58,7 +58,10 @@ if (StringUtil.emptyString(role)) { // role is [guest | user | admin] } if (!KBmanager.initialized) { - KBmanager.getMgr().initializeOnce(); + // Here would be the place to set rapid (threaded) KB processing + SUMOKBtoTPTPKB.rapidParsing = true; + System.out.println("Prelude.jsp: SUMOKBtoTPTPKB.rapidParsing==" + SUMOKBtoTPTPKB.rapidParsing); + mgr.initializeOnce(); // <- first call for KB initialization at startup 2/17/25 (tdn) System.out.println("Prelude.jsp: initializing. Redirecting to init.jsp."); response.sendRedirect("init.jsp"); return; @@ -80,12 +83,12 @@ if (StringUtil.isNonEmptyString(simple) && simple.equalsIgnoreCase("yes")) { String kbName = request.getParameter("kb"); if (StringUtil.emptyString(kbName)) { kbName = "SUMO"; - if (!KBmanager.getMgr().kbs.keySet().contains("SUMO")) - kbName = KBmanager.getMgr().getPref("sumokbname"); + if (!mgr.kbs.keySet().contains("SUMO")) + kbName = mgr.getPref("sumokbname"); } KB kb = null; -kb = KBmanager.getMgr().getKB(kbName); +kb = mgr.getKB(kbName); if (kb != null) TaxoModel.kbName = kbName; @@ -96,10 +99,10 @@ String flang = request.getParameter("flang"); // formal language flang = HTMLformatter.processFormalLanguage(flang); language = request.getParameter("lang"); language = HTMLformatter.processNaturalLanguage(language,kb); -String hostname = KBmanager.getMgr().getPref("hostname"); +String hostname = mgr.getPref("hostname"); if (hostname == null) hostname = "localhost"; -String port = KBmanager.getMgr().getPref("port"); +String port = mgr.getPref("port"); if (port == null) port = "8080"; String term = request.getParameter("term"); From ebf8eeb7f2f93fa2fd05d1ea6117d96114565c55 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2025 10:40:10 -0800 Subject: [PATCH 098/100] [Terry N.] clean up --- src/java/com/articulate/sigma/KB.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/java/com/articulate/sigma/KB.java b/src/java/com/articulate/sigma/KB.java index 3e5684c3..c0918655 100644 --- a/src/java/com/articulate/sigma/KB.java +++ b/src/java/com/articulate/sigma/KB.java @@ -427,11 +427,8 @@ public Set removeSuperClasses(Set set) { public void checkArity() { long millis = System.currentTimeMillis(); -// List toRemove = new ArrayList<>(); System.out.print("INFO in KB.checkArity(): Performing Arity Check"); -// String term; if (formulaMap != null && !formulaMap.isEmpty()) { -// int counter = 0; Future future; List> futures = new ArrayList<>(); int total = formulaMap.values().size(); @@ -445,7 +442,6 @@ public void checkArity() { if (!StringUtil.emptyString(term)) { errors.add("Formula in " + f.sourceFile + " rejected due to arity error of predicate " + term + " in formula: \n" + f.getFormula()); - // toRemove.add(f.getFormula()); } }; future = KButilities.EXECUTOR_SERVICE.submit(r); @@ -456,9 +452,9 @@ public void checkArity() { f.get(); // waits for task completion } catch (InterruptedException | ExecutionException ex) { System.err.printf("Error in KB.checkArity(): %s", ex); + } finally { + counter = 0; // reset } - - counter = 0; // reset System.out.println(); } System.out.println("KB.checkArity(): seconds: " + (System.currentTimeMillis() - millis) / 1000); From 11bdcd1b9e724df046bb9b73a08678eca0dede41 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2025 10:45:18 -0800 Subject: [PATCH 099/100] [Terry N.] clean up imports --- .../java/com/articulate/sigma/IntegrationTestBase.java | 3 ++- test/unit/java/com/articulate/sigma/UnitTestBase.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/integration/java/com/articulate/sigma/IntegrationTestBase.java b/test/integration/java/com/articulate/sigma/IntegrationTestBase.java index aecaf91d..0eb53435 100644 --- a/test/integration/java/com/articulate/sigma/IntegrationTestBase.java +++ b/test/integration/java/com/articulate/sigma/IntegrationTestBase.java @@ -1,11 +1,12 @@ package com.articulate.sigma; import com.articulate.sigma.trans.SUMOKBtoTPTPKB; -import org.junit.BeforeClass; import java.io.File; import java.io.IOException; +import org.junit.BeforeClass; + /** *************************************************************** * Base class for unit tests which are closer to integration tests because they require a large KB configuration. */ diff --git a/test/unit/java/com/articulate/sigma/UnitTestBase.java b/test/unit/java/com/articulate/sigma/UnitTestBase.java index 1624c8c5..19993786 100644 --- a/test/unit/java/com/articulate/sigma/UnitTestBase.java +++ b/test/unit/java/com/articulate/sigma/UnitTestBase.java @@ -2,11 +2,11 @@ import com.articulate.sigma.trans.SUMOKBtoTPTPKB; +import java.io.*; + import org.junit.AfterClass; import org.junit.BeforeClass; -import java.io.*; - import static org.junit.Assert.fail; /** From 43b0566cb0095677326071a5f29b568b15295140 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 19 Feb 2025 11:43:16 -0800 Subject: [PATCH 100/100] [Terry N.] reset counter --- src/java/com/articulate/sigma/KB.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/java/com/articulate/sigma/KB.java b/src/java/com/articulate/sigma/KB.java index c0918655..20c2b23f 100644 --- a/src/java/com/articulate/sigma/KB.java +++ b/src/java/com/articulate/sigma/KB.java @@ -452,9 +452,10 @@ public void checkArity() { f.get(); // waits for task completion } catch (InterruptedException | ExecutionException ex) { System.err.printf("Error in KB.checkArity(): %s", ex); - } finally { - counter = 0; // reset + ex.printStackTrace(); } + + counter = 0; // reset System.out.println(); } System.out.println("KB.checkArity(): seconds: " + (System.currentTimeMillis() - millis) / 1000);