[clasp] 01/03: Merge tag 'upstream/3.1.2'

[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 58cbf508f4821054b81498686796382609ac2c13
Merge: 3931b37 66508c2
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Tue May 12 07:11:12 2015 +0200

    Merge tag 'upstream/3.1.2'
    
    Upstream version 3.1.2

 CHANGES                                       |  10 +
 build_vc/vc12/clasp/examples/examples.vcxproj |   1 +
 libclasp/clasp/asp_preprocessor.h             |   1 +
 libclasp/clasp/clasp_facade.h                 |  54 ++++--
 libclasp/clasp/cli/clasp_cli_options.inl      |   1 +
 libclasp/clasp/heuristics.h                   |   2 +
 libclasp/clasp/logic_program.h                |  19 +-
 libclasp/clasp/logic_program_types.h          |   8 +-
 libclasp/clasp/solve_algorithms.h             |   3 +-
 libclasp/clasp/solver.h                       |   2 +
 libclasp/clasp/solver_strategies.h            |   2 +-
 libclasp/src/asp_preprocessor.cpp             |  22 ++-
 libclasp/src/cb_enumerator.cpp                |   5 +-
 libclasp/src/clasp_facade.cpp                 | 239 ++++++++++++++----------
 libclasp/src/enumerator.cpp                   |   5 +-
 libclasp/src/heuristics.cpp                   |  29 +--
 libclasp/src/logic_program.cpp                |  52 ++++--
 libclasp/src/logic_program_types.cpp          |  13 +-
 libclasp/src/minimize_constraint.cpp          |   5 +-
 libclasp/src/parallel_solve.cpp               |   2 +-
 libclasp/src/shared_context.cpp               |   3 -
 libclasp/src/solve_algorithms.cpp             |  13 +-
 libclasp/src/solver.cpp                       |  66 ++++++-
 libclasp/tests/decision_heuristic_test.cpp    |  67 +++++++
 libclasp/tests/dlp_builder_test.cpp           |  57 ++++++
 libclasp/tests/enumerator_test.cpp            |  16 ++
 libclasp/tests/facade_test.cpp                | 252 ++++++++++++++++++++++++--
 libclasp/tests/program_builder_test.cpp       |  58 ++++++
 libclasp/tests/rule_test.cpp                  |   6 +-
 libclasp/tests/solver_test.cpp                |  24 +++
 30 files changed, 836 insertions(+), 201 deletions(-)

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