programNormalizer = new NormalizeProgramTransformation(cfg.getAggregateRewritingConfig());
diff --git a/alpha-solver/src/main/java/at/ac/tuwien/kr/alpha/api/impl/AlphaImpl.java b/alpha-solver/src/main/java/at/ac/tuwien/kr/alpha/api/impl/AlphaImpl.java
index 78631d11b..f24c9df63 100644
--- a/alpha-solver/src/main/java/at/ac/tuwien/kr/alpha/api/impl/AlphaImpl.java
+++ b/alpha-solver/src/main/java/at/ac/tuwien/kr/alpha/api/impl/AlphaImpl.java
@@ -1,19 +1,19 @@
/**
* Copyright (c) 2017-2019, the Alpha Team.
* All rights reserved.
- *
+ *
* Additional changes made by Siemens.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
+ * list of conditions and the following disclaimer.
+ *
* 2) Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -79,9 +79,7 @@ public class AlphaImpl implements Alpha {
private static final Logger LOGGER = LoggerFactory.getLogger(AlphaImpl.class);
private final ProgramParser parser;
-
private final ProgramTransformation programNormalization;
-
private final Supplier stratifiedEvaluationFactory;
private final GrounderFactory grounderFactory;
private final SolverFactory solverFactory;
@@ -90,11 +88,11 @@ public class AlphaImpl implements Alpha {
private final boolean sortAnswerSets;
AlphaImpl(ProgramParser parser, ProgramTransformation programNormalization,
- Supplier stratifiedEvaluationFactory,
- GrounderFactory grounderFactory,
- SolverFactory solverFactory,
- Reifier reifier,
- boolean sortAnswerSets) {
+ Supplier stratifiedEvaluationFactory,
+ GrounderFactory grounderFactory,
+ SolverFactory solverFactory,
+ Reifier reifier,
+ boolean sortAnswerSets) {
this.parser = parser;
this.programNormalization = programNormalization;
this.stratifiedEvaluationFactory = stratifiedEvaluationFactory;
@@ -122,7 +120,7 @@ public InputProgram readProgram(InputConfig cfg) throws IOException {
@Override
public InputProgram readProgramFiles(boolean literate, Map externals, List paths) throws IOException {
- return readProgramFiles(literate, externals, paths.stream().map(Paths::get).collect(Collectors.toList()).toArray(new Path[] {}));
+ return readProgramFiles(literate, externals, paths.stream().map(Paths::get).collect(Collectors.toList()).toArray(new Path[]{}));
}
@Override
@@ -213,7 +211,7 @@ public Stream solve(NormalProgram program, java.util.function.Predica
/**
* Solves the given program and filters answer sets based on the passed predicate.
- *
+ *
* @param program an {@link InternalProgram} to solve
* @param filter {@link Predicate} filtering {@link at.ac.tuwien.kr.alpha.api.programs.Predicate}s in the returned answer sets
* @return a Stream of answer sets representing stable models of the given program
@@ -226,7 +224,7 @@ private Stream solve(CompiledProgram program, java.util.function.Pred
/**
* Prepares a solver (and accompanying grounder) instance pre-loaded with the given program. Use this if the
* solver is needed after reading answer sets (e.g. for obtaining statistics).
- *
+ *
* @param program the program to solve.
* @param filter a (java util) predicate that filters (asp-)predicates which should be contained in the answer
* set stream from the solver.
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/ActionsTest.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/ActionsTest.java
index b52ab8273..c954bfb46 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/ActionsTest.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/ActionsTest.java
@@ -3,7 +3,6 @@
import at.ac.tuwien.kr.alpha.api.Alpha;
import at.ac.tuwien.kr.alpha.api.AnswerSet;
import at.ac.tuwien.kr.alpha.api.config.SystemConfig;
-import at.ac.tuwien.kr.alpha.api.impl.AlphaFactory;
import at.ac.tuwien.kr.alpha.api.programs.InputProgram;
import at.ac.tuwien.kr.alpha.api.programs.terms.ConstantTerm;
import at.ac.tuwien.kr.alpha.api.programs.terms.FunctionTerm;
@@ -46,7 +45,7 @@ public class ActionsTest {
@Test
public void helloWorld() {
MockedActionsAlphaFactory alphaFactory = new MockedActionsAlphaFactory();
- Alpha alpha = AlphaFactory.newAlpha();
+ Alpha alpha = alphaFactory.buildInstance(new SystemConfig());
InputProgram program = alpha.readProgramString(HELLO_WORLD);
alpha.solve(program);
assertEquals("Hello World!", alphaFactory.getActionImplementationMock().getStdoutContent());
@@ -62,7 +61,7 @@ public void writeToFile() {
MockedActionsAlphaFactory alphaFactory = new MockedActionsAlphaFactory();
alphaFactory.getActionImplementationMock().setMockedFileOutputs(mockedFileOutputs);
ActionImplementationProvider actionProvider = alphaFactory.getActionImplementationMock();
- Alpha alpha = AlphaFactory.newAlpha();
+ Alpha alpha = alphaFactory.buildInstance(new SystemConfig());
InputProgram program = alpha.readProgramString(WRITE_TO_FILE);
Set answerSets = alpha.solve(program).collect(Collectors.toSet());
LOGGER.debug("Got answer sets: {}", answerSets);
@@ -70,7 +69,7 @@ public void writeToFile() {
AnswerSet answerSet = answerSets.stream().findFirst().get();
/*
* Note: We have to check answer set content here because we have no way of constructing an equal instance for
- * the outputStreamHandle that is constructed when execution the "fileOutputStream" action. *
+ * the outputStreamHandle that is constructed when executing the "fileOutputStream" action. *
*/
assertEquals(1, answerSet.query(Atoms.query(Predicates.getPredicate("outfile_open_result", 2))
.withFilter(0, term -> term instanceof ConstantTerm> && ((ConstantTerm) term).getObject().endsWith("dummy.file"))
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateLiteralSplittingTest.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateLiteralSplittingTest.java
index 13df2386e..9481ebc5f 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateLiteralSplittingTest.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateLiteralSplittingTest.java
@@ -1,15 +1,15 @@
-package at.ac.tuwien.kr.alpha.core.programs.transformation.aggregates;
+package at.ac.tuwien.kr.alpha;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import at.ac.tuwien.kr.alpha.api.programs.rules.Rule;
+import at.ac.tuwien.kr.alpha.api.programs.rules.heads.Head;
+import at.ac.tuwien.kr.alpha.core.programs.transformation.aggregates.AggregateLiteralSplitting;
+import at.ac.tuwien.kr.alpha.test.RuleParser;
+import org.junit.jupiter.api.Test;
import java.util.List;
-import org.junit.jupiter.api.Test;
-
-import at.ac.tuwien.kr.alpha.api.programs.rules.Rule;
-import at.ac.tuwien.kr.alpha.api.programs.rules.heads.Head;
-import at.ac.tuwien.kr.alpha.core.test.util.RuleParser;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AggregateLiteralSplittingTest {
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateOperatorNormalizationTest.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateOperatorNormalizationTest.java
index 3b8870c04..72ecd207b 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateOperatorNormalizationTest.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateOperatorNormalizationTest.java
@@ -1,10 +1,4 @@
-package at.ac.tuwien.kr.alpha.core.programs.transformation.aggregates;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.junit.jupiter.api.Test;
+package at.ac.tuwien.kr.alpha;
import at.ac.tuwien.kr.alpha.api.ComparisonOperator;
import at.ac.tuwien.kr.alpha.api.programs.literals.AggregateLiteral;
@@ -17,7 +11,11 @@
import at.ac.tuwien.kr.alpha.api.programs.terms.Term;
import at.ac.tuwien.kr.alpha.commons.comparisons.ComparisonOperators;
import at.ac.tuwien.kr.alpha.commons.programs.terms.Terms;
-import at.ac.tuwien.kr.alpha.core.test.util.RuleParser;
+import at.ac.tuwien.kr.alpha.core.programs.transformation.aggregates.AggregateOperatorNormalization;
+import at.ac.tuwien.kr.alpha.test.RuleParser;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
public class AggregateOperatorNormalizationTest {
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateRewritingContextTest.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateRewritingContextTest.java
index a4805b8b3..e872f081e 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateRewritingContextTest.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateRewritingContextTest.java
@@ -1,14 +1,4 @@
-package at.ac.tuwien.kr.alpha.core.programs.transformation.aggregates;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Predicate;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.junit.jupiter.api.Test;
+package at.ac.tuwien.kr.alpha;
import at.ac.tuwien.kr.alpha.api.ComparisonOperator;
import at.ac.tuwien.kr.alpha.api.programs.InputProgram;
@@ -19,7 +9,17 @@
import at.ac.tuwien.kr.alpha.commons.comparisons.ComparisonOperators;
import at.ac.tuwien.kr.alpha.commons.programs.terms.Terms;
import at.ac.tuwien.kr.alpha.core.parser.ProgramParserImpl;
+import at.ac.tuwien.kr.alpha.core.programs.transformation.aggregates.AggregateRewritingContext;
import at.ac.tuwien.kr.alpha.core.programs.transformation.aggregates.AggregateRewritingContext.AggregateInfo;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AggregateRewritingContextTest {
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateRewritingTest.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateRewritingTest.java
index e4ca8acf3..245304cc5 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateRewritingTest.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/AggregateRewritingTest.java
@@ -1,36 +1,22 @@
package at.ac.tuwien.kr.alpha;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
import at.ac.tuwien.kr.alpha.api.Alpha;
-import at.ac.tuwien.kr.alpha.api.impl.AlphaFactory;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
import at.ac.tuwien.kr.alpha.api.AnswerSet;
-import at.ac.tuwien.kr.alpha.api.Solver;
-import at.ac.tuwien.kr.alpha.api.config.SystemConfig;
+import at.ac.tuwien.kr.alpha.api.impl.AlphaFactory;
import at.ac.tuwien.kr.alpha.api.programs.InputProgram;
-import at.ac.tuwien.kr.alpha.api.programs.NormalProgram;
import at.ac.tuwien.kr.alpha.api.programs.Predicate;
-import at.ac.tuwien.kr.alpha.api.programs.ProgramParser;
import at.ac.tuwien.kr.alpha.commons.Predicates;
import at.ac.tuwien.kr.alpha.commons.programs.atoms.Atoms;
import at.ac.tuwien.kr.alpha.commons.programs.terms.Terms;
-import at.ac.tuwien.kr.alpha.core.common.AtomStore;
-import at.ac.tuwien.kr.alpha.core.common.AtomStoreImpl;
-import at.ac.tuwien.kr.alpha.core.grounder.Grounder;
-import at.ac.tuwien.kr.alpha.core.grounder.GrounderFactory;
-import at.ac.tuwien.kr.alpha.core.parser.ProgramParserImpl;
-import at.ac.tuwien.kr.alpha.core.programs.CompiledProgram;
-import at.ac.tuwien.kr.alpha.core.programs.InternalProgram;
-import at.ac.tuwien.kr.alpha.core.programs.transformation.NormalizeProgramTransformation;
-import at.ac.tuwien.kr.alpha.core.solver.SolverFactory;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AggregateRewritingTest {
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/ArithmeticTermsRewritingTest.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/ArithmeticTermsRewritingTest.java
index bbcb22734..3c6e195de 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/ArithmeticTermsRewritingTest.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/ArithmeticTermsRewritingTest.java
@@ -1,17 +1,5 @@
package at.ac.tuwien.kr.alpha;
-import static java.util.stream.Collectors.toList;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import at.ac.tuwien.kr.alpha.core.programs.transformation.ArithmeticTermsRewriting;
-import org.junit.jupiter.api.Test;
-
import at.ac.tuwien.kr.alpha.api.common.fixedinterpretations.PredicateInterpretation;
import at.ac.tuwien.kr.alpha.api.externals.Predicate;
import at.ac.tuwien.kr.alpha.api.programs.NormalProgram;
@@ -22,10 +10,21 @@
import at.ac.tuwien.kr.alpha.api.programs.rules.NormalRule;
import at.ac.tuwien.kr.alpha.api.programs.terms.ConstantTerm;
import at.ac.tuwien.kr.alpha.api.programs.terms.VariableTerm;
+import at.ac.tuwien.kr.alpha.commons.externals.Externals;
import at.ac.tuwien.kr.alpha.commons.programs.Programs;
import at.ac.tuwien.kr.alpha.commons.programs.terms.Terms;
-import at.ac.tuwien.kr.alpha.commons.externals.Externals;
import at.ac.tuwien.kr.alpha.core.parser.ProgramParserImpl;
+import at.ac.tuwien.kr.alpha.core.programs.transformation.ArithmeticTermsRewriting;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static java.util.stream.Collectors.toList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Copyright (c) 2021, the Alpha Team.
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/FixedInterpretationLiteralsTest.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/FixedInterpretationLiteralsTest.java
index 9915ef7b0..530040d78 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/FixedInterpretationLiteralsTest.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/FixedInterpretationLiteralsTest.java
@@ -1,31 +1,22 @@
package at.ac.tuwien.kr.alpha;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import at.ac.tuwien.kr.alpha.api.impl.AlphaFactory;
-import org.junit.jupiter.api.Test;
-
import at.ac.tuwien.kr.alpha.api.Alpha;
import at.ac.tuwien.kr.alpha.api.AnswerSet;
import at.ac.tuwien.kr.alpha.api.common.fixedinterpretations.PredicateInterpretation;
+import at.ac.tuwien.kr.alpha.api.impl.AlphaFactory;
import at.ac.tuwien.kr.alpha.api.programs.Predicate;
import at.ac.tuwien.kr.alpha.api.programs.atoms.Atom;
import at.ac.tuwien.kr.alpha.api.programs.terms.ConstantTerm;
import at.ac.tuwien.kr.alpha.commons.Predicates;
+import at.ac.tuwien.kr.alpha.commons.externals.AspStandardLibrary;
+import at.ac.tuwien.kr.alpha.commons.externals.Externals;
import at.ac.tuwien.kr.alpha.commons.programs.atoms.Atoms;
import at.ac.tuwien.kr.alpha.commons.programs.terms.Terms;
-import at.ac.tuwien.kr.alpha.commons.externals.Externals;
-import at.ac.tuwien.kr.alpha.commons.externals.AspStandardLibrary;
+import org.junit.jupiter.api.Test;
+
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
public class FixedInterpretationLiteralsTest {
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/RuleToStringTest.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/RuleToStringTest.java
index 7b075979e..f099fb724 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/RuleToStringTest.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/RuleToStringTest.java
@@ -23,13 +23,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package at.ac.tuwien.kr.alpha.core.grounder;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
+package at.ac.tuwien.kr.alpha;
import at.ac.tuwien.kr.alpha.api.programs.InputProgram;
import at.ac.tuwien.kr.alpha.api.programs.ProgramParser;
@@ -39,10 +33,12 @@
import at.ac.tuwien.kr.alpha.core.parser.ProgramParserImpl;
import at.ac.tuwien.kr.alpha.core.programs.rules.CompiledRule;
import at.ac.tuwien.kr.alpha.core.programs.rules.InternalRule;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
-/**
- * Tests {@link BasicRule#toString()} and {@link InternalRule#toString()}.
- */
public class RuleToStringTest {
private final ProgramParser parser = new ProgramParserImpl();
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/StratifiedEvaluationTest.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/StratifiedEvaluationTest.java
index 19ec176cb..7c6c5fdae 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/StratifiedEvaluationTest.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/StratifiedEvaluationTest.java
@@ -27,49 +27,32 @@
*/
package at.ac.tuwien.kr.alpha;
-import static at.ac.tuwien.kr.alpha.test.AlphaAssertions.assertAnswerSetsEqual;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
import at.ac.tuwien.kr.alpha.api.Alpha;
-import at.ac.tuwien.kr.alpha.api.DebugSolvingContext;
-import at.ac.tuwien.kr.alpha.api.impl.AlphaFactory;
-import at.ac.tuwien.kr.alpha.api.programs.NormalProgram;
-import at.ac.tuwien.kr.alpha.core.programs.transformation.NormalizeProgramTransformation;
-import at.ac.tuwien.kr.alpha.core.programs.transformation.StratifiedEvaluation;
-import org.junit.jupiter.api.Test;
-
import at.ac.tuwien.kr.alpha.api.AnswerSet;
-import at.ac.tuwien.kr.alpha.api.Solver;
+import at.ac.tuwien.kr.alpha.api.DebugSolvingContext;
import at.ac.tuwien.kr.alpha.api.common.fixedinterpretations.PredicateInterpretation;
-import at.ac.tuwien.kr.alpha.api.config.SystemConfig;
+import at.ac.tuwien.kr.alpha.api.impl.AlphaFactory;
import at.ac.tuwien.kr.alpha.api.programs.InputProgram;
+import at.ac.tuwien.kr.alpha.api.programs.NormalProgram;
import at.ac.tuwien.kr.alpha.api.programs.Predicate;
-import at.ac.tuwien.kr.alpha.api.programs.ProgramParser;
import at.ac.tuwien.kr.alpha.api.programs.atoms.Atom;
import at.ac.tuwien.kr.alpha.api.programs.atoms.BasicAtom;
import at.ac.tuwien.kr.alpha.commons.Predicates;
+import at.ac.tuwien.kr.alpha.commons.externals.Externals;
import at.ac.tuwien.kr.alpha.commons.programs.atoms.Atoms;
import at.ac.tuwien.kr.alpha.commons.programs.terms.Terms;
-import at.ac.tuwien.kr.alpha.commons.substitutions.Instance;
-import at.ac.tuwien.kr.alpha.core.common.AtomStore;
-import at.ac.tuwien.kr.alpha.core.common.AtomStoreImpl;
-import at.ac.tuwien.kr.alpha.commons.externals.Externals;
-import at.ac.tuwien.kr.alpha.core.grounder.Grounder;
-import at.ac.tuwien.kr.alpha.core.grounder.GrounderFactory;
-import at.ac.tuwien.kr.alpha.core.parser.ProgramParserImpl;
-import at.ac.tuwien.kr.alpha.core.programs.AnalyzedProgram;
-import at.ac.tuwien.kr.alpha.core.programs.CompiledProgram;
-import at.ac.tuwien.kr.alpha.core.programs.InternalProgram;
-import at.ac.tuwien.kr.alpha.core.solver.SolverFactory;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static at.ac.tuwien.kr.alpha.test.AlphaAssertions.assertAnswerSetsEqual;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class StratifiedEvaluationTest {
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/api/impl/AlphaImplTest.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/api/impl/AlphaImplTest.java
index c26b6c66d..9b25373ec 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/api/impl/AlphaImplTest.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/api/impl/AlphaImplTest.java
@@ -163,7 +163,7 @@ public void addsFacts() {
List things = asList(a, b);
InputProgram program = Programs.builder().addFacts(Externals.asFacts(Thingy.class, things)).build();
Set actual = system.solve(program).collect(Collectors.toSet());
- Set expected = new HashSet<>(singletonList(new AnswerSetBuilder().predicate("thingy").instance(a).instance(b).build()));
+ Set expected = Set.of(new AnswerSetBuilder().predicate("thingy").instance(a).instance(b).build());
assertEquals(expected, actual);
}
@@ -678,6 +678,7 @@ private void problematicRun(String program, long seed, int limit) throws IOExcep
// Detailed reproduction test-case for github issue #239.
@Test
+ @Disabled("This test relies on stratified evaluation being disabled, which is not supported anymore.")
public void testLearnedUnaryNoGoodCausingOutOfOrderLiteralsConflict() throws IOException {
final ProgramParser parser = new ProgramParserImpl();
InputProgramBuilder bld = Programs.builder();
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/regressiontests/SolverTests.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/regressiontests/SolverTests.java
index c992ae820..65556fc3e 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/regressiontests/SolverTests.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/regressiontests/SolverTests.java
@@ -27,16 +27,6 @@
*/
package at.ac.tuwien.kr.alpha.regressiontests;
-import static at.ac.tuwien.kr.alpha.regressiontests.util.RegressionTestUtils.*;
-import static java.util.Collections.singleton;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-
import at.ac.tuwien.kr.alpha.api.AnswerSet;
import at.ac.tuwien.kr.alpha.api.Solver;
import at.ac.tuwien.kr.alpha.api.config.SystemConfig;
@@ -49,11 +39,15 @@
import at.ac.tuwien.kr.alpha.commons.programs.Programs;
import at.ac.tuwien.kr.alpha.commons.programs.atoms.Atoms;
import at.ac.tuwien.kr.alpha.commons.programs.terms.Terms;
-import at.ac.tuwien.kr.alpha.core.common.AtomStore;
-import at.ac.tuwien.kr.alpha.core.common.AtomStoreImpl;
import at.ac.tuwien.kr.alpha.regressiontests.util.RegressionTest;
import at.ac.tuwien.kr.alpha.test.AnswerSetsParser;
+import java.util.*;
+
+import static at.ac.tuwien.kr.alpha.regressiontests.util.RegressionTestUtils.*;
+import static java.util.Collections.singleton;
+import static org.junit.jupiter.api.Assertions.*;
+
public class SolverTests {
private static class Thingy implements Comparable {
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/regressiontests/StratifiedEvaluationRegressionTest.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/regressiontests/StratifiedEvaluationRegressionTest.java
index db0f40009..ada29162d 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/regressiontests/StratifiedEvaluationRegressionTest.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/regressiontests/StratifiedEvaluationRegressionTest.java
@@ -113,7 +113,7 @@ public void runTest(String aspString, Consumer programVerifier,
LOGGER.debug("Testing ASP String {}", aspString);
// Parse and pre-evaluate program
// Alpha instance with default config, stratified evaluation enabled
- Alpha alpha =AlphaFactory.newAlpha();
+ Alpha alpha = AlphaFactory.newAlpha();
InputProgram input = alpha.readProgramString(aspString);
DebugSolvingContext dbgInfo = alpha.prepareDebugSolve(input);
NormalProgram evaluated = dbgInfo.getPreprocessedProgram();
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/regressiontests/util/RegressionTestUtils.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/regressiontests/util/RegressionTestUtils.java
index 0629c8be1..c4301385b 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/regressiontests/util/RegressionTestUtils.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/regressiontests/util/RegressionTestUtils.java
@@ -1,16 +1,5 @@
package at.ac.tuwien.kr.alpha.regressiontests.util;
-import static at.ac.tuwien.kr.alpha.test.AlphaAssertions.assertAnswerSetsEqual;
-import static at.ac.tuwien.kr.alpha.test.AlphaAssertions.assertAnswerSetsEqualWithBase;
-import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
-
-import java.time.Duration;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.function.Executable;
-
import at.ac.tuwien.kr.alpha.api.Alpha;
import at.ac.tuwien.kr.alpha.api.AnswerSet;
import at.ac.tuwien.kr.alpha.api.Solver;
@@ -19,6 +8,16 @@
import at.ac.tuwien.kr.alpha.api.config.SystemConfig;
import at.ac.tuwien.kr.alpha.api.impl.AlphaFactory;
import at.ac.tuwien.kr.alpha.api.programs.InputProgram;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.function.Executable;
+
+import java.time.Duration;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static at.ac.tuwien.kr.alpha.test.AlphaAssertions.assertAnswerSetsEqual;
+import static at.ac.tuwien.kr.alpha.test.AlphaAssertions.assertAnswerSetsEqualWithBase;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
public final class RegressionTestUtils {
@@ -38,7 +37,7 @@ public static Solver buildSolverForRegressionTest(String programString, SystemCo
}
public static Solver buildSolverForRegressionTest(InputProgram program, SystemConfig cfg) {
- Alpha alpha =AlphaFactory.newAlpha(cfg);
+ Alpha alpha = AlphaFactory.newAlpha(cfg);
return alpha.prepareSolverFor(program, InputConfig.DEFAULT_FILTER);
}
diff --git a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/test/util/MockedActionsAlphaFactory.java b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/test/util/MockedActionsAlphaFactory.java
index 82d6863d0..fffd0cd20 100644
--- a/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/test/util/MockedActionsAlphaFactory.java
+++ b/alpha-solver/src/test/java/at/ac/tuwien/kr/alpha/test/util/MockedActionsAlphaFactory.java
@@ -8,6 +8,7 @@ public class MockedActionsAlphaFactory extends AlphaFactory {
private MockActionImplementationProvider actionImplementationMock = new MockActionImplementationProvider("");
+
public MockActionImplementationProvider getActionImplementationMock() {
return actionImplementationMock;
}
@@ -16,6 +17,7 @@ public void setActionImplementationMock(MockActionImplementationProvider actionI
this.actionImplementationMock = actionImplementationMock;
}
+ @Override
protected ActionImplementationProvider newActionImplementationProvider() {
return actionImplementationMock;
}