rairlab/Spectra
1
0
Fork 0
mirror of https://github.com/RAIRLab/Spectra.git synced 2024-11-21 00:16:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Renaming imports to support ShadowProver changes

Browse source
This commit is contained in:
Brandon Rozek 2023-10-27 10:57:15 -04:00
parent 08b9c01f3e
commit aad79404af
No known key found for this signature in database
GPG key ID: 26E457DA82C9F480
34 changed files with 180 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pom.xml
View file

@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>com.naveensundarg</groupId> <groupId>org.rairlab</groupId>
<artifactId>planner</artifactId> <artifactId>planner</artifactId>
<version>0.50</version> <version>0.50</version>
@ -20,7 +20,7 @@
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
<mainClass>com.naveensundarg.planner.Py4JServer</mainClass> <mainClass>org.rairlab.planner.Py4JServer</mainClass>
</manifest> </manifest>
</archive> </archive>
<descriptorRefs> <descriptorRefs>
@ -39,7 +39,7 @@
<archive> <archive>
<manifest> <manifest>
<addClasspath>true</addClasspath> <addClasspath>true</addClasspath>
<mainClass>com.naveensundarg.planner.Py4JServer</mainClass> <mainClass>org.rairlab.planner.Py4JServer</mainClass>
</manifest> </manifest>
</archive> </archive>
<descriptorRefs> <descriptorRefs>
@ -61,7 +61,7 @@
<dependency> <dependency>
<groupId>com.naveensundarg</groupId> <groupId>org.rairlab</groupId>
<artifactId>prover</artifactId> <artifactId>prover</artifactId>
<version>1.40</version> <version>1.40</version>
</dependency> </dependency>

4
run_spectra.sh
View file

@ -19,7 +19,7 @@ if ! command -v mvn > /dev/null; then
fi 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"

18
src/main/java/com/naveensundarg/planner/Action.java
View file

@ -1,13 +1,13 @@
package com.naveensundarg.planner; package org.rairlab.planner;
import com.naveensundarg.shadow.prover.core.Logic; import org.rairlab.shadow.prover.core.Logic;
import com.naveensundarg.shadow.prover.representations.formula.And; import org.rairlab.shadow.prover.representations.formula.And;
import com.naveensundarg.shadow.prover.representations.formula.Formula; import org.rairlab.shadow.prover.representations.formula.Formula;
import com.naveensundarg.shadow.prover.representations.value.Compound; import org.rairlab.shadow.prover.representations.value.Compound;
import com.naveensundarg.shadow.prover.representations.value.Value; import org.rairlab.shadow.prover.representations.value.Value;
import com.naveensundarg.shadow.prover.representations.value.Variable; import org.rairlab.shadow.prover.representations.value.Variable;
import com.naveensundarg.shadow.prover.utils.CollectionUtils; import org.rairlab.shadow.prover.utils.CollectionUtils;
import com.naveensundarg.shadow.prover.utils.Sets; import org.rairlab.shadow.prover.utils.Sets;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

4
src/main/java/com/naveensundarg/planner/BreadthFirstPlanner.java
View file

@ -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.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;

2
src/main/java/com/naveensundarg/planner/Context.java
View file

@ -1,4 +1,4 @@
package com.naveensundarg.planner; package org.rairlab.planner;
import java.util.List; import java.util.List;

6
src/main/java/com/naveensundarg/planner/ContextNormPlanner.java
View file

@ -1,7 +1,7 @@
package com.naveensundarg.planner; package org.rairlab.planner;
import com.naveensundarg.planner.utils.PlanningProblem; import org.rairlab.planner.utils.PlanningProblem;
import com.naveensundarg.shadow.prover.representations.formula.Formula; import org.rairlab.shadow.prover.representations.formula.Formula;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;

16
src/main/java/com/naveensundarg/planner/DepthFirstPlanner.java
View file

@ -1,12 +1,12 @@
package com.naveensundarg.planner; package org.rairlab.planner;
import com.naveensundarg.planner.utils.Commons; import org.rairlab.planner.utils.Commons;
import com.naveensundarg.planner.utils.PlanningProblem; import org.rairlab.planner.utils.PlanningProblem;
import com.naveensundarg.planner.utils.Visualizer; import org.rairlab.planner.utils.Visualizer;
import com.naveensundarg.shadow.prover.core.proof.Justification; import org.rairlab.shadow.prover.core.proof.Justification;
import com.naveensundarg.shadow.prover.representations.formula.Formula; import org.rairlab.shadow.prover.representations.formula.Formula;
import com.naveensundarg.shadow.prover.utils.CollectionUtils; 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.Pair;

