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

1938 commits

Author SHA1 Message Date
Christoph M. Wintersteiger a0f6d1d3df ML API: replaced arrays with lists. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:54:28 +00:00
Christoph M. Wintersteiger 576591086d ML API savepoint 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:54:11 +00:00
Christoph M. Wintersteiger 9d15c95856 ML API: proper use of datatype API for list/enum/constructor. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:53:58 +00:00
Christoph M. Wintersteiger 2af1f81ae1 ML API: Cleanup 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:53:42 +00:00
Christoph M. Wintersteiger 09aa02759f ML API: Build system and error handling fixes. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:53:21 +00:00
Christoph M. Wintersteiger fd2ae5f60e ML API: bugfixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:53:20 +00:00
Christoph M. Wintersteiger a27945f297 ML API: got rid of "extra" objects on types. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:53:17 +00:00
Christoph M. Wintersteiger 23febf13c4 ML API: basic structure and interface 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:52:08 +00:00
Christoph M. Wintersteiger 34a72942bf ML API: documentation fixes. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:51:48 +00:00
Christoph M. Wintersteiger 276c5a5cdc ML API: No more objects; type hierarchy exposed; clean separation into modules. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:51:47 +00:00
Christoph M. Wintersteiger 0138d0c11c Checkpoint. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:51:46 +00:00
Christoph M. Wintersteiger 7b51dc9bdd Checkpoint. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:51:45 +00:00
Christoph M. Wintersteiger 1eae7a6bac ML API: Added Solver.assert_and_track 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:51:44 +00:00
Christoph M. Wintersteiger 7befc262d1 ML API: added functions for global parameter management. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:51:43 +00:00
Christoph M. Wintersteiger 69138924e5 ML API: Symbols are now normal types with visible hierarchy. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:51:40 +00:00
Christoph M. Wintersteiger d0fea5e740 ML API: moved more objects into normal types. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:51:39 +00:00
Christoph M. Wintersteiger bcc0c14233 ML API: moved more objects into normal types. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:51:39 +00:00
Christoph M. Wintersteiger bbd1e465bb ML API: bugfixes; starting to replace objects with normal types. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:51:38 +00:00
Christoph M. Wintersteiger 0e59d05629 ML API: changed context from object to normal type. Removed optional array parameters. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:51:37 +00:00
Christoph M. Wintersteiger 9eea0f3232 ML API: build system changes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:51:33 +00:00
Christoph M. Wintersteiger 597409c8ac ML API bugfixes 
More ML examples

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:49:55 +00:00
Christoph M. Wintersteiger cef9c2fa69 more ML 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:49:23 +00:00
Christoph M. Wintersteiger bffef2e808 New ML API bugfixes and first example. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:49:22 +00:00
Christoph M. Wintersteiger a42e21ede1 ML API: mk_context added. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:49:21 +00:00
Christoph M. Wintersteiger 39e538a8bc More new ML API; Status: everything is there except for error handling. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:49:21 +00:00
Christoph M. Wintersteiger 371db347af More new ML API. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:49:20 +00:00
Christoph M. Wintersteiger 3684b3a87d New ML API savepoint. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:49:19 +00:00
Christoph M. Wintersteiger d6a2048785 More new ML API 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:49:19 +00:00
Christoph M. Wintersteiger 524336ea3e New ML API savepoint. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:49:18 +00:00
Christoph M. Wintersteiger 2277ad3654 ML API bugfixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:49:18 +00:00
Christoph M. Wintersteiger dab162886e New ML API savepoint. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:49:17 +00:00
Christoph M. Wintersteiger fc227e3c96 .NET API documentation bugfixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:49:16 +00:00
Christoph M. Wintersteiger 794823ba6d More ML API: 
Fixes in native layer.
Added symbols.
Prepared code for automatic documentation.

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:49:16 +00:00
Christoph M. Wintersteiger 7efe7a2c16 ML native layer bugfixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:48:40 +00:00
Christoph M. Wintersteiger 8e83f8d034 ML build system checks 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:46:54 +00:00
Christoph M. Wintersteiger 518da6b6e2 move old files 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:44:44 +00:00
Christoph M. Wintersteiger e87feb8e45 added temporary Makefile for ML annotations. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:44:42 +00:00
Christoph M. Wintersteiger b193b827ed ML API bugfixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:44:42 +00:00
Christoph M. Wintersteiger 0fad5abd19 more ML API 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:43:28 +00:00
Christoph M. Wintersteiger c001da6188 ML API and example compilation. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:42:23 +00:00
Christoph M. Wintersteiger 01dc79fcd4 More ML API 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:42:20 +00:00
Christoph M. Wintersteiger bea09539cf More ML API 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:42:18 +00:00
Christoph M. Wintersteiger 2dde851ed7 More ML API 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:42:16 +00:00
Christoph M. Wintersteiger d5f135c432 More new ML API. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:40:52 +00:00
Christoph M. Wintersteiger f5a0520b83 More ML API 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:40:37 +00:00
Christoph M. Wintersteiger 70f0d2f423 Beginnings of a new ML API 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:38:52 +00:00
Christoph M. Wintersteiger 5619f6b583 FPA Python API bugfixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-19 15:18:12 +00:00
Nikolaj Bjorner 9790784488 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-01-18 04:50:20 +05:30
Nikolaj Bjorner 6af9782927 set default file format to smt2 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-01-18 04:50:00 +05:30
Christoph M. Wintersteiger c3247d7598 FPA: bugfix for rounding mode bv translation 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-17 16:36:33 +00:00
Christoph M. Wintersteiger 2b03ec63f6 Merge branch 'unstable' of https://git01.codeplex.com/z3 into fpa-api 2015-01-16 17:35:12 +00:00
Christoph M. Wintersteiger bb722b24c1 Added call to memory::finalize() to ease memory leak debugging 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-16 17:34:01 +00:00
Christoph M. Wintersteiger 88aa349eb7 Merge branch 'unstable' of https://git01.codeplex.com/z3 into fpa-api 2015-01-16 12:30:28 +00:00
Nikolaj Bjorner b9bbfbdbb7 fix interval dependencies bug. Codeplex issue 163 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-01-16 12:05:12 +05:30
Christoph M. Wintersteiger 2f81b6c6b5 Merge branch 'unstable' of https://git01.codeplex.com/z3 into fpa-api 2015-01-15 19:26:03 +00:00
Christoph M. Wintersteiger 5344d6f3c0 various bugfixes and extensions for FPA 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-15 19:25:49 +00:00
Christoph M. Wintersteiger caafee0033 Added simplifier plugin for FP 2015-01-15 19:18:18 +00:00
Nikolaj Bjorner ec384d3d31 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-01-15 17:23:37 +05:30
Nikolaj Bjorner dbc9bebd18 fix instance test 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-01-15 16:47:10 +05:30
Christoph M. Wintersteiger 0e37a1722f BV-SLS Cosmetics 2015-01-12 17:44:56 +00:00
Christoph M. Wintersteiger f1a00da401 BV-SLS Cosmetics 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:43:56 +00:00
Christoph M. Wintersteiger 58bf80f113 Cosmetics 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:22:13 +00:00
Christoph M. Wintersteiger 916ef815fa Disabled BV-SLS as default tactic in anticipation for integration 
with the unstable branch.

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:45 +00:00
Christoph M. Wintersteiger 168c3eb363 BV-SLS optimization 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:44 +00:00
Christoph M. Wintersteiger 85ff954bc6 merge fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:43 +00:00
Christoph M. Wintersteiger 8745872d28 compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:42 +00:00
Christoph M. Wintersteiger 0016ba5f3e compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:41 +00:00
Christoph M. Wintersteiger 7105e4d213 compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:40 +00:00
Christoph M. Wintersteiger 7a7566f39e compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:39 +00:00
Christoph M. Wintersteiger bec5938d9c removed unused file 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:39 +00:00
Christoph M. Wintersteiger 992d150b81 BVSLS comments 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:38 +00:00
Andreas Froehlich 7d18a17bb3 Cleaned up final SLS version. Enjoy! 2015-01-12 17:19:37 +00:00
Andreas Froehlich 80c94ef0b6 Moved parameters to the right file. Almost clean. 2015-01-12 17:19:37 +00:00
Andreas Froehlich ca1e3c3d9f Backup before I touch early pruning ... 2015-01-12 17:19:25 +00:00
Andreas Froehlich fb18547a5f Fixed bug with VNS repick. 2015-01-12 17:19:24 +00:00
Andreas Froehlich de028e7a30 Almost cleaned up version. 2015-01-12 17:19:24 +00:00
Andreas Froehlich c56e55b230 Current version before integration ... 2015-01-12 17:19:23 +00:00
Christoph M. Wintersteiger a48bb976e9 bvsls bugfix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:22 +00:00
Christoph M. Wintersteiger e382742a29 bvsls refactoring 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:22 +00:00
Christoph M. Wintersteiger ad412d4f08 bvsls refactoring 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:20 +00:00
Christoph M. Wintersteiger 1b98e6002b compilation fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:19 +00:00
Christoph M. Wintersteiger b76ffddf49 compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:18 +00:00
Christoph M. Wintersteiger 71fdb59747 removed dependency of bvsls on goal_refs 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:17 +00:00
Christoph M. Wintersteiger e9797c3922 bugfix 2015-01-12 17:19:16 +00:00
Christoph M. Wintersteiger 1834bb5950 disabled old code 2015-01-12 17:19:15 +00:00
Christoph M. Wintersteiger 1f326d9e72 removed dependency of bvsls on goal_refs 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:14 +00:00
Andreas Froehlich ad8cac7d88 uct forget and minisat restarts added 2015-01-12 17:19:13 +00:00
Christoph M. Wintersteiger 13307a1d51 SLS refactoring 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:12 +00:00
Christoph M. Wintersteiger 7451e5cae0 SLS refactoring 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:19:11 +00:00
Andreas Froehlich 442827e523 Current version for relocating. 2015-01-12 17:18:52 +00:00
Christoph M. Wintersteiger 664fa82c6c removed tabs 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:18:51 +00:00
Andreas Froehlich 140d28b6b3 plenty of new stuff 2015-01-12 17:18:50 +00:00
Andreas Froehlich dfe2d945e9 some extensions/modifications. versions added. 2015-01-12 17:18:36 +00:00
Andreas Froehlich c982f87025 sls tactic default 2015-01-12 17:18:19 +00:00
Christoph M. Wintersteiger 6818e850e9 Disabled BV-SLS as default tactic in anticipation for integration 
with the unstable branch.

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:15:34 +00:00
Christoph M. Wintersteiger 387f036f93 BV-SLS optimization 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:15:32 +00:00
Christoph M. Wintersteiger aa0980b83b merge fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:15:31 +00:00
Christoph M. Wintersteiger 6b9c5dbfc0 compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:15:13 +00:00
Christoph M. Wintersteiger 54cd1ea5e6 compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:15:12 +00:00
Christoph M. Wintersteiger 60753bf46b compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:15:11 +00:00
Christoph M. Wintersteiger fc0cdcfd29 compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:15:10 +00:00
Christoph M. Wintersteiger a02c59c1bc removed unused file 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:15:09 +00:00
Christoph M. Wintersteiger e34b5edf27 BVSLS comments 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:15:09 +00:00
Andreas Froehlich b3924d85ed Cleaned up final SLS version. Enjoy! 2015-01-12 17:15:08 +00:00
Andreas Froehlich c4fb21cca1 Moved parameters to the right file. Almost clean. 2015-01-12 17:15:07 +00:00
Andreas Froehlich b5a9e0a1f5 Backup before I touch early pruning ... 2015-01-12 17:15:06 +00:00
Andreas Froehlich 39ea6234a4 Fixed bug with VNS repick. 2015-01-12 17:15:04 +00:00
Andreas Froehlich 8a30a2caa9 Almost cleaned up version. 2015-01-12 17:15:04 +00:00
Andreas Froehlich 42702c8d8a Current version before integration ... 2015-01-12 17:14:46 +00:00
Christoph M. Wintersteiger f88b034b8b bvsls bugfix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:14:21 +00:00
Christoph M. Wintersteiger 239849957a bvsls refactoring 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:14:20 +00:00
Christoph M. Wintersteiger c541694f40 bvsls refactoring 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:14:20 +00:00
Christoph M. Wintersteiger 4e8c0c1418 compilation fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:14:19 +00:00
Christoph M. Wintersteiger ff7af2680d compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:14:17 +00:00
Christoph M. Wintersteiger beef8198a4 removed dependency of bvsls on goal_refs 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:14:16 +00:00
Christoph M. Wintersteiger cf1a600fb9 bugfix 2015-01-12 17:14:15 +00:00
Christoph M. Wintersteiger e9482a1447 disabled old code 2015-01-12 17:14:13 +00:00
Christoph M. Wintersteiger dfd2566e25 removed dependency of bvsls on goal_refs 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:14:13 +00:00
Andreas Froehlich 1e55b3bfb5 uct forget and minisat restarts added 2015-01-12 17:14:12 +00:00
Christoph M. Wintersteiger a6227d5446 SLS refactoring 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:13:59 +00:00
Christoph M. Wintersteiger b1eeb9adf4 SLS refactoring 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:13:59 +00:00
Andreas Froehlich aa6f8a4b8a Current version for relocating. 2015-01-12 17:13:42 +00:00
Christoph M. Wintersteiger e33e637ad8 removed tabs 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:13:12 +00:00
Andreas Froehlich e310ab5cd7 plenty of new stuff 2015-01-12 17:13:12 +00:00
Andreas Froehlich b002697e03 some extensions/modifications. versions added. 2015-01-12 17:13:11 +00:00
Andreas Froehlich 40014d019c sls tactic default 2015-01-12 17:13:10 +00:00
Christoph M. Wintersteiger 66abc1c65e Removed unnecessary file 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 17:03:27 +00:00
Christoph M. Wintersteiger d4ecc3c1be Disabled BV-SLS as default tactic in anticipation for integration 
with the unstable branch.

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-12 15:59:20 +00:00
Christoph M. Wintersteiger d39bd9d6b4 Merge branch 'unstable' of https://git01.codeplex.com/z3 into bvsls 2015-01-12 15:12:28 +00:00
Christoph M. Wintersteiger 766d585922 Merge branch 'unstable' of https://git01.codeplex.com/z3 into fpa-api 
Resolved  a bunch of Java documentation conflicts

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>

