Separate clause counting and clause checking.

Author: eladrion

src/main/java/nl/uu/cs/ape/solver/minisat/SATSynthesisEngine.java

@@ -278,7 +278,7 @@ public boolean synthesisEncoding() throws IOException {
          * counted again.
          */
         int variables = mappings.getSize();
-        int clauses = APEUtils.countCNFClauses(new FileInputStream(cnfEncoding), false);
+        int clauses = APEUtils.countCNFClauses(new FileInputStream(cnfEncoding));
         String satInputHeader = "p cnf " + variables + " " + clauses + "\n";
         APEUtils.timerRestartAndPrint(currLengthTimer, "Reading rows");
         satInputFile = APEFiles.prependToFile(satInputHeader, cnfEncoding);

src/main/java/nl/uu/cs/ape/utils/APEUtils.java

@@ -471,17 +471,11 @@ public static void timerPrintText(String timerID, String text) {
 
     /**
      * This function counts the CNF clauses in a stream, assuming correct CNF syntax.
-     * If verifyClauseSyntax is true, the syntax of the file is checked.
      *
      * @param cnfEncoding the CNF encoding
-     * @param verifyClauseSyntax if the clause syntax shall be verified
      * @return the count of non-empty clauses
      */
-    public static int countCNFClauses(InputStream cnfEncoding, boolean verifyClauseSyntax) {
-
-        if (verifyClauseSyntax) {
-            return countCNFClauses(cnfEncoding);
-        }
+    public static int countCNFClauses(InputStream cnfEncoding) {
 
         int count = 0;
         try (BufferedReader b = new BufferedReader(new InputStreamReader(cnfEncoding))) {
@@ -503,7 +497,7 @@ public static int countCNFClauses(InputStream cnfEncoding, boolean verifyClauseS
      * @param cnfEncoding the CNF encoding
      * @return the count of non-empty clauses
      */
-    public static int countCNFClauses(InputStream cnfEncoding) {
+    public static int checkCNFClauses(InputStream cnfEncoding) {
 
         int clauseCount = 0;
         int litCount    = 0;