2
src/main/java/com/naveensundarg/planner/Goal.java
View file

@ -1,4 +1,4 @@
package com.naveensundarg.planner; package org.rairlab.planner;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;

10
src/main/java/com/naveensundarg/planner/GoalTracker.java
View file

@ -1,9 +1,9 @@
package com.naveensundarg.planner; package org.rairlab.planner;
import com.naveensundarg.planner.utils.PlanningProblem; import org.rairlab.planner.utils.PlanningProblem;
import com.naveensundarg.shadow.prover.representations.formula.Formula; import org.rairlab.shadow.prover.representations.formula.Formula;
import com.naveensundarg.shadow.prover.utils.CollectionUtils; import org.rairlab.shadow.prover.utils.CollectionUtils;
import com.naveensundarg.shadow.prover.utils.Sets; import org.rairlab.shadow.prover.utils.Sets;
import java.util.Comparator; import java.util.Comparator;
import java.util.Optional; import java.util.Optional;

4
src/main/java/com/naveensundarg/planner/Inducer.java
View file

@ -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. * Created by naveensundarg on 12/19/17.

24
src/main/java/com/naveensundarg/planner/Operations.java
View file

@ -1,17 +1,17 @@
package com.naveensundarg.planner; package org.rairlab.planner;
import com.naveensundarg.planner.utils.Visualizer; import org.rairlab.planner.utils.Visualizer;
import com.naveensundarg.shadow.prover.core.Prover; import org.rairlab.shadow.prover.core.Prover;
import com.naveensundarg.shadow.prover.core.SnarkWrapper; import org.rairlab.shadow.prover.core.SnarkWrapper;
import com.naveensundarg.shadow.prover.core.proof.Justification; import org.rairlab.shadow.prover.core.proof.Justification;
import com.naveensundarg.shadow.prover.representations.formula.BiConditional; import org.rairlab.shadow.prover.representations.formula.BiConditional;
import com.naveensundarg.shadow.prover.representations.formula.Formula; import org.rairlab.shadow.prover.representations.formula.Formula;
import com.naveensundarg.shadow.prover.representations.formula.Predicate; import org.rairlab.shadow.prover.representations.formula.Predicate;
import com.naveensundarg.shadow.prover.representations.value.Value; import org.rairlab.shadow.prover.representations.value.Value;
import com.naveensundarg.shadow.prover.representations.value.Variable; import org.rairlab.shadow.prover.representations.value.Variable;
import com.naveensundarg.shadow.prover.utils.CollectionUtils; 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.Pair;
import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Triple; import org.apache.commons.lang3.tuple.Triple;

8
src/main/java/com/naveensundarg/planner/Plan.java
View file

@ -1,8 +1,8 @@
package com.naveensundarg.planner; package org.rairlab.planner;
import com.naveensundarg.planner.utils.Visualizer; import org.rairlab.planner.utils.Visualizer;
import com.naveensundarg.shadow.prover.representations.formula.Formula; import org.rairlab.shadow.prover.representations.formula.Formula;
import com.naveensundarg.shadow.prover.utils.CollectionUtils; import org.rairlab.shadow.prover.utils.CollectionUtils;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;

20
src/main/java/com/naveensundarg/planner/PlanMethod.java
View file

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

6
src/main/java/com/naveensundarg/planner/PlanSketch.java
View file

@ -1,7 +1,7 @@
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 com.naveensundarg.shadow.prover.utils.CollectionUtils; import org.rairlab.shadow.prover.utils.CollectionUtils;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;

6
src/main/java/com/naveensundarg/planner/Planner.java
View file

@ -1,7 +1,7 @@
package com.naveensundarg.planner; package org.rairlab.planner;
import com.naveensundarg.planner.utils.PlanningProblem; import org.rairlab.planner.utils.PlanningProblem;
import com.naveensundarg.shadow.prover.representations.formula.Formula; import org.rairlab.shadow.prover.representations.formula.Formula;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;

16
src/main/java/com/naveensundarg/planner/Py4JServer.java
View file

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

12
src/main/java/com/naveensundarg/planner/Simplifier.java
View file

@ -1,10 +1,10 @@
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 com.naveensundarg.shadow.prover.representations.formula.Predicate; import org.rairlab.shadow.prover.representations.formula.Predicate;
import com.naveensundarg.shadow.prover.representations.value.Compound; import org.rairlab.shadow.prover.representations.value.Compound;
import com.naveensundarg.shadow.prover.representations.value.Constant; import org.rairlab.shadow.prover.representations.value.Constant;
import com.naveensundarg.shadow.prover.representations.value.Value; import org.rairlab.shadow.prover.representations.value.Value;
import java.util.Arrays; import java.util.Arrays;
import java.util.function.Function; import java.util.function.Function;

