mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 22:05:36 +00:00
Code Activity
1836 commits 23 branches 48 tags 157 MiB
Commit graph

1466 commits

Author SHA1 Message Date
Anh-Dung Phan b35088f7e5 Update diff logic optimization 2013-11-22 18:15:34 -08:00
Anh-Dung Phan 37f5628824 Update basic spanning tree to be on par with threaded one 2013-11-22 13:44:12 -08:00
Anh-Dung Phan 7bc7a61a40 Debug undirected dfs and bfs 2013-11-22 08:58:17 +01:00
Anh-Dung Phan 3b2dd47cd4 Refactor pivot rules 2013-11-21 19:05:17 -08:00
Ken McMillan a93f8b04e5 working on duality and quantified arithmetic in interpolation 2013-11-21 18:10:21 -08:00
Nikolaj Bjorner 97dfb6d521 moving to rational coefficients 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-21 15:55:08 -08:00
Nikolaj Bjorner e44db06bb7 update conflict resolution 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-20 16:14:29 -08:00
Nikolaj Bjorner 61385c8489 a.ctx -> self.ctx, thanks gario 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-20 09:54:37 -08:00
Nikolaj Bjorner 33895d522b fix and enable learning 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-19 20:47:16 -08:00
Nikolaj Bjorner 696db3a6a4 debug conflict 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-19 17:25:19 -08:00
Nikolaj Bjorner 96921355cc pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-19 00:54:30 -08:00
Nikolaj Bjorner 1a8ff9cea4 working on pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 22:41:06 -08:00
Nikolaj Bjorner efecb9b6c0 working on pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 21:51:56 -08:00
Nikolaj Bjorner 475072f5da remove theory_card 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 21:27:36 -08:00
Nikolaj Bjorner 0ff1b63307 remove theory_card 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 21:26:23 -08:00
Nikolaj Bjorner ee0abfbfe9 rename card->pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 21:25:02 -08:00
Nikolaj Bjorner 2b2d0e155c debugged new pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 18:03:49 -08:00
Nikolaj Bjorner 86e22c1186 add validation option 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 09:44:20 -08:00
Nikolaj Bjorner c42f0d60e6 pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 05:10:30 -08:00
Nikolaj Bjorner 9734bab205 pb theory 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-17 21:10:15 -08:00
Nikolaj Bjorner 50cc852112 working on pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-17 20:15:24 -08:00
Nikolaj Bjorner 8cb959127f pb theory 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-17 10:41:15 -08:00
Nikolaj Bjorner f3721e5a15 pb theory 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-17 10:39:33 -08:00
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
Nikolaj Bjorner 816029c862 missing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 20:04:30 -08:00
Nikolaj Bjorner f997b639a0 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-08 18:22:18 -08:00
Nikolaj Bjorner c6c7093a4c make max-smt solvers generic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 18:22:07 -08:00
Anh-Dung Phan 5a27c035e4 Add a vector of edges to handle spanning trees 2013-11-08 18:00:48 -08:00
Nikolaj Bjorner 9f53a4aa18 working on supporting multiple max-sat objectives 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 16:54:34 -08:00
Ken McMillan 0cc5c169a4 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-11-08 16:28:27 -08:00
Ken McMillan 749f95c9d7 handle eq-propagate arithetic rule 2013-11-08 16:18:48 -08:00
Nikolaj Bjorner f350efffc7 working on pareto and upper/lower bound facilities 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 13:52:27 -08:00
Nikolaj Bjorner 6caee5e3ca more refactoring 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 13:16:10 -08:00
Nikolaj Bjorner 29cc9025cb renaming to optsmt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 12:41:05 -08:00
Christoph M. Wintersteiger 86f39cd4c1 Changed references to _DEBUG to Z3DEBUG. 
(gcc does not define _DEBUG for debug builds.)

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2013-11-08 19:21:55 +00:00
Nikolaj Bjorner 33be06c6dc continued re-factoring 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 09:00:24 -08:00
Nikolaj Bjorner acbeed2e97 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-07 18:09:58 -08:00
Nikolaj Bjorner 401fced400 separate out file for objectives 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 18:09:44 -08:00
Ken McMillan 763ae0d246 removed debugginf message in interpolation 2013-11-07 17:42:18 -08:00
Ken McMillan a898bad961 fixed two interpolation bugs 2013-11-07 17:38:39 -08:00
Ken McMillan b076c152b3 adding farkas axiom to interpolation 2013-11-07 16:17:56 -08:00
Anh-Dung Phan ab4efe2da0 Update interface of network flows 2013-11-07 15:56:53 -08:00
Ken McMillan cf176af48e looking for more farkas rules in interpolation 2013-11-07 15:40:44 -08:00
Ken McMillan d9c69f5294 handling commutativity rule in interpolation 2013-11-07 15:13:39 -08:00
Nikolaj Bjorner 759d80dfe3 fix regression 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 12:15:51 -08:00
Nikolaj Bjorner 8fb92e6312 tested network sorting 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 10:49:36 -08:00
Nikolaj Bjorner c57594d463 tested network sorting 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 10:47:12 -08:00
Christoph M. Wintersteiger 412f912c46 bugfix for pb2bv 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2013-11-07 15:06:36 +00:00
Nikolaj Bjorner 31e2d823c9 add cutting plane 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 01:35:25 -08:00
Nikolaj Bjorner 220b339e5e add cutting plane 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 01:30:19 -08:00
Nikolaj Bjorner d434cbea41 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-07 00:53:23 -08:00
Nikolaj Bjorner 3ee8c3efb5 pb/car constraints 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 00:53:08 -08:00
Anh-Dung Phan bc9bfe7f97 Use templates on spanning trees 2013-11-07 07:33:25 +01:00
Anh-Dung Phan 55e91c099f Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-06 18:34:28 -08:00
Anh-Dung Phan 676e38ad0b Minor updates 2013-11-06 18:34:09 -08:00
Anh-Dung Phan f7fdf134fd Create a separate class for spanning tree 
Remarks:

