Commit graph

1587 commits

Author SHA1 Message Date
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
803b61c7dc Removed an error that was raised for tautological conflict clauses 2015-01-29 15:39:48 +01:00
Guillaume Bury
a0ae0ca90c Forgot to end a 'TR' 2015-01-29 15:16:51 +01:00
Guillaume Bury
b6089e67c3 Fix for bad html printing 2015-01-29 15:14:24 +01:00
Guillaume Bury
863a49a0a4 Update for proof output in dot 2015-01-29 15:00:52 +01:00
Guillaume Bury
676ed7eed9 Better proof output for dot format 2015-01-29 14:44:23 +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
6b70dd413c Merge branch 'master' of github.com:Gbury/mSAT 2015-01-24 18:11:24 +01:00
Guillaume Bury
508698fd33 Better log levels 2015-01-24 18:11:01 +01:00
Guillaume Bury
23a3b3e72d Fixed a bug in printing 2015-01-20 16:03:01 +01:00
Guillaume Bury
d227d4c8b5 Solver modules are paramtrized by log module 2015-01-20 12:58:28 +01:00
Guillaume Bury
24b9362b30 [bugfix] when picking a new term to be assigned, it is possible it is
already assigned
2015-01-13 18:08:19 +01:00
Guillaume Bury
b05b21ac34 [bugfix] semantic variables weren't reset when backtracking 2015-01-13 18:02:06 +01:00
Guillaume Bury
017bcaad78 Merge branch 'master' of github.com:Gbury/mSAT 2015-01-13 17:37:11 +01:00
Guillaume Bury
cf578d1868 Removed useless level in plugin_intf 2015-01-13 17:36:13 +01:00
Guillaume Bury
ff25fae192 Fixed an interface omission 2015-01-09 15:04:06 +01:00
Guillaume Bury
a499d65fde Added model output for Mcsolver 2015-01-09 14:53:46 +01:00
Guillaume Bury
fe41b38501 Added propagation function in slice 2015-01-06 19:28:53 +01:00
Guillaume Bury
4b25650c4d Updated version number in opam to 0.1 2014-12-18 16:17:52 +01:00
Guillaume Bury
4e34bbdf59 Added some headers, and an interface for Expr 2014-12-18 16:04:17 +01:00
Guillaume Bury
2ed541d528 Faster iterating over subterms 2014-12-18 15:34:01 +01:00
Guillaume Bury
aacae0883b Bundled both smt and mcsat in sat_solve; updated the tests in Makefile 2014-12-16 21:32:18 +01:00
Guillaume Bury
ca70f87973 Mcsat now works 2014-12-16 17:30:14 +01:00
Guillaume Bury
aee73abd47 Progressing. Conflict clause computing is broken 2014-12-15 17:09:01 +01:00
Guillaume Bury
a0d6be1057 Modifications in progress.... 2014-12-12 17:14:06 +01:00
Guillaume Bury
8e8a592475 Some reorganization of files/folders 2014-12-11 17:02:27 +01:00
Guillaume Bury
ff83cb70e9 Fix for mid-solving clause adding 2014-11-23 21:04:46 +01:00
Guillaume Bury
be4ce92d08 Fix in filenames during bench log parsing 2014-11-20 21:41:16 +01:00
Guillaume Bury
d52c6d7965 Small update to bench/makefile 2014-11-20 20:18:45 +01:00
Guillaume Bury
02b5c61ee1 Better color scheme for dot output 2014-11-20 14:38:44 +01:00
Guillaume Bury
8f2ae64b1a Small modifications to colors in dot proof output 2014-11-20 00:39:37 +01:00
Guillaume Bury
4636a94ce2 Fix for theory propagated clauses 2014-11-20 00:24:39 +01:00
Guillaume Bury
5752a9f139 Changed theory interface to allow pushing of clauses 2014-11-19 21:56:24 +01:00
Guillaume Bury
5654414bfa Small fixes 2014-11-18 18:41:32 +01:00
Simon Cruanes
460df56d4b fix makefile (bis) 2014-11-18 17:56:29 +01:00
Simon Cruanes
50b62b4802 fix redundancies in Makefile 2014-11-18 17:53:45 +01:00
Guillaume Bury
1eb8cc62a0 TODO Update 2014-11-18 17:26:02 +01:00
Guillaume Bury
8e0dfc539c Check now also whecks model if sat.
Time/Memory limits now only applies to proof search (and not to model checking of proof building anymore).
2014-11-18 16:16:02 +01:00
Guillaume Bury
4ee3566aa0 Catched exception unkown_status in parselog 2014-11-17 17:20:20 +01:00