3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-19 07:09:03 +00:00
Commit graph

2124 commits

Author SHA1 Message Date
Nikolaj Bjorner 57fc0f3f55 bug fixes to min-max, and experiments with hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-28 15:44:39 -07:00
Nikolaj Bjorner 2071029bb3 hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-27 15:45:33 -07:00
Nikolaj Bjorner e370fbb7ed updated maxhs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-27 11:38:43 -07:00
Nikolaj Bjorner 698705b7fa initial version of HS maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-24 18:39:43 -07:00
Nikolaj Bjorner 3e1b9876db fix bug in model generation for COI filter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-15 17:54:54 -07:00
Nikolaj Bjorner 61dcdcb9d1 separate inc sat solver for now
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-15 11:25:05 -07:00
Nikolaj Bjorner 33e2f2012d inc sat experiment
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-15 08:46:20 -07:00
Nikolaj Bjorner d849b5c637 experiment with sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-14 19:40:58 -07:00
Nikolaj Bjorner 81c2560854 experimenting with inc-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-14 15:13:26 -07:00
Nikolaj Bjorner 6d6abb4dde experimenting with inc_sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-14 09:27:47 -07:00
Nikolaj Bjorner 6821d61ac4 working on incremental sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-13 17:19:19 -07:00
Nikolaj Bjorner 03979fd580 fix up pareto callback mechanism
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-13 12:48:17 -07:00
Nikolaj Bjorner 1ea376e310 edits
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-13 10:33:09 -07:00
Nikolaj Bjorner cad1e5cab3 move to scoped state, change default parameter for sls until bv is debugged
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-11 18:39:36 -07:00
Nikolaj Bjorner e9a11bd93b fix emptines check
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-10 17:43:42 -07:00
Nikolaj Bjorner d8ad75e3f4 ptr/ref
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 22:30:59 -07:00
Nikolaj Bjorner fb0305d5ec update timeout logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 22:27:35 -07:00
Nikolaj Bjorner cf55854d22 adding scoped state
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 17:21:16 -07:00
Nikolaj Bjorner 252b9e8819 fix lower/upper bound estimate with respect to offset
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 16:32:17 -07:00
Nikolaj Bjorner 9c4409a8fe set timout to max
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 11:48:28 -07:00
Nikolaj Bjorner 02b419c939 add logging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 11:36:08 -07:00
Nikolaj Bjorner f1194ffeaa add logging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 11:34:15 -07:00
Nikolaj Bjorner 4dc71acde0 add logging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 11:31:54 -07:00
Nikolaj Bjorner a0359c3035 add logging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 11:24:36 -07:00
Nikolaj Bjorner 1e235659c7 unreferenced variable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 11:05:22 -07:00
Nikolaj Bjorner 9c1f85e564 addressing compiler warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 11:03:11 -07:00
Nikolaj Bjorner 05a39cb2cf fix wrong simplex backtracking
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 08:51:07 -07:00
Nikolaj Bjorner d2db8007d8 tuning pb/max
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-06 04:01:10 -07:00
Nikolaj Bjorner 7ade3f2c04 fix sls based on pkb120
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-05 19:22:34 -07:00
Nikolaj Bjorner f1ebf2002a tuning sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-05 16:40:54 -07:00
Nikolaj Bjorner 25ad9d2ee1 tuning based on benchmarks from Robert White
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-05 14:43:06 -07:00
Nikolaj Bjorner 182fea2d7b fix bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-05 10:21:16 -07:00
Christoph M. Wintersteiger c3b7c738f8 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt
Conflicts:
	scripts/mk_project.py
	src/duality/duality.h
	src/duality/duality_solver.cpp
	src/duality/duality_wrapper.h
	src/interp/iz3hash.h

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 22:18:41 +01:00
Christoph M. Wintersteiger fceaf97c95 Merge branch 'unstable' of https://git01.codeplex.com/z3 into bvsls 2014-04-25 22:11:34 +01:00
Christoph M. Wintersteiger a5ce28d82a bugfix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 22:10:53 +01:00
Christoph M. Wintersteiger 0915e6fcd7 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-04-25 22:03:49 +01:00
Christoph M. Wintersteiger 39b562da44 compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 22:03:26 +01:00
Christoph M. Wintersteiger da4a2d6426 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-04-25 21:54:40 +01:00
Christoph M. Wintersteiger 23dccdc7d5 compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 21:54:08 +01:00
Christoph M. Wintersteiger 5f0739cdc0 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-04-25 21:50:29 +01:00
Christoph M. Wintersteiger c9c40877a7 compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 21:49:35 +01:00
Christoph M. Wintersteiger 5fab191c6c compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 18:58:19 +01:00
Christoph M. Wintersteiger 8fe2db1eed Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-04-25 18:11:48 +01:00
Christoph M. Wintersteiger 4ff6a7c38d compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 18:11:30 +01:00
Christoph M. Wintersteiger 216b4d1aaa Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-04-25 18:06:03 +01:00
Christoph M. Wintersteiger ac206bacbf Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt
Conflicts:
	src/tactic/sls/sls_compilation_settings.h

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 18:05:53 +01:00
Christoph M. Wintersteiger bfdea4242c removed unused file
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 18:03:35 +01:00
Christoph M. Wintersteiger a3f20774a8 BVSLS comments
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 17:17:47 +01:00
Andreas Froehlich 3df2967be9 Cleaned up final SLS version. Enjoy! 2014-04-25 13:56:15 +01:00
Nikolaj Bjorner 20cb8a3092 added pareto utility
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-25 03:00:31 +02:00