From ce44eda85afef96e8fb1ba4fefedad9c72358a19 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Sat, 2 Mar 2024 16:46:09 -0800 Subject: [PATCH] More changes. --- src/sat/bsat2/Alg.h | 2 +- src/sat/bsat2/Alloc.h | 4 ++-- src/sat/bsat2/Dimacs.h | 4 ++-- src/sat/bsat2/Heap.h | 2 +- src/sat/bsat2/MainSat.cpp | 10 +++++----- src/sat/bsat2/MainSimp.cpp | 10 +++++----- src/sat/bsat2/Map.h | 4 ++-- src/sat/bsat2/Options.cpp | 6 +++--- src/sat/bsat2/Options.h | 6 +++--- src/sat/bsat2/Queue.h | 2 +- src/sat/bsat2/SimpSolver.cpp | 6 +++--- src/sat/bsat2/SimpSolver.h | 4 ++-- src/sat/bsat2/Solver.cpp | 4 ++-- src/sat/bsat2/Solver.h | 10 +++++----- src/sat/bsat2/SolverTypes.h | 10 +++++----- src/sat/bsat2/Sort.h | 2 +- src/sat/bsat2/System.cpp | 2 +- src/sat/bsat2/System.h | 2 +- src/sat/bsat2/Vec.h | 4 ++-- 19 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/sat/bsat2/Alg.h b/src/sat/bsat2/Alg.h index 2a5af3eff..87004fce8 100644 --- a/src/sat/bsat2/Alg.h +++ b/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 diff --git a/src/sat/bsat2/Alloc.h b/src/sat/bsat2/Alloc.h index c583bf3b6..a9786a9a8 100644 --- a/src/sat/bsat2/Alloc.h +++ b/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 diff --git a/src/sat/bsat2/Dimacs.h b/src/sat/bsat2/Dimacs.h index 806b86942..0e7ad925a 100644 --- a/src/sat/bsat2/Dimacs.h +++ b/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 -#include "ParseUtils.h" -#include "SolverTypes.h" +#include "sat/bsat2/ParseUtils.h" +#include "sat/bsat2/SolverTypes.h" ABC_NAMESPACE_CXX_HEADER_START diff --git a/src/sat/bsat2/Heap.h b/src/sat/bsat2/Heap.h index bdaa7edfd..ae50c4b57 100644 --- a/src/sat/bsat2/Heap.h +++ b/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 diff --git a/src/sat/bsat2/MainSat.cpp b/src/sat/bsat2/MainSat.cpp index e988ac3ac..855466263 100644 --- a/src/sat/bsat2/MainSat.cpp +++ b/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 #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 diff --git a/src/sat/bsat2/MainSimp.cpp b/src/sat/bsat2/MainSimp.cpp index c959e606f..2d0ad109e 100644 --- a/src/sat/bsat2/MainSimp.cpp +++ b/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 #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 diff --git a/src/sat/bsat2/Map.h b/src/sat/bsat2/Map.h index d9a4c5631..374e76c9b 100644 --- a/src/sat/bsat2/Map.h +++ b/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 diff --git a/src/sat/bsat2/Options.cpp b/src/sat/bsat2/Options.cpp index 1f700dc0f..f14059f67 100644 --- a/src/sat/bsat2/Options.cpp +++ b/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 diff --git a/src/sat/bsat2/Options.h b/src/sat/bsat2/Options.h index 42bc45126..137b5a45e 100644 --- a/src/sat/bsat2/Options.h +++ b/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 #include -#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 diff --git a/src/sat/bsat2/Queue.h b/src/sat/bsat2/Queue.h index dd40e2c91..c2b3c64ad 100644 --- a/src/sat/bsat2/Queue.h +++ b/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 { diff --git a/src/sat/bsat2/SimpSolver.cpp b/src/sat/bsat2/SimpSolver.cpp index 59820a47b..59952d154 100644 --- a/src/sat/bsat2/SimpSolver.cpp +++ b/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 diff --git a/src/sat/bsat2/SimpSolver.h b/src/sat/bsat2/SimpSolver.h index 098254a12..ad02c6dff 100644 --- a/src/sat/bsat2/SimpSolver.h +++ b/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 diff --git a/src/sat/bsat2/Solver.cpp b/src/sat/bsat2/Solver.cpp index 2a0642407..1c45a4538 100644 --- a/src/sat/bsat2/Solver.cpp +++ b/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 -#include "Sort.h" -#include "Solver.h" +#include "sat/bsat2/Sort.h" +#include "sat/bsat2/Solver.h" ABC_NAMESPACE_IMPL_START diff --git a/src/sat/bsat2/Solver.h b/src/sat/bsat2/Solver.h index d14b2fec8..9c9a30ee3 100644 --- a/src/sat/bsat2/Solver.h +++ b/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 diff --git a/src/sat/bsat2/SolverTypes.h b/src/sat/bsat2/SolverTypes.h index 6401a2a0c..64fbe980e 100644 --- a/src/sat/bsat2/SolverTypes.h +++ b/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 -#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 diff --git a/src/sat/bsat2/Sort.h b/src/sat/bsat2/Sort.h index 15b6b7d07..7ce99ea46 100644 --- a/src/sat/bsat2/Sort.h +++ b/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 diff --git a/src/sat/bsat2/System.cpp b/src/sat/bsat2/System.cpp index e617500c2..2c64e7fea 100644 --- a/src/sat/bsat2/System.cpp +++ b/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__) diff --git a/src/sat/bsat2/System.h b/src/sat/bsat2/System.h index 2952d4117..e3d8afba2 100644 --- a/src/sat/bsat2/System.h +++ b/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 #endif -#include "IntTypes.h" +#include "sat/bsat2/IntTypes.h" //------------------------------------------------------------------------------------------------- diff --git a/src/sat/bsat2/Vec.h b/src/sat/bsat2/Vec.h index 59b5583a8..aade19f13 100644 --- a/src/sat/bsat2/Vec.h +++ b/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 #include -#include "IntTypes.h" -#include "XAlloc.h" +#include "sat/bsat2/IntTypes.h" +#include "sat/bsat2/XAlloc.h" ABC_NAMESPACE_CXX_HEADER_START