Updated minisat

diff --git a/libs/minisat/Alg.h b/libs/minisat/Alg.h
index 7f7eac61fbc8fe8600bf90867e1dd789c4938af1..ddb972e772bc0775840a98e0a02cf20e344ebeeb 100644 (file)
--- a/libs/minisat/Alg.h
+++ b/libs/minisat/Alg.h
@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Alg_h
 #define Minisat_Alg_h
 
-#include "libs/minisat/Vec.h"
+#include "Vec.h"
 
 namespace Minisat {
 

diff --git a/libs/minisat/Alloc.h b/libs/minisat/Alloc.h
index 0de4f07ca02a397fdd19e393bc2cab5ab3208763..6591dcd555d4f412200c15beb25fa382345148a9 100644 (file)
--- a/libs/minisat/Alloc.h
+++ b/libs/minisat/Alloc.h
@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Alloc_h
 #define Minisat_Alloc_h
 
-#include "libs/minisat/XAlloc.h"
-#include "libs/minisat/Vec.h"
+#include "XAlloc.h"
+#include "Vec.h"
 
 namespace Minisat {
 

diff --git a/libs/minisat/Dimacs.h b/libs/minisat/Dimacs.h
index 383e894bef8645cdc11ad56d51164d1b84f293e8..ccfa1c013537629ab7af670745ea43f8f88ee53e 100644 (file)
--- a/libs/minisat/Dimacs.h
+++ b/libs/minisat/Dimacs.h
@@ -23,8 +23,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 #include <stdio.h>
 
-#include "libs/minisat/ParseUtils.h"
-#include "libs/minisat/SolverTypes.h"
+#include "ParseUtils.h"
+#include "SolverTypes.h"
 
 namespace Minisat {
 

diff --git a/libs/minisat/Heap.h b/libs/minisat/Heap.h
index a75124627437e4cf45bd3902134d3897cd6312f9..057a3cdf247be9b4b18357cb738fee7e20b2b80b 100644 (file)
--- a/libs/minisat/Heap.h
+++ b/libs/minisat/Heap.h
@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Heap_h
 #define Minisat_Heap_h
 
-#include "libs/minisat/Vec.h"
-#include "libs/minisat/IntMap.h"
+#include "Vec.h"
+#include "IntMap.h"
 
 namespace Minisat {
 

diff --git a/libs/minisat/IntMap.h b/libs/minisat/IntMap.h
index 61dd0f679ced2cda420ebc67d305cc81da6e03b4..9a66315d194a8ed44b0ef7ef7a819a759fabe6b4 100644 (file)
--- a/libs/minisat/IntMap.h
+++ b/libs/minisat/IntMap.h
@@ -19,7 +19,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_IntMap_h
 #define Minisat_IntMap_h
 
-#include "libs/minisat/Vec.h"
+#include "Vec.h"
 
 namespace Minisat {
 

diff --git a/libs/minisat/Map.h b/libs/minisat/Map.h
index 93b6da31c4ff47df9128b8c119116d3b4f8fc8c2..a6f8320006a658647914c99d796bedffa9fc74d7 100644 (file)
--- a/libs/minisat/Map.h
+++ b/libs/minisat/Map.h
@@ -20,8 +20,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Map_h
 #define Minisat_Map_h
 
-#include "libs/minisat/IntTypes.h"
-#include "libs/minisat/Vec.h"
+#include "IntTypes.h"
+#include "Vec.h"
 
 namespace Minisat {
 

diff --git a/libs/minisat/Options.cc b/libs/minisat/Options.cc
index b1b3e31ba4073f2e838016d3552b2b6d59a459d4..1aff3fab24322bf0d17ed06c23fe36fae6ebca47 100644 (file)
--- a/libs/minisat/Options.cc
+++ b/libs/minisat/Options.cc
@@ -19,9 +19,9 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **************************************************************************************************/
 
-#include "libs/minisat/Sort.h"
-#include "libs/minisat/Options.h"
-#include "libs/minisat/ParseUtils.h"
+#include "Sort.h"
+#include "Options.h"
+#include "ParseUtils.h"
 
 using namespace Minisat;
 

diff --git a/libs/minisat/Options.h b/libs/minisat/Options.h
index 7d140a1ff756008e3739a744b4667256b7663cdf..d602769cf21060364e89847faa26bb0769d07002 100644 (file)
--- a/libs/minisat/Options.h
+++ b/libs/minisat/Options.h
@@ -25,9 +25,9 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include <math.h>
 #include <string.h>
 
-#include "libs/minisat/IntTypes.h"
-#include "libs/minisat/Vec.h"
-#include "libs/minisat/ParseUtils.h"
+#include "IntTypes.h"
+#include "Vec.h"
+#include "ParseUtils.h"
 
 namespace Minisat {
 

diff --git a/libs/minisat/ParseUtils.h b/libs/minisat/ParseUtils.h
index 7b2ddc554d066e758568f4acb21c8c5d852d8c73..1c9e7bf7b886210a66a0e1020c1bc511ceb04238 100644 (file)
--- a/libs/minisat/ParseUtils.h
+++ b/libs/minisat/ParseUtils.h
@@ -26,7 +26,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 #include <zlib.h>
 
-#include "libs/minisat/XAlloc.h"
+#include "XAlloc.h"
 
 namespace Minisat {
 

diff --git a/libs/minisat/Queue.h b/libs/minisat/Queue.h
index 1cae4f5ad130c7a115b05c1692b14844dee65c02..5ba50cd2bfd8f7b23cdc40fd31df2d121fc6d57f 100644 (file)
--- a/libs/minisat/Queue.h
+++ b/libs/minisat/Queue.h
@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Queue_h
 #define Minisat_Queue_h
 
-#include "libs/minisat/Vec.h"
+#include "Vec.h"
 
 namespace Minisat {
 

diff --git a/libs/minisat/Rnd.h b/libs/minisat/Rnd.h
index cf70610145f054973f870cd9f98343d94f8371e2..ccb94c6ce15a6317d3d40ee393af0ea724f3e51b 100644 (file)
--- a/libs/minisat/Rnd.h
+++ b/libs/minisat/Rnd.h
@@ -19,7 +19,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Rnd_h
 #define Minisat_Rnd_h
 
-#include "libs/minisat/Vec.h"
+#include "Vec.h"
 
 namespace Minisat {
 

diff --git a/libs/minisat/SimpSolver.cc b/libs/minisat/SimpSolver.cc
index 232368106e186db7f53fade4fbd81bd14cbdea0e..fd5774e0e74b8ba50107265c641545e5b9166879 100644 (file)
--- a/libs/minisat/SimpSolver.cc
+++ b/libs/minisat/SimpSolver.cc
@@ -20,9 +20,9 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **************************************************************************************************/
 
-#include "libs/minisat/Sort.h"
-#include "libs/minisat/SimpSolver.h"
-#include "libs/minisat/System.h"
+#include "Sort.h"
+#include "SimpSolver.h"
+#include "System.h"
 
 using namespace Minisat;
 

diff --git a/libs/minisat/SimpSolver.h b/libs/minisat/SimpSolver.h
index fc9bb43910cc2fff997b5bacef1dfbf8cafeb2d2..76d5aca1f01237ef3cdd8167c176bf03138ee87e 100644 (file)
--- a/libs/minisat/SimpSolver.h
+++ b/libs/minisat/SimpSolver.h
@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_SimpSolver_h
 #define Minisat_SimpSolver_h
 
-#include "libs/minisat/Queue.h"
-#include "libs/minisat/Solver.h"
+#include "Queue.h"
+#include "Solver.h"
 
 
 namespace Minisat {

diff --git a/libs/minisat/Solver.cc b/libs/minisat/Solver.cc
index 14aa39355824e617a36eca0b5219c8d9d0cf23ea..ab476853a227cd5175f6c79793cc12688bd24ee2 100644 (file)
--- a/libs/minisat/Solver.cc
+++ b/libs/minisat/Solver.cc
@@ -22,10 +22,10 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 #include <math.h>
 
-#include "libs/minisat/Alg.h"
-#include "libs/minisat/Sort.h"
-#include "libs/minisat/System.h"
-#include "libs/minisat/Solver.h"
+#include "Alg.h"
+#include "Sort.h"
+#include "System.h"
+#include "Solver.h"
 
 using namespace Minisat;
 

diff --git a/libs/minisat/Solver.h b/libs/minisat/Solver.h
index 73fc7d4cf329c45e67be9b0cd62b70babd728f1d..62a12f3c760df55976dc9c93daf5e994da79f9c6 100644 (file)
--- a/libs/minisat/Solver.h
+++ b/libs/minisat/Solver.h
@@ -21,12 +21,12 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Solver_h
 #define Minisat_Solver_h
 
-#include "libs/minisat/Vec.h"
-#include "libs/minisat/Heap.h"
-#include "libs/minisat/Alg.h"
-#include "libs/minisat/IntMap.h"
-#include "libs/minisat/Options.h"
-#include "libs/minisat/SolverTypes.h"
+#include "Vec.h"
+#include "Heap.h"
+#include "Alg.h"
+#include "IntMap.h"
+#include "Options.h"
+#include "SolverTypes.h"
 
 
 namespace Minisat {

diff --git a/libs/minisat/SolverTypes.h b/libs/minisat/SolverTypes.h
index a47c2ce834ff554fb638af22ec6d499ecbc234ca..a7df57858f71978731ffbfd7aac967f694736a3a 100644 (file)
--- a/libs/minisat/SolverTypes.h
+++ b/libs/minisat/SolverTypes.h
@@ -24,12 +24,12 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 #include <assert.h>
 
-#include "libs/minisat/IntTypes.h"
-#include "libs/minisat/Alg.h"
-#include "libs/minisat/Vec.h"
-#include "libs/minisat/IntMap.h"
-#include "libs/minisat/Map.h"
-#include "libs/minisat/Alloc.h"
+#include "IntTypes.h"
+#include "Alg.h"
+#include "Vec.h"
+#include "IntMap.h"
+#include "Map.h"
+#include "Alloc.h"
 
 namespace Minisat {
 

diff --git a/libs/minisat/Sort.h b/libs/minisat/Sort.h
index 4a25a9b49f70ab68c41bd2066dc106603448ba0b..cc96486d8c0b9137ea6b9f2238f2b182a145ff1b 100644 (file)
--- a/libs/minisat/Sort.h
+++ b/libs/minisat/Sort.h
@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #ifndef Minisat_Sort_h
 #define Minisat_Sort_h
 
-#include "libs/minisat/Vec.h"
+#include "Vec.h"
 
 //=================================================================================================
 // Some sorting algorithms for vec's

diff --git a/libs/minisat/System.cc b/libs/minisat/System.cc
index df4155af316afcdc46830650c5944b83bdfaa0ee..febe3b40ff97835f47c744eaac28dd83f021bf7d 100644 (file)
--- a/libs/minisat/System.cc
+++ b/libs/minisat/System.cc
@@ -23,7 +23,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include <signal.h>
 #include <stdio.h>
 
-#include "libs/minisat/System.h"
+#include "System.h"
 
 #if defined(__linux__)
 

diff --git a/libs/minisat/System.h b/libs/minisat/System.h
index eb8a7e4d3a6e0c3e723d5d7c9b0e60c3e88d6a17..ee92a6e08afb2f584c202d1b8155748784c80032 100644 (file)
--- a/libs/minisat/System.h
+++ b/libs/minisat/System.h
@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include <fpu_control.h>
 #endif
 
-#include "libs/minisat/IntTypes.h"
+#include "IntTypes.h"
 
 //-------------------------------------------------------------------------------------------------
 

diff --git a/libs/minisat/Vec.h b/libs/minisat/Vec.h
index 2086e0bb2aa0c36e7c3125649fae9f10031c356f..6e398801f58403fe533ab66f3db9e1ef8e04d4a7 100644 (file)
--- a/libs/minisat/Vec.h
+++ b/libs/minisat/Vec.h
@@ -25,8 +25,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include <limits>
 #include <new>
 
-#include "libs/minisat/IntTypes.h"
-#include "libs/minisat/XAlloc.h"
+#include "IntTypes.h"
+#include "XAlloc.h"
 
 namespace Minisat {