1. Templates should be in header files only

2. Should pass in svector<_> instead of returning a local one
 2013-11-06 17:42:09 -08:00
Anh-Dung Phan 034b33b6da Remove m_final from spanning tree representation 2013-11-06 13:30:29 -08:00
Nikolaj Bjorner 05b37b2f07 working on cardinality tactic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-06 12:40:56 -08:00
Nikolaj Bjorner 2f04918c39 working on cardinality tactic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-06 12:33:09 -08:00
Ken McMillan 33f941aaec interpolation fix 2013-11-06 12:20:55 -08:00
Ken McMillan 0696a7ef50 interpolation fix 2013-11-06 11:41:17 -08:00
Ken McMillan b008d036dd trying to fix proof mode issue 2013-11-05 17:38:50 -08:00
Nikolaj Bjorner e84c5e7e90 adding simple sorting network 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-05 16:53:35 -08:00
Nikolaj Bjorner cf75a7743e network update 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-05 16:18:21 -08:00
Nikolaj Bjorner bd33e466c2 network update 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-05 16:10:51 -08:00
Ken McMillan fa05116e66 fixed vc++ compaibility issues 2013-11-05 14:45:44 -08:00
Ken McMillan f83bca11a0 added interpolation options 2013-11-05 14:20:22 -08:00
Ken McMillan d8972d4b17 removed commented-out code 2013-11-05 13:35:37 -08:00
Ken McMillan a785a5a4b8 Merge branch 'unstable' into interp 2013-11-05 12:28:13 -08:00
Ken McMillan 49c72abb2d new interpolation fixes; re-added fixedpoint-push/pop 2013-11-05 12:17:09 -08:00
Nikolaj Bjorner 9467806a5c debugging cardinality theory 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-05 09:39:28 -08:00
Nikolaj Bjorner 27f3f7b735 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-05 01:30:54 -08:00
Nikolaj Bjorner 2853b322ca sketch cardinality plugin module 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-05 01:30:34 -08:00
Anh-Dung Phan 8b776569e0 Add fix_depth 2013-11-05 07:30:42 +01:00
Nikolaj Bjorner acb26d0cf9 review of network flow 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-04 16:00:50 -08:00
Nikolaj Bjorner 89989627d0 add blast method for ite terms 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-04 13:33:02 -08:00
Leonardo de Moura 063f6fe15f fix assertion violations (reported by Christoph Wintersteiger) at sage\app8\bench_2174.smt2, sage\app9\bench_1450.smt2, sage\app9\bench_1546.smt2 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2013-11-04 12:26:20 -08:00
Leonardo de Moura 88675ec728 fix assertion violations (reported by Christoph Wintersteiger) at sage/bench_1300.smt2 and sage/bench/2861.smt2 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2013-11-04 12:24:25 -08:00
Leonardo de Moura 825b72719c fix https://z3.codeplex.com/workitem/62 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2013-11-04 11:57:29 -08:00
Leonardo de Moura 8b10e13251 fix bug in factor_tactic 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2013-11-04 11:02:53 -08:00
Anh-Dung Phan 53d365bc44 Debug Network Simplex implementation 2013-11-04 09:12:25 +01:00
Nikolaj Bjorner 883018b405 v1 of conflict driven optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-03 19:27:06 -08:00
Nikolaj Bjorner a26bd69a5e missing new files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-03 14:55:48 -08:00
Nikolaj Bjorner a0d52e835b missing new files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-03 14:55:39 -08:00
Nikolaj Bjorner c0de1e34ac working on upper bound optimziation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-03 14:54:42 -08:00
Nikolaj Bjorner e5698119d7 debugging infinite upper bound checking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-01 17:27:24 -07:00
Nikolaj Bjorner b35ed169b1 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-01 17:26:48 -07:00
Nikolaj Bjorner 3c6f0c737a debugging infinite upper bound checking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-01 17:26:27 -07:00
Ken McMillan 7ca6c744fd added binary interpolation 2013-11-01 15:58:59 -07:00
Anh-Dung Phan 926f2e0834 Add more object invariants 2013-11-01 14:50:17 -07:00
Nikolaj Bjorner 2a907ea52a fix objective value regression in simplex maximation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-01 12:45:26 -07:00
Ken McMillan ac212ec54c fixing interpolation bugs 2013-11-01 11:03:55 -07:00
Anh-Dung Phan 736d43c084 Block lower bound of difference logic objectives 2013-11-01 08:05:29 +01:00
Nikolaj Bjorner 87141f4cb3 fix bugs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 22:09:52 -07:00
Nikolaj Bjorner ae3a69b32e Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-31 18:51:28 -07:00
Anh-Dung Phan 195df69a1b Use optional<_> for infinite check 2013-10-31 18:34:40 -07:00
Nikolaj Bjorner cfac32c57d add outline of object invariant 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 17:21:10 -07:00
Anh-Dung Phan a66a14dbf0 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-31 16:41:42 -07:00
Anh-Dung Phan 29622229cb Add lower bound case for edge_state 2013-10-31 13:03:24 -07:00
Anh-Dung Phan 1a32a64b96 Use constraint graphs for minimum cost flow correctly 2013-10-31 12:11:56 -07:00
Nikolaj Bjorner 72e82532b2 enabling upper bound test 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 09:43:15 -07:00
Nikolaj Bjorner 637b63cbe1 preparing for inf extension of arithmetic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 02:15:08 -07:00
Nikolaj Bjorner 5106c74b3e preparing for inf extension of arithmetic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 02:13:24 -07:00
Nikolaj Bjorner 0b65aa83e8 preparing for inf extension of arithmetic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 02:02:37 -07:00
Nikolaj Bjorner acc7aa1636 use iterative weighted algorithm 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 00:57:36 -07:00
Anh-Dung Phan a3a7af84c5 Minor updates 2013-10-30 18:25:39 -07:00
Anh-Dung Phan 3a3f93c4a5 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-30 16:52:52 -07:00
Anh-Dung Phan 01c3dd779b Add visualization of spanning trees 2013-10-30 16:52:37 -07:00
Nikolaj Bjorner 86151b4d52 dealing with cancel 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-30 13:38:47 -07:00
Nikolaj Bjorner 946b888b32 adding timeout, parameters, statistics 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-30 13:24:21 -07:00
Nikolaj Bjorner 9fc84f1389 adding timeout, parameters, statistics 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-30 13:23:04 -07:00
Anh-Dung Phan 49aba844b8 Refactor network_flow 
Use a template method for pretty printing
 2013-10-30 10:04:56 -07:00
