3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-07 18:05:21 +00:00
Commit graph

1858 commits

Author SHA1 Message Date
Nikolaj Bjorner f6c5088cc9 pb theory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-16 21:05:33 -08:00
Nikolaj Bjorner 77cdb2bcde working on pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-16 17:01:43 -08:00
Nikolaj Bjorner 06073db413 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-16 10:14:52 -08:00
Nikolaj Bjorner 41efa8a75d Merge branch 'opt' of https://git00.codeplex.com/z3 into opt
Conflicts:
	src/smt/theory_card.cpp
2013-11-16 10:14:29 -08:00
Anh-Dung Phan aadfe007c1 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-15 18:34:12 -08:00
Anh-Dung Phan 6ddc838628 Add a basic spanning tree 2013-11-15 18:34:05 -08:00
Nikolaj Bjorner 6da4bae840 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-15 17:31:39 -08:00
Nikolaj Bjorner 13c97d12a8 snapshot
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-15 17:31:31 -08:00
Anh-Dung Phan af8da013b5 Fix a few issues related to thread spanning tree 2013-11-15 17:17:20 -08:00
Anh-Dung Phan 761c95129b Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-15 16:59:01 -08:00
Anh-Dung Phan c837f62863 Use quick explain for unsat core in Fu Malik algorithm by default 2013-11-15 16:58:42 -08:00
Nikolaj Bjorner 314f03c12c started new PB solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-15 16:44:08 -08:00
Anh-Dung Phan 074e851d49 Display Fu Malik statistics 2013-11-15 12:58:11 -08:00
Ken McMillan 8320144af0 fixed bug in duality logging 2013-11-15 11:24:02 -08:00
Christoph M. Wintersteiger 31495bb9d9 bugfix for float rounding to integral values for cases where ebits >= sbits
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-11-15 17:19:41 +00:00
Nikolaj Bjorner f9164f4cb1 local updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-14 20:21:33 -08:00
Anh-Dung Phan 0acf331ed1 Merge conflicts 2013-11-14 19:07:23 -08:00
Anh-Dung Phan 4be11f24e1 Instrument fu_malik to use the new SAT solver (WIP) 2013-11-14 19:02:15 -08:00
Nikolaj Bjorner e034331f2e working on pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-14 18:04:55 -08:00
Nikolaj Bjorner 06ae0db116 working on pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-14 18:04:05 -08:00
Anh-Dung Phan d729e89a7b Fix a minor bug on cardinality solver 2013-11-14 12:36:39 -08:00
Christoph M. Wintersteiger c96f7b5a51 bugfixes for float to float conversion
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-11-14 20:13:37 +00:00
Christoph M. Wintersteiger b77d408128 bugfix for FPA rounding when ebits is very small. 2013-11-14 19:11:19 +00:00
Christoph M. Wintersteiger bb8373151d Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-11-14 19:09:30 +00:00
Ken McMillan 9cba5d7c85 working on quantifiers in interpolation 2013-11-14 10:18:44 -08:00
Christoph M. Wintersteiger 6a2f987fb7 optimizations for float to float conversions
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-11-14 16:56:13 +00:00
Nikolaj Bjorner d8d77d943c Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-14 08:51:13 -08:00
Nikolaj Bjorner 34af198816 missing file
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-14 08:51:01 -08:00
Anh-Dung Phan 5921628f53 Dump opt_solver checksat calls for profiling 2013-11-13 18:46:18 -08:00
Nikolaj Bjorner 2d3f6ca71d add pb constraints to API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-13 17:15:41 -08:00
Nikolaj Bjorner d1937b2032 add PB operators to C-based API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-13 17:09:10 -08:00
Nikolaj Bjorner 133ba2d02a fixes to pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-13 13:41:14 -05:00
Anh-Dung Phan 64daa2977d Fix termination conditions on core_maxsat 2013-11-12 16:14:21 -08:00
Ken McMillan d73310cfa1 working on eq-propagate rule in interpolation 2013-11-12 12:38:30 -08:00
Anh-Dung Phan 66eda866ca Fix bugs on candidate list pivot rule 2013-11-11 18:23:21 -08:00
Ken McMillan 4b0c00969c Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-11-11 16:40:21 -08:00
Christoph M. Wintersteiger e1a6c5098d fixed memory leak
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-11-11 17:33:02 +00:00
Anh-Dung Phan 0d6ffe6b31 Implement three pivot rules 2013-11-11 08:51:52 +01:00
Nikolaj Bjorner e412d6175d add pb capabilities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-09 16:19:49 -08:00
Nikolaj Bjorner 3e8c7d85aa add vocabulary for arbitrary PB inequalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-09 16:13:26 -08:00
Nikolaj Bjorner 293a97bdfc working on core-maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-09 15:54:38 -08:00
Ken McMillan c4f7b4d0d4 remove duality junk on stdout 2013-11-09 13:55:01 -08:00
Nikolaj Bjorner 2349a0fcdd adding core-based max-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-09 12:35:20 -08:00
Christoph M. Wintersteiger 7a718d4e07 fixed tabs 2013-11-09 14:57:45 +00:00
Christoph M. Wintersteiger 2924b1acc6 fixed reference to _DEBUG 2013-11-09 14:51:44 +00:00
Nikolaj Bjorner dc78da4873 case analysis for commit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 23:29:31 -08:00
Nikolaj Bjorner ba05f79415 bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 22:40:43 -08:00
Nikolaj Bjorner b573b94f84 nits
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 21:59:38 -08:00
Nikolaj Bjorner 21058c38fd fix bounds for weighted maxsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 21:26:05 -08:00
Nikolaj Bjorner 6e1c186017 enable answer generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 20:55:01 -08:00