3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 13:58:45 +00:00
Commit graph

1496 commits

Author SHA1 Message Date
Nikolaj Bjorner c57594d463 tested network sorting
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-07 10:47:12 -08: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
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
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
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
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
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 6ca0c7c6c7 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-31 21:32:18 -07:00
Nikolaj Bjorner 6baa469073 local updates to opt_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-31 21:32:11 -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