cl-satwrap.git
7 years agomodernize for asdf3master
u-u-h [Tue, 31 May 2016 09:02:26 +0000 (31 11:02 +0200)]
modernize for asdf3

7 years agofix minisat compile on modern c++ compilers
u-u-h [Tue, 31 May 2016 08:45:56 +0000 (31 10:45 +0200)]
fix minisat compile on modern c++ compilers

7 years agomodernize autotools usage
Utz-Uwe Haus [Mon, 30 May 2016 11:04:29 +0000 (30 13:04 +0200)]
modernize autotools usage

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
12 years agoadd missing configure.ac and ltmain.sh in minisat subtree
Utz-Uwe Haus [Fri, 13 May 2011 10:11:50 +0000 (13 12:11 +0200)]
add missing configure.ac and ltmain.sh in minisat subtree

12 years agoupdate to newer libtool, keep in-tree
Utz-Uwe Haus [Mon, 9 May 2011 11:43:45 +0000 (9 13:43 +0200)]
update to newer libtool, keep in-tree

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
12 years agoanother round of default test predicate mess
Utz-Uwe Haus [Mon, 9 May 2011 11:29:00 +0000 (9 13:29 +0200)]
another round of default test predicate mess

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
12 years agomessing with default test predicate in macro again
Utz-Uwe Haus [Mon, 27 Sep 2010 08:46:00 +0000 (27 10:46 +0200)]
messing with default test predicate in macro again

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
12 years ago.gitignore update
Utz-Uwe Haus [Mon, 9 May 2011 11:28:31 +0000 (9 13:28 +0200)]
.gitignore update

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
12 years agofixes for package name confusion in swig-lispify
Utz-Uwe Haus [Mon, 9 May 2011 11:28:23 +0000 (9 13:28 +0200)]
fixes for package name confusion in swig-lispify

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoReduce consing in flush-to-backend
Utz-Uwe Haus [Tue, 22 Jun 2010 20:44:40 +0000 (22 22:44 +0200)]
Reduce consing in flush-to-backend

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoAdd vector variant for clause-valid method
Utz-Uwe Haus [Tue, 22 Jun 2010 20:44:20 +0000 (22 22:44 +0200)]
Add vector variant for clause-valid method

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoReduce consing and recursion in split-delimited-string
Utz-Uwe Haus [Tue, 22 Jun 2010 20:42:48 +0000 (22 22:42 +0200)]
Reduce consing and recursion in split-delimited-string

ACL did not recognize tail-recursion

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoAllow assumptions to be lists or vectors in backend
Utz-Uwe Haus [Tue, 22 Jun 2010 20:42:03 +0000 (22 22:42 +0200)]
Allow assumptions to be lists or vectors in backend

Implement vector variant for minisat backend

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoAvoid double mapping from symbolic literals to variables in CNF creation
Utz-Uwe Haus [Tue, 22 Jun 2010 15:21:43 +0000 (22 17:21 +0200)]
Avoid double mapping from symbolic literals to variables in CNF creation

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoFix NNF generation if explicit :ATOMs are used
Utz-Uwe Haus [Tue, 22 Jun 2010 15:20:32 +0000 (22 17:20 +0200)]
Fix NNF generation if explicit :ATOMs are used

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agofix add-formula to drop :AND and :OR-symbols before adding clauses
Utz-Uwe Haus [Tue, 22 Jun 2010 08:45:30 +0000 (22 10:45 +0200)]
fix add-formula to drop :AND and :OR-symbols before adding clauses

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoFix macro expansion time confusion in with-index-hash
Utz-Uwe Haus [Tue, 22 Jun 2010 08:45:00 +0000 (22 10:45 +0200)]
Fix macro expansion time confusion in with-index-hash

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoremove debugging output and ensure empty clauses are deleted from CNFs
Utz-Uwe Haus [Thu, 17 Jun 2010 23:26:44 +0000 (18 01:26 +0200)]
remove debugging output and ensure empty clauses are deleted from CNFs

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoFix call to minisat solve()minisat-backend
Utz-Uwe Haus [Thu, 17 Jun 2010 14:14:14 +0000 (17 16:14 +0200)]
Fix call to minisat solve()

Assumptions don't play well with presolve. Forum answer by Niklas:

"I could repeat the problem and realized that it has to do with one of
the undocumented constraints of the solver-API. More specificly, it
has to do with preprocessing. If you turn that off it gives consistent
results: both turning on the literal as an assumption or as a unit
clause gives an unsatisfiable result.

The cause of this problem is that when you call solve the first time
you specify that the preprocessing should be turned off at the end of
the call. This means that all data-structures that has to do with
preprocessing are deleted, and it is no longer possible to refer to
any of the variables that may have been removed by the preprocessor.
In this case the literal you pass as an assumption was indeed removed.

The way to work around this is to either use preprocessing throughout,
by replacing all calls of the form "solve(xxx, true, true)" with calls
to "solve(xxx)", or to initially turn off all preprocessing, which can
be done with a call to "eliminate(true)" before anything else.

Which alternative works best depends on your application, but as
preprocessing can be pretty unpredictable in some incremental settings
your best bet may be to turn it off.

