Morgan Deters [Sat, 4 Aug 2012 18:45:13 +0000 (18:45 +0000)]
isConst() rule for datatypes
Morgan Deters [Fri, 3 Aug 2012 22:38:11 +0000 (22:38 +0000)]
the array-store "construle" for isConst
Morgan Deters [Fri, 3 Aug 2012 22:15:33 +0000 (22:15 +0000)]
Comparisons for LogicInfos, and associated tests
Morgan Deters [Fri, 3 Aug 2012 21:49:20 +0000 (21:49 +0000)]
ArrayStoreAll infrastructure
Morgan Deters [Fri, 3 Aug 2012 20:39:25 +0000 (20:39 +0000)]
fix uses of getMetaKind() from outside the expr package. (they now use isConst() and isVar() as appropriate)
also some base infrastructure for the new ::isConst().
Morgan Deters [Fri, 3 Aug 2012 18:49:59 +0000 (18:49 +0000)]
fix for proofs-enabled builds
Morgan Deters [Fri, 3 Aug 2012 00:09:57 +0000 (00:09 +0000)]
better parser makefile fix
Morgan Deters [Thu, 2 Aug 2012 23:55:08 +0000 (23:55 +0000)]
fixes to paths in parser makefiles; if you've noticed strange SMT2 parser behavior the last couple days, this should fix it
Morgan Deters [Thu, 2 Aug 2012 21:40:02 +0000 (21:40 +0000)]
array-store-all class
Morgan Deters [Wed, 1 Aug 2012 22:33:13 +0000 (22:33 +0000)]
add isFinished() to type enumerators (so we don't rely on exception-throwing after exhaustively enumerating finite types), also fix a standards-related FIXME in SmtEngine by clarifying the text of an error message
Morgan Deters [Wed, 1 Aug 2012 22:17:18 +0000 (22:17 +0000)]
a couple fixes to SmtEngine::setOption(). thanks Andy for the report!
Morgan Deters [Wed, 1 Aug 2012 21:05:36 +0000 (21:05 +0000)]
fixes to some *clean targets
Morgan Deters [Wed, 1 Aug 2012 19:25:10 +0000 (19:25 +0000)]
fix for the SmtEngine::beforeSearch() option predicate
Morgan Deters [Wed, 1 Aug 2012 02:25:39 +0000 (02:25 +0000)]
some fixes for Mac OS
Morgan Deters [Tue, 31 Jul 2012 21:44:22 +0000 (21:44 +0000)]
fixes for portfolio
Morgan Deters [Tue, 31 Jul 2012 21:24:31 +0000 (21:24 +0000)]
Moving some instantiation-related stuff from src/theory to src/theory/quantifiers and src/theory/rewriterules. This unclutters the src/theory directory somewhat.
The namespaces weren't changed, only the file locations.
Morgan Deters [Tue, 31 Jul 2012 20:50:24 +0000 (20:50 +0000)]
fix some file documentation
Morgan Deters [Tue, 31 Jul 2012 20:40:14 +0000 (20:40 +0000)]
Options merge. This commit:
1. changes the way options are declared (see http://church.cims.nyu.edu/wiki/Options)
2. moves module-specific options enumerations (SimplificationMode, DecisionMode, ArithUnateLemmaMode, etc.) to their own header files, also they are no longer inside the Options:: class namespace.
3. includes many SMT-LIBv2 compliance fixes, especially to (set-option..) and (get-option..)
The biggest syntactical changes (outside of adding new options) you'll notice are in accessing and setting options:
* to access an option, write (e.g.) options::unconstrainedSimp() instead of Options::current()->unconstrainedSimp.
* to determine if an option value was set by the user, check (e.g.) options::unconstrainedSimp.wasSetByUser().
* ensure that you have the option available (you have to #include the right module's options.h file, e.g. #include "theory/uf/options.h" for UF options)
*** this point is important. If you access an option and it tells you the option doesn't exist, you aren't #including the appropriate options.h header file ***
Note that if you want an option to be directly set (i.e., other than via command-line parsing or SmtEngine::setOption()), you need to mark the option :read-write in its options file (otherwise it's read-only), and you then write (e.g.) options::unconstrainedSimp.set(true).
Adding new options is incredibly simple for primitive types (int, unsigned, bool, string, double). For option settings that you need to turn into a member of an enumerated type, you write a custom "handler" for the option---this is no additional work than it was before, and there are many examples to copy from (a good one is stringToSimplificationMode() in src/smt/options_handlers.h).
Benefits of the new options system include:
1. changes to options declarations don't require a full-source rebuild (you only have to rebuild those sources that depend on the set of options that changed).
2. lots of sanity checks (that the same option isn't declared twice, that option values are in range for their type, that all options are documented properly, etc.)
3. consistency: Boolean-valued option --foo gets a --no-foo automatically, documentation is generated consistently, the option-parsing matches the documented option name, etc.
4. setting options programmatically via SmtEngine::setOption() is enabled, and behaves the same as command-line equivalents (including checking the value is in range, etc.)
5. the notion of options being "set by the user" is now primitive; you can use (e.g.) options::unconstrainedSimp.wasSetByUser() instead of having to use (and maintain) a separate Boolean option for the purpose
I've taken lots of care not to break anything. Hopefully, I've succeeded in that.
Morgan Deters [Fri, 27 Jul 2012 22:01:03 +0000 (22:01 +0000)]
Minor cleanup after today's commits:
* change some uses of "std::cout" to "Message()"
* change some files to use Unix newlines instead of DOS newlines
* fix compiler warning
Andrew Reynolds [Fri, 27 Jul 2012 21:07:42 +0000 (21:07 +0000)]
removing unecessary files
Andrew Reynolds [Fri, 27 Jul 2012 19:27:45 +0000 (19:27 +0000)]
merging fmf-devel branch, includes refactored datatype theory, updates to model.h/cpp to prepare for release, and major refactoring of quantifiers/finite model finding. Note that new datatype theory does not insist upon any interpretation for selectors applied to incorrect constructors and consequently some answers may differ with previous version
François Bobot [Fri, 27 Jul 2012 13:36:32 +0000 (13:36 +0000)]
Merge quantifiers2-trunk:
- new syntax for rewrite rules
- better rewrite rules theory
- remove the rewriting with rewrite rules during ppRewrite temporarily
- theory can define their own candidate generator
- define a general candidate generator (inefficient ask to every theory)
- split inst_match between the pattern matching used for quantifiers (inst_match.*) and
the one used for rewrite rules (rr_inst_match.*):
- the pattern matching is less exhaustive for quantifiers,
- the one for rewrite rules can use efficient-e-matching.
Morgan Deters [Thu, 26 Jul 2012 21:09:10 +0000 (21:09 +0000)]
Datatype enumerator work. This version is not a "fair" enumerator, but I got it in quickly for Andy.
A "fair" version forthcoming.
Morgan Deters [Wed, 18 Jul 2012 21:32:05 +0000 (21:32 +0000)]
more compliance fixes for SMT-LIBv2
Morgan Deters [Wed, 18 Jul 2012 21:21:56 +0000 (21:21 +0000)]
a few fixes for java system test
Morgan Deters [Wed, 18 Jul 2012 21:21:28 +0000 (21:21 +0000)]
small change to model-generation function, after discussion w/ Andy
Morgan Deters [Wed, 18 Jul 2012 17:37:41 +0000 (17:37 +0000)]
removing an obsolete assertion in model-generation framework, per Andy's request
Morgan Deters [Wed, 18 Jul 2012 17:34:12 +0000 (17:34 +0000)]
removing output operator for SExprTypes, which is never used (and SExprTypes is not public-facing)---this fixes the language bindings, which fixes the broken debian build overnight
Morgan Deters [Tue, 17 Jul 2012 22:07:59 +0000 (22:07 +0000)]
SMT-LIBv2 compliance updates:
* more correct support for get-info responses
* printer infrastructure extended to SExprs
* parser updates to correctly handle symbols and strings
(there were some minor differences from the spec)
Andrew Reynolds [Tue, 17 Jul 2012 21:19:58 +0000 (21:19 +0000)]
minor fix to prevent getValue from returning null
Morgan Deters [Tue, 17 Jul 2012 21:01:06 +0000 (21:01 +0000)]
fix for --produce-models with CVC4 presentation language
Morgan Deters [Tue, 17 Jul 2012 20:34:34 +0000 (20:34 +0000)]
fix an obvious oversight: "distinct" wasn't part of the SMT2 core theory---but this only gave trouble in strict parsing mode
Morgan Deters [Mon, 16 Jul 2012 19:00:31 +0000 (19:00 +0000)]
now passes "make distcheck", which does important checks for the release (e.g., "make dist" produces a distribution that passes "make dist" and "make check", "make uninstall" actually uninstalls, "make distclean" actually cleans, ...)
Morgan Deters [Mon, 16 Jul 2012 17:11:26 +0000 (17:11 +0000)]
fix compiler warning in unit test
Morgan Deters [Mon, 16 Jul 2012 16:04:56 +0000 (16:04 +0000)]
stronger two_smt_engines test
Morgan Deters [Mon, 16 Jul 2012 15:53:51 +0000 (15:53 +0000)]
fix inadvertent change to system test
Morgan Deters [Mon, 16 Jul 2012 15:53:22 +0000 (15:53 +0000)]
Support for having two SmtEngines with the same ExprManager.
Basically, this involves creating a separate StatisticsRegistry for the
ExprManager and for the SmtEngine. Otherwise, theories register the
same statistic twice. This is a larger problem, though, for creating
multiple instances of theories, and that is unaddressed. Still,
separating out the expr statistics into a separate registry is probably
a good idea, since the expr package is somewhat separate anyway (and in
the short term it allows two SmtEngines to co-exist).
Morgan Deters [Mon, 16 Jul 2012 15:52:36 +0000 (15:52 +0000)]
found a bug in the initialization order of UF, EqualityEngine, and the UF strong solver; fixed
Morgan Deters [Mon, 16 Jul 2012 15:51:51 +0000 (15:51 +0000)]
reverse the order of link arguments to -lcln -lgmp, fixes linking errors for static-binary CLN-enabled builds on greed
Morgan Deters [Sat, 14 Jul 2012 22:53:58 +0000 (22:53 +0000)]
Type enumerator infrastructure and uninterpreted constant support. No support yet for enumerating arrays, or for enumerating non-trivial datatypes.
Morgan Deters [Sat, 14 Jul 2012 21:14:39 +0000 (21:14 +0000)]
Applying Dejan's patch for bug #369, which resolves it by adding a new (let..) form for each introduced binding.
Morgan Deters [Sat, 14 Jul 2012 21:04:41 +0000 (21:04 +0000)]
fixing make dist
Morgan Deters [Sat, 14 Jul 2012 20:40:00 +0000 (20:40 +0000)]
fix a warning in unit test compilation
Morgan Deters [Sat, 14 Jul 2012 17:26:33 +0000 (17:26 +0000)]
svn ignore
Dejan Jovanović [Sat, 14 Jul 2012 13:07:19 +0000 (13:07 +0000)]
an example that uses bitvectors to simulate sha1 computation and dumps an smt problem corresponding to the hash-inversion problem
Andrew Reynolds [Thu, 12 Jul 2012 18:32:08 +0000 (18:32 +0000)]
removing readme from fmf-devel
Andrew Reynolds [Thu, 12 Jul 2012 18:30:15 +0000 (18:30 +0000)]
merged fmf-devel branch, includes support for SMT2 command get-value and (extended) SMT command get-model. added collectModelInfo and removed getValue from theory interface. merge also includes major updates to finite model finding module (from CASC), added fmf options, some updates to strong solver and quantifiers engine interface. The test recursion_breaker_black currently fails for me on production builds, Morgan is planning to look into this.
Morgan Deters [Tue, 10 Jul 2012 17:58:44 +0000 (17:58 +0000)]
svn ingore
Dejan Jovanović [Tue, 10 Jul 2012 15:24:22 +0000 (15:24 +0000)]
* fixing the simple_vc_cxx.cpp compile issue (no more Integer constants)
* adding as examples the programs i used to translate nonlinear smt2 problems to other formats
Dejan Jovanović [Tue, 10 Jul 2012 15:18:32 +0000 (15:18 +0000)]
going back to 1. being a non decimal
Dejan Jovanović [Tue, 10 Jul 2012 01:20:44 +0000 (01:20 +0000)]
small changes:
* smtlib2 decimal constant can be "1.", i.e. doesn't need digits after the point
* adding CVC4_PUBLIC to rational output operator, otherwise it's unusable for users
Morgan Deters [Mon, 9 Jul 2012 20:13:23 +0000 (20:13 +0000)]
minor fix-ups
Morgan Deters [Mon, 9 Jul 2012 15:00:37 +0000 (15:00 +0000)]
fix portfolio build
Morgan Deters [Mon, 9 Jul 2012 14:54:58 +0000 (14:54 +0000)]
fix eXecutable bit on a script
Morgan Deters [Sun, 8 Jul 2012 23:45:40 +0000 (23:45 +0000)]
minor SMT-LIBv2 compliance issues
Morgan Deters [Sun, 8 Jul 2012 22:10:17 +0000 (22:10 +0000)]
remove a debugging line from configure script that was left in inadvertently
Morgan Deters [Sun, 8 Jul 2012 20:55:11 +0000 (20:55 +0000)]
another signed-ness warning fix for newer GCC
Morgan Deters [Sun, 8 Jul 2012 20:06:22 +0000 (20:06 +0000)]
Minor changes to avoid some warnings on GCC 4.7.1 (Debian wheezy/sid). ANDY - please look at the diff and make sure I didn't do something stupid
Morgan Deters [Sun, 8 Jul 2012 17:36:50 +0000 (17:36 +0000)]
Bugs resolved by this commit: #314, #322, #359, #364, #365.
See below for details.
* Fix the "assert" name-collision bug (resolves bug #364).
Our identifiers should never be named "assert", as that's a preprocessor
definition in <assert.h>, which is often #included indirectly (so simply
having a policy of not including <assert.h> isn't good enough---one of
our dependences might include it). It was once the case that we didn't
have anything named "assert", but "assert()" has now crept back in.
Instead, name things "assertFoo()" or similar. Thanks to Tim for the
report.
To fix this, I've changed some of Dejan's circuit-propagator code from
"assert()" to "assertTrue()". Ditto for Andy's explanation manager.
Guys, if you prefer a different name in your code, please change it.
* Fix the incorrect parsing of lets in SMT-LIBv2 parser (resolves bug #365).
Inner lets now shadow outer lets (previously, they incorrectly gave an
error). Additionally, while looking at this, I found that a sequential let
was implemented rather than a parallel let. This is now fixed. Thanks to
Liana for the report.
* Remove ANTLR parser generation warnings in CVC parser (resolves bug #314).
* There were a lot of Debug lines in bitvectors that had embedded toString()
calls. This wasted a LOT of time in debug builds for BV benchmarks
(like in "make regress"). Added if(Debug.isOn(...)) guards; much faster
now.
* Support for building public-facing interface documentation only (as opposed
to all internals documentation). Now "make doc" does the public-facing and
"make doc-internals" does documentation of everything. (Along with changes
to the nightly build script---which will now build and publish both types
of Doxygen documentation---this resolves bug #359).
* Fix the lambda typechecking bug (resolves bug #322). Thanks to Andy for the
report (a long long time ago--sorry).
* The default output language for all streams is now based on the current set
of Options (if there is one). This has been a constant annoyance, especially
when stringstreams are used to construct output. However, it doesn't work
for calls from outside the library, so it's mainly an annoyance-fixer for
CVC4 library code itself.
* Add some CVC4_UNUSED markers to local variables in theory_arith.cpp that
are used only in assertions-enabled builds (and thus give warnings in
production builds). This was briefly discussed at the meeting this week.
Morgan Deters [Sat, 7 Jul 2012 21:01:33 +0000 (21:01 +0000)]
Various fixes to documentation---typos, some incomplete documentation fixed, \file tags corrected, copyright added to files that had it missing, etc.
I ensured that I didn't change any code with this commit, and even tested on the cluster to be doubly sure:
http://church.cims.nyu.edu/regress-results/compare_jobs.php?job_id=4655&reference_id=4646&p=0
Tim King [Fri, 6 Jul 2012 17:47:49 +0000 (17:47 +0000)]
Adding std namespace to a couple of make_pair instances.
Tim King [Fri, 6 Jul 2012 17:45:59 +0000 (17:45 +0000)]
Added include unistd to main/util.cpp
Tim King [Fri, 6 Jul 2012 17:44:12 +0000 (17:44 +0000)]
Added virtual destructor to PpRewrite.
Morgan Deters [Sun, 1 Jul 2012 00:04:49 +0000 (00:04 +0000)]
Some changes to configure.ac:
1. Includes BOOST_CPPFLAGS during compilation of all files, not just portfolio-relevant files. This is necessary since we now have a general dependence on Boost (not just its threading stuff). This resolves bug 357.
2. Support --disable-thread-support and --enable-thread-support, in an effort to get to the bottom of bug 361.
These changes shouldn't affect performance, though #1 will build the cvc4 libs with a couple of pthread definitions that conceivably could change the behavior of #included standard headers. Let's keep an eye on tonight's regressions.
Morgan Deters [Thu, 28 Jun 2012 12:32:05 +0000 (12:32 +0000)]
svn:ignore
Clark Barrett [Thu, 28 Jun 2012 11:26:07 +0000 (11:26 +0000)]
Fixed bug in bv rewriter that caused wrong answer in SMT-COMP
Morgan Deters [Thu, 28 Jun 2012 09:42:09 +0000 (09:42 +0000)]
fix a link error on church, due to Antlr #defining "true" and "false" :-( --for now, just #undef them after the #include
Tim King [Wed, 27 Jun 2012 22:45:51 +0000 (22:45 +0000)]
Fixing a bug in proof production for the DioSolver.
Tim King [Wed, 27 Jun 2012 21:06:29 +0000 (21:06 +0000)]
This adds TheoryArith::safeToReset(). This fixes bug 363.
Tim King [Wed, 27 Jun 2012 20:58:37 +0000 (20:58 +0000)]
Adding access to simplex's ArithPriorityQueue to TheoryArith for ArithPriorityQueue::reduce(), ::begin() and ::end().
Tim King [Wed, 27 Jun 2012 20:56:23 +0000 (20:56 +0000)]
Improved debugging output.
Tim King [Wed, 27 Jun 2012 20:56:04 +0000 (20:56 +0000)]
Improved debugging output.
Tim King [Wed, 27 Jun 2012 20:55:17 +0000 (20:55 +0000)]
Adding reduce() to the ArithPriorityQueue. This reduces the queue from a superset of the basic variables that violate a bound to the exact set.
Tim King [Mon, 25 Jun 2012 16:00:21 +0000 (16:00 +0000)]
Added a warning to arithmetic for a known dio solver bug. Somehow the fix never made it to trunk. Do not know how. The fix to the bug is pending the hunt for bug 363.
François Bobot [Fri, 22 Jun 2012 15:11:37 +0000 (15:11 +0000)]
TPTP: add parser for cnf and fof
- include directive works
- no keyword : 'fof', 'cnf', ... can be used for symbols name
- real -> unsorted -> real (for the one that appear, so no bijection bitween real and unsorted)
- same thing for string
But:
- string not distinct by projection to real, not sure if the current state of string theory make them distinct
- filtering in include is not done
- the result is not printed in the TPTP way (currently SMT2 way)
François Bobot [Fri, 22 Jun 2012 15:11:21 +0000 (15:11 +0000)]
parser: add some acces function and recover the original nextToken from antlr3
in order to be able to use the stack of streams.
François Bobot [Fri, 22 Jun 2012 15:11:16 +0000 (15:11 +0000)]
fix : function AntlrInput::tokenTextSubstr
François Bobot [Fri, 22 Jun 2012 15:11:11 +0000 (15:11 +0000)]
Parser: add the possibility to bind at level 0.
Morgan Deters [Mon, 18 Jun 2012 22:43:09 +0000 (22:43 +0000)]
qf_lra strategy
Clark Barrett [Mon, 18 Jun 2012 22:39:12 +0000 (22:39 +0000)]
Reverting buggy rewriter code
Morgan Deters [Mon, 18 Jun 2012 22:22:04 +0000 (22:22 +0000)]
another qf_lra strategy update
Clark Barrett [Mon, 18 Jun 2012 22:18:27 +0000 (22:18 +0000)]
Fixed bug in rewriter
Morgan Deters [Mon, 18 Jun 2012 21:55:25 +0000 (21:55 +0000)]
unnecessary ^ in regular expression; warning produced on smt-exec
Morgan Deters [Mon, 18 Jun 2012 21:48:02 +0000 (21:48 +0000)]
QF_LRA strategy in run script, now final (?) for smt-comp 2012
Morgan Deters [Mon, 18 Jun 2012 21:33:00 +0000 (21:33 +0000)]
final sources (?) for competition
Clark Barrett [Mon, 18 Jun 2012 19:59:56 +0000 (19:59 +0000)]
Fix for slow array rewrite and minor bug fix in arrays that popped up as a result
Clark Barrett [Mon, 18 Jun 2012 16:19:10 +0000 (16:19 +0000)]
small bug fix and performance fix in ite simplifier
Andrew Reynolds [Mon, 18 Jun 2012 06:04:21 +0000 (06:04 +0000)]
fixed smt version 1 parser for quantifiers
Kshitij Bansal [Mon, 18 Jun 2012 02:52:11 +0000 (02:52 +0000)]
tracing code to make sure decision options are being set correctly
Kshitij Bansal [Mon, 18 Jun 2012 02:04:37 +0000 (02:04 +0000)]
bugfix, enable only QF_LRA, not other arith
Kshitij Bansal [Mon, 18 Jun 2012 01:46:39 +0000 (01:46 +0000)]
QF_LRA, Quantifiers: enable use decision for (only for) stopping search
Morgan Deters [Mon, 18 Jun 2012 00:56:27 +0000 (00:56 +0000)]
Fixing bug 360. The driver wasn't exiting when there was an error (it just plowed ahead to the next command). Now the driver exits on the first error, unless it's in interactive mode.
Kshitij Bansal [Sun, 17 Jun 2012 23:02:01 +0000 (23:02 +0000)]
QF_AUFLIA: enable use decision for (only for) stopping search
Dejan Jovanović [Sun, 17 Jun 2012 22:33:31 +0000 (22:33 +0000)]
fixing a problem due to lemmas produced while backtracking
Kshitij Bansal [Sun, 17 Jun 2012 22:04:41 +0000 (22:04 +0000)]
--decision=justification-stoponly : use decision engine only for stopping
search early, not to make decisions
new options.h :)
Dejan Jovanović [Sun, 17 Jun 2012 18:22:01 +0000 (18:22 +0000)]
enabling theoryof=term for quantifiers with sharing
disableing one test case in equantifiers/decision that runs long
Dejan Jovanović [Sun, 17 Jun 2012 16:08:38 +0000 (16:08 +0000)]
fixing wrong assertion
Clark Barrett [Sun, 17 Jun 2012 02:29:14 +0000 (02:29 +0000)]
Removed assertion that can fail
Dejan Jovanović [Sun, 17 Jun 2012 01:59:53 +0000 (01:59 +0000)]
fixing makefile error that brakes build
Clark Barrett [Sun, 17 Jun 2012 01:49:58 +0000 (01:49 +0000)]
Fix array bug causing incorrect answers