From 7cb3eb8c7f674a4b00e2328031fb7fdb11727800 Mon Sep 17 00:00:00 2001
From: apease <apease@articulatesoftware.com>
Date: Tue, 27 Feb 2024 10:25:11 -0800
Subject: [PATCH] remove optional universal quantifiers

---
 src/java/com/articulate/sigma/trans/HOL.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/java/com/articulate/sigma/trans/HOL.java b/src/java/com/articulate/sigma/trans/HOL.java
index bb39a9c8..8f8d6991 100644
--- a/src/java/com/articulate/sigma/trans/HOL.java
+++ b/src/java/com/articulate/sigma/trans/HOL.java
@@ -41,10 +41,10 @@ public static Formula handleHOLpred(Formula f, KB kb, Integer worldNum) {
         StringBuffer fstring = new StringBuffer();
         ArrayList<Formula> flist = f.complexArgumentsToArrayList(1);
         worldNum = worldNum + 1;
-        fstring.append("(forall (?W" + worldNum + ") (=> (accreln s__" + f.car() + " " +
+        fstring.append("(=> (accreln " + f.car() + " " +
                 flist.get(0) + " ?W" + (worldNum - 1) + " ?W" + worldNum + ") ");
         fstring.append(" " + processRecurse(flist.get(1),kb,worldNum));
-        fstring.append(")))");
+        fstring.append("))");
         Formula result = new Formula();
         result.read(fstring.toString());
         return result;
@@ -58,10 +58,10 @@ public static Formula handleModalAttribute(Formula f, KB kb, Integer worldNum) {
         StringBuffer fstring = new StringBuffer();
         ArrayList<Formula> flist = f.complexArgumentsToArrayList(1);
         worldNum = worldNum + 1;
-        fstring.append("(forall (?W" + worldNum + ") (=> (accreln s__modalAttribute " +
+        fstring.append("(=> (accreln modalAttribute " +
                 flist.get(1) + " ?W" + (worldNum - 1) + " ?W" + worldNum + ") ");
         fstring.append(processRecurse(flist.get(0),kb,worldNum));
-        fstring.append(")))");
+        fstring.append("))");
         Formula result = new Formula();
         result.read(fstring.toString());
         return result;
@@ -106,7 +106,7 @@ public static Formula processHigherOrder(Formula f, KB kb) {
         //    return f;
         result = processRecurse(f,kb,worldNum);
         String fstring = result.getFormula();
-        result.read("(forall (?W1) " + fstring + ")");
+        result.read(fstring);
         return result;
     }
 
@@ -122,7 +122,7 @@ public static void main(String[] args) {
                 "    (not\n" +
                 "        (modalAttribute ?FORMULA Permission)))";
         Formula f = new Formula(fstr);
-        System.out.println(processHigherOrder(f,kb));
+        System.out.println(processHigherOrder(f,kb) + "\n\n");
 
         fstr = "(=>\n" +
                 "    (and\n" +