[gringo] 01/04: Merge tag 'upstream/4.4.0'
Thomas Krennwallner
tkren-guest at moszumanska.debian.org
Mon Aug 18 16:04:48 UTC 2014
This is an automated email from the git hooks/post-receive script.
tkren-guest pushed a commit to branch master
in repository gringo.
commit 6719c2691bdf0640228f8e5299c361200873186e
Merge: 985685c 612570a
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date: Mon Aug 18 17:00:06 2014 +0200
Merge tag 'upstream/4.4.0'
Upstream version 4.4.0
.clang_complete | 19 +
CHANGES | 74 +
COPYING | 674 +
INSTALL | 206 +
NOTES | 291 +
README | 22 +
SConscript | 328 +
SConstruct | 119 +
app/clingo/src/clasp/clasp_app.cpp | 593 +
app/clingo/src/clasp/clasp_app.h | 187 +
app/clingo/src/clingo_app.cc | 171 +
app/clingo/src/clingo_app.hh | 67 +
app/clingo/src/main.cc | 27 +
app/clingo/tests/lua/assumptions1.lp | 13 +
app/clingo/tests/lua/assumptions1.sol | 3 +
app/clingo/tests/lua/assumptions2.lp | 13 +
app/clingo/tests/lua/assumptions2.sol | 3 +
app/clingo/tests/lua/assumptions3.lp | 14 +
app/clingo/tests/lua/assumptions3.sol | 5 +
app/clingo/tests/lua/assumptions4.lp | 31 +
app/clingo/tests/lua/assumptions4.sol | 7 +
app/clingo/tests/lua/blocksworld1.lp | 226 +
app/clingo/tests/lua/blocksworld1.sol | 12 +
app/clingo/tests/lua/conformant1.lp | 292 +
app/clingo/tests/lua/conformant1.sol | 48 +
app/clingo/tests/lua/conformant2.lp | 153 +
app/clingo/tests/lua/conformant2.sol | 14 +
app/clingo/tests/lua/conformant3.lp | 287 +
app/clingo/tests/lua/conformant3.sol | 201 +
app/clingo/tests/lua/csp-shrinking.lp | 16 +
app/clingo/tests/lua/csp-shrinking.sol | 53 +
app/clingo/tests/lua/externals.lp | 19 +
app/clingo/tests/lua/externals.sol | 7 +
app/clingo/tests/lua/iclingo.lp | 25 +
app/clingo/tests/lua/iclingo.sol | 7 +
app/clingo/tests/lua/interrupt.lp | 23 +
app/clingo/tests/lua/interrupt.sol | 7 +
app/clingo/tests/lua/queens.lp | 41 +
app/clingo/tests/lua/queens.sol | 2 +
app/clingo/tests/lua/robots.lp | 212 +
app/clingo/tests/lua/robots.sol | 8 +
app/clingo/tests/lua/setconfig.lp | 28 +
app/clingo/tests/lua/setconfig.sol | 11 +
app/clingo/tests/lua/show.lp | 63 +
app/clingo/tests/lua/show.sol | 7 +
app/clingo/tests/lua/sokoban.lp | 124 +
app/clingo/tests/lua/sokoban.sol | 16 +
app/clingo/tests/lua/sokoban_back.lp | 136 +
app/clingo/tests/lua/sokoban_back.sol | 16 +
app/clingo/tests/lua/sokoban_para.lp | 167 +
app/clingo/tests/lua/sokoban_para.sol | 21 +
app/clingo/tests/lua/solitaire_para.lp | 140 +
app/clingo/tests/lua/solitaire_para.sol | 23 +
app/clingo/tests/lua/solitaire_sort.lp | 193 +
app/clingo/tests/lua/solitaire_sort.sol | 20 +
app/clingo/tests/lua/test.lp | 74 +
app/clingo/tests/lua/test.sol | 45 +
app/clingo/tests/lua/toh.lp | 105 +
app/clingo/tests/lua/toh.sol | 35 +
app/clingo/tests/lua/unsat-async.lp | 11 +
app/clingo/tests/lua/unsat-async.sol | 1 +
app/clingo/tests/lua/unsat-sync.lp | 11 +
app/clingo/tests/lua/unsat-sync.sol | 1 +
app/clingo/tests/python/assumptions1.lp | 13 +
app/clingo/tests/python/assumptions1.sol | 3 +
app/clingo/tests/python/assumptions2.lp | 13 +
app/clingo/tests/python/assumptions2.sol | 3 +
app/clingo/tests/python/assumptions3.lp | 14 +
app/clingo/tests/python/assumptions3.sol | 5 +
app/clingo/tests/python/assumptions4.lp | 19 +
app/clingo/tests/python/assumptions4.sol | 7 +
app/clingo/tests/python/blocksworld1.lp | 216 +
app/clingo/tests/python/blocksworld1.sol | 12 +
app/clingo/tests/python/externals.lp | 19 +
app/clingo/tests/python/externals.sol | 7 +
app/clingo/tests/python/iclingo.lp | 22 +
app/clingo/tests/python/iclingo.sol | 7 +
app/clingo/tests/python/interrupt.lp | 23 +
app/clingo/tests/python/interrupt.sol | 7 +
app/clingo/tests/python/project.lp | 192 +
app/clingo/tests/python/project.sol | 28 +
app/clingo/tests/python/queens.lp | 37 +
app/clingo/tests/python/queens.sol | 1236 +
app/clingo/tests/python/setconfig.lp | 29 +
app/clingo/tests/python/setconfig.sol | 11 +
app/clingo/tests/python/show.lp | 53 +
app/clingo/tests/python/show.sol | 7 +
app/clingo/tests/python/sokoban.cmd | 1 +
app/clingo/tests/python/sokoban.lp | 104 +
app/clingo/tests/python/sokoban.sol | 14 +
app/clingo/tests/python/test.lp | 51 +
app/clingo/tests/python/test.sol | 45 +
app/clingo/tests/run.sh | 131 +
app/gringo/main.cc | 343 +
app/luaclingo/src/clingo_lib.cc | 117 +
app/luaclingo/src/clingo_lib.hh | 51 +
app/luaclingo/src/main.cc | 43 +
app/pyclingo/src/clingo_lib.cc | 117 +
app/pyclingo/src/clingo_lib.hh | 51 +
app/pyclingo/src/main.cc | 43 +
app/shared/include/clingocontrol.hh | 293 +
app/shared/src/clingocontrol.cc | 447 +
examples/asp/gbie/README | 9 +
examples/asp/gbie/gbie1.lp | 47 +
examples/asp/gbie/gbie2.lp | 32 +
examples/asp/gbie/instances/sat_01.lp | 33 +
examples/asp/gbie/instances/sat_02.lp | 95144 +++++++++++++++++++
examples/asp/gbie/instances/sat_03.lp | 81956 ++++++++++++++++
examples/asp/gbie/instances/unsat_01.lp | 42 +
examples/asp/gbie/instances/unsat_02.lp | 83951 ++++++++++++++++
examples/asp/queens/README | 6 +
examples/asp/queens/queens1.lp | 15 +
examples/asp/queens/queens2.lp | 18 +
examples/asp/rec-cond/README | 4 +
examples/asp/rec-cond/encoding.lp | 61 +
examples/asp/rec-cond/instance.lp | 132 +
examples/asp/toh/README | 4 +
examples/asp/toh/tohE.lp | 22 +
examples/asp/toh/tohI.lp | 6 +
examples/scripting/addclause/README | 5 +
examples/scripting/addclause/addclause-lua.lp | 20 +
examples/scripting/addclause/addclause-py.lp | 19 +
examples/scripting/blocksworld/README | 13 +
examples/scripting/blocksworld/blocks_01.lp | 27 +
examples/scripting/blocksworld/control_01.lua | 11 +
examples/scripting/blocksworld/control_01.out | 235 +
examples/scripting/blocksworld/lua.lp | 126 +
examples/scripting/blocksworld/lua_interpret.lp | 21 +
examples/scripting/blocksworld/world.lp | 130 +
examples/scripting/commit/README | 7 +
examples/scripting/commit/commit-lua.lp | 17 +
examples/scripting/commit/commit-py.lp | 14 +
examples/scripting/commit/encoding.lp | 5 +
examples/scripting/consequences/README | 6 +
examples/scripting/consequences/brave-lua.lp | 46 +
examples/scripting/consequences/brave-py.lp | 24 +
examples/scripting/consequences/example.lp | 4 +
examples/scripting/context/README | 6 +
examples/scripting/context/context-lua.lp | 30 +
examples/scripting/context/context-py.lp | 21 +
examples/scripting/context/encoding.lp | 1 +
examples/scripting/controller/README | 11 +
examples/scripting/controller/client-lua.lp | 74 +
examples/scripting/controller/client-py.lp | 71 +
examples/scripting/controller/client.lp | 15 +
examples/scripting/controller/server.py | 99 +
examples/scripting/enum-assumption/README | 8 +
examples/scripting/enum-assumption/example-lua.lp | 20 +
examples/scripting/enum-assumption/example-py.lp | 19 +
examples/scripting/external/README | 3 +
examples/scripting/external/external-lua.lp | 15 +
examples/scripting/external/external-py.lp | 14 +
examples/scripting/external/external.lp | 8 +
examples/scripting/iclingo/README | 10 +
examples/scripting/iclingo/example.lp | 18 +
examples/scripting/iclingo/iclingo-int.lp | 1 +
examples/scripting/iclingo/iclingo-lua.lp | 53 +
examples/scripting/iclingo/iclingo-py.lp | 34 +
examples/scripting/include/README | 5 +
examples/scripting/include/encoding-lua.lp | 13 +
examples/scripting/include/encoding-py.lp | 12 +
examples/scripting/include/include.lp | 1 +
examples/scripting/incqueens/README | 7 +
examples/scripting/incqueens/incqueens-lua.lp | 20 +
examples/scripting/incqueens/incqueens-py.lp | 14 +
examples/scripting/incqueens/incqueens.lp | 23 +
examples/scripting/ipython/README | 23 +
examples/scripting/ipython/ipython.py | 7 +
examples/scripting/itersolve/README | 5 +
examples/scripting/itersolve/itersolve-lua.lp | 25 +
examples/scripting/itersolve/itersolve-py.lp | 9 +
examples/scripting/itersolve/program.lp | 1 +
examples/scripting/load/README | 5 +
examples/scripting/load/load-lua.lp | 16 +
examples/scripting/load/load-py.lp | 15 +
examples/scripting/load/program.lp | 3 +
examples/scripting/onmodel/README | 9 +
examples/scripting/onmodel/onmodel-lua.lp | 44 +
examples/scripting/onmodel/onmodel-py.lp | 31 +
examples/scripting/planning/README | 6 +
examples/scripting/planning/convert.lp | 28 +
examples/scripting/planning/convert.sh | 2 +
examples/scripting/planning/encoding.lp | 90 +
examples/scripting/planning/instances/coins01.lp | 139 +
examples/scripting/planning/instances/comm02.lp | 179 +
examples/scripting/planning/instances/comm03.lp | 239 +
examples/scripting/planning/instances/comm05.lp | 371 +
examples/scripting/planning/instances/uts01.lp | 37 +
examples/scripting/planning/planning-lua.lp | 37 +
examples/scripting/pydoc/README | 3 +
examples/scripting/pydoc/pydoc-lib.py | 5 +
examples/scripting/pydoc/pydoc.lp | 8 +
examples/scripting/setconf/README | 5 +
examples/scripting/setconf/setconf-lua.lp | 53 +
examples/scripting/setconf/setconf-py.lp | 50 +
examples/scripting/solitaire/README | 53 +
examples/scripting/solitaire/instance.lp | 37 +
examples/scripting/solitaire/solitaire.lp | 33 +
examples/scripting/solitaire/visualize.py | 163 +
examples/scripting/solve-async/README | 7 +
examples/scripting/solve-async/program.lp | 5 +
examples/scripting/solve-async/solve-async-lua.lp | 23 +
examples/scripting/solve-async/solve-async-py.lp | 20 +
examples/scripting/stats/README | 8 +
examples/scripting/stats/example.lp | 3 +
examples/scripting/stats/stats-lua.lp | 17 +
examples/scripting/stats/stats-py.lp | 13 +
examples/scripting/unblock/README | 11 +
examples/scripting/unblock/inst1.lp | 15 +
examples/scripting/unblock/inst2.lp | 18 +
examples/scripting/unblock/inst3.lp | 11 +
examples/scripting/unblock/inst4.lp | 14 +
examples/scripting/unblock/inst5.lp | 42 +
examples/scripting/unblock/unblock.lp | 48 +
examples/scripting/unblock/visualize.py | 177 +
libclasp/clasp/asp_preprocessor.h | 126 +
libclasp/clasp/cb_enumerator.h | 59 +
libclasp/clasp/clasp_facade.h | 347 +
libclasp/clasp/claspfwd.h | 57 +
libclasp/clasp/clause.h | 531 +
libclasp/clasp/cli/clasp_cli_configs.inl | 87 +
libclasp/clasp/cli/clasp_cli_options.inl | 428 +
libclasp/clasp/cli/clasp_options.h | 314 +
libclasp/clasp/cli/clasp_output.h | 258 +
libclasp/clasp/cli/clifwd.h | 32 +
libclasp/clasp/constraint.h | 532 +
libclasp/clasp/dependency_graph.h | 301 +
libclasp/clasp/enumerator.h | 301 +
libclasp/clasp/heuristics.h | 417 +
libclasp/clasp/literal.h | 399 +
libclasp/clasp/logic_program.h | 512 +
libclasp/clasp/logic_program_types.h | 727 +
libclasp/clasp/lookahead.h | 239 +
libclasp/clasp/minimize_constraint.h | 561 +
libclasp/clasp/model_enumerators.h | 114 +
libclasp/clasp/parallel_solve.h | 353 +
libclasp/clasp/parser.h | 262 +
libclasp/clasp/pod_vector.h | 95 +
libclasp/clasp/program_builder.h | 219 +
libclasp/clasp/satelite.h | 167 +
libclasp/clasp/shared_context.h | 711 +
libclasp/clasp/solve_algorithms.h | 215 +
libclasp/clasp/solver.h | 1082 +
libclasp/clasp/solver_strategies.h | 455 +
libclasp/clasp/solver_types.h | 872 +
libclasp/clasp/unfounded_check.h | 292 +
libclasp/clasp/util/atomic.h | 82 +
libclasp/clasp/util/indexed_priority_queue.h | 216 +
libclasp/clasp/util/left_right_sequence.h | 350 +
libclasp/clasp/util/misc_types.h | 377 +
libclasp/clasp/util/multi_queue.h | 252 +
libclasp/clasp/util/mutex.h | 85 +
libclasp/clasp/util/platform.h | 179 +
libclasp/clasp/util/pod_vector.h | 558 +
libclasp/clasp/util/thread.h | 47 +
libclasp/clasp/util/timer.h | 64 +
libclasp/clasp/util/type_manip.h | 137 +
libclasp/clasp/weight_constraint.h | 213 +
libclasp/src/asp_preprocessor.cpp | 513 +
libclasp/src/cb_enumerator.cpp | 182 +
libclasp/src/clasp_facade.cpp | 612 +
libclasp/src/clasp_options.cpp | 975 +
libclasp/src/clasp_output.cpp | 953 +
libclasp/src/clause.cpp | 1068 +
libclasp/src/constraint.cpp | 92 +
libclasp/src/dependency_graph.cpp | 659 +
libclasp/src/enumerator.cpp | 289 +
libclasp/src/heuristics.cpp | 916 +
libclasp/src/logic_program.cpp | 1411 +
libclasp/src/logic_program_types.cpp | 1461 +
libclasp/src/lookahead.cpp | 393 +
libclasp/src/minimize_constraint.cpp | 1407 +
libclasp/src/model_enumerators.cpp | 317 +
libclasp/src/parallel_solve.cpp | 1069 +
libclasp/src/parser.cpp | 456 +
libclasp/src/program_builder.cpp | 300 +
libclasp/src/satelite.cpp | 619 +
libclasp/src/shared_context.cpp | 825 +
libclasp/src/solve_algorithms.cpp | 324 +
libclasp/src/solver.cpp | 1581 +
libclasp/src/solver_strategies.cpp | 314 +
libclasp/src/solver_types.cpp | 149 +
libclasp/src/timer.cpp | 104 +
libclasp/src/unfounded_check.cpp | 798 +
libclasp/src/weight_constraint.cpp | 585 +
libgringo/gringo/backtrace.hh | 119 +
libgringo/gringo/base.hh | 258 +
libgringo/gringo/bug.hh | 81 +
libgringo/gringo/clonable.hh | 50 +
libgringo/gringo/comparable.hh | 42 +
libgringo/gringo/control.hh | 179 +
libgringo/gringo/domain.hh | 590 +
libgringo/gringo/flyweight.hh | 522 +
libgringo/gringo/graph.hh | 156 +
libgringo/gringo/ground/binders.hh | 203 +
libgringo/gringo/ground/dependency.hh | 299 +
libgringo/gringo/ground/instantiation.hh | 136 +
libgringo/gringo/ground/literal.hh | 68 +
libgringo/gringo/ground/literals.hh | 176 +
libgringo/gringo/ground/program.hh | 68 +
libgringo/gringo/ground/statement.hh | 52 +
libgringo/gringo/ground/statements.hh | 752 +
libgringo/gringo/hashable.hh | 68 +
libgringo/gringo/input/aggregate.hh | 200 +
libgringo/gringo/input/aggregates.hh | 306 +
libgringo/gringo/input/literal.hh | 97 +
libgringo/gringo/input/literals.hh | 202 +
libgringo/gringo/input/nongroundparser.hh | 87 +
libgringo/gringo/input/program.hh | 87 +
libgringo/gringo/input/programbuilder.hh | 329 +
libgringo/gringo/input/statement.hh | 97 +
libgringo/gringo/intervals.hh | 318 +
libgringo/gringo/lexerstate.hh | 314 +
libgringo/gringo/locatable.hh | 152 +
libgringo/gringo/logger.hh | 135 +
libgringo/gringo/lua.hh | 50 +
libgringo/gringo/output/literal.hh | 64 +
libgringo/gringo/output/literals.hh | 354 +
libgringo/gringo/output/lparseoutputter.hh | 62 +
libgringo/gringo/output/output.hh | 95 +
libgringo/gringo/output/statement.hh | 73 +
libgringo/gringo/output/statements.hh | 242 +
libgringo/gringo/printable.hh | 46 +
libgringo/gringo/python.hh | 48 +
libgringo/gringo/safetycheck.hh | 186 +
libgringo/gringo/scripts.hh | 58 +
libgringo/gringo/term.hh | 766 +
libgringo/gringo/terms.hh | 131 +
libgringo/gringo/unique_list.hh | 356 +
libgringo/gringo/utility.hh | 455 +
libgringo/gringo/value.hh | 551 +
libgringo/gringo/version.hh | 26 +
libgringo/src/ground/instantiation.cc | 154 +
libgringo/src/ground/literals.cc | 440 +
libgringo/src/ground/program.cc | 149 +
libgringo/src/ground/statements.cc | 1686 +
libgringo/src/input/aggregate.cc | 107 +
libgringo/src/input/aggregates.cc | 1339 +
libgringo/src/input/literal.cc | 60 +
libgringo/src/input/literals.cc | 487 +
libgringo/src/input/nongroundgrammar.yy | 780 +
libgringo/src/input/nongroundlexer.xh | 176 +
libgringo/src/input/nongroundparser.cc | 255 +
libgringo/src/input/program.cc | 222 +
libgringo/src/input/programbuilder.cc | 357 +
libgringo/src/input/statement.cc | 369 +
libgringo/src/lua.cc | 1422 +
libgringo/src/output/literals.cc | 868 +
libgringo/src/output/output.cc | 918 +
libgringo/src/output/statements.cc | 772 +
libgringo/src/python.cc | 2459 +
libgringo/src/scripts.cc | 52 +
libgringo/src/term.cc | 1604 +
libgringo/src/terms.cc | 178 +
libgringo/tests/flyweight.cc | 238 +
libgringo/tests/graph.cc | 115 +
libgringo/tests/ground/dependency.cc | 252 +
libgringo/tests/ground/instantiation.cc | 1097 +
libgringo/tests/ground/literal.cc | 195 +
libgringo/tests/ground/program.cc | 240 +
libgringo/tests/input/aggregate.cc | 457 +
libgringo/tests/input/aggregate_helper.hh | 89 +
libgringo/tests/input/lit_helper.hh | 93 +
libgringo/tests/input/literal.cc | 210 +
libgringo/tests/input/nongroundgrammar.cc | 963 +
libgringo/tests/input/nongroundlexer.cc | 124 +
libgringo/tests/input/program.cc | 177 +
libgringo/tests/input/programbuilder.cc | 304 +
libgringo/tests/intervals.cc | 401 +
libgringo/tests/lua.cc | 158 +
libgringo/tests/main.cc | 31 +
libgringo/tests/output/aspcomp13.cc | 2639 +
libgringo/tests/output/incremental.cc | 302 +
libgringo/tests/output/lparse.cc | 818 +
libgringo/tests/output/solver_helper.hh | 117 +
libgringo/tests/output/warnings.cc | 129 +
libgringo/tests/python.cc | 167 +
libgringo/tests/safetycheck.cc | 101 +
libgringo/tests/term.cc | 344 +
libgringo/tests/term_helper.hh | 94 +
libgringo/tests/tests.hh | 318 +
libgringo/tests/unique_list.cc | 105 +
libgringo/tests/utility.cc | 256 +
libgringo/tests/value.cc | 243 +
libprogram_opts/program_opts/application.h | 132 +
libprogram_opts/program_opts/detail/alarm.h | 74 +
libprogram_opts/program_opts/detail/notifier.h | 58 +
libprogram_opts/program_opts/detail/refcountable.h | 72 +
libprogram_opts/program_opts/detail/value_store.h | 87 +
libprogram_opts/program_opts/errors.h | 109 +
libprogram_opts/program_opts/mapped_value.h | 92 +
libprogram_opts/program_opts/program_options.h | 511 +
libprogram_opts/program_opts/string_convert.h | 280 +
libprogram_opts/program_opts/typed_value.h | 250 +
libprogram_opts/program_opts/value.h | 207 +
libprogram_opts/program_opts/value_store.h | 152 +
libprogram_opts/src/alarm.cpp | 161 +
libprogram_opts/src/application.cpp | 265 +
libprogram_opts/src/program_options.cpp | 957 +
libprogram_opts/src/string_convert.cpp | 222 +
libprogram_opts/src/value_store.cpp | 81 +
401 files changed, 345647 insertions(+)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gringo.git
More information about the debian-science-commits
mailing list