12
src/main/java/com/naveensundarg/planner/State.java
View file

@ -1,10 +1,10 @@
package com.naveensundarg.planner; package org.rairlab.planner;
import com.naveensundarg.shadow.prover.core.Prover; import org.rairlab.shadow.prover.core.Prover;
import com.naveensundarg.shadow.prover.core.SnarkWrapper; import org.rairlab.shadow.prover.core.SnarkWrapper;
import com.naveensundarg.shadow.prover.representations.formula.Formula; import org.rairlab.shadow.prover.representations.formula.Formula;
import com.naveensundarg.shadow.prover.utils.CollectionUtils; import org.rairlab.shadow.prover.utils.CollectionUtils;
import com.naveensundarg.shadow.prover.utils.Reader; import org.rairlab.shadow.prover.utils.Reader;
import java.util.Set; import java.util.Set;

18
src/main/java/com/naveensundarg/planner/inducers/SimpleInducer.java
View file

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

12
src/main/java/com/naveensundarg/planner/utils/Commons.java
View file

@ -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.ColoredPrinter;
import com.diogonunes.jcdp.color.api.Ansi; import com.diogonunes.jcdp.color.api.Ansi;
import com.naveensundarg.shadow.prover.representations.formula.And; import org.rairlab.shadow.prover.representations.formula.And;
import com.naveensundarg.shadow.prover.representations.formula.Formula; import org.rairlab.shadow.prover.representations.formula.Formula;
import com.naveensundarg.shadow.prover.representations.value.Value; import org.rairlab.shadow.prover.representations.value.Value;
import com.naveensundarg.shadow.prover.representations.value.Variable; import org.rairlab.shadow.prover.representations.value.Variable;
import com.naveensundarg.shadow.prover.utils.CollectionUtils; import org.rairlab.shadow.prover.utils.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;

2
src/main/java/com/naveensundarg/planner/utils/FrozenPrinter.java
View file

@ -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.ColoredPrinter;
import com.diogonunes.jcdp.color.api.AbstractColoredPrinter; import com.diogonunes.jcdp.color.api.AbstractColoredPrinter;

16
src/main/java/com/naveensundarg/planner/utils/GoalTrackingProblem.java
View file

@ -1,11 +1,11 @@
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 com.naveensundarg.shadow.prover.utils.CollectionUtils; import org.rairlab.shadow.prover.utils.CollectionUtils;
import com.naveensundarg.shadow.prover.utils.Reader; import org.rairlab.shadow.prover.utils.Reader;
import com.naveensundarg.planner.Goal; import org.rairlab.planner.Goal;
import com.naveensundarg.planner.PlanMethod; import org.rairlab.planner.PlanMethod;
import com.naveensundarg.planner.State; import org.rairlab.planner.State;
import us.bpsm.edn.Keyword; import us.bpsm.edn.Keyword;
import us.bpsm.edn.parser.Parseable; import us.bpsm.edn.parser.Parseable;
import us.bpsm.edn.parser.Parser; import us.bpsm.edn.parser.Parser;
@ -16,7 +16,7 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.*; 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. * Created by naveensundarg on 1/13/17.

8
src/main/java/com/naveensundarg/planner/utils/IndefiniteAction.java
View file

@ -1,8 +1,8 @@
package com.naveensundarg.planner.utils; package org.rairlab.planner.utils;
import com.naveensundarg.planner.Action; import org.rairlab.planner.Action;
import com.naveensundarg.shadow.prover.representations.formula.Formula; import org.rairlab.shadow.prover.representations.formula.Formula;
import com.naveensundarg.shadow.prover.representations.value.Variable; import org.rairlab.shadow.prover.representations.value.Variable;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;

12
src/main/java/com/naveensundarg/planner/utils/LearningSystem.java
View file

@ -1,11 +1,11 @@
package com.naveensundarg.planner.utils; package org.rairlab.planner.utils;
import com.diogonunes.jcdp.color.ColoredPrinter; import com.diogonunes.jcdp.color.ColoredPrinter;
import com.naveensundarg.planner.DepthFirstPlanner; import org.rairlab.planner.DepthFirstPlanner;
import com.naveensundarg.planner.GoalTracker; import org.rairlab.planner.GoalTracker;
import com.naveensundarg.planner.Plan; import org.rairlab.planner.Plan;
import com.naveensundarg.planner.Planner; import org.rairlab.planner.Planner;
import com.naveensundarg.shadow.prover.utils.Reader; import org.rairlab.shadow.prover.utils.Reader;
import org.apache.commons.lang3.tuple.Triple; import org.apache.commons.lang3.tuple.Triple;
import java.util.ArrayList; import java.util.ArrayList;