Conflicts:
	src/api/java/AST.java
	src/api/java/ASTMap.java
	src/api/java/ASTVector.java
	src/api/java/AlgebraicNum.java
	src/api/java/BoolExpr.java
	src/api/java/Context.java
	src/api/java/Expr.java
	src/api/java/Fixedpoint.java
	src/api/java/Global.java
	src/api/java/InterpolationContext.java
	src/api/java/Model.java
	src/api/java/Solver.java
 2015-01-11 18:39:17 +00:00
Christoph M. Wintersteiger 6c971b1301 Beginnings of a Python API for FPA 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-11 18:29:40 +00:00
Christoph M. Wintersteiger e0bc704106 FPA API bugfixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-11 18:29:12 +00:00
Christoph M. Wintersteiger 4bd8e0f497 FPA API cosmetics 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-11 18:28:07 +00:00
Christoph M. Wintersteiger ee0ec7fe3a FPA API: numerals, .NET and Java 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-10 17:28:07 +00:00
Christoph M. Wintersteiger 3391c9c44c typo fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-09 11:53:24 +00:00
Christoph M. Wintersteiger 46e236487b Eliminated FPRMNum classes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-09 11:53:18 +00:00
Christoph M. Wintersteiger 71912830f1 Formatting, mostly tabs 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-08 17:54:44 +00:00
Christoph M. Wintersteiger 0381e4317a Formatting, mostly tabs. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-08 17:54:04 +00:00
Christoph M. Wintersteiger cad841cff4 to_fp_real marked as NIY for now 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-08 17:23:13 +00:00
Christoph M. Wintersteiger 7fe9ad5cb4 Java FPA API overhaul 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-08 17:22:02 +00:00
Christoph M. Wintersteiger ee2c9095c6 .NET FPA API overhaul 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-08 17:21:29 +00:00
Christoph M. Wintersteiger bcbce8f190 FPA Java and .NET API updates 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-08 16:31:09 +00:00
Christoph M. Wintersteiger 33dc6340e1 More renaming mk_value -> mk_numeral 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-08 14:23:13 +00:00
Christoph M. Wintersteiger c0bc2518b0 Renaming for consistency mk_value -> mk_numeral 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-08 14:22:44 +00:00
Christoph M. Wintersteiger c5b220cc12 FPA: Added AST kind descriptions 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-08 14:07:59 +00:00
Christoph M. Wintersteiger c0a027fc80 FPA: Elminated nzero/pzero AST kinds 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-08 14:07:47 +00:00
Christoph M. Wintersteiger 0cedd32ea2 More renaming floats -> fpa 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-08 13:47:26 +00:00
Christoph M. Wintersteiger 5e5758bb25 More float -> fpa renaming 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-08 13:37:18 +00:00
Christoph M. Wintersteiger dd17f3c7d6 Renaming floats, float, Floats, Float -> FPA, fpa 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-08 13:18:56 +00:00
Christoph M. Wintersteiger 5ff923f504 Added fp.to_sbv 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-04 19:01:02 +00:00
Christoph M. Wintersteiger 6d8587dff9 FPA fixes for internal func_decls 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-04 18:53:21 +00:00
Christoph M. Wintersteiger cf81f86c67 build fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-04 18:52:23 +00:00
Christoph M. Wintersteiger 007ecb4ab2 MPF bugfix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-04 14:37:33 +00:00
Christoph M. Wintersteiger 0faf329054 FPA API: bugfixes and examples for .NET and Java 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-03 17:26:58 +00:00
Christoph M. Wintersteiger fa26e2423e Java API: Added FPA 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-03 16:50:31 +00:00
Christoph M. Wintersteiger cf4dc527c4 .NET FPA API bugfix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-03 16:49:42 +00:00
Christoph M. Wintersteiger 3a2db1c793 FPA API cosmetics 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-03 15:15:55 +00:00
Christoph M. Wintersteiger 6bfc9878fb FPA API cosmetics 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-03 15:13:57 +00:00
Christoph M. Wintersteiger 376614a782 Java API: slight overhaul in preparation for the FP additions 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-03 15:09:52 +00:00
Christoph M. Wintersteiger 263456116d Added fpa2bv_rewriter_params 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-02 19:05:40 +00:00
Christoph M. Wintersteiger 3c75b700e8 Updates to the .NET API for FP 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-02 19:03:20 +00:00
Christoph M. Wintersteiger 3266e96e80 fpa2bv slight refactoring 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-02 18:59:27 +00:00
Christoph M. Wintersteiger f684675a6e FPA API: Added get_ebits/get_sbits + doc fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-02 18:58:43 +00:00
Christoph M. Wintersteiger 09814128a6 Update MPF toString 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-02 18:57:38 +00:00
Christoph M. Wintersteiger e1e594be75 Merge branch 'unstable' of https://git01.codeplex.com/z3 into fpa-api 2015-01-02 18:11:16 +00:00
Christoph M. Wintersteiger 8e7278f02c Java API: Removed unnecessary imports 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-02 18:10:47 +00:00
Christoph M. Wintersteiger 6e849d7f73 FPA API cosmetics 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-01 19:16:02 +00:00
Christoph M. Wintersteiger 076c709453 cosmetics 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-01 19:00:06 +00:00
Christoph M. Wintersteiger 09247d2e29 FPA theory and API overhaul 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-01 18:44:41 +00:00
Christoph M. Wintersteiger a28454d95e FPA: sort names consistency fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-01 15:24:36 +00:00
Christoph M. Wintersteiger 97df505dba MPF consistency fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-01 15:23:27 +00:00
Christoph M. Wintersteiger 4f453703f7 Added arguments of type float to the replayer. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2015-01-01 15:23:02 +00:00
Christoph M. Wintersteiger 7d61223a3a Improved FP theory 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-31 18:34:42 +00:00
Christoph M. Wintersteiger 3fe11e4c38 improved handling of unspecified values in FP 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-31 17:31:11 +00:00
Christoph M. Wintersteiger 7a5239ef70 QF_FP default tactic bugfix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-31 17:30:45 +00:00
Christoph M. Wintersteiger 80c025b289 Improved default tactic for QF_FP 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-31 16:15:55 +00:00
Christoph M. Wintersteiger afae49b9ed More renaming QF_FPA -> QF_FP 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-31 16:15:40 +00:00
Christoph M. Wintersteiger 21a847d299 More renamings for QF_FP/qffp/is-qffp 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-31 15:36:11 +00:00
Christoph M. Wintersteiger 208994e2dc Renamed the default tactics form QF_FPA and QF_FPABV to QF_FP and QF_FPBV, in anticipation of the logic name QF_FPA to mean floats+arrays. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-31 15:33:50 +00:00
Christoph M. Wintersteiger 01d78b7274 added internal functions to fpa2bv converter 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-31 14:49:52 +00:00
Christoph M. Wintersteiger 4d18e24fb4 FPA rewriter bugfix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-31 14:48:45 +00:00
Christoph M. Wintersteiger 2258988b37 MPF bugfix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-31 14:48:06 +00:00
Christoph M. Wintersteiger defb6158fe MPF: bugfix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-29 17:09:28 +00:00
Christoph M. Wintersteiger 33af7e8468 FPA: bugfixes for fp.to_ubv 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-29 17:09:18 +00:00
Christoph M. Wintersteiger 0ab2782048 FPA: name consistency 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-29 17:08:46 +00:00
Christoph M. Wintersteiger 05121e25d4 FPA theory support for conversion functions 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-28 19:28:48 +00:00
Christoph M. Wintersteiger 621be0f47f FPA: Added fp.to_ubv 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-28 18:01:18 +00:00
Christoph M. Wintersteiger 96c8bd7e91 MPF conversion bugfix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-28 17:57:21 +00:00
Christoph M. Wintersteiger 12aaa0610b FPA: added get_some_value/s for FP models 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-28 15:27:40 +00:00
Christoph M. Wintersteiger 4d1f71775d FPA: added to_fp_unsigned 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-28 15:26:52 +00:00
Christoph M. Wintersteiger 1aae53f48c FPA: comment fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-28 15:26:41 +00:00
Christoph M. Wintersteiger 23aa614d55 FPA: New theory implementation with support for "hidden" variables, relevancy, and eq/diseq. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-28 13:44:29 +00:00
Christoph M. Wintersteiger 7a15c41c47 FPA: improved error messages for to_fp 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-28 13:40:36 +00:00
Christoph M. Wintersteiger d1cb2566e4 fpa2bv: adjustments for consistency 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-28 13:39:46 +00:00
Christoph M. Wintersteiger 55662bcf6b fpa2bv: added reset(), adjustments for consistency 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-28 13:33:19 +00:00
Christoph M. Wintersteiger 6ebeebde50 Added parameter to display floating point numerals as reals 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-28 13:32:34 +00:00
Christoph M. Wintersteiger 7f8a34d2e1 Adjusted default model display for float literals. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-28 13:31:30 +00:00
Christoph M. Wintersteiger 65cc5fbe8b Merge branch 'unstable' of https://git01.codeplex.com/z3 into fpa-api 2014-12-27 11:09:03 +00:00
Christoph M. Wintersteiger b8c373bbce fpa2bv tactic bugfix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-22 14:25:23 +00:00
Christoph M. Wintersteiger 9dd4d7b011 Python API bugfix. Thanks to Tom Ball for reporting this one. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-12-21 20:43:26 +00:00