Nikolaj Bjorner 42cbbe830e working on wmaxsmt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-30 01:28:50 -07:00
Nikolaj Bjorner 6302d1b7db wmax nits 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-30 01:18:10 -07:00
Anh-Dung Phan a6e103dd36 Make a few variables private 2013-10-30 06:30:51 +01:00
Nikolaj Bjorner f5e6a18015 working on wmaxsmt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-29 21:16:02 -07:00
Nikolaj Bjorner bc44bcad10 push blocking code to optimizer context 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-29 20:26:54 -07:00
Anh-Dung Phan b0fddd8e60 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-29 18:33:06 -07:00
Anh-Dung Phan b67d333cf9 First complete version of Network Simplex 2013-10-29 18:32:10 -07:00
Nikolaj Bjorner 5170cbbd7e Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-29 17:40:50 -07:00
Nikolaj Bjorner 96562962fa working on wmaxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-29 17:40:37 -07:00
Anh-Dung Phan e715ccbc98 Minor updates 2013-10-29 15:49:53 -07:00
Anh-Dung Phan 905f230b8f Add pretty printing for network_flow 
Reuse the original graph as much as possible
 2013-10-29 14:20:29 -07:00
Nikolaj Bjorner 1878d64b02 working on weighted maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-28 21:32:41 -07:00
Nikolaj Bjorner d30f183476 working on weighted maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-28 21:30:57 -07:00
Anh-Dung Phan 906bbb4eeb Update Network Simplex implementation 2013-10-28 18:29:14 -07:00
Nikolaj Bjorner d78d22deb6 working on weighted max smt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-28 17:13:23 -07:00
Nikolaj Bjorner 72c3473400 cleanup 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-26 20:48:19 +08:00
Nikolaj Bjorner 9903c722af adding review notes to code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-26 16:24:21 +08:00
Nikolaj Bjorner 3852b3a753 working on internalizer 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-26 15:03:39 +08:00
Anh-Dung Phan 3d943bf70d Fix a mistake in previous commit causing imcompilable code 
Also correct my alias
 2013-10-26 05:22:52 +02:00
