mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Code Activity
3565 commits 23 branches 48 tags 157 MiB
Commit graph

3565 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph M. Wintersteiger
84ed1c19a0 Bugfixes for the Java FPA API 
Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 19:20:43 +00:00
Christoph M. Wintersteiger
42162f1ea5 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-01-21 19:10:34 +00:00
Christoph M. Wintersteiger
bf28eb32c6 Merge branch 'fpa-api' of https://git01.codeplex.com/z3 into unstable 2015-01-21 19:09:48 +00:00
Christoph M. Wintersteiger
b6a7d60043 Added FPA functions to Java API 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 19:09:22 +00:00
Christoph M. Wintersteiger
95300e801d fixed build errors and warnings 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 18:24:36 +00:00
Christoph M. Wintersteiger
71042bbf6d Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-01-21 18:04:11 +00:00
Christoph M. Wintersteiger
2cb84280d8 Final adjustments for the FP integration 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 17:58:31 +00:00
Christoph M. Wintersteiger
1209302fe6 Fixed integration issues 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 15:34:21 +00:00
Christoph M. Wintersteiger
9a53fe43e6 Removed unnecessary #includes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 15:31:12 +00:00
Christoph M. Wintersteiger
1a6af4385e Fixed C example 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 15:01:50 +00:00
Christoph M. Wintersteiger
74e60fc955 disabled debug output 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 15:01:35 +00:00
Christoph M. Wintersteiger
e5c5c801c7 fixed botched merge 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 14:40:18 +00:00
Christoph M. Wintersteiger
d56d63e3e8 Merge branch 'fpa-api' of https://git01.codeplex.com/z3 into unstable 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>

Conflicts:
	src/tactic/portfolio/default_tactic.cpp
 2015-01-21 14:25:31 +00:00
Christoph M. Wintersteiger
079204d1aa FPA Python API cosmetics 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 14:22:47 +00:00
Christoph M. Wintersteiger
052baaabe4 FPA API bugfixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 14:22:35 +00:00
Christoph M. Wintersteiger
d0a7246f00 Merge branch 'unstable' of https://git01.codeplex.com/z3 into ml-ng 2015-01-21 13:51:00 +00:00
Christoph M. Wintersteiger
ae792f1891 avoid spurious warning message 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 13:47:32 +00:00
Christoph M. Wintersteiger
a603f76b6c BV-SLS build fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 13:47:17 +00:00
Christoph M. Wintersteiger
e20dc9f9a4 typo 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 13:35:25 +00:00
Christoph M. Wintersteiger
71e5f03b44 build fix 2015-01-21 13:04:05 +00:00
Christoph M. Wintersteiger
83023c7211 build fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-21 13:02:18 +00: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
Christoph M. Wintersteiger
5e6ea4e570 added --x86 build flag 2015-01-20 19:03:49 +00:00
Christoph M. Wintersteiger
237577acc8 Bumping version to 4.4 
Added to release notes

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-20 15:59:54 +00:00
Christoph M. Wintersteiger
0746ede537 BV SLS: Final adjustments 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-20 15:59:25 +00:00
Christoph M. Wintersteiger
074ff311c0 BV-SLS final integration. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-20 15:19:31 +00:00
Christoph M. Wintersteiger
61ba7f5e09 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into unstable 
Conflicts:
	src/tactic/portfolio/default_tactic.cpp

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-20 15:15:31 +00:00
Christoph M. Wintersteiger
d20c7bc9ee Added is_qfaufbv_probe and is_qfauflia_probe. 
Potential performance disruption for some users:
Changed default_tactic to call the respective tactics,
where previously they would have run the default 'smt'
tactic.

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 18:19:43 +00:00
Christoph M. Wintersteiger
a8d8e3e9e5 formatting 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 18:16:51 +00:00
Christoph M. Wintersteiger
d8f90802c0 Added FPA setup to default kernel setup 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 18:14:22 +00:00
Christoph M. Wintersteiger
ed0fa93245 Minor adjustments after rebase 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 17:35:19 +00:00
Christoph M. Wintersteiger
c9fa77cc70 ML API: fixed Python 3.4 issues in the build scripts 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 17:17:59 +00:00
Christoph M. Wintersteiger
e754aa1c11 Minor adjustments after rebasing ml-ng onto unstable. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 17:17:58 +00:00
Christoph M. Wintersteiger
bb31014417 ML API: build fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 17:17:14 +00:00
Christoph M. Wintersteiger
10c153bfe4 ML API: build fix 2015-01-19 17:17:13 +00:00
Christoph M. Wintersteiger
011b700c20 ML API: build fix 2015-01-19 17:17:13 +00:00
Christoph M. Wintersteiger
5c67b59685 ML API: Windows build fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 17:17:12 +00:00
Christoph M. Wintersteiger
05f42b0073 ML API: build fixes? 2015-01-19 17:17:11 +00:00
Christoph M. Wintersteiger
93a20d9074 ML API: build fixes 2015-01-19 17:17:10 +00:00
Christoph M. Wintersteiger
ea9fc43544 ML API: build fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 17:16:48 +00:00
Christoph M. Wintersteiger
d47f143591 ML API: build fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 17:16:47 +00:00
Christoph M. Wintersteiger
198c6ef930 ML API: build fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 17:16:45 +00:00
Christoph M. Wintersteiger
4c28085022 ML API: build fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 17:16:45 +00:00
Christoph M. Wintersteiger
ceabafa01c ML API: build fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 17:16:44 +00:00
Christoph M. Wintersteiger
2ee4409962 ML API: build fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 17:16:43 +00:00
Christoph M. Wintersteiger
40c6be0baa ML API: build fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 17:16:42 +00:00
Christoph M. Wintersteiger
93d7412950 ML API build fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 17:16:41 +00:00
Christoph M. Wintersteiger
b85c3e12f4 ML API build fix 2015-01-19 17:16:39 +00:00