[gringo] branch devel updated (5fba161 -> ede37ff)

Thomas Krennwallner tkren-guest at moszumanska.debian.org
Sat Jul 11 07:53:31 UTC 2015


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

tkren-guest pushed a change to branch devel
in repository gringo.

      from  5fba161   Bump Standards-Version to 3.9.6.
      adds  85f46b9   Imported Upstream version 4.5.0
       new  3610ccb   Merge tag 'upstream/4.5.0'
       new  f37322a   Merge branch 'master' into devel
       new  1b54dc2   Add Breaks: aspcud (<= 1.9.0-2). Add reify description.
       new  dc22192   Update copyright information, remove outdated files.
       new  dd31aa1   Remove NOTES.
       new  f15a2c4   Install reify.
       new  ede37ff   Build reify.

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .clang_complete                                    |    5 +-
 .ycm_extra_conf.py                                 |  174 ++
 CHANGES                                            |   27 +-
 INSTALL                                            |   27 +-
 NOTES                                              |  291 --
 README                                             |    7 +-
 SConscript                                         |   68 +-
 SConstruct                                         |   13 +-
 app/clingo/src/clingo_app.cc                       |   12 +-
 app/clingo/tests/lua/assumptions4.lp               |    2 +-
 app/clingo/tests/lua/conformant1.lp                |   14 +-
 app/clingo/tests/lua/conformant2.lp                |  141 +-
 app/clingo/tests/lua/conformant2.sol               |    3 +
 app/clingo/tests/lua/conformant3.lp                |  141 +-
 app/clingo/tests/lua/conformant3.sol               |   29 +
 app/clingo/tests/lua/csp-shrinking.sol             |    1 +
 app/clingo/tests/lua/domain.lp                     |   30 +
 app/clingo/tests/lua/domain.sol                    |    3 +
 app/clingo/tests/lua/icolor.lp                     |   45 +
 .../{python/assumptions4.sol => lua/icolor.sol}    |    4 +-
 app/clingo/tests/lua/interrupt.lp                  |    2 +-
 app/clingo/tests/lua/robots.lp                     |   16 +-
 app/clingo/tests/lua/solitaire_sort.lp             |    2 +-
 app/clingo/tests/lua/unsat-async.sol               |    2 +
 app/clingo/tests/lua/unsat-sync.sol                |    2 +
 app/clingo/tests/python/domain.lp                  |   26 +
 app/clingo/tests/python/domain.sol                 |    3 +
 app/clingo/tests/python/interrupt.lp               |    2 +-
 app/clingo/tests/python/project.lp                 |   10 +-
 app/clingo/tests/python/show.lp                    |    8 +-
 app/clingo/tests/python/test.lp                    |   20 +-
 app/clingo/tests/run.sh                            |    2 +-
 app/gringo/main.cc                                 |   74 +-
 app/luaclingo/src/clingo_lib.cc                    |  117 -
 app/luaclingo/src/clingo_lib.hh                    |   51 -
 app/luaclingo/src/main.cc                          |   12 +-
 app/pyclingo/src/clingo_lib.cc                     |  117 -
 app/pyclingo/src/clingo_lib.hh                     |   51 -
 app/pyclingo/src/main.cc                           |   26 +-
 app/reify/main.cc                                  |   93 +
 app/shared/include/clingocontrol.hh                |  132 +-
 app/shared/src/clingocontrol.cc                    |  377 ++-
 debian/control                                     |   17 +-
 debian/copyright                                   |  185 +-
 debian/docs                                        |    1 -
 debian/install                                     |    1 +
 debian/rules                                       |    4 +-
 examples/asp/toh/README                            |    4 -
 examples/{scripting => clingo}/addclause/README    |    0
 .../addclause/addclause-lua.lp                     |    0
 .../addclause/addclause-py.lp                      |    0
 examples/{scripting => clingo}/blocksworld/README  |    0
 .../{scripting => clingo}/blocksworld/blocks_01.lp |    0
 .../blocksworld/control_01.lua                     |    0
 .../blocksworld/control_01.out                     |    0
 examples/{scripting => clingo}/blocksworld/lua.lp  |    0
 .../blocksworld/lua_interpret.lp                   |    0
 .../{scripting => clingo}/blocksworld/world.lp     |    0
 examples/{scripting => clingo}/commit/README       |    0
 .../{scripting => clingo}/commit/commit-lua.lp     |    0
 examples/{scripting => clingo}/commit/commit-py.lp |    0
 examples/{scripting => clingo}/commit/encoding.lp  |    0
 examples/{scripting => clingo}/consequences/README |    0
 .../consequences/brave-lua.lp                      |    0
 .../{scripting => clingo}/consequences/brave-py.lp |    0
 .../{scripting => clingo}/consequences/example.lp  |    0
 examples/{scripting => clingo}/context/README      |    0
 .../{scripting => clingo}/context/context-lua.lp   |    0
 .../{scripting => clingo}/context/context-py.lp    |    0
 examples/{scripting => clingo}/context/encoding.lp |    0
 examples/clingo/controller-async/README            |    8 +
 .../controller-async}/client.lp                    |    0
 examples/clingo/controller-async/controller.py     |  122 +
 .../controller-processes}/README                   |    0
 .../controller-processes}/client-lua.lp            |    0
 .../controller-processes}/client-py.lp             |    2 +-
 .../controller-processes}/client.lp                |    0
 .../controller-processes}/server.py                |    0
 examples/clingo/controller-threads/README          |    8 +
 .../controller-threads}/client.lp                  |    0
 examples/clingo/controller-threads/controller.py   |  154 +
 examples/clingo/domains/README                     |    6 +
 examples/clingo/domains/domains-lua.lp             |   23 +
 examples/clingo/domains/domains-py.lp              |   19 +
 examples/clingo/domains/instance.lp                |    5 +
 .../{scripting => clingo}/enum-assumption/README   |    0
 .../enum-assumption/example-lua.lp                 |    0
 .../enum-assumption/example-py.lp                  |    0
 .../expansion/GraphColouring/encodings/encoding.lp |   31 +
 .../instances/0004-graph_colouring-125-0.lp        | 1687 +++++++++++
 .../instances/0005-graph_colouring-125-0.lp        | 1649 +++++++++++
 .../instances/0007-graph_colouring-125-0.lp        | 1609 +++++++++++
 .../instances/0008-graph_colouring-125-0.lp        | 1677 +++++++++++
 .../instances/0013-graph_colouring-130-0.lp        | 1714 +++++++++++
 .../instances/0021-graph_colouring-135-0.lp        | 1981 +++++++++++++
 .../instances/0022-graph_colouring-135-0.lp        | 2043 +++++++++++++
 .../instances/0023-graph_colouring-135-0.lp        | 1869 ++++++++++++
 .../instances/0025-graph_colouring-135-0.lp        | 1995 +++++++++++++
 .../instances/0032-graph_colouring-140-0.lp        | 2226 +++++++++++++++
 .../instances/0036-graph_colouring-140-0.lp        | 2126 ++++++++++++++
 .../instances/0039-graph_colouring-140-0.lp        | 2174 ++++++++++++++
 .../instances/0040-graph_colouring-140-0.lp        | 2214 ++++++++++++++
 .../instances/0046-graph_colouring-145-0.lp        | 2345 +++++++++++++++
 .../instances/0047-graph_colouring-145-0.lp        | 2177 ++++++++++++++
 .../instances/0048-graph_colouring-145-0.lp        | 2233 +++++++++++++++
 .../instances/0050-graph_colouring-145-0.lp        | 2219 ++++++++++++++
 .../instances/0056-graph_colouring-150-0.lp        | 2252 +++++++++++++++
 .../instances/0059-graph_colouring-150-0.lp        | 2374 +++++++++++++++
 .../instances/0060-graph_colouring-150-0.lp        | 2472 ++++++++++++++++
 .../expansion/PartnerUnits/encodings/encoding.lp   |   66 +
 .../instances/100-partner_units-100-0.lp           |  744 +++++
 .../instances/102-partner_units-100-0.lp           |  744 +++++
 .../114-partner_units_polynomial-100-0.lp          |  746 +++++
 .../115-partner_units_polynomial-100-0.lp          |  746 +++++
 .../119-partner_units_polynomial-100-0.lp          |  746 +++++
 .../127-partner_units_polynomial-100-0.lp          |  740 +++++
 .../instances/153-partner_units-100-0.lp           |  748 +++++
 .../instances/154-partner_units-100-0.lp           |  746 +++++
 .../instances/156-partner_units-100-0.lp           |  742 +++++
 .../instances/161-partner_units-100-0.lp           |  742 +++++
 .../instances/175-partner_units_polynomial-75-0.lp |  780 +++++
 .../instances/180-partner_units_polynomial-47-0.lp |  366 +++
 .../instances/188-partner_units_polynomial-57-0.lp |  588 ++++
 .../instances/196-partner_units_polynomial-59-0.lp |  412 +++
 .../instances/26-partner_units_polynomial-60-0.lp  |  620 ++++
 .../instances/52-partner_units_polynomial-100-0.lp |  744 +++++
 .../instances/58-partner_units_polynomial-100-0.lp |  740 +++++
 .../instances/69-partner_units_polynomial-100-0.lp |  744 +++++
 .../instances/91-partner_units-100-0.lp            |  742 +++++
 .../instances/99-partner_units-100-0.lp            |  748 +++++
 examples/clingo/expansion/README                   |   33 +
 examples/clingo/expansion/main.py                  |  117 +
 examples/{scripting => clingo}/external/README     |    0
 .../{scripting => clingo}/external/external-lua.lp |    0
 .../{scripting => clingo}/external/external-py.lp  |    0
 .../{scripting => clingo}/external/external.lp     |    0
 examples/clingo/iclingo/README                     |   10 +
 examples/{scripting => clingo}/iclingo/example.lp  |    6 +-
 examples/clingo/iclingo/incmode-int.lp             |    1 +
 examples/clingo/iclingo/incmode-lua.lp             |   39 +
 examples/clingo/iclingo/incmode-py.lp              |   32 +
 examples/{scripting => clingo}/include/README      |    0
 .../{scripting => clingo}/include/encoding-lua.lp  |    0
 .../{scripting => clingo}/include/encoding-py.lp   |    0
 examples/{scripting => clingo}/include/include.lp  |    0
 examples/{scripting => clingo}/incqueens/README    |    0
 .../incqueens/incqueens-lua.lp                     |    0
 .../incqueens/incqueens-py.lp                      |    2 +
 .../{scripting => clingo}/incqueens/incqueens.lp   |    0
 examples/{scripting => clingo}/ipython/README      |    2 +-
 examples/{scripting => clingo}/ipython/ipython.py  |    0
 examples/{scripting => clingo}/itersolve/README    |    0
 .../itersolve/itersolve-lua.lp                     |    0
 .../itersolve/itersolve-py.lp                      |    0
 .../{scripting => clingo}/itersolve/program.lp     |    0
 examples/clingo/load/README                        |    7 +
 examples/{scripting => clingo}/load/load-lua.lp    |    0
 examples/{scripting => clingo}/load/load-py.lp     |    0
 examples/{scripting => clingo}/load/program.lp     |    0
 examples/{scripting => clingo}/onmodel/README      |    0
 .../{scripting => clingo}/onmodel/onmodel-lua.lp   |    0
 .../{scripting => clingo}/onmodel/onmodel-py.lp    |    0
 examples/{scripting => clingo}/planning/README     |    0
 examples/{scripting => clingo}/planning/convert.lp |    0
 examples/{scripting => clingo}/planning/convert.sh |    0
 .../{scripting => clingo}/planning/encoding.lp     |    0
 .../planning/instances/coins01.lp                  |    0
 .../planning/instances/comm02.lp                   |    0
 .../planning/instances/comm03.lp                   |    0
 .../planning/instances/comm05.lp                   |    0
 .../planning/instances/uts01.lp                    |    0
 .../{scripting => clingo}/planning/planning-lua.lp |    0
 examples/{scripting => clingo}/pydoc/README        |    0
 examples/{scripting => clingo}/pydoc/pydoc-lib.py  |    0
 examples/{scripting => clingo}/pydoc/pydoc.lp      |    0
 examples/clingo/robots/README                      |   11 +
 examples/clingo/robots/board.lp                    |   42 +
 examples/clingo/robots/img/arrow_blue_east.gif     |  Bin 0 -> 680 bytes
 examples/clingo/robots/img/arrow_blue_north.gif    |  Bin 0 -> 643 bytes
 examples/clingo/robots/img/arrow_blue_south.gif    |  Bin 0 -> 657 bytes
 examples/clingo/robots/img/arrow_blue_west.gif     |  Bin 0 -> 679 bytes
 examples/clingo/robots/img/arrow_green_east.gif    |  Bin 0 -> 697 bytes
 examples/clingo/robots/img/arrow_green_north.gif   |  Bin 0 -> 704 bytes
 examples/clingo/robots/img/arrow_green_south.gif   |  Bin 0 -> 714 bytes
 examples/clingo/robots/img/arrow_green_west.gif    |  Bin 0 -> 690 bytes
 examples/clingo/robots/img/arrow_red_east.gif      |  Bin 0 -> 680 bytes
 examples/clingo/robots/img/arrow_red_north.gif     |  Bin 0 -> 643 bytes
 examples/clingo/robots/img/arrow_red_south.gif     |  Bin 0 -> 657 bytes
 examples/clingo/robots/img/arrow_red_west.gif      |  Bin 0 -> 679 bytes
 examples/clingo/robots/img/arrow_yellow_east.gif   |  Bin 0 -> 680 bytes
 examples/clingo/robots/img/arrow_yellow_north.gif  |  Bin 0 -> 640 bytes
 examples/clingo/robots/img/arrow_yellow_south.gif  |  Bin 0 -> 658 bytes
 examples/clingo/robots/img/arrow_yellow_west.gif   |  Bin 0 -> 679 bytes
 examples/clingo/robots/img/moon_blue.gif           |  Bin 0 -> 1121 bytes
 examples/clingo/robots/img/moon_green.gif          |  Bin 0 -> 1137 bytes
 examples/clingo/robots/img/moon_red.gif            |  Bin 0 -> 1121 bytes
 examples/clingo/robots/img/moon_yellow.gif         |  Bin 0 -> 1120 bytes
 examples/clingo/robots/img/move_blue_east.gif      |  Bin 0 -> 637 bytes
 examples/clingo/robots/img/move_blue_north.gif     |  Bin 0 -> 634 bytes
 examples/clingo/robots/img/move_blue_south.gif     |  Bin 0 -> 627 bytes
 examples/clingo/robots/img/move_blue_west.gif      |  Bin 0 -> 647 bytes
 examples/clingo/robots/img/move_green_east.gif     |  Bin 0 -> 624 bytes
 examples/clingo/robots/img/move_green_north.gif    |  Bin 0 -> 639 bytes
 examples/clingo/robots/img/move_green_south.gif    |  Bin 0 -> 657 bytes
 examples/clingo/robots/img/move_green_west.gif     |  Bin 0 -> 653 bytes
 examples/clingo/robots/img/move_red_east.gif       |  Bin 0 -> 616 bytes
 examples/clingo/robots/img/move_red_north.gif      |  Bin 0 -> 634 bytes
 examples/clingo/robots/img/move_red_south.gif      |  Bin 0 -> 627 bytes
 examples/clingo/robots/img/move_red_west.gif       |  Bin 0 -> 647 bytes
 examples/clingo/robots/img/move_yellow_east.gif    |  Bin 0 -> 631 bytes
 examples/clingo/robots/img/move_yellow_north.gif   |  Bin 0 -> 631 bytes
 examples/clingo/robots/img/move_yellow_south.gif   |  Bin 0 -> 627 bytes
 examples/clingo/robots/img/move_yellow_west.gif    |  Bin 0 -> 643 bytes
 examples/clingo/robots/img/random_robot.gif        |  Bin 0 -> 1415 bytes
 examples/clingo/robots/img/robot_blue.gif          |  Bin 0 -> 687 bytes
 examples/clingo/robots/img/robot_green.gif         |  Bin 0 -> 1142 bytes
 examples/clingo/robots/img/robot_red.gif           |  Bin 0 -> 687 bytes
 examples/clingo/robots/img/robot_yellow.gif        |  Bin 0 -> 685 bytes
 examples/clingo/robots/img/saturn_blue.gif         |  Bin 0 -> 763 bytes
 examples/clingo/robots/img/saturn_green.gif        |  Bin 0 -> 825 bytes
 examples/clingo/robots/img/saturn_red.gif          |  Bin 0 -> 763 bytes
 examples/clingo/robots/img/saturn_yellow.gif       |  Bin 0 -> 763 bytes
 examples/clingo/robots/img/star_blue.gif           |  Bin 0 -> 721 bytes
 examples/clingo/robots/img/star_green.gif          |  Bin 0 -> 757 bytes
 examples/clingo/robots/img/star_red.gif            |  Bin 0 -> 721 bytes
 examples/clingo/robots/img/star_yellow.gif         |  Bin 0 -> 723 bytes
 examples/clingo/robots/img/sun_blue.gif            |  Bin 0 -> 1147 bytes
 examples/clingo/robots/img/sun_green.gif           |  Bin 0 -> 1155 bytes
 examples/clingo/robots/img/sun_red.gif             |  Bin 0 -> 1147 bytes
 examples/clingo/robots/img/sun_yellow.gif          |  Bin 0 -> 1144 bytes
 examples/clingo/robots/img/tile_left.gif           |  Bin 0 -> 1724 bytes
 examples/clingo/robots/img/tile_right.gif          |  Bin 0 -> 1770 bytes
 examples/clingo/robots/img/wall_north.gif          |  Bin 0 -> 1136 bytes
 examples/clingo/robots/img/wall_west.gif           |  Bin 0 -> 1171 bytes
 examples/clingo/robots/robots.lp                   |   35 +
 examples/clingo/robots/visualize.py                |  473 +++
 examples/{scripting => clingo}/setconf/README      |    0
 .../{scripting => clingo}/setconf/setconf-lua.lp   |    2 +-
 .../{scripting => clingo}/setconf/setconf-py.lp    |    2 +-
 examples/{scripting => clingo}/solitaire/README    |    2 +-
 .../{scripting => clingo}/solitaire/instance.lp    |    0
 .../{scripting => clingo}/solitaire/solitaire.lp   |    6 +-
 .../{scripting => clingo}/solitaire/visualize.py   |    4 +-
 examples/{scripting => clingo}/solve-async/README  |    0
 .../{scripting => clingo}/solve-async/program.lp   |    0
 .../solve-async/solve-async-lua.lp                 |    0
 .../solve-async/solve-async-py.lp                  |    0
 examples/{scripting => clingo}/stats/README        |    0
 examples/{scripting => clingo}/stats/example.lp    |    0
 examples/{scripting => clingo}/stats/stats-lua.lp  |    0
 examples/{scripting => clingo}/stats/stats-py.lp   |    0
 examples/{scripting => clingo}/unblock/README      |    0
 examples/{scripting => clingo}/unblock/inst1.lp    |    0
 examples/{scripting => clingo}/unblock/inst2.lp    |    0
 examples/{scripting => clingo}/unblock/inst3.lp    |    0
 examples/{scripting => clingo}/unblock/inst4.lp    |    0
 examples/{scripting => clingo}/unblock/inst5.lp    |    0
 examples/{scripting => clingo}/unblock/unblock.lp  |    6 +-
 .../{scripting => clingo}/unblock/visualize.py     |    4 +-
 examples/{asp => gringo}/gbie/README               |    0
 examples/{asp => gringo}/gbie/gbie1.lp             |    0
 examples/{asp => gringo}/gbie/gbie2.lp             |    0
 examples/{asp => gringo}/gbie/instances/sat_01.lp  |    0
 examples/{asp => gringo}/gbie/instances/sat_02.lp  |    0
 examples/{asp => gringo}/gbie/instances/sat_03.lp  |    0
 .../{asp => gringo}/gbie/instances/unsat_01.lp     |    0
 .../{asp => gringo}/gbie/instances/unsat_02.lp     |    0
 examples/{asp => gringo}/queens/README             |    0
 examples/{asp => gringo}/queens/queens1.lp         |    4 +-
 examples/{asp => gringo}/queens/queens2.lp         |    0
 examples/{asp => gringo}/rec-cond/README           |    0
 examples/{asp => gringo}/rec-cond/encoding.lp      |    0
 examples/{asp => gringo}/rec-cond/instance.lp      |    0
 examples/gringo/toh/README                         |    6 +
 examples/{asp => gringo}/toh/tohE.lp               |    6 +-
 examples/{asp => gringo}/toh/tohI.lp               |    0
 examples/reify/README                              |   19 +
 examples/reify/example1.lp                         |    5 +
 examples/reify/meta.lp                             |   42 +
 examples/reify/metaD.lp                            |   89 +
 examples/reify/metaO.lp                            |   80 +
 examples/scripting/iclingo/README                  |   10 -
 examples/scripting/iclingo/iclingo-int.lp          |    1 -
 examples/scripting/iclingo/iclingo-lua.lp          |   53 -
 examples/scripting/iclingo/iclingo-py.lp           |   34 -
 examples/scripting/load/README                     |    5 -
 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                      |    6 +-
 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 +-
 libgringo/gringo/base.hh                           |   24 +-
 libgringo/gringo/control.hh                        |   55 +-
 libgringo/gringo/domain.hh                         |  145 +-
 libgringo/gringo/flyweight.hh                      |   33 +-
 libgringo/gringo/ground/binders.hh                 |   21 +-
 libgringo/gringo/ground/dependency.hh              |    2 +-
 libgringo/gringo/ground/instantiation.hh           |   18 +-
 libgringo/gringo/ground/statement.hh               |    8 +-
 libgringo/gringo/ground/statements.hh              | 1198 ++++----
 libgringo/gringo/input/aggregate.hh                |   37 +-
 libgringo/gringo/input/aggregates.hh               |   67 +-
 libgringo/gringo/input/groundtermparser.hh         |   64 +
 libgringo/gringo/input/literal.hh                  |    5 +-
 libgringo/gringo/input/literals.hh                 |   31 +-
 libgringo/gringo/input/nongroundparser.hh          |    1 +
 libgringo/gringo/input/programbuilder.hh           |  119 +-
 libgringo/gringo/input/statement.hh                |   25 +-
 libgringo/gringo/intervals.hh                      |   55 +-
 libgringo/gringo/lexerstate.hh                     |    3 +-
 libgringo/gringo/logger.hh                         |    6 +-
 libgringo/gringo/lua.hh                            |    4 +-
 libgringo/gringo/output/aggregates.hh              |   80 +
 libgringo/gringo/output/literal.hh                 |   13 +-
 libgringo/gringo/output/literals.hh                |   93 +-
 libgringo/gringo/output/output.hh                  |    9 +-
 libgringo/gringo/output/statement.hh               |    6 +-
 libgringo/gringo/output/statements.hh              |  114 +-
 libgringo/gringo/python.hh                         |    7 +-
 libgringo/gringo/scripts.hh                        |    2 +-
 libgringo/gringo/term.hh                           |  163 +-
 libgringo/gringo/terms.hh                          |   13 +-
 libgringo/gringo/unique_list.hh                    |   14 +-
 libgringo/gringo/value.hh                          |  179 +-
 libgringo/gringo/version.hh                        |    2 +-
 libgringo/src/ground/instantiation.cc              |   82 +-
 libgringo/src/ground/literals.cc                   |   86 +-
 libgringo/src/ground/program.cc                    |   51 +-
 libgringo/src/ground/statements.cc                 | 3017 +++++++++++---------
 libgringo/src/input/aggregate.cc                   |   14 +-
 libgringo/src/input/aggregates.cc                  |  937 ++++--
 libgringo/src/input/groundtermgrammar.yy           |  149 +
 libgringo/src/input/groundtermlexer.xh             |   79 +
 libgringo/src/input/groundtermparser.cc            |   99 +
 libgringo/src/input/literal.cc                     |    4 +-
 libgringo/src/input/literals.cc                    |  152 +-
 libgringo/src/input/nongroundgrammar.yy            |  225 +-
 libgringo/src/input/nongroundlexer.xh              |    2 +-
 libgringo/src/input/nongroundparser.cc             |  224 +-
 libgringo/src/input/program.cc                     |   44 +-
 libgringo/src/input/programbuilder.cc              |   81 +-
 libgringo/src/input/statement.cc                   |  241 +-
 libgringo/src/lua.cc                               |  564 ++--
 libgringo/src/output/aggregates.cc                 |  432 +++
 libgringo/src/output/literal.cc                    |   13 +
 libgringo/src/output/literals.cc                   |  600 ++--
 libgringo/src/output/output.cc                     |  306 +-
 libgringo/src/output/statements.cc                 |  425 ++-
 libgringo/src/python.cc                            |  964 +++++--
 libgringo/src/scripts.cc                           |   11 +-
 libgringo/src/term.cc                              | 2291 ++++++++-------
 libgringo/src/terms.cc                             |   59 +-
 .../printable.hh => tests/gringo_module.hh}        |   35 +-
 libgringo/tests/ground/dependency.cc               |   72 +-
 libgringo/tests/ground/instantiation.cc            |  253 +-
 libgringo/tests/ground/literal.cc                  |   88 +-
 libgringo/tests/ground/program.cc                  |  148 +-
 libgringo/tests/input/aggregate.cc                 |  112 +-
 libgringo/tests/input/literal.cc                   |  120 +-
 libgringo/tests/input/nongroundgrammar.cc          |   52 +-
 libgringo/tests/input/nongroundlexer.cc            |    3 +-
 libgringo/tests/input/program.cc                   |   39 +-
 libgringo/tests/input/programbuilder.cc            |   48 +-
 libgringo/tests/intervals.cc                       |   30 +
 libgringo/tests/lua.cc                             |   39 +-
 libgringo/tests/output/aspcomp13.cc                |    4 +-
 libgringo/tests/output/incremental.cc              |   89 +-
 libgringo/tests/output/lparse.cc                   |  705 ++++-
 libgringo/tests/output/solver_helper.hh            |    5 +-
 libgringo/tests/output/warnings.cc                 |  118 +-
 libgringo/tests/python.cc                          |   39 +-
 libgringo/tests/term.cc                            |  276 +-
 libgringo/tests/term_helper.hh                     |    7 +
 libgringo/tests/tests.hh                           |    5 +-
 libgringo/tests/value.cc                           |  117 +-
 libprogram_opts/src/string_convert.cpp             |   65 +-
 libreify/reify/parser.hh                           |   60 +
 libreify/reify/program.hh                          |  112 +
 .../gringo/version.hh => libreify/reify/reify.hh   |   21 +-
 libreify/reify/util.hh                             |   88 +
 libreify/src/lexer.xh                              |  121 +
 libreify/src/parser.cc                             |  205 ++
 libreify/src/program.cc                            |  273 ++
 {libgringo => libreify}/tests/main.cc              |    0
 libreify/tests/parser.cc                           |  123 +
 407 files changed, 69303 insertions(+), 7585 deletions(-)
 create mode 100644 .ycm_extra_conf.py
 delete mode 100644 NOTES
 create mode 100644 app/clingo/tests/lua/domain.lp
 create mode 100644 app/clingo/tests/lua/domain.sol
 create mode 100644 app/clingo/tests/lua/icolor.lp
 copy app/clingo/tests/{python/assumptions4.sol => lua/icolor.sol} (70%)
 create mode 100644 app/clingo/tests/python/domain.lp
 create mode 100644 app/clingo/tests/python/domain.sol
 delete mode 100644 app/luaclingo/src/clingo_lib.cc
 delete mode 100644 app/luaclingo/src/clingo_lib.hh
 delete mode 100644 app/pyclingo/src/clingo_lib.cc
 delete mode 100644 app/pyclingo/src/clingo_lib.hh
 create mode 100644 app/reify/main.cc
 delete mode 100644 examples/asp/toh/README
 rename examples/{scripting => clingo}/addclause/README (100%)
 rename examples/{scripting => clingo}/addclause/addclause-lua.lp (100%)
 rename examples/{scripting => clingo}/addclause/addclause-py.lp (100%)
 rename examples/{scripting => clingo}/blocksworld/README (100%)
 rename examples/{scripting => clingo}/blocksworld/blocks_01.lp (100%)
 rename examples/{scripting => clingo}/blocksworld/control_01.lua (100%)
 rename examples/{scripting => clingo}/blocksworld/control_01.out (100%)
 rename examples/{scripting => clingo}/blocksworld/lua.lp (100%)
 rename examples/{scripting => clingo}/blocksworld/lua_interpret.lp (100%)
 rename examples/{scripting => clingo}/blocksworld/world.lp (100%)
 rename examples/{scripting => clingo}/commit/README (100%)
 rename examples/{scripting => clingo}/commit/commit-lua.lp (100%)
 rename examples/{scripting => clingo}/commit/commit-py.lp (100%)
 rename examples/{scripting => clingo}/commit/encoding.lp (100%)
 rename examples/{scripting => clingo}/consequences/README (100%)
 rename examples/{scripting => clingo}/consequences/brave-lua.lp (100%)
 rename examples/{scripting => clingo}/consequences/brave-py.lp (100%)
 rename examples/{scripting => clingo}/consequences/example.lp (100%)
 rename examples/{scripting => clingo}/context/README (100%)
 rename examples/{scripting => clingo}/context/context-lua.lp (100%)
 rename examples/{scripting => clingo}/context/context-py.lp (100%)
 rename examples/{scripting => clingo}/context/encoding.lp (100%)
 create mode 100644 examples/clingo/controller-async/README
 copy examples/{scripting/controller => clingo/controller-async}/client.lp (100%)
 create mode 100755 examples/clingo/controller-async/controller.py
 rename examples/{scripting/controller => clingo/controller-processes}/README (100%)
 rename examples/{scripting/controller => clingo/controller-processes}/client-lua.lp (100%)
 rename examples/{scripting/controller => clingo/controller-processes}/client-py.lp (98%)
 copy examples/{scripting/controller => clingo/controller-processes}/client.lp (100%)
 rename examples/{scripting/controller => clingo/controller-processes}/server.py (100%)
 create mode 100644 examples/clingo/controller-threads/README
 rename examples/{scripting/controller => clingo/controller-threads}/client.lp (100%)
 create mode 100755 examples/clingo/controller-threads/controller.py
 create mode 100644 examples/clingo/domains/README
 create mode 100644 examples/clingo/domains/domains-lua.lp
 create mode 100644 examples/clingo/domains/domains-py.lp
 create mode 100644 examples/clingo/domains/instance.lp
 rename examples/{scripting => clingo}/enum-assumption/README (100%)
 rename examples/{scripting => clingo}/enum-assumption/example-lua.lp (100%)
 rename examples/{scripting => clingo}/enum-assumption/example-py.lp (100%)
 create mode 100644 examples/clingo/expansion/GraphColouring/encodings/encoding.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0004-graph_colouring-125-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0005-graph_colouring-125-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0007-graph_colouring-125-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0008-graph_colouring-125-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0013-graph_colouring-130-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0021-graph_colouring-135-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0022-graph_colouring-135-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0023-graph_colouring-135-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0025-graph_colouring-135-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0032-graph_colouring-140-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0036-graph_colouring-140-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0039-graph_colouring-140-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0040-graph_colouring-140-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0046-graph_colouring-145-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0047-graph_colouring-145-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0048-graph_colouring-145-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0050-graph_colouring-145-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0056-graph_colouring-150-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0059-graph_colouring-150-0.lp
 create mode 100644 examples/clingo/expansion/GraphColouring/instances/0060-graph_colouring-150-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/encodings/encoding.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/100-partner_units-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/102-partner_units-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/114-partner_units_polynomial-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/115-partner_units_polynomial-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/119-partner_units_polynomial-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/127-partner_units_polynomial-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/153-partner_units-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/154-partner_units-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/156-partner_units-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/161-partner_units-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/175-partner_units_polynomial-75-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/180-partner_units_polynomial-47-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/188-partner_units_polynomial-57-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/196-partner_units_polynomial-59-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/26-partner_units_polynomial-60-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/52-partner_units_polynomial-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/58-partner_units_polynomial-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/69-partner_units_polynomial-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/91-partner_units-100-0.lp
 create mode 100644 examples/clingo/expansion/PartnerUnits/instances/99-partner_units-100-0.lp
 create mode 100644 examples/clingo/expansion/README
 create mode 100755 examples/clingo/expansion/main.py
 rename examples/{scripting => clingo}/external/README (100%)
 rename examples/{scripting => clingo}/external/external-lua.lp (100%)
 rename examples/{scripting => clingo}/external/external-py.lp (100%)
 rename examples/{scripting => clingo}/external/external.lp (100%)
 create mode 100644 examples/clingo/iclingo/README
 rename examples/{scripting => clingo}/iclingo/example.lp (62%)
 create mode 100644 examples/clingo/iclingo/incmode-int.lp
 create mode 100644 examples/clingo/iclingo/incmode-lua.lp
 create mode 100644 examples/clingo/iclingo/incmode-py.lp
 rename examples/{scripting => clingo}/include/README (100%)
 rename examples/{scripting => clingo}/include/encoding-lua.lp (100%)
 rename examples/{scripting => clingo}/include/encoding-py.lp (100%)
 rename examples/{scripting => clingo}/include/include.lp (100%)
 rename examples/{scripting => clingo}/incqueens/README (100%)
 rename examples/{scripting => clingo}/incqueens/incqueens-lua.lp (100%)
 rename examples/{scripting => clingo}/incqueens/incqueens-py.lp (99%)
 rename examples/{scripting => clingo}/incqueens/incqueens.lp (100%)
 rename examples/{scripting => clingo}/ipython/README (92%)
 rename examples/{scripting => clingo}/ipython/ipython.py (100%)
 rename examples/{scripting => clingo}/itersolve/README (100%)
 rename examples/{scripting => clingo}/itersolve/itersolve-lua.lp (100%)
 rename examples/{scripting => clingo}/itersolve/itersolve-py.lp (100%)
 rename examples/{scripting => clingo}/itersolve/program.lp (100%)
 create mode 100644 examples/clingo/load/README
 rename examples/{scripting => clingo}/load/load-lua.lp (100%)
 rename examples/{scripting => clingo}/load/load-py.lp (100%)
 rename examples/{scripting => clingo}/load/program.lp (100%)
 rename examples/{scripting => clingo}/onmodel/README (100%)
 rename examples/{scripting => clingo}/onmodel/onmodel-lua.lp (100%)
 rename examples/{scripting => clingo}/onmodel/onmodel-py.lp (100%)
 rename examples/{scripting => clingo}/planning/README (100%)
 rename examples/{scripting => clingo}/planning/convert.lp (100%)
 rename examples/{scripting => clingo}/planning/convert.sh (100%)
 rename examples/{scripting => clingo}/planning/encoding.lp (100%)
 rename examples/{scripting => clingo}/planning/instances/coins01.lp (100%)
 rename examples/{scripting => clingo}/planning/instances/comm02.lp (100%)
 rename examples/{scripting => clingo}/planning/instances/comm03.lp (100%)
 rename examples/{scripting => clingo}/planning/instances/comm05.lp (100%)
 rename examples/{scripting => clingo}/planning/instances/uts01.lp (100%)
 rename examples/{scripting => clingo}/planning/planning-lua.lp (100%)
 rename examples/{scripting => clingo}/pydoc/README (100%)
 rename examples/{scripting => clingo}/pydoc/pydoc-lib.py (100%)
 rename examples/{scripting => clingo}/pydoc/pydoc.lp (100%)
 create mode 100644 examples/clingo/robots/README
 create mode 100644 examples/clingo/robots/board.lp
 create mode 100644 examples/clingo/robots/img/arrow_blue_east.gif
 create mode 100644 examples/clingo/robots/img/arrow_blue_north.gif
 create mode 100644 examples/clingo/robots/img/arrow_blue_south.gif
 create mode 100644 examples/clingo/robots/img/arrow_blue_west.gif
 create mode 100644 examples/clingo/robots/img/arrow_green_east.gif
 create mode 100644 examples/clingo/robots/img/arrow_green_north.gif
 create mode 100644 examples/clingo/robots/img/arrow_green_south.gif
 create mode 100644 examples/clingo/robots/img/arrow_green_west.gif
 create mode 100644 examples/clingo/robots/img/arrow_red_east.gif
 create mode 100644 examples/clingo/robots/img/arrow_red_north.gif
 create mode 100644 examples/clingo/robots/img/arrow_red_south.gif
 create mode 100644 examples/clingo/robots/img/arrow_red_west.gif
 create mode 100644 examples/clingo/robots/img/arrow_yellow_east.gif
 create mode 100644 examples/clingo/robots/img/arrow_yellow_north.gif
 create mode 100644 examples/clingo/robots/img/arrow_yellow_south.gif
 create mode 100644 examples/clingo/robots/img/arrow_yellow_west.gif
 create mode 100644 examples/clingo/robots/img/moon_blue.gif
 create mode 100644 examples/clingo/robots/img/moon_green.gif
 create mode 100644 examples/clingo/robots/img/moon_red.gif
 create mode 100644 examples/clingo/robots/img/moon_yellow.gif
 create mode 100644 examples/clingo/robots/img/move_blue_east.gif
 create mode 100644 examples/clingo/robots/img/move_blue_north.gif
 create mode 100644 examples/clingo/robots/img/move_blue_south.gif
 create mode 100644 examples/clingo/robots/img/move_blue_west.gif
 create mode 100644 examples/clingo/robots/img/move_green_east.gif
 create mode 100644 examples/clingo/robots/img/move_green_north.gif
 create mode 100644 examples/clingo/robots/img/move_green_south.gif
 create mode 100644 examples/clingo/robots/img/move_green_west.gif
 create mode 100644 examples/clingo/robots/img/move_red_east.gif
 create mode 100644 examples/clingo/robots/img/move_red_north.gif
 create mode 100644 examples/clingo/robots/img/move_red_south.gif
 create mode 100644 examples/clingo/robots/img/move_red_west.gif
 create mode 100644 examples/clingo/robots/img/move_yellow_east.gif
 create mode 100644 examples/clingo/robots/img/move_yellow_north.gif
 create mode 100644 examples/clingo/robots/img/move_yellow_south.gif
 create mode 100644 examples/clingo/robots/img/move_yellow_west.gif
 create mode 100644 examples/clingo/robots/img/random_robot.gif
 create mode 100644 examples/clingo/robots/img/robot_blue.gif
 create mode 100644 examples/clingo/robots/img/robot_green.gif
 create mode 100644 examples/clingo/robots/img/robot_red.gif
 create mode 100644 examples/clingo/robots/img/robot_yellow.gif
 create mode 100644 examples/clingo/robots/img/saturn_blue.gif
 create mode 100644 examples/clingo/robots/img/saturn_green.gif
 create mode 100644 examples/clingo/robots/img/saturn_red.gif
 create mode 100644 examples/clingo/robots/img/saturn_yellow.gif
 create mode 100644 examples/clingo/robots/img/star_blue.gif
 create mode 100644 examples/clingo/robots/img/star_green.gif
 create mode 100644 examples/clingo/robots/img/star_red.gif
 create mode 100644 examples/clingo/robots/img/star_yellow.gif
 create mode 100644 examples/clingo/robots/img/sun_blue.gif
 create mode 100644 examples/clingo/robots/img/sun_green.gif
 create mode 100644 examples/clingo/robots/img/sun_red.gif
 create mode 100644 examples/clingo/robots/img/sun_yellow.gif
 create mode 100644 examples/clingo/robots/img/tile_left.gif
 create mode 100644 examples/clingo/robots/img/tile_right.gif
 create mode 100644 examples/clingo/robots/img/wall_north.gif
 create mode 100644 examples/clingo/robots/img/wall_west.gif
 create mode 100644 examples/clingo/robots/robots.lp
 create mode 100755 examples/clingo/robots/visualize.py
 rename examples/{scripting => clingo}/setconf/README (100%)
 rename examples/{scripting => clingo}/setconf/setconf-lua.lp (95%)
 rename examples/{scripting => clingo}/setconf/setconf-py.lp (95%)
 rename examples/{scripting => clingo}/solitaire/README (96%)
 rename examples/{scripting => clingo}/solitaire/instance.lp (100%)
 rename examples/{scripting => clingo}/solitaire/solitaire.lp (93%)
 rename examples/{scripting => clingo}/solitaire/visualize.py (97%)
 rename examples/{scripting => clingo}/solve-async/README (100%)
 rename examples/{scripting => clingo}/solve-async/program.lp (100%)
 rename examples/{scripting => clingo}/solve-async/solve-async-lua.lp (100%)
 rename examples/{scripting => clingo}/solve-async/solve-async-py.lp (100%)
 rename examples/{scripting => clingo}/stats/README (100%)
 rename examples/{scripting => clingo}/stats/example.lp (100%)
 rename examples/{scripting => clingo}/stats/stats-lua.lp (100%)
 rename examples/{scripting => clingo}/stats/stats-py.lp (100%)
 rename examples/{scripting => clingo}/unblock/README (100%)
 rename examples/{scripting => clingo}/unblock/inst1.lp (100%)
 rename examples/{scripting => clingo}/unblock/inst2.lp (100%)
 rename examples/{scripting => clingo}/unblock/inst3.lp (100%)
 rename examples/{scripting => clingo}/unblock/inst4.lp (100%)
 rename examples/{scripting => clingo}/unblock/inst5.lp (100%)
 rename examples/{scripting => clingo}/unblock/unblock.lp (96%)
 rename examples/{scripting => clingo}/unblock/visualize.py (98%)
 rename examples/{asp => gringo}/gbie/README (100%)
 rename examples/{asp => gringo}/gbie/gbie1.lp (100%)
 rename examples/{asp => gringo}/gbie/gbie2.lp (100%)
 rename examples/{asp => gringo}/gbie/instances/sat_01.lp (100%)
 rename examples/{asp => gringo}/gbie/instances/sat_02.lp (100%)
 rename examples/{asp => gringo}/gbie/instances/sat_03.lp (100%)
 rename examples/{asp => gringo}/gbie/instances/unsat_01.lp (100%)
 rename examples/{asp => gringo}/gbie/instances/unsat_02.lp (100%)
 rename examples/{asp => gringo}/queens/README (100%)
 rename examples/{asp => gringo}/queens/queens1.lp (85%)
 rename examples/{asp => gringo}/queens/queens2.lp (100%)
 rename examples/{asp => gringo}/rec-cond/README (100%)
 rename examples/{asp => gringo}/rec-cond/encoding.lp (100%)
 rename examples/{asp => gringo}/rec-cond/instance.lp (100%)
 create mode 100644 examples/gringo/toh/README
 rename examples/{asp => gringo}/toh/tohE.lp (87%)
 rename examples/{asp => gringo}/toh/tohI.lp (100%)
 create mode 100644 examples/reify/README
 create mode 100644 examples/reify/example1.lp
 create mode 100644 examples/reify/meta.lp
 create mode 100644 examples/reify/metaD.lp
 create mode 100644 examples/reify/metaO.lp
 delete mode 100644 examples/scripting/iclingo/README
 delete mode 100644 examples/scripting/iclingo/iclingo-int.lp
 delete mode 100644 examples/scripting/iclingo/iclingo-lua.lp
 delete mode 100644 examples/scripting/iclingo/iclingo-py.lp
 delete mode 100644 examples/scripting/load/README
 create mode 100644 libgringo/gringo/input/groundtermparser.hh
 create mode 100644 libgringo/gringo/output/aggregates.hh
 create mode 100644 libgringo/src/input/groundtermgrammar.yy
 create mode 100644 libgringo/src/input/groundtermlexer.xh
 create mode 100644 libgringo/src/input/groundtermparser.cc
 create mode 100644 libgringo/src/output/aggregates.cc
 create mode 100644 libgringo/src/output/literal.cc
 copy libgringo/{gringo/printable.hh => tests/gringo_module.hh} (50%)
 create mode 100644 libreify/reify/parser.hh
 create mode 100644 libreify/reify/program.hh
 copy libgringo/gringo/version.hh => libreify/reify/reify.hh (67%)
 create mode 100644 libreify/reify/util.hh
 create mode 100644 libreify/src/lexer.xh
 create mode 100644 libreify/src/parser.cc
 create mode 100644 libreify/src/program.cc
 copy {libgringo => libreify}/tests/main.cc (100%)
 create mode 100644 libreify/tests/parser.cc

-- 
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