More changes.

src/sat/bsat2/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 "Vec.h"
+#include "sat/bsat2/Vec.h"
 
 ABC_NAMESPACE_CXX_HEADER_START
 

src/sat/bsat2/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 "XAlloc.h"
-#include "Vec.h"
+#include "sat/bsat2/XAlloc.h"
+#include "sat/bsat2/Vec.h"
 
 ABC_NAMESPACE_CXX_HEADER_START
 

src/sat/bsat2/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 "ParseUtils.h"
-#include "SolverTypes.h"
+#include "sat/bsat2/ParseUtils.h"
+#include "sat/bsat2/SolverTypes.h"
 
 ABC_NAMESPACE_CXX_HEADER_START
 

src/sat/bsat2/Heap.h

@@ -21,7 +21,7 @@ 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 "Vec.h"
+#include "sat/bsat2/Vec.h"
 
 ABC_NAMESPACE_CXX_HEADER_START
 

src/sat/bsat2/MainSat.cpp

@@ -23,11 +23,11 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include <signal.h>
 #include "misc/zlib/zlib.h"
 
-#include "System.h"
-#include "ParseUtils.h"
-#include "Options.h"
-#include "Dimacs.h"
-#include "Solver.h"
+#include "sat/bsat2/System.h"
+#include "sat/bsat2/ParseUtils.h"
+#include "sat/bsat2/Options.h"
+#include "sat/bsat2/Dimacs.h"
+#include "sat/bsat2/Solver.h"
 
 ABC_NAMESPACE_IMPL_START
 

src/sat/bsat2/MainSimp.cpp

@@ -27,11 +27,11 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include <sys/resource.h>
 #endif
 
-#include "System.h"
-#include "ParseUtils.h"
-#include "Options.h"
-#include "Dimacs.h"
-#include "SimpSolver.h"
+#include "sat/bsat2/System.h"
+#include "sat/bsat2/ParseUtils.h"
+#include "sat/bsat2/Options.h"
+#include "sat/bsat2/Dimacs.h"
+#include "sat/bsat2/SimpSolver.h"
 
 ABC_NAMESPACE_IMPL_START
 

src/sat/bsat2/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 "IntTypes.h"
-#include "Vec.h"
+#include "sat/bsat2/IntTypes.h"
+#include "sat/bsat2/Vec.h"
 
 ABC_NAMESPACE_CXX_HEADER_START
 

src/sat/bsat2/Options.cpp

@@ -17,9 +17,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 "Sort.h"
-#include "Options.h"
-#include "ParseUtils.h"
+#include "sat/bsat2/Sort.h"
+#include "sat/bsat2/Options.h"
+#include "sat/bsat2/ParseUtils.h"
 
 ABC_NAMESPACE_IMPL_START
 

src/sat/bsat2/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 "IntTypes.h"
-#include "Vec.h"
-#include "ParseUtils.h"
+#include "sat/bsat2/IntTypes.h"
+#include "sat/bsat2/Vec.h"
+#include "sat/bsat2/ParseUtils.h"
 
 ABC_NAMESPACE_CXX_HEADER_START
 

src/sat/bsat2/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 "Vec.h"
+#include "sat/bsat2/Vec.h"
 
 namespace Minisat {
 

src/sat/bsat2/SimpSolver.cpp

@@ -18,9 +18,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 "Sort.h"
-#include "SimpSolver.h"
-#include "System.h"
+#include "sat/bsat2/Sort.h"
+#include "sat/bsat2/SimpSolver.h"
+#include "sat/bsat2/System.h"
 
 ABC_NAMESPACE_IMPL_START
 

src/sat/bsat2/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 "Queue.h"
-#include "Solver.h"
+#include "sat/bsat2/Queue.h"
+#include "sat/bsat2/Solver.h"
 
 ABC_NAMESPACE_CXX_HEADER_START
 

src/sat/bsat2/Solver.cpp

@@ -20,8 +20,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 #include <math.h>
 
-#include "Sort.h"
-#include "Solver.h"
+#include "sat/bsat2/Sort.h"
+#include "sat/bsat2/Solver.h"
 
 ABC_NAMESPACE_IMPL_START
 

src/sat/bsat2/Solver.h

@@ -21,11 +21,11 @@ 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 "Vec.h"
-#include "Heap.h"
-#include "Alg.h"
-#include "Options.h"
-#include "SolverTypes.h"
+#include "sat/bsat2/Vec.h"
+#include "sat/bsat2/Heap.h"
+#include "sat/bsat2/Alg.h"
+#include "sat/bsat2/Options.h"
+#include "sat/bsat2/SolverTypes.h"
 
 ABC_NAMESPACE_CXX_HEADER_START
 

src/sat/bsat2/SolverTypes.h

@@ -24,11 +24,11 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 
 #include <assert.h>
 
-#include "IntTypes.h"
-#include "Alg.h"
-#include "Vec.h"
-#include "Map.h"
-#include "Alloc.h"
+#include "sat/bsat2/IntTypes.h"
+#include "sat/bsat2/Alg.h"
+#include "sat/bsat2/Vec.h"
+#include "sat/bsat2/Map.h"
+#include "sat/bsat2/Alloc.h"
 
 ABC_NAMESPACE_CXX_HEADER_START
 

src/sat/bsat2/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 "Vec.h"
+#include "sat/bsat2/Vec.h"
 
 //=================================================================================================
 // Some sorting algorithms for vec's

src/sat/bsat2/System.cpp

@@ -18,7 +18,7 @@ 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 "System.h"
+#include "sat/bsat2/System.h"
 
 #if defined(__linux__)
 

src/sat/bsat2/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 "IntTypes.h"
+#include "sat/bsat2/IntTypes.h"
 
 //-------------------------------------------------------------------------------------------------
 

src/sat/bsat2/Vec.h

@@ -24,8 +24,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include <assert.h>
 #include <new>
 
-#include "IntTypes.h"
-#include "XAlloc.h"
+#include "sat/bsat2/IntTypes.h"
+#include "sat/bsat2/XAlloc.h"
 
 ABC_NAMESPACE_CXX_HEADER_START