[clasp] 02/03: Merge branch 'master' into devel

[Thomas Krennwallner]

This is an automated email from the git hooks/post-receive script.

tkren-guest pushed a commit to branch devel
in repository clasp.

commit 5fe40e61d0f672fb4f834f6de12c971b74a648b5
Merge: 460afae 58cbf50
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Tue May 12 07:11:57 2015 +0200

    Merge branch 'master' into devel

 CHANGES                                       |  18 ++
 build_vc/vc12/clasp/examples/examples.vcxproj |   1 +
 debian/changelog                              |   7 +
 libclasp/clasp/asp_preprocessor.h             |   1 +
 libclasp/clasp/clasp_facade.h                 |  54 ++++--
 libclasp/clasp/cli/clasp_cli_configs.inl      |   2 +-
 libclasp/clasp/cli/clasp_cli_options.inl      |   7 +-
 libclasp/clasp/heuristics.h                   |   2 +
 libclasp/clasp/literal.h                      |  11 ++
 libclasp/clasp/logic_program.h                |  23 ++-
 libclasp/clasp/logic_program_types.h          |  13 +-
 libclasp/clasp/parser.h                       |   1 +
 libclasp/clasp/solve_algorithms.h             |   3 +-
 libclasp/clasp/solver.h                       |   2 +
 libclasp/clasp/solver_strategies.h            |   2 +-
 libclasp/clasp/util/misc_types.h              |  11 --
 libclasp/src/asp_preprocessor.cpp             |  22 ++-
 libclasp/src/cb_enumerator.cpp                |   5 +-
 libclasp/src/clasp_facade.cpp                 | 239 ++++++++++++++----------
 libclasp/src/clasp_output.cpp                 |   3 +
 libclasp/src/enumerator.cpp                   |   5 +-
 libclasp/src/heuristics.cpp                   |  33 ++--
 libclasp/src/logic_program.cpp                |  91 +++++++---
 libclasp/src/logic_program_types.cpp          |  23 ++-
 libclasp/src/minimize_constraint.cpp          |   5 +-
 libclasp/src/parallel_solve.cpp               |   2 +-
 libclasp/src/parser.cpp                       |  11 ++
 libclasp/src/shared_context.cpp               |   3 -
 libclasp/src/solve_algorithms.cpp             |  13 +-
 libclasp/src/solver.cpp                       |  66 ++++++-
 libclasp/tests/cli_test.cpp                   |  19 ++
 libclasp/tests/decision_heuristic_test.cpp    |  86 +++++++++
 libclasp/tests/dlp_builder_test.cpp           | 137 ++++++++++++++
 libclasp/tests/enumerator_test.cpp            |  16 ++
 libclasp/tests/facade_test.cpp                | 252 ++++++++++++++++++++++++--
 libclasp/tests/program_builder_test.cpp       | 122 ++++++++++++-
 libclasp/tests/rule_test.cpp                  |   6 +-
 libclasp/tests/solver_test.cpp                |  24 +++
 libprogram_opts/src/string_convert.cpp        |  65 +++----
 39 files changed, 1137 insertions(+), 269 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clasp.git