diff options
author | Morgan Deters <mdeters@gmail.com> | 2010-06-04 18:55:22 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2010-06-04 18:55:22 +0000 |
commit | a460f751e8345e61c4989386765d84bb76fe37d6 (patch) | |
tree | 08bc3c035b5bd8f220853e06dc90fb939c55b2ed /src/prop | |
parent | febba49895125f4f3489e7dff283a000ae9965b3 (diff) |
** Don't fear the files-changed list, almost all changes are in the **
** file-level documentation at the top of the sources. **
This is the "make bugzilla stop bugging me" bugfix commit.
* Remove BackedNodeBuilder<> and collapse NodeBuilder<> hierarchy.
Updated documentation in the file. Resolves bug #99.
* Convenience NodeBuilders (PlusNodeBuilder, OrNodeBuilder, etc.)
moved into a separate file. Partially resolves bug #100.
* Moved isAssociative(Kind) into kind.h (and into the CVC4::kind
namespace) instead of metakind.h (where it was in CVC4::metakind).
This clears up a warning (private #inclusion) from the SMT and SMT2
parsers, and maybe makes more sense anyways, since this is based on
the kind (and not the metakind) of an operator.
* Documentation improvement; doxygen top-level \file gestures, \brief
gestures for files, etc. Changed contrib/update-copyright.pl for
this change, and post-processed to add \brief. Resolves bug #98.
* Removed ExprManager::mkExpr(Kind) and NodeManager::mkNode(Kind).
They no longer made sense. Resolves bug #91.
Diffstat (limited to 'src/prop')
-rw-r--r-- | src/prop/cnf_stream.cpp | 10 | ||||
-rw-r--r-- | src/prop/cnf_stream.h | 11 | ||||
-rw-r--r-- | src/prop/prop_engine.cpp | 10 | ||||
-rw-r--r-- | src/prop/prop_engine.h | 10 | ||||
-rw-r--r-- | src/prop/sat.cpp | 19 | ||||
-rw-r--r-- | src/prop/sat.h | 11 |
6 files changed, 54 insertions, 17 deletions
diff --git a/src/prop/cnf_stream.cpp b/src/prop/cnf_stream.cpp index 225f95d54..45f7ab398 100644 --- a/src/prop/cnf_stream.cpp +++ b/src/prop/cnf_stream.cpp @@ -1,14 +1,18 @@ /********************* */ -/** cnf_stream.cpp +/*! \file cnf_stream.cpp + ** \verbatim ** Original author: taking ** Major contributors: dejan - ** Minor contributors (to current version): mdeters + ** Minor contributors (to current version): mdeters, cconway ** This file is part of the CVC4 prototype. ** Copyright (c) 2009, 2010 The Analysis of Computer Systems Group (ACSys) ** Courant Institute of Mathematical Sciences ** New York University ** See the file COPYING in the top-level source directory for licensing - ** information. + ** information.\endverbatim + ** + ** \brief A CNF converter that takes in asserts and has the side effect + ** of given an equisatisfiable stream of assertions to PropEngine. ** ** A CNF converter that takes in asserts and has the side effect ** of given an equisatisfiable stream of assertions to PropEngine. diff --git a/src/prop/cnf_stream.h b/src/prop/cnf_stream.h index ce6c7eb1e..abb69f590 100644 --- a/src/prop/cnf_stream.h +++ b/src/prop/cnf_stream.h @@ -1,14 +1,17 @@ /********************* */ -/** cnf_stream.h +/*! \file cnf_stream.h + ** \verbatim ** Original author: taking - ** Major contributors: dejan - ** Minor contributors (to current version): cconway, mdeters + ** Major contributors: cconway, dejan + ** Minor contributors (to current version): mdeters ** This file is part of the CVC4 prototype. ** Copyright (c) 2009, 2010 The Analysis of Computer Systems Group (ACSys) ** Courant Institute of Mathematical Sciences ** New York University ** See the file COPYING in the top-level source directory for licensing - ** information. + ** information.\endverbatim + ** + ** \brief This class transforms a sequence of formulas into clauses. ** ** This class takes a sequence of formulas. ** It outputs a stream of clauses that is propositionally diff --git a/src/prop/prop_engine.cpp b/src/prop/prop_engine.cpp index 16881f9e4..7cccca177 100644 --- a/src/prop/prop_engine.cpp +++ b/src/prop/prop_engine.cpp @@ -1,15 +1,19 @@ /********************* */ -/** prop_engine.cpp +/*! \file prop_engine.cpp + ** \verbatim ** Original author: mdeters - ** Major contributors: dejan + ** Major contributors: cconway, dejan ** Minor contributors (to current version): taking ** This file is part of the CVC4 prototype. ** Copyright (c) 2009, 2010 The Analysis of Computer Systems Group (ACSys) ** Courant Institute of Mathematical Sciences ** New York University ** See the file COPYING in the top-level source directory for licensing - ** information. + ** information.\endverbatim ** + ** \brief Implementation of the propositional engine of CVC4. + ** + ** Implementation of the propositional engine of CVC4. **/ #include "cnf_stream.h" diff --git a/src/prop/prop_engine.h b/src/prop/prop_engine.h index 7d3656a32..4adaa1434 100644 --- a/src/prop/prop_engine.h +++ b/src/prop/prop_engine.h @@ -1,14 +1,18 @@ /********************* */ -/** prop_engine.h +/*! \file prop_engine.h + ** \verbatim ** Original author: mdeters ** Major contributors: taking, dejan - ** Minor contributors (to current version): none + ** Minor contributors (to current version): cconway ** This file is part of the CVC4 prototype. ** Copyright (c) 2009, 2010 The Analysis of Computer Systems Group (ACSys) ** Courant Institute of Mathematical Sciences ** New York University ** See the file COPYING in the top-level source directory for licensing - ** information. + ** information.\endverbatim + ** + ** \brief The PropEngine (proposiitonal engine); main interface point + ** between CVC4's SMT infrastructure and the SAT solver. ** ** The PropEngine (proposiitonal engine); main interface point ** between CVC4's SMT infrastructure and the SAT solver. diff --git a/src/prop/sat.cpp b/src/prop/sat.cpp index df6eead4c..207bda4db 100644 --- a/src/prop/sat.cpp +++ b/src/prop/sat.cpp @@ -1,3 +1,22 @@ +/********************* */ +/*! \file sat.cpp + ** \verbatim + ** Original author: cconway + ** Major contributors: none + ** Minor contributors (to current version): dejan + ** This file is part of the CVC4 prototype. + ** Copyright (c) 2009, 2010 The Analysis of Computer Systems Group (ACSys) + ** Courant Institute of Mathematical Sciences + ** New York University + ** See the file COPYING in the top-level source directory for licensing + ** information.\endverbatim + ** + ** \brief [[ Add one-line brief description here ]] + ** + ** [[ Add lengthier description here ]] + ** \todo document this file + **/ + #include "cnf_stream.h" #include "prop_engine.h" #include "sat.h" diff --git a/src/prop/sat.h b/src/prop/sat.h index f9d27d2ac..e023410c7 100644 --- a/src/prop/sat.h +++ b/src/prop/sat.h @@ -1,14 +1,17 @@ /********************* */ -/** sat.h +/*! \file sat.h + ** \verbatim ** Original author: mdeters - ** Major contributors: dejan - ** Minor contributors (to current version): cconway + ** Major contributors: dejan, cconway + ** Minor contributors (to current version): none ** This file is part of the CVC4 prototype. ** Copyright (c) 2009, 2010 The Analysis of Computer Systems Group (ACSys) ** Courant Institute of Mathematical Sciences ** New York University ** See the file COPYING in the top-level source directory for licensing - ** information. + ** information.\endverbatim + ** + ** \brief SAT Solver. ** ** SAT Solver. **/ |