merged upstream changes

alpha-asp · Aug 27, 2020 · 2fb34af · 2fb34af
2 parents 66baa80 + f1d1cd9
commit 2fb34af
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/at/ac/tuwien/kr/alpha/Main.java b/src/main/java/at/ac/tuwien/kr/alpha/Main.java
@@ -46,7 +46,7 @@
 import at.ac.tuwien.kr.alpha.api.Alpha;
 import at.ac.tuwien.kr.alpha.common.AnswerSet;
 import at.ac.tuwien.kr.alpha.common.AnswerSetFormatter;
-import at.ac.tuwien.kr.alpha.common.BasicAnswerSetFormatter;
+import at.ac.tuwien.kr.alpha.common.SimpleAnswerSetFormatter;
 import at.ac.tuwien.kr.alpha.common.depgraph.ComponentGraph;
 import at.ac.tuwien.kr.alpha.common.depgraph.DependencyGraph;
 import at.ac.tuwien.kr.alpha.common.graphio.ComponentGraphWriter;
@@ -188,7 +188,7 @@ private static void computeAndConsumeAnswerSets(Alpha alpha, InputConfig inputCf
 		if (!alpha.getConfig().isQuiet()) {
 			AtomicInteger counter = new AtomicInteger(0);
 			final BiConsumer<Integer, AnswerSet> answerSetHandler;
-			final AnswerSetFormatter<String> fmt = new BasicAnswerSetFormatter(alpha.getConfig().getAtomSeparator());
+			final AnswerSetFormatter<String> fmt = new SimpleAnswerSetFormatter(alpha.getConfig().getAtomSeparator());
 			BiConsumer<Integer, AnswerSet> stdoutPrinter = (n, as) -> {
 				System.out.println("Answer set " + Integer.toString(n) + ":" + System.lineSeparator() + fmt.format(as));
 			};

diff --git a/...alpha/common/BasicAnswerSetFormatter.java → ...lpha/common/SimpleAnswerSetFormatter.java b/...alpha/common/BasicAnswerSetFormatter.java → ...lpha/common/SimpleAnswerSetFormatter.java
@@ -7,11 +7,11 @@
 
 import at.ac.tuwien.kr.alpha.common.atoms.Atom;
 
-public class BasicAnswerSetFormatter implements AnswerSetFormatter<String> {
+public class SimpleAnswerSetFormatter implements AnswerSetFormatter<String> {
 
 	private final String atomSeparator;
 
-	public BasicAnswerSetFormatter(String atomSeparator) {
+	public SimpleAnswerSetFormatter(String atomSeparator) {
 		this.atomSeparator = atomSeparator;
 	}
 

diff --git a/src/main/java/at/ac/tuwien/kr/alpha/config/CommandLineParser.java b/src/main/java/at/ac/tuwien/kr/alpha/config/CommandLineParser.java
@@ -143,7 +143,7 @@ public class CommandLineParser {
 					+ SystemConfig.DEFAULT_GROUNDER_ACCUMULATOR_ENABLED + ")")
 			.build();
 	private static final Option OPT_OUTPUT_ATOM_SEPARATOR = Option.builder("sep").longOpt("atomSeparator").hasArg(true).argName("separator")
-			.desc("a character (sequence) to use s separator for atoms in printed answer sets. (default: "
+			.desc("a character (sequence) to use as separator for atoms in printed answer sets (default: "
 					+ SystemConfig.DEFAULT_ATOM_SEPARATOR + ")")
 			.build();
 	//@formatter:on

diff --git a/src/test/java/at/ac/tuwien/kr/alpha/common/AnswerSetFormatterTest.java b/src/test/java/at/ac/tuwien/kr/alpha/common/AnswerSetFormatterTest.java
@@ -7,7 +7,7 @@ public class AnswerSetFormatterTest {
 
 	@Test
 	public void basicFormatterWithSeparator() {
-		AnswerSetFormatter<String> fmt = new BasicAnswerSetFormatter(" bla ");
+		AnswerSetFormatter<String> fmt = new SimpleAnswerSetFormatter(" bla ");
 		AnswerSet as = new AnswerSetBuilder().predicate("p").instance("a").predicate("q").instance("b").build();
 		String formatted = fmt.format(as);
 		Assert.assertEquals("{ p(\"a\") bla q(\"b\") }", formatted);