Ken McMillan 81df4932fb added quantifiers in new interpolation 2013-10-25 18:40:26 -07:00
Anh-Dung Phan 532c345fd1 Reduce difference logic solver to min cost flow 2013-10-25 17:42:03 -07:00
Ken McMillan 79b0f83ab3 working on new interpolation 2013-10-25 13:58:56 -07:00
Anh-Dung Phan ebed5fa037 WIP on min cost flow problem 
Remarks:
1. Follow the template structure of diff_logic.h
2. Try to reuse dl_graph<Ext> with some ready-to-use graph algorithms
3. Need to add 'explanation' to 'GExt' in order to instantiate
dl_graph<_>
 2013-10-24 17:58:15 -07:00
Christoph M. Wintersteiger ff265c6c6c bugfix for variable unmarking in the sat solver. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2013-10-24 17:48:03 +01:00
Phan Anh Dung be81e77c70 Some progress on Network Simplex 2013-10-24 09:50:12 +02:00
Phan Anh Dung 1ff373072d Add objective functions to difference logic solver 2013-10-24 08:57:21 +02:00
Nikolaj Bjorner 7c8fbbb06a fixing bug with optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-24 12:03:05 +08:00
Nikolaj Bjorner 11010086be fixing bug with optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-24 11:57:30 +08:00
Anh-Dung Phan 6919f335a1 Sketch a skeleton of Difference Logic optimizer 2013-10-22 16:28:03 -07:00
Nikolaj Bjorner 36d7948399 fixing optimizer for multi-objectives and epsilon 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-22 10:36:13 +08:00
Anh-Dung Phan 3441fc2942 A few changes based on previous reviews 
Tested the optimization procedure with:
- unbounded objectives
- bounded with rational solutions
- bounded with irrational solutions
 2013-10-21 17:25:34 -07:00
Christoph M. Wintersteiger 2b627b0821 fixed parameters to disallow overwriting them with illegal combinations on the command line 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2013-10-21 17:28:21 +01:00
Nikolaj Bjorner 3dd72f8f16 more updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-19 17:43:59 -07:00
Nikolaj Bjorner 3996f58a8e tidy & todo notes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-19 12:22:56 -07:00
Phan Anh Dung 53f78f7d19 Replace the use of optional<rational> by inf_eps_rational<rational> 
Also handle composite objectives correctly.
 2013-10-19 06:03:21 +02:00
Anh-Dung Phan a44044fb15 A rudimentary version of MathSAT optimization 
Remarks:
(1) The core procedure accepts maximization only
(2) Add lazy initialization to min_maximize_cmd
(3) The procedure isn't working with composite objective yet.
 2013-10-18 18:00:24 -07:00
Ken McMillan 3a0947b3ba merged with unstable 2013-10-18 17:26:41 -07:00
Nikolaj Bjorner 898609a3ef cleanup macro usage 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-17 20:50:33 -07:00
Nikolaj Bjorner cfedbe3dfd add opt_solver layer 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-17 17:33:43 -07:00