diff --git a/pom.xml b/pom.xml index a091ab4..12694c2 100644 --- 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"> 4.0.0 - com.naveensundarg + org.rairlab planner 0.50 @@ -20,7 +20,7 @@ - com.naveensundarg.planner.Py4JServer + org.rairlab.planner.Py4JServer @@ -39,7 +39,7 @@ true - com.naveensundarg.planner.Py4JServer + org.rairlab.planner.Py4JServer @@ -61,7 +61,7 @@ - com.naveensundarg + org.rairlab prover 1.40 diff --git a/run_spectra.sh b/run_spectra.sh index 949732e..b1ae52b 100755 --- 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 index 4aab872..bc9a91e 100644 --- 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; +package org.rairlab.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; +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 index 27efbbd..c769cc6 100644 --- 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 index bbdaebf..8dfea8d 100644 --- 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 index d135998..2563284 100644 --- 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 index 0b7df78..6d96c74 100644 --- 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; +package org.rairlab.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; +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 index 6ed0355..72ca55c 100644 --- 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 index 2755a0a..257a4fa 100644 --- 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 index f9e3a33..b40c267 100644 --- 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 index 0cb254f..6632e21 100644 --- 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; +package org.rairlab.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 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 com.naveensundarg.shadow.prover.utils.Sets; +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 index b4618d7..c531adb 100644 --- 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 index 9b1e0fe..1ef9c3b 100644 --- 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; +package org.rairlab.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; +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 index e43c8f7..a3558fe 100644 --- 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 index 4815b61..8ad40fc 100644 --- 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 index e365f72..959c526 100644 --- 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; +package org.rairlab.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; +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 index cd221dd..9ba0055 100644 --- 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 index 8b92cb8..8e0e8d9 100644 --- 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 index 4021d98..aaf7be3 100644 --- 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; +package org.rairlab.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; +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 index 641b26a..7624527 100644 --- 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 index de03397..137dde7 100644 --- 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 index 04db498..41e9546 100644 --- 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; +package org.rairlab.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; +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.InputStream; 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 index d2087d2..1a4783f 100644 --- 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; diff --git a/src/main/java/com/naveensundarg/planner/utils/LearningSystem.java b/src/main/java/com/naveensundarg/planner/utils/LearningSystem.java index 92b8a0c..d796990 100644 --- a/src/main/java/com/naveensundarg/planner/utils/LearningSystem.java +++ b/src/main/java/com/naveensundarg/planner/utils/LearningSystem.java @@ -1,11 +1,11 @@ -package com.naveensundarg.planner.utils; +package org.rairlab.planner.utils; import com.diogonunes.jcdp.color.ColoredPrinter; -import com.naveensundarg.planner.DepthFirstPlanner; -import com.naveensundarg.planner.GoalTracker; -import com.naveensundarg.planner.Plan; -import com.naveensundarg.planner.Planner; -import com.naveensundarg.shadow.prover.utils.Reader; +import org.rairlab.planner.DepthFirstPlanner; +import org.rairlab.planner.GoalTracker; +import org.rairlab.planner.Plan; +import org.rairlab.planner.Planner; +import org.rairlab.shadow.prover.utils.Reader; import org.apache.commons.lang3.tuple.Triple; import java.util.ArrayList; diff --git a/src/main/java/com/naveensundarg/planner/utils/PlanningProblem.java b/src/main/java/com/naveensundarg/planner/utils/PlanningProblem.java index 2b20657..5817b93 100644 --- a/src/main/java/com/naveensundarg/planner/utils/PlanningProblem.java +++ b/src/main/java/com/naveensundarg/planner/utils/PlanningProblem.java @@ -1,15 +1,15 @@ -package com.naveensundarg.planner.utils; +package org.rairlab.planner.utils; -import com.naveensundarg.planner.Context; -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 com.naveensundarg.shadow.prover.utils.Reader; -import com.naveensundarg.shadow.prover.utils.Sets; -import com.naveensundarg.planner.Action; -import com.naveensundarg.planner.PlanMethod; -import com.naveensundarg.planner.State; +import org.rairlab.planner.Context; +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 org.rairlab.shadow.prover.utils.Reader; +import org.rairlab.shadow.prover.utils.Sets; +import org.rairlab.planner.Action; +import org.rairlab.planner.PlanMethod; +import org.rairlab.planner.State; import us.bpsm.edn.Keyword; import us.bpsm.edn.Symbol; import us.bpsm.edn.parser.Parseable; @@ -23,7 +23,7 @@ import java.io.StringReader; import java.util.*; import java.util.stream.Collectors; -import static com.naveensundarg.planner.utils.Reader.readPlanMethodFrom; +import static org.rairlab.planner.utils.Reader.readPlanMethodFrom; /** * Created by naveensundarg on 1/13/17. diff --git a/src/main/java/com/naveensundarg/planner/utils/ProceduralAttachment.java b/src/main/java/com/naveensundarg/planner/utils/ProceduralAttachment.java index 26de45d..755a0c7 100644 --- a/src/main/java/com/naveensundarg/planner/utils/ProceduralAttachment.java +++ b/src/main/java/com/naveensundarg/planner/utils/ProceduralAttachment.java @@ -1,6 +1,6 @@ -package com.naveensundarg.planner.utils; +package org.rairlab.planner.utils; -import com.naveensundarg.shadow.prover.representations.formula.Formula; +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/utils/Reader.java b/src/main/java/com/naveensundarg/planner/utils/Reader.java index 1ea1f18..c853aff 100644 --- a/src/main/java/com/naveensundarg/planner/utils/Reader.java +++ b/src/main/java/com/naveensundarg/planner/utils/Reader.java @@ -1,10 +1,10 @@ -package com.naveensundarg.planner.utils; +package org.rairlab.planner.utils; -import com.naveensundarg.shadow.prover.representations.formula.Formula; -import com.naveensundarg.shadow.prover.representations.value.Compound; -import com.naveensundarg.shadow.prover.representations.value.Variable; -import com.naveensundarg.shadow.prover.utils.CollectionUtils; -import com.naveensundarg.planner.PlanMethod; +import org.rairlab.shadow.prover.representations.formula.Formula; +import org.rairlab.shadow.prover.representations.value.Compound; +import org.rairlab.shadow.prover.representations.value.Variable; +import org.rairlab.shadow.prover.utils.CollectionUtils; +import org.rairlab.planner.PlanMethod; import us.bpsm.edn.Keyword; import us.bpsm.edn.Symbol; import us.bpsm.edn.parser.Parseable; @@ -25,7 +25,7 @@ public class Reader { private static final Keyword ACTIONS = Keyword.newKeyword("actions"); private static final Keyword WHILE = Keyword.newKeyword("while"); - public static List readPlanMethodsFrom(InputStream inputStream) throws com.naveensundarg.shadow.prover.utils.Reader.ParsingException { + public static List readPlanMethodsFrom(InputStream inputStream) throws org.rairlab.shadow.prover.utils.Reader.ParsingException { Parseable parseable = Parsers.newParseable(new InputStreamReader(inputStream)); Parser parser = Parsers.newParser(Parsers.defaultConfiguration()); @@ -47,7 +47,7 @@ public class Reader { // (def planMethod [?x ?y ?z] {:goal [...] :action [....]) - public static PlanMethod readPlanMethodFromString(String stringSpec) throws com.naveensundarg.shadow.prover.utils.Reader.ParsingException { + public static PlanMethod readPlanMethodFromString(String stringSpec) throws org.rairlab.shadow.prover.utils.Reader.ParsingException { Parseable parseable = Parsers.newParseable(new StringReader(stringSpec)); Parser parser = Parsers.newParser(Parsers.defaultConfiguration()); @@ -57,7 +57,7 @@ public class Reader { } // (def planMethod [?x ?y ?z] {:goal [...] :action [....]) - public static PlanMethod readPlanMethodFrom(List planMethodSpec) throws com.naveensundarg.shadow.prover.utils.Reader.ParsingException { + public static PlanMethod readPlanMethodFrom(List planMethodSpec) throws org.rairlab.shadow.prover.utils.Reader.ParsingException { Object command = planMethodSpec.get(0); @@ -70,7 +70,7 @@ public class Reader { List variables = CollectionUtils.newEmptyList(); for(Symbol varSym : variableObjs){ - variables.add((Variable) com.naveensundarg.shadow.prover.utils.Reader.readLogicValueFromString(varSym.toString())); + variables.add((Variable) org.rairlab.shadow.prover.utils.Reader.readLogicValueFromString(varSym.toString())); } @@ -85,7 +85,7 @@ public class Reader { for(Object goalPrecondSpec : goalPrecondSpecs){ - goalPreconds.add(com.naveensundarg.shadow.prover.utils.Reader.readFormula(goalPrecondSpec)); + goalPreconds.add(org.rairlab.shadow.prover.utils.Reader.readFormula(goalPrecondSpec)); } @@ -93,7 +93,7 @@ public class Reader { for(Object whilePrecondSpec : whilePrecondSpecs){ - whilePreconds.add(com.naveensundarg.shadow.prover.utils.Reader.readFormula(whilePrecondSpec)); + whilePreconds.add(org.rairlab.shadow.prover.utils.Reader.readFormula(whilePrecondSpec)); } @@ -102,7 +102,7 @@ public class Reader { for(Object actionPrecondSpec : actionPrecondSpecs){ - actionCompounds.add((Compound) com.naveensundarg.shadow.prover.utils.Reader.readLogicValue(actionPrecondSpec)); + actionCompounds.add((Compound) org.rairlab.shadow.prover.utils.Reader.readLogicValue(actionPrecondSpec)); } return new PlanMethod(goalPreconds, whilePreconds, variables, actionCompounds); diff --git a/src/main/java/com/naveensundarg/planner/utils/RunDemo.java b/src/main/java/com/naveensundarg/planner/utils/RunDemo.java index cdf069a..8b79b3a 100644 --- a/src/main/java/com/naveensundarg/planner/utils/RunDemo.java +++ b/src/main/java/com/naveensundarg/planner/utils/RunDemo.java @@ -1,16 +1,16 @@ -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.google.common.collect.Sets; -import com.naveensundarg.planner.Goal; -import com.naveensundarg.planner.GoalTracker; -import com.naveensundarg.planner.Inducer; -import com.naveensundarg.planner.Plan; -import com.naveensundarg.shadow.prover.core.Prover; -import com.naveensundarg.shadow.prover.core.SnarkWrapper; -import com.naveensundarg.shadow.prover.utils.Reader; - import com.naveensundarg.planner.inducers.SimpleInducer; +import org.rairlab.planner.Goal; +import org.rairlab.planner.GoalTracker; +import org.rairlab.planner.Inducer; +import org.rairlab.planner.Plan; +import org.rairlab.shadow.prover.core.Prover; +import org.rairlab.shadow.prover.core.SnarkWrapper; +import org.rairlab.shadow.prover.utils.Reader; + import org.rairlab.planner.inducers.SimpleInducer; import org.apache.commons.lang3.tuple.Triple; import java.util.*; diff --git a/src/main/java/com/naveensundarg/planner/utils/Runner.java b/src/main/java/com/naveensundarg/planner/utils/Runner.java index d9ac3d2..d14b4eb 100644 --- a/src/main/java/com/naveensundarg/planner/utils/Runner.java +++ b/src/main/java/com/naveensundarg/planner/utils/Runner.java @@ -1,9 +1,9 @@ -package com.naveensundarg.planner.utils; +package org.rairlab.planner.utils; -import com.naveensundarg.planner.BreadthFirstPlanner; -import com.naveensundarg.planner.Plan; -import com.naveensundarg.planner.Planner; -import com.naveensundarg.shadow.prover.utils.Reader; +import org.rairlab.planner.BreadthFirstPlanner; +import org.rairlab.planner.Plan; +import org.rairlab.planner.Planner; +import org.rairlab.shadow.prover.utils.Reader; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/main/java/com/naveensundarg/planner/utils/Sandbox.java b/src/main/java/com/naveensundarg/planner/utils/Sandbox.java index 0640d23..3818e56 100644 --- a/src/main/java/com/naveensundarg/planner/utils/Sandbox.java +++ b/src/main/java/com/naveensundarg/planner/utils/Sandbox.java @@ -1,22 +1,22 @@ -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.planner.*; -import com.naveensundarg.shadow.prover.representations.formula.Predicate; +import org.rairlab.planner.*; +import org.rairlab.shadow.prover.representations.formula.Predicate; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import static com.naveensundarg.shadow.prover.utils.Reader.readFormulaFromString; +import static org.rairlab.shadow.prover.utils.Reader.readFormulaFromString; /** * Created by naveensundarg on 12/22/17. */ public class Sandbox { - public static void demoPlanMethods(String[] args) throws com.naveensundarg.shadow.prover.utils.Reader.ParsingException { + public static void demoPlanMethods(String[] args) throws org.rairlab.shadow.prover.utils.Reader.ParsingException { PlanMethod seriatedPlanMethod = (Reader.readPlanMethodsFrom(Sandbox.class.getResourceAsStream("../problems/learning/dry.clj"))).get(0); @@ -48,7 +48,7 @@ public class Sandbox { static ColoredPrinter cp = new ColoredPrinter.Builder(1, false).build(); - public static void main(String[] args) throws com.naveensundarg.shadow.prover.utils.Reader.ParsingException { + public static void main(String[] args) throws org.rairlab.shadow.prover.utils.Reader.ParsingException { diff --git a/src/main/java/com/naveensundarg/planner/utils/Visualizer.java b/src/main/java/com/naveensundarg/planner/utils/Visualizer.java index 9d04ec2..5865c50 100644 --- a/src/main/java/com/naveensundarg/planner/utils/Visualizer.java +++ b/src/main/java/com/naveensundarg/planner/utils/Visualizer.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.Ansi; diff --git a/src/test/java/com/naveensundarg/planner/DepthFirstPlannerTest.java b/src/test/java/com/naveensundarg/planner/DepthFirstPlannerTest.java index 7a9e8aa..2ffcd89 100644 --- a/src/test/java/com/naveensundarg/planner/DepthFirstPlannerTest.java +++ b/src/test/java/com/naveensundarg/planner/DepthFirstPlannerTest.java @@ -1,7 +1,7 @@ -package com.naveensundarg.planner; +package org.rairlab.planner; -import com.naveensundarg.planner.utils.PlanningProblem; -import com.naveensundarg.shadow.prover.utils.Reader; +import org.rairlab.planner.utils.PlanningProblem; +import org.rairlab.shadow.prover.utils.Reader; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; diff --git a/src/test/java/com/naveensundarg/planner/GoalTrackerTest.java b/src/test/java/com/naveensundarg/planner/GoalTrackerTest.java index 1ec176f..b684783 100644 --- a/src/test/java/com/naveensundarg/planner/GoalTrackerTest.java +++ b/src/test/java/com/naveensundarg/planner/GoalTrackerTest.java @@ -1,9 +1,9 @@ -package com.naveensundarg.planner; +package org.rairlab.planner; import com.diogonunes.jcdp.color.ColoredPrinter; import com.diogonunes.jcdp.color.api.Ansi; -import com.naveensundarg.planner.utils.GoalTrackingProblem; -import com.naveensundarg.shadow.prover.utils.Reader; +import org.rairlab.planner.utils.GoalTrackingProblem; +import org.rairlab.shadow.prover.utils.Reader; import java.util.List; diff --git a/src/test/java/com/naveensundarg/planner/HeinzGoalTrackerTest.java b/src/test/java/com/naveensundarg/planner/HeinzGoalTrackerTest.java index 456e468..1c33a46 100644 --- a/src/test/java/com/naveensundarg/planner/HeinzGoalTrackerTest.java +++ b/src/test/java/com/naveensundarg/planner/HeinzGoalTrackerTest.java @@ -1,9 +1,9 @@ -package com.naveensundarg.planner; +package org.rairlab.planner; import com.diogonunes.jcdp.color.ColoredPrinter; import com.diogonunes.jcdp.color.api.Ansi; -import com.naveensundarg.planner.utils.GoalTrackingProblem; -import com.naveensundarg.shadow.prover.utils.Reader; +import org.rairlab.planner.utils.GoalTrackingProblem; +import org.rairlab.shadow.prover.utils.Reader; import java.util.List;