Commit graph

52 commits

Author SHA1 Message Date
Guillaume Bury
ec32a67e54 Better doc for theory interface 2014-11-12 21:29:15 +01:00
Guillaume Bury
752fcbe2ba Tail-rec version of sform in tseitin. 2014-11-12 18:56:56 +01:00
Guillaume Bury
e2d4f4fdc5 Added theory lemma as possible premise for clauses 2014-11-12 17:29:11 +01:00
Guillaume Bury
aad20489cd Fix in doc comment 2014-11-12 16:53:19 +01:00
Guillaume Bury
b44c3c3559 Fixed indentation 2014-11-12 16:51:41 +01:00
Guillaume Bury
73c9082b3a Removed solver_types module in solver.Make functor 2014-11-12 16:48:44 +01:00
Guillaume Bury
2b2631b1c3 Removed a few warnings 2014-11-12 16:27:52 +01:00
Guillaume Bury
35ce540684 Progressing on new theory interface 2014-11-12 16:24:08 +01:00
Guillaume Bury
68a1249527 New interface for theories (still needs work in solver.ml) 2014-11-11 23:52:36 +01:00
Guillaume Bury
9b733851c6 Removed useless argument to Th.assume 2014-11-11 15:34:10 +01:00
Guillaume Bury
b50246d55d Some more doc + indentation 2014-11-11 13:54:24 +01:00
Guillaume Bury
6338f682df Added unsat-core option in sat_solve
Cleaned up a bit soler_types and added some doc
2014-11-11 12:25:16 +01:00
Guillaume Bury
625c0ad309 Fix for tseitin cnf conversion 2014-11-10 19:47:42 +01:00
Guillaume Bury
4c040ccbde Added smtlib input option 2014-11-09 23:39:54 +01:00
Guillaume Bury
ff34f5c6f0 Added tseitin cnf conversion 2014-11-08 16:18:20 +01:00
Guillaume Bury
d6cfd27f32 Fixed a bug in proof dot printer (+ indent) 2014-11-07 17:46:32 +01:00
Guillaume Bury
e1486b416d Lots of fixes for proof generation. 2014-11-07 15:11:32 +01:00
Guillaume Bury
7d7859010e Removed unsat_core from solver.ml 2014-11-07 13:48:12 +01:00
Guillaume Bury
6073622a8c Unit hyp clauses are now added as assumptions in the proof 2014-11-07 09:37:36 +01:00
Guillaume Bury
19ebfeb866 Now using unicode characters 2014-11-06 21:24:11 +01:00
Guillaume Bury
fd4a618c2a Better dot output for unsat proofs 2014-11-06 21:05:45 +01:00
Guillaume Bury
62835b35d0 Indentation + some debug output in res.ml 2014-11-06 18:56:39 +01:00
Guillaume Bury
a13029f96c Added proof building and output for pure sat. 2014-11-06 18:25:55 +01:00
Guillaume Bury
f36aa78a35 In sat/sat, replaced theory state with type unit 2014-11-06 00:20:40 +01:00
Guillaume Bury
3422634923 Replaced List.map with List.rev_map
Added Vec.set_unsafe and fixed a few bugs
2014-11-05 15:57:48 +01:00
Guillaume Bury
91cc15eec1 Indent. 2014-11-04 19:07:26 +01:00
Simon Cruanes
6cc3510d0e copyright header in .header; authors in opam file 2014-11-04 17:59:58 +01:00
Guillaume Bury
a5e2fe079a Merge branch 'master' of github.com:Gbury/mSAT 2014-11-04 00:18:45 +01:00
Guillaume Bury
ed8ed101f9 Proof resolution building (work in progress). 2014-11-04 00:18:03 +01:00
Simon Cruanes
e88eb28049 in some case, Solver.pop can reset env.is_unsat 2014-11-04 00:16:37 +01:00
Simon Cruanes
f18b77cdaa removed french comments; first attempt for Solver.pop 2014-11-04 00:00:26 +01:00
Simon Cruanes
1257dba6b1 comments and Vec.exists, used in Solver 2014-11-03 23:51:10 +01:00
Simon Cruanes
38d16e8874 new interface for sat/Solver, without a Sat exception, nor save/restore. Wip on levels 2014-11-03 23:29:26 +01:00
Guillaume Bury
df58c57622 Removed some warnings 2014-11-03 18:39:47 +01:00
Simon Cruanes
f11fb2477b make Vec.t abstract and document it; remove ugly hacks 2014-11-03 15:25:07 +01:00
Guillaume Bury
45d120ac80 Few fixes in resolution module. Added dot proof output. 2014-11-03 13:39:50 +01:00
Guillaume Bury
99ce25e74f Added a module to represent resolution proof (not tested yet) 2014-11-03 00:49:07 +01:00
Guillaume Bury
d4e9865a4c Corrected indentation. 2014-11-02 15:18:00 +01:00
Guillaume Bury
7cd1f38d49 New test script. 2014-11-01 23:42:57 +01:00
Guillaume Bury
df524375a7 Added small lexer/parser for dimacs (work in progress). 2014-11-01 21:43:58 +01:00
Guillaume Bury
088fc05fac Removed true_ and false_ constants
Added some debug output in solver.ml
Added options to test utility
2014-11-01 20:11:41 +01:00
Guillaume Bury
8d95cecba4 Correct indentation. 2014-11-01 17:17:50 +01:00
Guillaume Bury
4ce4cb79be Added some documentation. 2014-11-01 17:12:56 +01:00
Guillaume Bury
7a8a6d0de1 Few fixes. Sat Solver is working. 2014-11-01 16:31:19 +01:00
Guillaume Bury
3c235e259d Sat Solver is broken. 2014-11-01 02:12:17 +01:00
Guillaume Bury
c4e8e19db3 Added Instanciated Sat Solver. 2014-10-31 18:10:28 +01:00
Guillaume Bury
722cdc7d6d Cleaned up map module in formulas
Removed a warning in explanation.ml
2014-10-31 17:15:29 +01:00
Guillaume Bury
854c7e3f6e Updated .merlin 2014-10-31 16:56:31 +01:00
Guillaume Bury
dc43c28a02 Everything has now been properly indented with ocp-indent. 2014-10-31 16:40:59 +01:00
Guillaume Bury
a00506b95f Solver module is now functorised. 'make' now compiles. 2014-10-31 16:21:11 +01:00