Move the filename counter out so it's saved between CNF converter objects.

git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@1356 e59a4935-1847-0410-ae03-e826735625c1

diff --git a/src/STPManager/STPManager.h b/src/STPManager/STPManager.h
index e9c8601ce830ea68afae5ef11582b41cf1d777a3..83f6b0b8c1c4d8c8fb722b79f9baf4daaac799e9 100644 (file)
--- a/src/STPManager/STPManager.h
+++ b/src/STPManager/STPManager.h
@@ -172,6 +172,9 @@ namespace BEEV
     //count is used in the creation of new variables
     unsigned int _symbol_count;
 
+    // The value to append to the filename when saving the CNF.
+    unsigned int CNFFileNameCounter;
+
     /****************************************************************
      * Public Member Functions                                      *
      ****************************************************************/
@@ -182,7 +185,8 @@ namespace BEEV
       _bvconst_unique_table(),
       _interior_unique_table(),
       UserFlags(),
-      _symbol_count(0)
+      _symbol_count(0),
+      CNFFileNameCounter(0)
     {
       _max_node_num = 0;
       Begin_RemoveWrites = false;

diff --git a/src/to-sat/AIG/ToSATAIG.cpp b/src/to-sat/AIG/ToSATAIG.cpp
index d48cb820f173debc9e46b279f83b9ac3a0e43658..7d5305316b7c51fb9b03ee540b7e7374efe6df1b 100644 (file)
--- a/src/to-sat/AIG/ToSATAIG.cpp
+++ b/src/to-sat/AIG/ToSATAIG.cpp
@@ -60,7 +60,7 @@ namespace BEEV
       if (bm->UserFlags.output_CNF_flag)
       {
                stringstream fileName;
-               fileName << "output_" << CNFFileNameCounter++ << ".cnf";
+               fileName << "output_" << bm->CNFFileNameCounter++ << ".cnf";
        Cnf_DataWriteIntoFile(cnfData, (char*)fileName.str().c_str(), 0);
       }
          first = false;

diff --git a/src/to-sat/AIG/ToSATAIG.h b/src/to-sat/AIG/ToSATAIG.h
index f5b4e4bb1852c0661981653a9a8d82c5921d7bd3..5a795cb154bff0e1c48febbef81f1266192a7fe2 100644 (file)
--- a/src/to-sat/AIG/ToSATAIG.h
+++ b/src/to-sat/AIG/ToSATAIG.h
@@ -37,7 +37,6 @@ namespace BEEV
 
        int count;
        bool first;
-       int CNFFileNameCounter;
 
        ToCNFAIG toCNF;
 
@@ -45,7 +44,6 @@ namespace BEEV
     {
         count = 0;
         first = true;
-        CNFFileNameCounter =0;
         arrayTransformer = NULL;
     }