Nikolaj Bjorner
|
55956df8d8
|
remove critical sections that are now redundant due to different cancellation model
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2016-03-13 12:10:14 -04:00 |
|
Nuno Lopes
|
8b53628d67
|
remove a few unused decls
|
2016-03-09 17:01:06 +00:00 |
|
Nikolaj Bjorner
|
5db84575f6
|
fix regression in o7.smt2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2016-03-08 22:27:47 -08:00 |
|
Nikolaj Bjorner
|
5994c5a948
|
fix partial model tracking over cancellation/exceptions, reported by August Shi. Fix regression test for fp-to-real, reset the pre-processor in inc_sat_solver on exceptions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2016-03-07 16:42:29 -08:00 |
|
Nikolaj Bjorner
|
67397bf71e
|
enable logic parameter update to configure SMTLIB logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2016-03-01 09:48:24 -08:00 |
|
Nikolaj Bjorner
|
2a65503235
|
fix #425 and report from Patrick Trentin of same bug in preprocessing soft constraints that are simplified to true/false
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2016-02-04 22:35:02 +00:00 |
|
Nikolaj Bjorner
|
85d44c5d66
|
fix axioms for extract, add extensionality checking for shared variables, convert exceptions to unknown status per #419
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2016-01-18 11:09:41 +05:30 |
|
Nikolaj Bjorner
|
baee4225a7
|
reworking cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-12-11 16:21:24 -08:00 |
|
Nikolaj Bjorner
|
32b6b2da44
|
moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-12-11 13:13:11 -08:00 |
|
Nikolaj Bjorner
|
61dbb6168e
|
cleanup cancelation logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-12-11 12:35:35 -08:00 |
|
Nuno Lopes
|
b26735a887
|
fix build with gcc
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
|
2015-11-22 11:24:30 +00:00 |
|
Nikolaj Bjorner
|
c1a6163bda
|
disable aig tactic in inc_sat_solver (it can blow up the size of formulas significantly without sharing) and fix configuration update bug for optimization context exposed in example by Corina
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-11-20 14:34:31 -08:00 |
|
Nikolaj Bjorner
|
0592e76574
|
Enhancement for Valentin #332
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-11-19 10:26:01 -08:00 |
|
Nikolaj Bjorner
|
5948013b1b
|
clear label buffer
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-11-18 18:56:54 -08:00 |
|
Nikolaj Bjorner
|
c58e640563
|
extract labels for optimal model. Fix to #325
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-11-18 14:53:08 -08:00 |
|
Nikolaj Bjorner
|
1575dd06a7
|
expose labels from optimization. Move printing of objectives to after sat/unsat. Cahnge format to something that is somewhat related to how other output is created. Issue #325.
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-11-18 09:42:12 -08:00 |
|
Nikolaj Bjorner
|
c2108f74f1
|
fix uninitialized variable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-11-14 10:35:06 -08:00 |
|
Nikolaj Bjorner
|
0a26bcf14c
|
ensure unique symbols when MaxSAT problems are extracted from linear objectives such that multiple objectives can be supported. Fixes issue #308
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-11-13 15:12:08 -05:00 |
|
Nikolaj Bjorner
|
2865f60f8c
|
deal with case of unsatisfiable context and bit-vector objectives that are not normalized to maxsmt. Issue #304
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-11-11 11:39:34 -05:00 |
|
Nikolaj Bjorner
|
b4cb51cdb3
|
working on Forking/Serializing a z3 Solver #209
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-11-06 17:29:24 -08:00 |
|
Nikolaj Bjorner
|
653416153d
|
use appropriate MaxSAT solver even if there are no soft constraints. Also avoid PB constraints when all soft constraints are false. Reported by Klaus Becker
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-11-02 08:18:51 -08:00 |
|
Nikolaj Bjorner
|
7838213675
|
eliminate to_real coersions to make mixed integer problems easier to digest. Issue #277
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-10-30 15:12:21 -07:00 |
|
Nikolaj Bjorner
|
9b3e242990
|
adding rlimit resource limit facility to provide platform and architecture independent method for canceling activities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-09-28 13:37:59 -07:00 |
|
Christoph M. Wintersteiger
|
f3441c6a9b
|
tabs and indentation
|
2015-09-17 13:25:22 +01:00 |
|
Nikolaj Bjorner
|
b25e8e2288
|
tune lexicographic products, avoid push/pop and ensure correction sets are not used for multiple objectives
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-09-13 16:00:45 +02:00 |
|
Nikolaj Bjorner
|
cc5d719d9e
|
enable incremental bit-vector solving
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-09-01 09:48:35 -07:00 |
|
Nikolaj Bjorner
|
0ed38ed59b
|
add option for using corr set and use partial cores
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-30 14:48:24 -07:00 |
|
Nikolaj Bjorner
|
b2ebd095cb
|
fix for unintialized variable m_conflict_lvl
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-24 17:01:46 -07:00 |
|
Nikolaj Bjorner
|
149549dd52
|
fix wcnf front-end and unsat case in pd
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-23 14:24:51 -07:00 |
|
Nikolaj Bjorner
|
ee458fa601
|
revising pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-23 12:09:07 -07:00 |
|
Nikolaj Bjorner
|
546a9b8f03
|
revising pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-23 10:53:39 -07:00 |
|
Nikolaj Bjorner
|
da0c12cdba
|
move display method to before first SAT call
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-21 18:29:36 -07:00 |
|
Nikolaj Bjorner
|
a78fc031bc
|
adding facility to dump wcnf benchmarks
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-21 07:26:49 -07:00 |
|
Nikolaj Bjorner
|
a9807878ea
|
reworking pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-20 12:20:30 -07:00 |
|
Nikolaj Bjorner
|
e3cb0e2d8b
|
reworking pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-20 12:06:27 -07:00 |
|
Nikolaj Bjorner
|
980e74b4ff
|
add tactic to recognize small discrete domains and convert them into bit-vectors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-20 06:39:11 -07:00 |
|
Nikolaj Bjorner
|
655b44c07b
|
make :weight understand both decimal and integral values, remove dweight, remove deprecated commands for optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-15 00:48:22 +02:00 |
|
Nikolaj Bjorner
|
eb5af100bd
|
adding optimize bindings for ML, adding get_reason_unknown to optimize, mentioned in pull request issue #188, second edition
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-09 17:49:20 +02:00 |
|
Nikolaj Bjorner
|
aa431bb67f
|
ensure pb on lex > 1 constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-08 14:10:11 +02:00 |
|
Nikolaj Bjorner
|
a3c43c34fb
|
change default behavior of solver pretty printer to include declarations
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-06 18:57:11 +02:00 |
|
Nikolaj Bjorner
|
f96c0b6963
|
fixes #186, remove ite-lifting from opt_context to detect weighted maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-08-06 11:52:59 +02:00 |
|
Nikolaj Bjorner
|
4bc044c982
|
update header guards to be C++ style. Fixes issue #9
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-07-08 23:18:40 -07:00 |
|
Nikolaj Bjorner
|
77c8e5b0a0
|
add model on unknown, to address issue #139
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-06-23 14:45:52 +02:00 |
|
Nikolaj Bjorner
|
564da787fb
|
add count of memory allocations and way to limit allocations globally. Fix purification in nlsat_smt to fix regressions on QF_UFNRA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-06-22 07:45:40 +02:00 |
|
Nikolaj Bjorner
|
4675643271
|
fixes to githup issue #133 and stackoverflow reported bug on assertion violation in poly_simplifier_plugin
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-06-21 13:49:15 -07:00 |
|
Nikolaj Bjorner
|
6f0d76a62e
|
Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable
|
2015-06-21 09:39:32 -07:00 |
|
Nikolaj Bjorner
|
fe7c577d99
|
isolate inc_sat_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-06-21 01:54:52 -07:00 |
|
Nikolaj Bjorner
|
d06207f072
|
remove ite terms from objectives to synchronize values in tableau with objective value. Fixes part of (three repros) from issue #120
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
|
2015-06-02 10:38:22 -07:00 |
|
Nikolaj Bjorner
|
ffff006945
|
remove old files
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
|
2015-06-02 09:15:08 -07:00 |
|
Nikolaj Bjorner
|
1714182c38
|
Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable
|
2015-05-29 11:08:25 -07:00 |
|
Nikolaj Bjorner
|
a2448be0cd
|
print pareto model in check-sat too
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
|
2015-05-29 08:55:44 -07:00 |
|
Nikolaj Bjorner
|
ed7e0e11a8
|
n/a
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-05-28 20:55:13 -07:00 |
|
Nikolaj Bjorner
|
203c5015c8
|
fix debian amd64 warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-05-18 15:17:21 -07:00 |
|
Nikolaj Bjorner
|
5632900f35
|
fix gcc compiler warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-05-16 12:04:10 +01:00 |
|
Nikolaj Bjorner
|
64bd62b17e
|
fix gcc compiler warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-05-16 11:56:04 +01:00 |
|
Nuno Lopes
|
6c22edc988
|
fix assorted compiler warnings
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
|
2015-05-16 11:44:58 +01:00 |
|
Nikolaj Bjorner
|
e6b8af402f
|
fix build warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-05-15 15:56:21 +01:00 |
|
Nikolaj Bjorner
|
a0f0b53686
|
fixes to #52, #53
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-04-28 14:48:59 -07:00 |
|
Nikolaj Bjorner
|
bd162588b2
|
enable SAT solver by default for MaxSAT constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
|
2015-04-02 17:09:01 -07:00 |
|
Nikolaj Bjorner
|
e944f89505
|
fix bug introduced when clearing state between calls to Pareto/Box
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-04-02 02:36:01 -07:00 |
|
Nikolaj Bjorner
|
fc36d861a7
|
update default to maxres for MaxSAT, reset pareto and box state on every constraint update
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-04-01 19:32:50 -07:00 |
|
Nikolaj Bjorner
|
f8d04118d8
|
switch models for multiple box objectives. Feature request at codeplex issue 194, George Karpenov. Usage model is same as Pareto fronts you call check-sat multiple times until retrieving unsat
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
|
2015-04-01 16:21:56 -07:00 |
|
Nikolaj Bjorner
|
52619b9dbb
|
pull unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
|
2015-04-01 14:57:11 -07:00 |
|
nikolajbjorner
|
fe6af38d97
|
debugging assertion violation
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
|
2015-03-10 20:57:01 -07:00 |
|
nikolajbjorner
|
fbf8289394
|
probe also hard constraints before enabling SAT solver. Bug reported by Zvonimir Pavlinovic
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
|
2015-02-24 14:02:23 -08:00 |
|
Nikolaj Bjorner
|
c3232693f0
|
use PB solver instead of full arithmetic for bouding Pareto fronts so that difference logic theory isn't broken. Codeplex issue 175
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-02-22 09:46:21 -08:00 |
|
Nikolaj Bjorner
|
911ffc370a
|
separate MaxSMT functionality to enable using this independently (and incrementally) of overall context
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-02-16 09:11:28 +01:00 |
|
Nikolaj Bjorner
|
8141dadc89
|
break on small cores
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-02-08 10:22:06 +01:00 |
|
Nikolaj Bjorner
|
761c7d9a40
|
adding annotation to logging to show number of columns and rows, adding dual propagation sketch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-01-25 04:01:18 -08:00 |
|
Nikolaj Bjorner
|
552cbd840f
|
adding soft-assertions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-01-23 13:06:11 -08:00 |
|
Nikolaj Bjorner
|
e50e02e656
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2015-01-20 16:38:55 -08:00 |
|
Nikolaj Bjorner
|
e24db56650
|
integrating new integer primal loop
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-01-20 16:38:45 -08:00 |
|
Nikolaj Bjorner
|
f1d9228b94
|
fix bug in context push/pop for sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-01-20 16:30:46 -08:00 |
|
Nikolaj Bjorner
|
ef57e4abe5
|
extract theory symbols from Boolean objectives
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-01-05 19:42:06 -08:00 |
|
Nikolaj Bjorner
|
21ea48bfd8
|
epsilon should have real type, reported by GeorgeKarpenkov, codeplex issue 145
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-12-15 16:27:35 -08:00 |
|
Nikolaj Bjorner
|
f4dfb9ac82
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2014-12-09 20:57:34 +01:00 |
|
Nikolaj Bjorner
|
08cb8b8de8
|
address divergence in the case of shared theory symbols. Codeplex issue 147, thanks to George Karpenkov
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-12-09 16:04:25 +01:00 |
|
Nikolaj Bjorner
|
e9baaa0900
|
rename 'or' to 'fml' toe mae gcc happy, reported by Geroge Karpenkov
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-11-25 10:23:41 -08:00 |
|
Nikolaj Bjorner
|
2dccfc0ce2
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2014-11-24 16:17:41 -08:00 |
|
Nikolaj Bjorner
|
f71fd2afb5
|
disable unconstrained elimination pre-processing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-11-24 16:17:22 -08:00 |
|
Nikolaj Bjorner
|
444879db5f
|
fix bug reported on stackoverflow on crash for unconstrained variables
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-11-05 13:51:27 +01:00 |
|
Nikolaj Bjorner
|
301f441801
|
bypass simplifier if (m_is_clausal) {
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-10-22 09:02:08 -07:00 |
|
Nikolaj Bjorner
|
630a3d6ea8
|
integrate bounds from original model
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-10-15 15:11:31 -07:00 |
|
Nikolaj Bjorner
|
ce18421a7a
|
fix box
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-10-15 14:29:39 -07:00 |
|
Nikolaj Bjorner
|
ff69ee049b
|
fix non-termination
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-10-14 16:45:54 -07:00 |
|
Nikolaj Bjorner
|
69a5634e7e
|
adding symba designated strategy (back?) to optsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-10-14 16:33:55 -07:00 |
|
Nikolaj Bjorner
|
f7f4feaa47
|
fix lex bug for maxres case
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-10-11 01:05:30 -07:00 |
|
Nikolaj Bjorner
|
e1c2049343
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2014-10-06 08:37:41 -07:00 |
|
Nikolaj Bjorner
|
db20b2502d
|
try qx
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-10-04 19:50:42 -07:00 |
|
Nikolaj Bjorner
|
f3d2535b46
|
another unit test for Nuno
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-10-03 16:58:46 -07:00 |
|
Nikolaj Bjorner
|
cb88968588
|
tuning maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-10-02 17:10:51 -07:00 |
|
Nikolaj Bjorner
|
0b1c180808
|
fix lexicographic product for MaxSMT
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-10-01 13:49:23 -07:00 |
|
Nikolaj Bjorner
|
08dcd51594
|
fix bugs in incremental operation of sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-27 12:04:54 -07:00 |
|
Nikolaj Bjorner
|
caa35f6270
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2014-09-27 09:59:00 -07:00 |
|
Nikolaj Bjorner
|
1392dc020f
|
local debug update
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-27 09:58:43 -07:00 |
|
Nikolaj Bjorner
|
e6725b2344
|
merge unstable into opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-26 12:12:24 -07:00 |
|
Nikolaj Bjorner
|
99ff13b651
|
opt + udoc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-17 11:39:25 -07:00 |
|
Nikolaj Bjorner
|
73070585b8
|
fix bug in core generation in legacy core: it ignores complementary literals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-14 13:06:01 -07:00 |
|
Nikolaj Bjorner
|
a96fa0c555
|
remove deprecated maxsat solvers, adjust values inline
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-14 11:55:47 -07:00 |
|
Nikolaj Bjorner
|
019ff77613
|
fix sorting network bug, add network compilation,...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-11 18:47:21 -07:00 |
|
Nikolaj Bjorner
|
72f09e4729
|
better verbose pretty printing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-09 16:57:43 -07:00 |
|
Nikolaj Bjorner
|
f151879c0b
|
enable neat vs. less neat pretty priting as an option
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-09 16:25:41 -07:00 |
|
Nikolaj Bjorner
|
c1580fb85a
|
follow logic annotation/enable diff logic when configured
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-07 11:52:14 -07:00 |
|
Nikolaj Bjorner
|
18b491eee0
|
fixes to maxres/mss
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-03 10:03:56 -07:00 |
|
Nikolaj Bjorner
|
b5bbf83847
|
update core generation to be partial, update maxres to use current model too
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-02 19:05:28 -07:00 |
|
Nikolaj Bjorner
|
3f8083dfa6
|
fix push/pop bugs in optimize context, add example to c++, fix bug in arithemtic bounds axiom addition
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-02 09:32:38 -07:00 |
|
Nikolaj Bjorner
|
75c114feab
|
fix regression on push/pop
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-09-01 14:37:58 -07:00 |
|
Nikolaj Bjorner
|
afe7fc367b
|
working on maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-30 12:40:37 -07:00 |
|
Nikolaj Bjorner
|
83a7d1a658
|
adding options to maxres for experiments, include option to pretty print module parameters in smt2 style
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-30 11:46:29 -07:00 |
|
Nikolaj Bjorner
|
b45b2872d8
|
basic primal/dual
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-29 16:24:46 -07:00 |
|
Nikolaj Bjorner
|
5fdb58348e
|
working on mus-mss
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-29 15:34:48 -07:00 |
|
Nikolaj Bjorner
|
3da60804fc
|
basic primal/dual
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-29 09:52:56 -07:00 |
|
Nikolaj Bjorner
|
c928f776da
|
working on mss/mus v2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-29 08:39:31 -07:00 |
|
Nikolaj Bjorner
|
1b9529e1e1
|
fix scope bugs per Klaus Becker's examples
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-29 01:55:32 -07:00 |
|
Nikolaj Bjorner
|
bd8875bf5f
|
add MUS/MCS plan
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-28 21:18:17 -07:00 |
|
Nikolaj Bjorner
|
16e0ad14aa
|
add MUS/MCS plan
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-28 20:56:41 -07:00 |
|
Nikolaj Bjorner
|
9e7cef7d6b
|
working on product sets
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-26 16:45:45 -07:00 |
|
Nikolaj Bjorner
|
3ae10abf04
|
remove extra qualifier
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-25 13:15:29 -07:00 |
|
Nikolaj Bjorner
|
ff501986f1
|
remove extra qualifier
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-25 13:15:01 -07:00 |
|
Nikolaj Bjorner
|
2dcbf192cc
|
remove extra qualifier
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-25 13:14:20 -07:00 |
|
Nikolaj Bjorner
|
4d589de970
|
remove extra qualifier
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-25 13:13:43 -07:00 |
|
Nikolaj Bjorner
|
20728535e8
|
remove extra qualifier
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-25 13:12:49 -07:00 |
|
Nikolaj Bjorner
|
15734398d8
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2014-08-25 12:11:49 -07:00 |
|
Nikolaj Bjorner
|
8938de2ba2
|
fix build error reported by Ari
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-25 12:11:34 -07:00 |
|
Nikolaj Bjorner
|
b82a68f4d4
|
fix bug in sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-24 19:53:55 -07:00 |
|
Nikolaj Bjorner
|
b596828d23
|
add DDNF based engine
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-21 18:04:46 -07:00 |
|
Nikolaj Bjorner
|
a47f3df703
|
fix bug in unsat core extraction in sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-18 23:43:51 -07:00 |
|
Nikolaj Bjorner
|
1c56d6ee95
|
align lengths of weights and soft constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-18 01:17:26 -07:00 |
|
Nikolaj Bjorner
|
f748a03ac7
|
opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-16 22:31:54 -07:00 |
|
Nikolaj Bjorner
|
33f74b9c9f
|
sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-15 22:49:21 -07:00 |
|
Nikolaj Bjorner
|
ddb9e6e8d4
|
fix flipper
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-15 18:30:06 -07:00 |
|
Nikolaj Bjorner
|
be1cceba34
|
fix scope and mus with user-scopes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-15 11:29:08 -07:00 |
|
Nikolaj Bjorner
|
ee1a1b1135
|
refactor sat/sls interface. Remove wpm2 and bvsls dependencies
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-15 10:40:44 -07:00 |
|
Nikolaj Bjorner
|
180b0d4ec9
|
add sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-12 19:24:31 -07:00 |
|
Nikolaj Bjorner
|
1652c16163
|
add missing code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-10 22:13:55 -07:00 |
|
Nikolaj Bjorner
|
39d90f914d
|
NA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-10 21:27:07 -07:00 |
|
Nikolaj Bjorner
|
e832bdd257
|
fix bug in blocked clause elimination that was enabled for external variables, fix other bugs in maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-10 21:23:05 -07:00 |
|
Nikolaj Bjorner
|
317e76a11b
|
mss and mss-mus-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-03 20:23:10 -07:00 |
|
Nikolaj Bjorner
|
d429e72e92
|
v2 of dual maxres engine
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-03 18:50:21 -07:00 |
|
Nikolaj Bjorner
|
622d8b5cd1
|
moving to maxres consolidation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-03 00:18:09 -07:00 |
|
Nikolaj Bjorner
|
6a4c08c7cb
|
moving to maxres consolidation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-03 00:17:55 -07:00 |
|
Nikolaj Bjorner
|
a41b1d34ce
|
moving dual solver to maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-03 00:08:57 -07:00 |
|
Nikolaj Bjorner
|
5e026b7897
|
mss and maxres tuning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-02 23:34:43 -07:00 |
|
Nikolaj Bjorner
|
9681dc12b1
|
tuning auxiliary literals and clauses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-02 14:25:04 -07:00 |
|
Nikolaj Bjorner
|
8814ba0629
|
testing maxres with sat core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-02 12:27:57 -07:00 |
|
Nikolaj Bjorner
|
b928734348
|
perf improvements, mus
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-08-01 16:11:52 -07:00 |
|
Nikolaj Bjorner
|
6438c477b3
|
working on maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-31 23:35:41 -07:00 |
|
Nikolaj Bjorner
|
39414d8b8d
|
testing inc_sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-31 22:29:47 -07:00 |
|
Nikolaj Bjorner
|
365f05b41a
|
testing inc-sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-30 17:49:51 -07:00 |
|
Nikolaj Bjorner
|
bfc0af7820
|
testing inc-sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-30 16:35:46 -07:00 |
|
Nikolaj Bjorner
|
e8056e066d
|
enable bvsat, multi disjoint cores for dual-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-30 12:57:30 -07:00 |
|
Nikolaj Bjorner
|
3fefed69b7
|
incremental sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-30 11:12:15 -07:00 |
|
Nikolaj Bjorner
|
4f0de9a0cf
|
implement user scopes for sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-30 09:27:03 -07:00 |
|
Nikolaj Bjorner
|
2b1af8fd50
|
updated sat solver for cores
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-29 14:38:17 -07:00 |
|
Nikolaj Bjorner
|
4ab27eff78
|
refactor weighted-maxsat into separate files
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-28 08:31:57 -07:00 |
|
Nikolaj Bjorner
|
9f1b2ccfc4
|
restructure maxsmt solvers, flatten weighted/non-weighted versions, fix bugs and simplify mus/max-res
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-23 23:53:03 +02:00 |
|
Nikolaj Bjorner
|
5e9bf2ef53
|
maxres revised to handle weighted constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-22 15:42:08 +02:00 |
|
Nikolaj Bjorner
|
bf35a62da7
|
adding mus extraction
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-21 23:28:19 +02:00 |
|
Nikolaj Bjorner
|
582dbe509c
|
first implementation of maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-21 22:24:34 +02:00 |
|
Nikolaj Bjorner
|
53f82e3239
|
update model during Lex
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-06 17:33:54 +02:00 |
|
Nikolaj Bjorner
|
519c9dba25
|
update hitting set implementation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-23 11:28:38 -07:00 |
|
Nikolaj Bjorner
|
04407938be
|
custom HS solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-18 17:31:00 -07:00 |
|
Nikolaj Bjorner
|
d7d85aa18a
|
working on HS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-17 22:32:32 -07:00 |
|
Nikolaj Bjorner
|
84d971b69a
|
working on HS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-17 17:05:05 -07:00 |
|
Nikolaj Bjorner
|
b64b12cae3
|
working on HS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-17 12:54:50 -07:00 |
|
Nikolaj Bjorner
|
bad03822b4
|
working on HS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-16 16:55:48 -07:00 |
|
Nikolaj Bjorner
|
63550d8a1a
|
bug fixes in hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-15 05:44:03 -07:00 |
|
Nikolaj Bjorner
|
ef62a52fff
|
cleanup
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-14 18:45:16 -07:00 |
|
Nikolaj Bjorner
|
7fbe7124f9
|
bugfixes to hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-14 17:29:53 -07:00 |
|
Nikolaj Bjorner
|
5427964c54
|
use approximate hitting set implementation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-14 14:08:55 -07:00 |
|
Nikolaj Bjorner
|
960e8ea1d5
|
working on hitting sets
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-08 14:12:54 +01:00 |
|
Nikolaj Bjorner
|
4415df3fcf
|
various fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-02 19:10:20 +05:30 |
|
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
|
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
|
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
|
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
|
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 |
|
Nikolaj Bjorner
|
20cb8a3092
|
added pareto utility
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-04-25 03:00:31 +02:00 |
|
Nikolaj Bjorner
|
55863b4bb5
|
fix build problems, fix scoping
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-04-23 14:05:59 +02:00 |
|
Nikolaj Bjorner
|
27fa7077a6
|
fix compiler warnings/errors reported by Robert White
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-04-23 09:22:31 +02:00 |
|
Nikolaj Bjorner
|
23a74b3c26
|
fix assertions reported by Christoph
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-04-23 08:07:37 +02:00 |
|
Nikolaj Bjorner
|
d67b5226f0
|
fix compiler errors reported by Robert White
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-04-22 16:59:40 +02:00 |
|
Nikolaj Bjorner
|
3003049df8
|
fix bug in bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-04-22 15:41:11 +02:00 |
|
Nikolaj Bjorner
|
beaa50e0d8
|
fixing sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-04-21 18:07:02 +02:00 |
|
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
|
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
|
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
|
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
|
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 |
|
Nikolaj Bjorner
|
fdf150d762
|
adding bcp2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-25 17:08:58 -07:00 |
|
Nikolaj Bjorner
|
ede9549818
|
fix compilation errors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-25 13:43:45 -07:00 |
|
Nikolaj Bjorner
|
5f245de36d
|
new test file
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-24 10:47:00 -07:00 |
|
Nikolaj Bjorner
|
ff1543d700
|
fix APIs, add python API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-23 21:28:11 -07:00 |
|
Nikolaj Bjorner
|
0181f0f9df
|
add bvmax tactic, add proviso for non-0 lower bounds in elim01
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-23 18:03:20 -07:00 |
|
Nikolaj Bjorner
|
ea261c930d
|
fix memory leak in scoped_numeral_vector
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-22 20:34:34 -07:00 |
|
Nikolaj Bjorner
|
92145f2bfa
|
integrate opt with push/pop/check-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-22 16:31:48 -07:00 |
|
Nikolaj Bjorner
|
fdaeb9bb73
|
integrate opt with push/pop/check-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-22 16:15:50 -07:00 |
|
Nikolaj Bjorner
|
7c4bd23b3d
|
check types
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-22 01:07:38 -07:00 |
|
Nikolaj Bjorner
|
9556a223f3
|
check types
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-22 00:54:14 -07:00 |
|
Nikolaj Bjorner
|
2c69aa0df1
|
fix duplicate class
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-22 00:06:34 -07:00 |
|
Nikolaj Bjorner
|
8cbe257434
|
improved SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-21 14:33:29 -07:00 |
|
Nikolaj Bjorner
|
25383796c6
|
improved SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-20 22:22:46 -07:00 |
|
Nikolaj Bjorner
|
d9796ec030
|
improved SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-20 22:19:30 -07:00 |
|
Nikolaj Bjorner
|
39ac22c37e
|
sls testing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-20 17:34:01 -07:00 |
|
Nikolaj Bjorner
|
8a63ae0cdf
|
patch bounds normalization bug found by dvitek
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-19 17:59:20 -07:00 |
|
Nikolaj Bjorner
|
e3a854743b
|
working on SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-19 15:55:16 -07:00 |
|
Nikolaj Bjorner
|
2909e8cd9e
|
working on SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-19 15:53:28 -07:00 |
|
Nikolaj Bjorner
|
3b3498c4b5
|
initial sls experiment
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-19 15:39:11 -07:00 |
|
Nikolaj Bjorner
|
78975827b2
|
add sls test to wmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-03-18 21:30:45 -07:00 |
|