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

2035 commits

Author SHA1 Message Date
Nikolaj Bjorner 1f66e46c67 move sls functionality to solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-19 20:50:44 -07:00
Nikolaj Bjorner 3f5ed8ff11 coallesce common code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-19 20:27:39 -07:00
Nikolaj Bjorner b300041075 resetting SLS engine between calls, moved statistics collection to engine
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-19 16:52:57 -07:00
Nikolaj Bjorner ff154a09b3 sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-19 12:12:51 -07:00
Nikolaj Bjorner 032e2618f6 refactor
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-19 11:58:57 -07:00
Nikolaj Bjorner 5ead06bcef adding SLS solver layer
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-18 10:29:52 -07:00
Nikolaj Bjorner e3b346df6f working on bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-18 08:04:18 -07:00
Nikolaj Bjorner ae1656a92c working on bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-17 15:37:03 -07:00
Nikolaj Bjorner 7237be768b fixing bugs in refactored code exposed from White's example
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-17 11:06:43 -07:00
Nikolaj Bjorner c84ab2fc01 tidy
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-14 22:12:22 -07:00
Nikolaj Bjorner e32666927b tidy
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-14 21:59:39 -07:00
Nikolaj Bjorner 91dc527635 tidy
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-14 21:18:18 -07:00
Nikolaj Bjorner ac31e3856e refactor weighted maxsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-14 16:25:52 -07:00
Nikolaj Bjorner 00f45579cc refactor weighted maxsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-14 16:24:23 -07:00
Christoph M. Wintersteiger 64106af5ec bvsls_opt_engine fixes
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-14 17:48:09 +01:00
Christoph M. Wintersteiger 71af72eed4 bugfix for bvsls_opt_engine
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-14 15:24:47 +01:00
Nikolaj Bjorner 1db7e0a149 fix compiler warnings reported by Robert White
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-02 15:54:28 +02:00
Nikolaj Bjorner 7fd6549a40 another sls example
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-31 23:32:31 +02:00
Nikolaj Bjorner deb325b8c2 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-03-31 23:31:06 +02:00
Nikolaj Bjorner f321f19b20 adding bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-31 23:30:59 +02:00
Christoph M. Wintersteiger 7d896e5a9a bvsls_opt_engine bugfix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-31 17:58:19 +01:00
Christoph M. Wintersteiger 3bc31b6603 bvsls integration with opt::wmaxsmt
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-31 17:41:34 +01:00
Nikolaj Bjorner d67f1f36c4 refactor weighted theory solver into own file
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-29 16:54:12 -07:00
Nikolaj Bjorner 8d23b2b813 speed up parsing of large Datalog files, remove pinned
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-28 18:26:42 -07:00
Nikolaj Bjorner efe2a70f6f integrating SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-28 14:30:36 -07:00
Nikolaj Bjorner 3d7f208ce6 add bvsls module as backend to weighted maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-28 13:32:31 -07:00
Christoph M. Wintersteiger a26e299390 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-03-28 17:46:32 +00:00
Christoph M. Wintersteiger c068db16e8 first attempts at getting to the bvsls from opt_context. 2014-03-28 17:46:26 +00:00
Nikolaj Bjorner cc577a431a C++ API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-28 09:39:14 -07:00
Nikolaj Bjorner 13e454ad63 adding C++ API for optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-28 09:29:21 -07:00
Nikolaj Bjorner 776f1dc631 Merge branch 'unstable' of https://git01.codeplex.com/z3 into opt 2014-03-28 08:52:37 -07:00
Nikolaj Bjorner 6f7c9607ea Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2014-03-28 08:52:04 -07:00
Nikolaj Bjorner 4c95bb4dd9 add 'distinct' to C++ API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-28 08:51:50 -07:00
Nikolaj Bjorner 9916439913 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-03-28 08:35:02 -07:00
Nikolaj Bjorner a6d7d23bb5 fix compilation warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-28 08:34:54 -07:00
Nikolaj Bjorner ac7fffa9cb fix bug exposed by example by Robert White
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-28 08:34:31 -07:00
Christoph M. Wintersteiger 97e549d946 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-28 15:28:12 +00:00
Christoph M. Wintersteiger f8ee58b301 bvsls bugfix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-28 15:28:02 +00:00
Christoph M. Wintersteiger efe5df1e90 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-28 15:27:20 +00:00
Christoph M. Wintersteiger 0f5d2e010d bvsls refactoring
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-28 15:26:52 +00:00
Christoph M. Wintersteiger 864bef8e2c Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-28 15:08:17 +00:00
Christoph M. Wintersteiger 24d662ba49 bvsls refactoring
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-28 14:58:59 +00:00
Christoph M. Wintersteiger 2da9392e9e Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-28 12:30:58 +00:00
Christoph M. Wintersteiger 8e5659ac4c compilation fixes
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-28 12:30:15 +00:00
Christoph M. Wintersteiger 965157e354 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-28 12:28:53 +00:00
Christoph M. Wintersteiger 176715aea0 compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-28 12:28:40 +00:00
Christoph M. Wintersteiger 715ce15dec Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-28 12:27:26 +00:00
Christoph M. Wintersteiger 883762d54a removed dependency of bvsls on goal_refs
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-28 12:27:06 +00:00
Christoph M. Wintersteiger 2103bc3831 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-27 13:37:34 +00:00
Christoph M. Wintersteiger c5e059211f bugfix 2014-03-27 13:37:04 +00:00