24
src/main/java/com/naveensundarg/planner/utils/PlanningProblem.java
View file

@ -1,15 +1,15 @@
package com.naveensundarg.planner.utils; package org.rairlab.planner.utils;
import com.naveensundarg.planner.Context; import org.rairlab.planner.Context;
import com.naveensundarg.shadow.prover.representations.formula.Formula; import org.rairlab.shadow.prover.representations.formula.Formula;
import com.naveensundarg.shadow.prover.representations.value.Value; import org.rairlab.shadow.prover.representations.value.Value;
import com.naveensundarg.shadow.prover.representations.value.Variable; import org.rairlab.shadow.prover.representations.value.Variable;
import com.naveensundarg.shadow.prover.utils.CollectionUtils; import org.rairlab.shadow.prover.utils.CollectionUtils;
import com.naveensundarg.shadow.prover.utils.Reader; import org.rairlab.shadow.prover.utils.Reader;
import com.naveensundarg.shadow.prover.utils.Sets; import org.rairlab.shadow.prover.utils.Sets;
import com.naveensundarg.planner.Action; import org.rairlab.planner.Action;
import com.naveensundarg.planner.PlanMethod; import org.rairlab.planner.PlanMethod;
import com.naveensundarg.planner.State; import org.rairlab.planner.State;
import us.bpsm.edn.Keyword; import us.bpsm.edn.Keyword;
import us.bpsm.edn.Symbol; import us.bpsm.edn.Symbol;
import us.bpsm.edn.parser.Parseable; import us.bpsm.edn.parser.Parseable;
@ -23,7 +23,7 @@ import java.io.StringReader;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; 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. * Created by naveensundarg on 1/13/17.

4
src/main/java/com/naveensundarg/planner/utils/ProceduralAttachment.java
View file

@ -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.Optional;
import java.util.Set; import java.util.Set;

26
src/main/java/com/naveensundarg/planner/utils/Reader.java
View file

