Renaming imports to support ShadowProver changes

RAIRLab · Oct 27, 2023 · aad7940 · aad7940
1 parent 08b9c01
commit aad7940
Show file tree

Hide file tree

Showing 34 changed files with 189 additions and 189 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.naveensundarg</groupId>
+    <groupId>org.rairlab</groupId>
     <artifactId>planner</artifactId>
     <version>0.50</version>
 
@@ -20,7 +20,7 @@
                         <configuration>
                             <archive>
                                 <manifest>
-                                    <mainClass>com.naveensundarg.planner.Py4JServer</mainClass>
+                                    <mainClass>org.rairlab.planner.Py4JServer</mainClass>
                                 </manifest>
                             </archive>
                             <descriptorRefs>
@@ -39,7 +39,7 @@
                             <archive>
                                 <manifest>
                                     <addClasspath>true</addClasspath>
-                                    <mainClass>com.naveensundarg.planner.Py4JServer</mainClass>
+                                    <mainClass>org.rairlab.planner.Py4JServer</mainClass>
                                 </manifest>
                             </archive>
                             <descriptorRefs>
@@ -61,7 +61,7 @@
 
 
         <dependency>
-            <groupId>com.naveensundarg</groupId>
+            <groupId>org.rairlab</groupId>
             <artifactId>prover</artifactId>
             <version>1.40</version>
         </dependency>

diff --git a/run_spectra.sh b/run_spectra.sh
@@ -19,7 +19,7 @@ if ! command -v mvn > /dev/null; then
 fi
 
 
-mvn -q exec:java -Dexec.mainClass="com.naveensundarg.planner.utils.Runner" -Dexec.args="$1"
+mvn -q exec:java -Dexec.mainClass="org.rairlab.planner.utils.Runner" -Dexec.args="$1"
 
-#mvn exec:java -Dexec.mainClass="com.naveensundarg.planner.utils.Runner" -Dexec.args="$PWD/src/main/resources/com/naveensundarg/planner/problems/ai2thor/FloorPlan28.clj"
+#mvn exec:java -Dexec.mainClass="org.rairlab.planner.utils.Runner" -Dexec.args="$PWD/src/main/resources/com/naveensundarg/planner/problems/ai2thor/FloorPlan28.clj"
 
diff --git a/src/main/java/com/naveensundarg/planner/Action.java b/src/main/java/com/naveensundarg/planner/Action.java
@@ -1,13 +1,13 @@
-package com.naveensundarg.planner;
-
-import com.naveensundarg.shadow.prover.core.Logic;
-import com.naveensundarg.shadow.prover.representations.formula.And;
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.representations.value.Compound;
-import com.naveensundarg.shadow.prover.representations.value.Value;
-import com.naveensundarg.shadow.prover.representations.value.Variable;
-import com.naveensundarg.shadow.prover.utils.CollectionUtils;
- import com.naveensundarg.shadow.prover.utils.Sets;
+package org.rairlab.planner;
+
+import org.rairlab.shadow.prover.core.Logic;
+import org.rairlab.shadow.prover.representations.formula.And;
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.representations.value.Compound;
+import org.rairlab.shadow.prover.representations.value.Value;
+import org.rairlab.shadow.prover.representations.value.Variable;
+import org.rairlab.shadow.prover.utils.CollectionUtils;
+ import org.rairlab.shadow.prover.utils.Sets;
 
 import java.util.List;
 import java.util.Map;

diff --git a/src/main/java/com/naveensundarg/planner/BreadthFirstPlanner.java b/src/main/java/com/naveensundarg/planner/BreadthFirstPlanner.java
@@ -1,6 +1,6 @@
-package com.naveensundarg.planner;
+package org.rairlab.planner;
 
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.representations.formula.Formula;
 
 import java.util.*;
 import java.util.stream.Collectors;

diff --git a/src/main/java/com/naveensundarg/planner/Context.java b/src/main/java/com/naveensundarg/planner/Context.java
@@ -1,4 +1,4 @@
-package com.naveensundarg.planner;
+package org.rairlab.planner;
 
 import java.util.List;
 

diff --git a/src/main/java/com/naveensundarg/planner/ContextNormPlanner.java b/src/main/java/com/naveensundarg/planner/ContextNormPlanner.java
@@ -1,7 +1,7 @@
-package com.naveensundarg.planner;
+package org.rairlab.planner;
 
-import com.naveensundarg.planner.utils.PlanningProblem;
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
+import org.rairlab.planner.utils.PlanningProblem;
+import org.rairlab.shadow.prover.representations.formula.Formula;
 
 import java.util.Optional;
 import java.util.Set;

