Guillaume Bury
f88a5dd514
[bugfix/minor] Ensure generativity of solver_types
...
This ensures that the same solver_types module is not reused
for two different solvers, which would be problematic.
Marked minor because of the low use of multiple instances of a solver.
2016-04-15 13:30:46 +02:00
Guillaume Bury
ea518c6ab3
Update for compatibility with ocaml 4.00.1
2016-02-29 13:43:46 +01:00
Guillaume Bury
b6effe691c
Added dummy arguments to some functors
...
Some functors lacked a dummy argument, and thus
could introduce some problems if duplicated (because
they would share the same internal state).
2016-02-29 10:58:22 +01:00
Simon Cruanes
756363ffd6
everwhere, use new Log interface and remove the functor on Log_intf
2016-01-20 21:05:22 +01:00
Guillaume Bury
aed3aeb17c
A bit of restructuring to have cleaner dependencies between fonctors
2015-07-21 19:20:40 +02:00
Guillaume Bury
e7140d6897
Added some abstraction to allow for more direct types int the pure SAT
...
solver
2015-06-26 14:12:47 +02:00
Guillaume Bury
6f384fb80b
Big refactoring of code. Some performances were lost on pure SAT Solving.
2015-06-25 15:37:29 +02:00
Guillaume Bury
198890b68c
Remove some excessive debug messages
2015-03-19 12:47:36 +01:00
Guillaume Bury
e059441347
Fixed potential bug in vec.set
...
Removed some excessive logging messages
2015-03-17 14:20:11 +01:00
Guillaume Bury
a2e2e15137
Fix for restart increments
2015-03-16 15:50:20 +01:00
Guillaume Bury
f604401e47
More log messages
2015-03-16 15:29:12 +01:00
Guillaume Bury
a362505d86
Little test
2015-03-16 15:22:18 +01:00
Guillaume Bury
381081314e
Removed some useless semi-colons
2015-03-16 13:56:28 +01:00
Guillaume Bury
31f5fdd1ae
Debugging...
2015-03-16 13:27:51 +01:00
Guillaume Bury
25dae83c6e
Still working...
2015-03-15 22:12:21 +01:00
Guillaume Bury
5a61a6c852
Still in extreme debug mode
2015-03-15 22:00:48 +01:00
Guillaume Bury
c5fd429821
Extremely verbose message added (to be removed later)
2015-03-15 21:55:29 +01:00
Guillaume Bury
34141f9d7d
Added a few debug messages
2015-03-15 21:52:48 +01:00
Guillaume Bury
1f0fdf65fd
Hopefully a fix for restarts
2015-03-15 21:32:07 +01:00
Guillaume Bury
582530b9ee
Logging restarts
2015-03-15 20:42:16 +01:00
Guillaume Bury
ee13eb366b
Fix for incomplete proofs due to hypothesis not proved
2015-03-13 14:48:20 +01:00
Guillaume Bury
6005652f3f
Only pure hypothesis are instantly learned
2015-03-13 14:39:48 +01:00
Guillaume Bury
5786e26705
Typo
2015-03-13 14:35:00 +01:00
Guillaume Bury
0050fdae3c
Better clause names
2015-03-13 14:31:46 +01:00
Guillaume Bury
cddf914ce6
Better proving of hypothesis
2015-03-13 14:23:40 +01:00
Guillaume Bury
d7c5077c0a
Log module is passed down to proof module in solvers
2015-03-13 14:09:16 +01:00
Guillaume Bury
a17d83eb1d
Fixed location of debug message
2015-03-10 17:57:48 +01:00
Guillaume Bury
1b5038e620
New clauses are memorized, and redundant ones eliminated.
2015-03-10 17:43:41 +01:00
Guillaume Bury
e584e0979d
A bit of cleanup of dead code
2015-02-09 17:43:45 +01:00
Guillaume Bury
714e0988e3
[bugfix] some late unsat conflicts were not handled correctly
2015-02-09 17:25:58 +01:00
Guillaume Bury
9c8e970b8d
[bugfix] level 0 conflict in mcsat weren't detected
2015-02-09 17:10:45 +01:00
Guillaume Bury
3ec4f6f2e3
[bugfix] semantic backtrack added decision with wrong level
2015-02-09 14:15:15 +01:00
Guillaume Bury
ce8920bf88
Revert "[bugfix] uip clause detection was wrong"
...
This reverts commit 7a5e8e082d .
2015-02-06 17:16:58 +01:00
Guillaume Bury
7a5e8e082d
[bugfix] uip clause detection was wrong
2015-02-06 17:05:37 +01:00
Guillaume Bury
c9657cc795
Small log message update
2015-02-04 14:58:00 +01:00
Guillaume Bury
07b49c8481
Added 'if_sat' possibility for plugins
2015-02-03 17:37:36 +01:00
Guillaume Bury
cef1cef703
Fix typo in resolution error message
2015-01-30 10:28:46 +01:00
Guillaume Bury
0e84c5bfb3
Revert "Removed an error that was raised for tautological conflict clauses"
...
This reverts commit 803b61c7dc .
2015-01-29 15:49:17 +01:00
Guillaume Bury
436dc49111
Better error message
2015-01-29 15:44:54 +01:00
Guillaume Bury
6995cf90e1
Fix for iheap size
2015-01-26 15:56:05 +01:00
Guillaume Bury
a5c67c7545
Fix for lack of insertion of new atoms in iheap.
2015-01-26 15:54:28 +01:00
Guillaume Bury
db0bd8c2df
Fix for late propagation of theories when it conflicts with boolean
...
propagtion. Printing fix
2015-01-26 15:49:27 +01:00
Guillaume Bury
3ed5d26ac7
Merge branch 'master' of github.com:Gbury/mSAT
...
Conflicts:
solver/mcsolver.ml
2015-01-26 15:02:44 +01:00
Guillaume Bury
ccebc8c44a
Fix for uip unit clause which conflicts with level0
2015-01-26 15:01:26 +01:00
Guillaume Bury
51339eccf8
Bug fixed (hopefully)
2015-01-24 21:43:23 +01:00
Guillaume Bury
8fcf90b5c9
Some more debug logging
2015-01-24 21:31:45 +01:00
Guillaume Bury
8afdc59ced
Tentative fix for absurd slice size
2015-01-24 21:24:03 +01:00
Guillaume Bury
f85714537e
Some more logging messages
2015-01-24 21:10:01 +01:00
Guillaume Bury
508698fd33
Better log levels
2015-01-24 18:11:01 +01:00
Guillaume Bury
d227d4c8b5
Solver modules are paramtrized by log module
2015-01-20 12:58:28 +01:00