@ -1,10 +1,10 @@
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 com.naveensundarg.shadow.prover.representations.value.Compound; import org.rairlab.shadow.prover.representations.value.Compound;
import com.naveensundarg.shadow.prover.representations.value.Variable; import org.rairlab.shadow.prover.representations.value.Variable;
import com.naveensundarg.shadow.prover.utils.CollectionUtils; import org.rairlab.shadow.prover.utils.CollectionUtils;
import com.naveensundarg.planner.PlanMethod; import org.rairlab.planner.PlanMethod;
import us.bpsm.edn.Keyword; import us.bpsm.edn.Keyword;
import us.bpsm.edn.Symbol; import us.bpsm.edn.Symbol;
import us.bpsm.edn.parser.Parseable; 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 ACTIONS = Keyword.newKeyword("actions");
private static final Keyword WHILE = Keyword.newKeyword("while"); private static final Keyword WHILE = Keyword.newKeyword("while");
public static List<PlanMethod> readPlanMethodsFrom(InputStream inputStream) throws com.naveensundarg.shadow.prover.utils.Reader.ParsingException { public static List<PlanMethod> readPlanMethodsFrom(InputStream inputStream) throws org.rairlab.shadow.prover.utils.Reader.ParsingException {
Parseable parseable = Parsers.newParseable(new InputStreamReader(inputStream)); Parseable parseable = Parsers.newParseable(new InputStreamReader(inputStream));
Parser parser = Parsers.newParser(Parsers.defaultConfiguration()); Parser parser = Parsers.newParser(Parsers.defaultConfiguration());
@ -47,7 +47,7 @@ public class Reader {
// (def planMethod [?x ?y ?z] {:goal [...] :action [....]) // (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)); Parseable parseable = Parsers.newParseable(new StringReader(stringSpec));
Parser parser = Parsers.newParser(Parsers.defaultConfiguration()); Parser parser = Parsers.newParser(Parsers.defaultConfiguration());
@ -57,7 +57,7 @@ public class Reader {
} }
// (def planMethod [?x ?y ?z] {:goal [...] :action [....]) // (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); Object command = planMethodSpec.get(0);
@ -70,7 +70,7 @@ public class Reader {
List<Variable> variables = CollectionUtils.newEmptyList(); List<Variable> variables = CollectionUtils.newEmptyList();
for(Symbol varSym : variableObjs){ 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){ 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){ 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){ 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); return new PlanMethod(goalPreconds, whilePreconds, variables, actionCompounds);

18
src/main/java/com/naveensundarg/planner/utils/RunDemo.java
View file

@ -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.ColoredPrinter;
import com.diogonunes.jcdp.color.api.Ansi; import com.diogonunes.jcdp.color.api.Ansi;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.naveensundarg.planner.Goal; import org.rairlab.planner.Goal;
import com.naveensundarg.planner.GoalTracker; import org.rairlab.planner.GoalTracker;
import com.naveensundarg.planner.Inducer; import org.rairlab.planner.Inducer;
import com.naveensundarg.planner.Plan; import org.rairlab.planner.Plan;
import com.naveensundarg.shadow.prover.core.Prover; import org.rairlab.shadow.prover.core.Prover;
import com.naveensundarg.shadow.prover.core.SnarkWrapper; import org.rairlab.shadow.prover.core.SnarkWrapper;
import com.naveensundarg.shadow.prover.utils.Reader; import org.rairlab.shadow.prover.utils.Reader;
import com.naveensundarg.planner.inducers.SimpleInducer; import org.rairlab.planner.inducers.SimpleInducer;
import org.apache.commons.lang3.tuple.Triple; import org.apache.commons.lang3.tuple.Triple;
import java.util.*; import java.util.*;

10
src/main/java/com/naveensundarg/planner/utils/Runner.java
View file

@ -1,9 +1,9 @@
package com.naveensundarg.planner.utils; package org.rairlab.planner.utils;
import com.naveensundarg.planner.BreadthFirstPlanner; import org.rairlab.planner.BreadthFirstPlanner;
import com.naveensundarg.planner.Plan; import org.rairlab.planner.Plan;
import com.naveensundarg.planner.Planner; import org.rairlab.planner.Planner;
import com.naveensundarg.shadow.prover.utils.Reader; import org.rairlab.shadow.prover.utils.Reader;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

12
src/main/java/com/naveensundarg/planner/utils/Sandbox.java
View file

@ -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.ColoredPrinter;
import com.diogonunes.jcdp.color.api.Ansi; import com.diogonunes.jcdp.color.api.Ansi;
import com.naveensundarg.planner.*; import org.rairlab.planner.*;
import com.naveensundarg.shadow.prover.representations.formula.Predicate; import org.rairlab.shadow.prover.representations.formula.Predicate;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; 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. * Created by naveensundarg on 12/22/17.
*/ */
public class Sandbox { 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); 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(); 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 {

2
src/main/java/com/naveensundarg/planner/utils/Visualizer.java
View file

@ -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.ColoredPrinter;
import com.diogonunes.jcdp.color.api.Ansi; import com.diogonunes.jcdp.color.api.Ansi;

6
src/test/java/com/naveensundarg/planner/DepthFirstPlannerTest.java
View file

@ -1,7 +1,7 @@
package com.naveensundarg.planner; package org.rairlab.planner;
import com.naveensundarg.planner.utils.PlanningProblem; import org.rairlab.planner.utils.PlanningProblem;
import com.naveensundarg.shadow.prover.utils.Reader; import org.rairlab.shadow.prover.utils.Reader;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;

6
src/test/java/com/naveensundarg/planner/GoalTrackerTest.java
View file

@ -1,9 +1,9 @@
package com.naveensundarg.planner; package org.rairlab.planner;
import com.diogonunes.jcdp.color.ColoredPrinter; import com.diogonunes.jcdp.color.ColoredPrinter;
import com.diogonunes.jcdp.color.api.Ansi; import com.diogonunes.jcdp.color.api.Ansi;
import com.naveensundarg.planner.utils.GoalTrackingProblem; import org.rairlab.planner.utils.GoalTrackingProblem;
import com.naveensundarg.shadow.prover.utils.Reader; import org.rairlab.shadow.prover.utils.Reader;
import java.util.List; import java.util.List;

6
src/test/java/com/naveensundarg/planner/HeinzGoalTrackerTest.java
View file

@ -1,9 +1,9 @@
package com.naveensundarg.planner; package org.rairlab.planner;
import com.diogonunes.jcdp.color.ColoredPrinter; import com.diogonunes.jcdp.color.ColoredPrinter;
import com.diogonunes.jcdp.color.api.Ansi; import com.diogonunes.jcdp.color.api.Ansi;
import com.naveensundarg.planner.utils.GoalTrackingProblem; import org.rairlab.planner.utils.GoalTrackingProblem;
import com.naveensundarg.shadow.prover.utils.Reader; import org.rairlab.shadow.prover.utils.Reader;
import java.util.List; import java.util.List;