minor edits

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

diff --git a/scripts/run_stp_tests.pl b/scripts/run_stp_tests.pl
index cf30defd7ec51305d646bc1d96e1486038f73bcf..1bd10ae61ef62a92433db93ef542dd12c9b0fe11 100755 (executable)
--- a/scripts/run_stp_tests.pl
+++ b/scripts/run_stp_tests.pl
@@ -76,7 +76,7 @@ my %optionsDefault = ("level" => 4,
                      # when looking for info comments
                      "maxInfoLines" => 4,
                      # Runtime limit; 0 = no limit
-                     "time" => 30,
+                     "time" => 60,
                      # Additional command line options to stp
                      "stpOptions" => "-d");
 

diff --git a/src/to-sat/SimpBool.cpp b/src/to-sat/SimpBool.cpp
index 5ff029a8204d3eae84a7cd9ccc7105ab63b273d4..273b46a000d92246e32eea98ff3f61806e56161a 100644 (file)
--- a/src/to-sat/SimpBool.cpp
+++ b/src/to-sat/SimpBool.cpp
@@ -494,13 +494,12 @@ namespace BEEV
 //       }
     else
       {
-       ASTNode left = 
-         CreateNode(AND, child0, child1);
-       ASTNode right = 
-         CreateNode(AND,
-                    CreateNode(NOT,child0),
-                    child2);
-        retval = CreateNode(XOR, left, right);
+       ASTNode left  = CreateNode(AND, child0, child1);
+       ASTNode right = CreateNode(AND, CreateNode(NOT,child0), child2);
+       ASTVec c;
+       c.push_back(left);
+       c.push_back(right);
+        retval = CreateSimpXor(c);
       }
 
     if (_trace_simpbool)