[clasp] 03/10: Merge tag 'upstream/3.2.1'
Thomas Krennwallner
tkren-guest at moszumanska.debian.org
Fri Dec 2 07:28:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
tkren-guest pushed a commit to branch devel
in repository clasp.
commit ae1855adba447275b40cd57e39f2711cceea772e
Merge: bf9a52c 551651c
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date: Mon Nov 28 07:58:46 2016 +0100
Merge tag 'upstream/3.2.1'
Upstream version 3.2.1
CHANGES | 51 +-
CMakeLists.txt | 79 +-
README | 122 +-
app/CMakeLists.txt | 18 +-
app/clasp_app.cpp | 538 +-
app/clasp_app.h | 100 +-
app/lpconvert/lpconvert.cpp | 108 +
app/main.cpp | 18 +-
build_vc/vc10/clasp/app/app.vcxproj | 27 +-
build_vc/vc10/clasp/clasp.sln | 42 +-
build_vc/vc10/clasp/lib/lib.vcxproj | 20 +-
.../app.vcproj => vc10/clasp/liblp/liblp.vcproj} | 99 +-
.../clasp/{lib/lib.vcxproj => liblp/liblp.vcxproj} | 172 +-
.../clasp/libprogram_opts/libprogram_opts.vcxproj | 64 -
build_vc/vc10/clasp/test/test.vcxproj | 15 +-
build_vc/vc12/clasp/app/app.vcxproj | 30 +-
build_vc/vc12/clasp/clasp.sln | 71 +-
build_vc/vc12/clasp/examples/examples.vcxproj | 18 +-
build_vc/vc12/clasp/lib/lib.vcxproj | 25 +-
.../{lib/lib.vcxproj => liblplp/liblp.vcxproj} | 181 +-
.../clasp/libprogram_opts/libprogram_opts.vcxproj | 66 -
build_vc/vc12/clasp/lpconvert/lpconvert.vcxproj | 113 +
build_vc/vc12/clasp/test/test.vcxproj | 18 +-
.../examples.vcxproj => test_lp/test_lp.vcxproj} | 150 +-
build_vc/vc9/clasp/app/app.vcproj | 12 +-
build_vc/vc9/clasp/clasp.sln | 51 +-
build_vc/vc9/clasp/examples/examples.vcproj | 4 +-
build_vc/vc9/clasp/lib/lib.vcproj | 26 +-
.../libprogram_opts.vcproj => liblp/liblp.vcproj} | 64 +-
.../clasp/libprogram_opts/libprogram_opts.vcproj | 2 +-
.../lpconvert.vcproj} | 123 +-
build_vc/vc9/clasp/test/test.vcproj | 10 +-
configure.bat | 56 +-
configure.sh | 128 +-
libclasp/CMakeLists.txt | 25 +-
libclasp/clasp/asp_preprocessor.h | 32 +-
libclasp/clasp/cb_enumerator.h | 31 +-
libclasp/clasp/clasp_facade.h | 524 +-
libclasp/clasp/claspfwd.h | 66 +-
libclasp/clasp/clause.h | 284 +-
libclasp/clasp/cli/clasp_cli_configs.inl | 30 +-
libclasp/clasp/cli/clasp_cli_options.inl | 430 +-
libclasp/clasp/cli/clasp_options.h | 127 +-
libclasp/clasp/cli/clasp_output.h | 153 +-
libclasp/clasp/clingo.h | 144 +
libclasp/clasp/constraint.h | 464 +-
libclasp/clasp/dependency_graph.h | 367 +-
libclasp/clasp/enumerator.h | 92 +-
libclasp/clasp/heuristics.h | 250 +-
libclasp/clasp/literal.h | 395 +-
libclasp/clasp/logic_program.h | 665 +-
libclasp/clasp/logic_program_types.h | 676 +-
libclasp/clasp/lookahead.h | 102 +-
libclasp/clasp/minimize_constraint.h | 246 +-
libclasp/clasp/model_enumerators.h | 75 +-
libclasp/clasp/parallel_solve.h | 101 +-
libclasp/clasp/parser.h | 324 +-
libclasp/clasp/pod_vector.h | 26 +-
libclasp/clasp/program_builder.h | 133 +-
libclasp/clasp/satelite.h | 53 +-
libclasp/clasp/shared_context.h | 636 +-
libclasp/clasp/solve_algorithms.h | 159 +-
libclasp/clasp/solver.h | 530 +-
libclasp/clasp/solver_strategies.h | 331 +-
libclasp/clasp/solver_types.h | 703 +-
libclasp/clasp/statistics.h | 301 +
libclasp/clasp/unfounded_check.h | 82 +-
libclasp/clasp/util/atomic.h | 156 +-
libclasp/clasp/util/hash_map.h | 77 +
libclasp/clasp/util/left_right_sequence.h | 4 +-
libclasp/clasp/util/misc_types.h | 299 +-
libclasp/clasp/util/multi_queue.h | 76 +-
libclasp/clasp/util/mutex.h | 97 +-
libclasp/clasp/util/platform.h | 113 +-
libclasp/clasp/util/pod_vector.h | 8 +-
libclasp/clasp/util/thread.h | 41 +-
libclasp/clasp/util/timer.h | 36 +-
libclasp/clasp/weight_constraint.h | 98 +-
libclasp/doc/api/clasp | 21 +-
libclasp/doc/api/clasp.txt | 16 +-
libclasp/example/example.h | 20 +-
libclasp/example/example1.cpp | 116 +-
libclasp/example/example2.cpp | 38 +-
libclasp/example/example3.cpp | 27 +-
libclasp/example/example4.cpp | 27 +-
libclasp/example/main.cpp | 30 +-
libclasp/src/asp_preprocessor.cpp | 112 +-
libclasp/src/cb_enumerator.cpp | 312 +-
libclasp/src/clasp_facade.cpp | 1092 ++-
libclasp/src/clasp_options.cpp | 392 +-
libclasp/src/clasp_output.cpp | 720 +-
libclasp/src/clause.cpp | 321 +-
libclasp/src/clingo.cpp | 280 +
libclasp/src/constraint.cpp | 103 +-
libclasp/src/dependency_graph.cpp | 754 +-
libclasp/src/enumerator.cpp | 115 +-
libclasp/src/heuristics.cpp | 585 +-
libclasp/src/logic_program.cpp | 2127 +++--
libclasp/src/logic_program_types.cpp | 1055 +--
libclasp/src/lookahead.cpp | 75 +-
libclasp/src/minimize_constraint.cpp | 658 +-
libclasp/src/model_enumerators.cpp | 172 +-
libclasp/src/parallel_solve.cpp | 407 +-
libclasp/src/parser.cpp | 718 +-
libclasp/src/program_builder.cpp | 273 +-
libclasp/src/satelite.cpp | 125 +-
libclasp/src/shared_context.cpp | 641 +-
libclasp/src/solve_algorithms.cpp | 342 +-
libclasp/src/solver.cpp | 1014 ++-
libclasp/src/solver_strategies.cpp | 173 +-
libclasp/src/solver_types.cpp | 268 +-
libclasp/src/statistics.cpp | 265 +
libclasp/src/timer.cpp | 12 +-
libclasp/src/unfounded_check.cpp | 238 +-
libclasp/src/weight_constraint.cpp | 153 +-
libclasp/tests/clause_creator_test.cpp | 144 +-
libclasp/tests/clause_test.cpp | 219 +-
libclasp/tests/cli_test.cpp | 166 +-
libclasp/tests/decision_heuristic_test.cpp | 958 +-
libclasp/tests/dependency_graph_test.cpp | 358 +-
libclasp/tests/dlp_builder_test.cpp | 514 +-
libclasp/tests/enumerator_test.cpp | 310 +-
libclasp/tests/facade_test.cpp | 1239 ++-
libclasp/tests/literal_test.cpp | 121 +-
libclasp/tests/lpcompare.h | 94 +
libclasp/tests/minimize_test.cpp | 371 +-
libclasp/tests/parser_test.cpp | 1052 ++-
libclasp/tests/program_builder_test.cpp | 3322 ++++---
libclasp/tests/rule_test.cpp | 590 +-
libclasp/tests/satelite_test.cpp | 79 +-
libclasp/tests/shared_clause_test.cpp | 66 +-
libclasp/tests/solver_test.cpp | 930 +-
libclasp/tests/test.h | 12 +-
libclasp/tests/test_main.cpp | 40 +-
libclasp/tests/unfounded_check_test.cpp | 679 +-
libclasp/tests/weight_constraint_test.cpp | 82 +-
liblp/CMakeLists.txt | 13 +
libclasp/doc/api/clasp => liblp/Doxyfile | 54 +-
liblp/potassco/aspif.h | 130 +
liblp/potassco/aspif_text.h | 70 +
liblp/potassco/basic_types.h | 334 +
liblp/potassco/clingo.h | 211 +
liblp/potassco/convert.h | 94 +
liblp/potassco/match_basic_types.h | 266 +
liblp/potassco/rule_utils.h | 142 +
liblp/potassco/smodels.h | 188 +
liblp/potassco/theory_data.h | 408 +
liblp/src/aspif.cpp | 284 +
liblp/src/aspif_text.cpp | 324 +
liblp/src/clingo.cpp | 29 +
liblp/src/convert.cpp | 325 +
liblp/src/match_basic_types.cpp | 380 +
liblp/src/rule_utils.cpp | 231 +
liblp/src/smodels.cpp | 385 +
liblp/src/theory_data.cpp | 328 +
liblp/tests/CMakeLists.txt | 5 +
liblp/tests/aspif.cpp | 521 ++
liblp/tests/catch.hpp | 9427 ++++++++++++++++++++
liblp/tests/common.h | 82 +
liblp/tests/main.cpp | 2 +
liblp/tests/smodels.cpp | 602 ++
liblp/tests/text.cpp | 153 +
libprogram_opts/CMakeLists.txt | 2 +-
libprogram_opts/program_opts/application.h | 2 +-
libprogram_opts/program_opts/program_options.h | 20 +-
libprogram_opts/program_opts/typed_value.h | 15 +-
libprogram_opts/program_opts/value.h | 14 +-
libprogram_opts/src/program_options.cpp | 35 +-
libprogram_opts/src/string_convert.cpp | 34 +-
tools/Base.in | 14 +-
tools/LibRule.in | 9 +-
tools/ProjRule.in | 5 +-
...config.txt => clasp-option-config-discrete.txt} | 149 +-
tools/clasp-option-config.txt | 42 +-
tools/clasp-test.in | 20 +
tools/has_std_thread.cpp | 13 +
176 files changed, 37227 insertions(+), 15461 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clasp.git
More information about the debian-science-commits
mailing list