diff --git a/src/main/java/com/naveensundarg/planner/DepthFirstPlanner.java b/src/main/java/com/naveensundarg/planner/DepthFirstPlanner.java
@@ -1,12 +1,12 @@
-package com.naveensundarg.planner;
-
-import com.naveensundarg.planner.utils.Commons;
-import com.naveensundarg.planner.utils.PlanningProblem;
-import com.naveensundarg.planner.utils.Visualizer;
-import com.naveensundarg.shadow.prover.core.proof.Justification;
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.utils.CollectionUtils;
-import com.naveensundarg.shadow.prover.utils.Sets;
+package org.rairlab.planner;
+
+import org.rairlab.planner.utils.Commons;
+import org.rairlab.planner.utils.PlanningProblem;
+import org.rairlab.planner.utils.Visualizer;
+import org.rairlab.shadow.prover.core.proof.Justification;
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.utils.CollectionUtils;
+import org.rairlab.shadow.prover.utils.Sets;
 
 import org.apache.commons.lang3.tuple.Pair;
 

diff --git a/src/main/java/com/naveensundarg/planner/Goal.java b/src/main/java/com/naveensundarg/planner/Goal.java
@@ -1,4 +1,4 @@
-package com.naveensundarg.planner;
+package org.rairlab.planner;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

diff --git a/src/main/java/com/naveensundarg/planner/GoalTracker.java b/src/main/java/com/naveensundarg/planner/GoalTracker.java
@@ -1,9 +1,9 @@
-package com.naveensundarg.planner;
+package org.rairlab.planner;
 
-import com.naveensundarg.planner.utils.PlanningProblem;
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.utils.CollectionUtils;
-import com.naveensundarg.shadow.prover.utils.Sets;
+import org.rairlab.planner.utils.PlanningProblem;
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.utils.CollectionUtils;
+import org.rairlab.shadow.prover.utils.Sets;
 
 import java.util.Comparator;
 import java.util.Optional;

diff --git a/src/main/java/com/naveensundarg/planner/Inducer.java b/src/main/java/com/naveensundarg/planner/Inducer.java
@@ -1,6 +1,6 @@
-package com.naveensundarg.planner;
+package org.rairlab.planner;
 