I hope this helps,"

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoFix non-cnf formula addition interface
Utz-Uwe Haus [Thu, 17 Jun 2010 14:12:54 +0000 (17 16:12 +0200)]
Fix non-cnf formula addition interface

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoFix with-sat-solver macro to correctly reference *default-sat-backend* at run time
Utz-Uwe Haus [Wed, 16 Jun 2010 09:18:36 +0000 (16 11:18 +0200)]
Fix with-sat-solver macro to correctly reference *default-sat-backend* at run time

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years ago(minisat backend ) Return number of queued assumptions from add_assumption
Utz-Uwe Haus [Tue, 15 Jun 2010 15:03:09 +0000 (15 17:03 +0200)]
(minisat backend ) Return number of queued assumptions from add_assumption

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoAlso build minisat backend
Utz-Uwe Haus [Tue, 15 Jun 2010 15:02:24 +0000 (15 17:02 +0200)]
Also build minisat backend

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoFix assumption handling in precosat backend
Utz-Uwe Haus [Tue, 15 Jun 2010 15:02:08 +0000 (15 17:02 +0200)]
Fix assumption handling in precosat backend

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoAdd CNF builder convenience functions
Utz-Uwe Haus [Thu, 10 Jun 2010 11:43:22 +0000 (10 13:43 +0200)]
Add CNF builder convenience functions

WIP, Still broken and incomplete

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoadd-clauses convenience function
Utz-Uwe Haus [Thu, 10 Jun 2010 11:42:39 +0000 (10 13:42 +0200)]
add-clauses convenience function

13 years agoNew method synchronize-backend to allow incremental flushing
Utz-Uwe Haus [Thu, 3 Jun 2010 08:36:32 +0000 (3 10:36 +0200)]
New method synchronize-backend to allow incremental flushing

Avoid re-creation of the whole problem in the backend during
get-essential-variables computations, with backends that support it (like minisat)

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoAdd minisat backend to lisp code, make it the default
Utz-Uwe Haus [Wed, 2 Jun 2010 19:37:28 +0000 (2 21:37 +0200)]
Add minisat backend to lisp code, make it the default

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoMinimalistic minisat header and SWIG integration
Utz-Uwe Haus [Wed, 2 Jun 2010 14:40:50 +0000 (2 16:40 +0200)]
Minimalistic minisat header and SWIG integration

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoAutotools setup for minisat
Utz-Uwe Haus [Wed, 2 Jun 2010 12:01:09 +0000 (2 14:01 +0200)]
Autotools setup for minisat

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoFix first line in dimacs format export
Utz-Uwe Haus [Wed, 2 Jun 2010 08:47:58 +0000 (2 10:47 +0200)]
Fix first line in dimacs format export

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoImport minisat2-070721
Utz-Uwe Haus [Wed, 2 Jun 2010 08:23:54 +0000 (2 10:23 +0200)]
Import minisat2-070721

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoReally fix memory issue: Precosat Solver->reset() was actually dysfunction in NDEBUG...
Utz-Uwe Haus [Tue, 1 Jun 2010 13:12:07 +0000 (1 15:12 +0200)]
Really fix memory issue: Precosat Solver->reset() was actually dysfunction in NDEBUG build

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoFix with-index-hash
Utz-Uwe Haus [Tue, 1 Jun 2010 12:35:19 +0000 (1 14:35 +0200)]
Fix with-index-hash

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoProperly dispose of precosat objects.
Utz-Uwe Haus [Tue, 1 Jun 2010 12:34:52 +0000 (1 14:34 +0200)]
Properly dispose of precosat objects.

The solver destructor does not call reset, probably to save time in satrace competition. Urgs

Signed-off-by: Utz-Uwe Haus <haus@uuhaus.de>
13 years agoAdd get-essential-variables implementation.
Utz-Uwe Haus [Tue, 1 Jun 2010 11:08:17 +0000 (1 13:08 +0200)]
Add get-essential-variables implementation.

Signed-off-by: Utz-Uwe Haus <lisp@uuhaus.de>
13 years agoAdd with-sat-solver and with-index-hash macros.
Utz-Uwe Haus [Tue, 1 Jun 2010 10:32:39 +0000 (1 12:32 +0200)]
Add with-sat-solver and with-index-hash macros.

Signed-off-by: Utz-Uwe Haus <haus@uuhaus.de>
13 years agoAdd dimacs reader/writer
Utz-Uwe Haus [Tue, 1 Jun 2010 09:53:48 +0000 (1 11:53 +0200)]
Add dimacs reader/writer

Signed-off-by: Utz-Uwe Haus <haus@uuhaus.de>
13 years agoProper garbage collection of foreign objects using trivial-garbage.
Utz-Uwe Haus [Tue, 1 Jun 2010 09:07:57 +0000 (1 11:07 +0200)]
Proper garbage collection of foreign objects using trivial-garbage.

Also fix for SBCL (wants .so in foreign library names in the asd file)

Signed-off-by: Utz-Uwe Haus <haus@uuhaus.de>
13 years agoSWIG wrapper layer and .i file for precosat, minimalistic generic interface
Utz-Uwe Haus [Tue, 1 Jun 2010 08:27:31 +0000 (1 10:27 +0200)]
SWIG wrapper layer and .i file for precosat, minimalistic generic interface

Signed-off-by: Utz-Uwe Haus <haus@uuhaus.de>
13 years agoImport precosat-465r2-2ce82ba-100514
Utz-Uwe Haus [Sun, 30 May 2010 19:10:21 +0000 (30 21:10 +0200)]
Import precosat-465r2-2ce82ba-100514

Signed-off-by: Utz-Uwe Haus <haus@uuhaus.de>
13 years agoInitial layout
Utz-Uwe Haus [Sun, 30 May 2010 17:39:02 +0000 (30 19:39 +0200)]
Initial layout

Signed-off-by: Utz-Uwe Haus <haus@uuhaus.de>