Updated minisat

This commit is contained in:
Clifford Wolf 2014-07-21 01:01:26 +02:00
parent c6b3f4e089
commit 92c9403249
20 changed files with 45 additions and 45 deletions

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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 {

View File

@ -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 {

View File

@ -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

View File

@ -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__)

View File

@ -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"
//-------------------------------------------------------------------------------------------------

View File

@ -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 {