-import com.naveensundarg.planner.utils.PlanningProblem;
+import org.rairlab.planner.utils.PlanningProblem;
 
 /**
  * Created by naveensundarg on 12/19/17.

diff --git a/src/main/java/com/naveensundarg/planner/Operations.java b/src/main/java/com/naveensundarg/planner/Operations.java
@@ -1,17 +1,17 @@
-package com.naveensundarg.planner;
-
-import com.naveensundarg.planner.utils.Visualizer;
-import com.naveensundarg.shadow.prover.core.Prover;
-import com.naveensundarg.shadow.prover.core.SnarkWrapper;
-import com.naveensundarg.shadow.prover.core.proof.Justification;
-import com.naveensundarg.shadow.prover.representations.formula.BiConditional;
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.representations.formula.Predicate;
-import com.naveensundarg.shadow.prover.representations.value.Value;
-import com.naveensundarg.shadow.prover.representations.value.Variable;
-import com.naveensundarg.shadow.prover.utils.CollectionUtils;
-
-import com.naveensundarg.shadow.prover.utils.Sets;
+package org.rairlab.planner;
+
+import org.rairlab.planner.utils.Visualizer;
+import org.rairlab.shadow.prover.core.Prover;
+import org.rairlab.shadow.prover.core.SnarkWrapper;
+import org.rairlab.shadow.prover.core.proof.Justification;
+import org.rairlab.shadow.prover.representations.formula.BiConditional;
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.representations.formula.Predicate;
+import org.rairlab.shadow.prover.representations.value.Value;
+import org.rairlab.shadow.prover.representations.value.Variable;
+import org.rairlab.shadow.prover.utils.CollectionUtils;
+
+import org.rairlab.shadow.prover.utils.Sets;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Triple;

diff --git a/src/main/java/com/naveensundarg/planner/Plan.java b/src/main/java/com/naveensundarg/planner/Plan.java
@@ -1,8 +1,8 @@
-package com.naveensundarg.planner;
+package org.rairlab.planner;
 
-import com.naveensundarg.planner.utils.Visualizer;
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.utils.CollectionUtils;
+import org.rairlab.planner.utils.Visualizer;
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.utils.CollectionUtils;
 
 import java.util.List;
 import java.util.Set;

diff --git a/src/main/java/com/naveensundarg/planner/PlanMethod.java b/src/main/java/com/naveensundarg/planner/PlanMethod.java
@@ -1,14 +1,14 @@
-package com.naveensundarg.planner;
-
-import com.naveensundarg.planner.utils.PlanningProblem;
-import com.naveensundarg.shadow.prover.representations.formula.And;
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.representations.value.Compound;
-import com.naveensundarg.shadow.prover.representations.value.Value;
-import com.naveensundarg.shadow.prover.representations.value.Variable;
-import com.naveensundarg.shadow.prover.utils.CollectionUtils;
-import com.naveensundarg.shadow.prover.utils.Reader;
-import com.naveensundarg.shadow.prover.utils.Sets;
+package org.rairlab.planner;
+
+import org.rairlab.planner.utils.PlanningProblem;
+import org.rairlab.shadow.prover.representations.formula.And;
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.representations.value.Compound;
+import org.rairlab.shadow.prover.representations.value.Value;
+import org.rairlab.shadow.prover.representations.value.Variable;
+import org.rairlab.shadow.prover.utils.CollectionUtils;
+import org.rairlab.shadow.prover.utils.Reader;
+import org.rairlab.shadow.prover.utils.Sets;
 
 import java.util.*;
 import java.util.stream.Collectors;

diff --git a/src/main/java/com/naveensundarg/planner/PlanSketch.java b/src/main/java/com/naveensundarg/planner/PlanSketch.java
@@ -1,7 +1,7 @@
-package com.naveensundarg.planner;
+package org.rairlab.planner;
 
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.utils.CollectionUtils;
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.utils.CollectionUtils;
 
 import java.util.List;
 import java.util.Set;

diff --git a/src/main/java/com/naveensundarg/planner/Planner.java b/src/main/java/com/naveensundarg/planner/Planner.java
@@ -1,7 +1,7 @@
-package com.naveensundarg.planner;
+package org.rairlab.planner;
 
-import com.naveensundarg.planner.utils.PlanningProblem;
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
+import org.rairlab.planner.utils.PlanningProblem;
+import org.rairlab.shadow.prover.representations.formula.Formula;
 
 import java.util.Optional;
 import java.util.Set;

diff --git a/src/main/java/com/naveensundarg/planner/Py4JServer.java b/src/main/java/com/naveensundarg/planner/Py4JServer.java
@@ -1,12 +1,12 @@
-package com.naveensundarg.planner;
-
-import com.naveensundarg.planner.utils.PlanningProblem;
-import com.naveensundarg.shadow.prover.core.ccprovers.CognitiveCalculusProver;
-import com.naveensundarg.shadow.prover.core.proof.Justification;
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.utils.Problem;
-import com.naveensundarg.shadow.prover.utils.ProblemReader;
-import com.naveensundarg.shadow.prover.utils.Reader;
+package org.rairlab.planner;
+
+import org.rairlab.planner.utils.PlanningProblem;
+import org.rairlab.shadow.prover.core.ccprovers.CognitiveCalculusProver;
+import org.rairlab.shadow.prover.core.proof.Justification;
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.utils.Problem;
+import org.rairlab.shadow.prover.utils.ProblemReader;
+import org.rairlab.shadow.prover.utils.Reader;
 import py4j.GatewayServer;
 
 import java.io.ByteArrayInputStream;

diff --git a/src/main/java/com/naveensundarg/planner/Simplifier.java b/src/main/java/com/naveensundarg/planner/Simplifier.java
@@ -1,10 +1,10 @@
-package com.naveensundarg.planner;
+package org.rairlab.planner;
 
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.representations.formula.Predicate;
-import com.naveensundarg.shadow.prover.representations.value.Compound;
-import com.naveensundarg.shadow.prover.representations.value.Constant;
-import com.naveensundarg.shadow.prover.representations.value.Value;
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.representations.formula.Predicate;
+import org.rairlab.shadow.prover.representations.value.Compound;
+import org.rairlab.shadow.prover.representations.value.Constant;
+import org.rairlab.shadow.prover.representations.value.Value;
 
 import java.util.Arrays;
 import java.util.function.Function;

diff --git a/src/main/java/com/naveensundarg/planner/State.java b/src/main/java/com/naveensundarg/planner/State.java
@@ -1,10 +1,10 @@
-package com.naveensundarg.planner;
+package org.rairlab.planner;
 
-import com.naveensundarg.shadow.prover.core.Prover;
-import com.naveensundarg.shadow.prover.core.SnarkWrapper;
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.utils.CollectionUtils;
-import com.naveensundarg.shadow.prover.utils.Reader;
+import org.rairlab.shadow.prover.core.Prover;
+import org.rairlab.shadow.prover.core.SnarkWrapper;
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.utils.CollectionUtils;
+import org.rairlab.shadow.prover.utils.Reader;
 
 import java.util.Set;
 

diff --git a/src/main/java/com/naveensundarg/planner/inducers/SimpleInducer.java b/src/main/java/com/naveensundarg/planner/inducers/SimpleInducer.java
@@ -1,13 +1,13 @@
-package com.naveensundarg.planner.inducers;
-
-import com.naveensundarg.planner.*;
-import com.naveensundarg.planner.utils.Commons;
-import com.naveensundarg.planner.utils.PlanningProblem;
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.representations.value.Compound;
-import com.naveensundarg.shadow.prover.representations.value.Value;
-import com.naveensundarg.shadow.prover.representations.value.Variable;
-import com.naveensundarg.shadow.prover.utils.Sets;
+package org.rairlab.planner.inducers;
+
+import org.rairlab.planner.*;
+import org.rairlab.planner.utils.Commons;
+import org.rairlab.planner.utils.PlanningProblem;
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.representations.value.Compound;
+import org.rairlab.shadow.prover.representations.value.Value;
+import org.rairlab.shadow.prover.representations.value.Variable;
+import org.rairlab.shadow.prover.utils.Sets;
 
 import java.util.*;
 import java.util.function.Function;

diff --git a/src/main/java/com/naveensundarg/planner/utils/Commons.java b/src/main/java/com/naveensundarg/planner/utils/Commons.java
@@ -1,12 +1,12 @@
-package com.naveensundarg.planner.utils;
+package org.rairlab.planner.utils;
 
 import com.diogonunes.jcdp.color.ColoredPrinter;
 import com.diogonunes.jcdp.color.api.Ansi;
-import com.naveensundarg.shadow.prover.representations.formula.And;
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.representations.value.Value;
-import com.naveensundarg.shadow.prover.representations.value.Variable;
-import com.naveensundarg.shadow.prover.utils.CollectionUtils;
+import org.rairlab.shadow.prover.representations.formula.And;
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.representations.value.Value;
+import org.rairlab.shadow.prover.representations.value.Variable;
+import org.rairlab.shadow.prover.utils.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Map;

diff --git a/src/main/java/com/naveensundarg/planner/utils/FrozenPrinter.java b/src/main/java/com/naveensundarg/planner/utils/FrozenPrinter.java
@@ -1,4 +1,4 @@
-package com.naveensundarg.planner.utils;
+package org.rairlab.planner.utils;
 
 import com.diogonunes.jcdp.color.ColoredPrinter;
 import com.diogonunes.jcdp.color.api.AbstractColoredPrinter;

diff --git a/src/main/java/com/naveensundarg/planner/utils/GoalTrackingProblem.java b/src/main/java/com/naveensundarg/planner/utils/GoalTrackingProblem.java
@@ -1,11 +1,11 @@
-package com.naveensundarg.planner.utils;
-
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.utils.CollectionUtils;
-import com.naveensundarg.shadow.prover.utils.Reader;
-import com.naveensundarg.planner.Goal;
-import com.naveensundarg.planner.PlanMethod;
-import com.naveensundarg.planner.State;
+package org.rairlab.planner.utils;
+
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.utils.CollectionUtils;
+import org.rairlab.shadow.prover.utils.Reader;
+import org.rairlab.planner.Goal;
+import org.rairlab.planner.PlanMethod;
+import org.rairlab.planner.State;
 import us.bpsm.edn.Keyword;
 import us.bpsm.edn.parser.Parseable;
 import us.bpsm.edn.parser.Parser;
@@ -16,7 +16,7 @@
 import java.io.InputStreamReader;
 import java.util.*;
 
-import static com.naveensundarg.planner.utils.Reader.readPlanMethodsFrom;
+import static org.rairlab.planner.utils.Reader.readPlanMethodsFrom;
 
 /**
  * Created by naveensundarg on 1/13/17.

diff --git a/src/main/java/com/naveensundarg/planner/utils/IndefiniteAction.java b/src/main/java/com/naveensundarg/planner/utils/IndefiniteAction.java
@@ -1,8 +1,8 @@
-package com.naveensundarg.planner.utils;
+package org.rairlab.planner.utils;
 
-import com.naveensundarg.planner.Action;
-import com.naveensundarg.shadow.prover.representations.formula.Formula;
-import com.naveensundarg.shadow.prover.representations.value.Variable;
+import org.rairlab.planner.Action;
+import org.rairlab.shadow.prover.representations.formula.Formula;
+import org.rairlab.shadow.prover.representations.value.Variable;
 
 import java.util.List;
 import java.util.Set;