Merge branch 'refs/heads/develop'

7 months ago · 4a5b6acdea
parent 705ddabff8 fcceb668e1
commit 4a5b6acdea
5 changed files with 4 additions and 1 deletions
--- a/TestPaperGenerationSystem.jar
+++ b/TestPaperGenerationSystem.jar
--- a/out/artifacts/TestPaperGenerationSystem_jar/TestPaperGenerationSystem.jar
+++ b/out/artifacts/TestPaperGenerationSystem_jar/TestPaperGenerationSystem.jar
--- a/out/production/TestPaperGenerationSystem/AbstractProblemGenerator$1.class
+++ b/out/production/TestPaperGenerationSystem/AbstractProblemGenerator$1.class
--- a/out/production/TestPaperGenerationSystem/AbstractProblemGenerator.class
+++ b/out/production/TestPaperGenerationSystem/AbstractProblemGenerator.class
--- a/src/AbstractProblemGenerator.java
+++ b/src/AbstractProblemGenerator.java
@ -80,7 +80,10 @@ public abstract class AbstractProblemGenerator implements IProblemGenerator {
      }
    }

-    addParentheses(operands, operators);
+    if(!nonNegativeOnly) {
+      addParentheses(operands, operators);
+    }
+
    return new Equation(operands, operators);
  }