Commit graph

99 commits

Author SHA1 Message Date
Guillaume Bury
3f6de07440 Merge branch 'master' into push_pop 2015-11-27 14:53:41 +01:00
Simon Cruanes
99b1f25e4f style 2015-11-25 10:28:21 +01:00
Simon Cruanes
15e5a4224d ocp-indent all the files, for the greater good! 2015-11-25 10:04:01 +01:00
Guillaume Bury
a32d443b96 Cleaned unused vec 2015-11-24 16:09:59 +01:00
Guillaume Bury
3fd91d9751 Fixed push in case of unsat env
Renamed some field names of env in solver/internal
2015-11-24 14:33:02 +01:00
Guillaume Bury
5911f18cb4 Res module adapted to accomodate puush/pop 2015-11-19 14:59:54 +01:00
Guillaume Bury
28f32de24c Removed assertion
Long explanation: when backtracking to level 0,
while already being at level 0, very strange
things might happen, most notably there might still
be facts left to propagate...
2015-11-18 17:43:26 +01:00
Guillaume Bury
6567d32900 Fixed bad decision level updating during pop 2015-11-18 17:37:36 +01:00
Guillaume Bury
763d23146f A *lot* of fixes for push/pop 2015-11-17 16:17:14 +01:00
Guillaume Bury
e2cac78d39 Fixed typos in clause simplification 2015-10-20 16:48:43 +02:00
Guillaume Bury
ac5e8a9766 First test (probably unsound) 2015-10-19 22:04:15 +02:00
Guillaume Bury
bbbd407631 Res now includes solver type 2015-10-02 13:30:32 +02:00
Guillaume Bury
aed3aeb17c A bit of restructuring to have cleaner dependencies between fonctors 2015-07-21 19:20:40 +02:00
Guillaume Bury
9c1ca06aea Dot output is now available through independent backend 2015-07-09 19:03:44 +02:00
Guillaume Bury
4b51f22464 Changed internal representation of proofs 2015-07-09 16:29:57 +02:00
Guillaume Bury
393d521478 Version 1.1 release 2015-06-26 14:51:23 +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
ce05d8fe62 Simpler representation of solver types 2015-06-26 12:58:00 +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
c1af34823c Fix for compilation on older ocaml compiler 2015-03-17 17:33:35 +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
5047882fc7 Fix for dependencies during proof computing 2015-03-13 15:03:30 +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
9b41aab1b1 Tautological input clauses are now accepted 2015-03-10 18:02:31 +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
68edd9916e Updated README + some more doc 2015-03-03 16:54:28 +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
07c62fc5bc Merge branch 'master' of github.com:Gbury/mSAT 2015-02-09 17:11:36 +01:00
Guillaume Bury
9c8e970b8d [bugfix] level 0 conflict in mcsat weren't detected 2015-02-09 17:10:45 +01:00
Simon Cruanes
1062297389 fix usage of Log in Solver 2015-02-09 16:09:05 +01:00
Guillaume Bury
5f155f6bde Simplified proof generation 2015-02-09 16:07:28 +01:00