Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master into phase_saving_and_restarts #222

Merged
merged 117 commits into from
Feb 15, 2020
Merged

Merge master into phase_saving_and_restarts #222

merged 117 commits into from
Feb 15, 2020

Commits on Jan 7, 2019

  1. Merge branch 'domind_heuristics' into domind_plus_grounder_heu

    @rtaupe
    rtaupe committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    e98a1dc View commit details
    Browse the repository at this point in the history

  2. First attempt at lax grounder heuristics 

    (i.e. heuristics that allow to ground more rules than just those whose
positive body is satisfied)
    @rtaupe
    rtaupe committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    cb17d3c View commit details
    Browse the repository at this point in the history

  3. Rename RuleGroundingOrder -> RuleGroundingOrders

    @rtaupe
    rtaupe committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    9be1542 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2019

  1. Determine position where all vars are bound in RuleGroundingOrder

    @rtaupe
    rtaupe committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    932e587 View commit details
    Browse the repository at this point in the history

  2. Record predicates defined only be facts in NaiveGrounder

    @rtaupe
    rtaupe committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    46efc99 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'grounder_heuristics' into domind_plus_grounder_heu

    @rtaupe
    rtaupe committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    16ed906 View commit details
    Browse the repository at this point in the history

  4. Introduce GrounderHeuristicsConfiguration

    @rtaupe
    rtaupe committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    3149162 View commit details
    Browse the repository at this point in the history

  5. Changes after review by Antonius Weinzierl 

     * removed NaiveGrounder.predicatesDefinedOnlyByFacts again, because it
does not provide additional benefit over ProgramAnalysis
 * comments on design decisions in NaiveGrounder.bindNextAtomInRule
 * bugfix in NaiveGrounder.storeAtomAndTerminateIfAtomDoesNotHold
    @rtaupe
    rtaupe committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    fd18df0 View commit details
    Browse the repository at this point in the history

  6. RuleGroundingOrder#toString

    @rtaupe
    rtaupe committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    f36485c View commit details
    Browse the repository at this point in the history

  7. Satisfy CheckStyle

    @rtaupe
    rtaupe committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    74546b6 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2019

  1. Fix bug in NaiveGrounder#storeAtomAndTerminateIfAtomDoesNotHold 

    The issue here is that it is possible that atoms have been grounded by
bootstrap() and are not yet known to the assignment. The computation of
maxAtomIdBeforeGroundingNewNoGoods happened therefore too late (after
bootstrap()), but we can do without maxAtomIdBeforeGroundingNewNoGoods
anyway.
    @rtaupe
    rtaupe committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    8e0dc36 View commit details
    Browse the repository at this point in the history

  2. Throw exception when lax grounder heuristics encounters a dead end 

    i.e. a situation in which it has to terminate binding, but where it
could (potentially) continue if the grounding order were different
    @rtaupe
    rtaupe committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    20572c1 View commit details
    Browse the repository at this point in the history

  3. Do not ground rules that are not applicable

    @rtaupe
    rtaupe committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    492e50b View commit details
    Browse the repository at this point in the history

  4. Respect GrounderHeuristicConfiguration 

    terminate binding if more than N positive body literals are unassigned
    @rtaupe
    rtaupe committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    d800cf0 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'grounder_heuristics' into domind_plus_grounder_heu

    @rtaupe
    rtaupe committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    d197df8 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2019

  1. Merge branch 'grounder_heuristics' into domind_plus_grounder_heu 

    # Conflicts:
#	src/main/java/at/ac/tuwien/kr/alpha/Main.java
#	src/main/java/at/ac/tuwien/kr/alpha/grounder/GrounderFactory.java
#	src/main/java/at/ac/tuwien/kr/alpha/grounder/NaiveGrounder.java
#	src/test/java/at/ac/tuwien/kr/alpha/solver/AggregatesTest.java
    @rtaupe
    rtaupe committed Jan 13, 2019
    Configuration menu
    Copy the full SHA
    543a502 View commit details
    Browse the repository at this point in the history

  2. Strengthen NaiveGrounder.laxGrounderHeuristicCouldPotentiallyContinue 

    (which is just a temporary workaround)
    @rtaupe
    rtaupe committed Jan 13, 2019
    Configuration menu
    Copy the full SHA
    f09eb9b View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2019

  1. RuleGroundingOrder.pushBack() (experimental)

    @rtaupe
    rtaupe committed Jan 14, 2019
    Configuration menu
    Copy the full SHA
    ebd1e4f View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2019

  1. Do not abort grounding a rule in which a negative atom is true 

    because this might lead to necessary rules not being grounded at all
    @rtaupe
    rtaupe committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    2b24a78 View commit details
    Browse the repository at this point in the history

  2. Ignore deprecated test case

    @rtaupe
    rtaupe committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    ce53f0a View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2019

  1. Correct escaping dead ends in rule grounding order

    @rtaupe
    rtaupe committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    d884d55 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2019

  1. Log message if rule is grounded with unassigned positive body atoms

    @rtaupe
    rtaupe committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    684ea80 View commit details
    Browse the repository at this point in the history

  2. Fix handling of (remaining)tolerance in NaiveGrounder#bindNextAtomInRule

    @rtaupe
    rtaupe committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    3570d8d View commit details
    Browse the repository at this point in the history

  3. Fix: Terminate binding if FixedInterpretationLiteral cannot be satisfied

    @rtaupe
    rtaupe committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    802877a View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2019

  1. Merge branch 'fix_158' into domind_plus_grounder_heu

    @rtaupe
    rtaupe committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    7390d76 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2019

  1. Make GrounderHeuristicConfiguration configurable from CLI

    @rtaupe
    rtaupe committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    b768f28 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix_159_justification' into domind_plus_grounder_heu_2

    @rtaupe
    rtaupe committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    2ab535e View commit details
    Browse the repository at this point in the history

  3. Fix merge

    @rtaupe
    rtaupe committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    02fdb19 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2019

  1. Merge branch 'master' into domind_plus_grounder_heu_2

    @rtaupe
    rtaupe committed Feb 2, 2019
    Configuration menu
    Copy the full SHA
    8d5f082 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. workaround for bug causing non-satisfiable comparison literals 

    to be left in grounded rules
    @rtaupe
    rtaupe committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    df714e5 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2019

  1. Statistics on numbers of NoGoods by type and cardinality 

    Contributes to #113
    @rtaupe
    rtaupe committed Mar 4, 2019
    Configuration menu
    Copy the full SHA
    84d86b3 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2019

  1. Avoid debug message if debug not enabled

    @rtaupe
    rtaupe committed Mar 12, 2019
    Configuration menu
    Copy the full SHA
    fede066 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2019

  1. Merge branch 'domind_heuristics' into domind_plus_grounder_heu

    @rtaupe
    rtaupe committed Mar 13, 2019
    Configuration menu
    Copy the full SHA
    6c7a49b View commit details
    Browse the repository at this point in the history

  2. Reintroduce CLI parameters for grounding strategies 

    lost during merge 6c7a49b
    @rtaupe
    rtaupe committed Mar 13, 2019
    Configuration menu
    Copy the full SHA
    3b85a8e View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2019

  1. Merge branch 'fix_gradle_config_loc' into domind_plus_grounder_heu

    @rtaupe
    rtaupe committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    bfd4d32 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into domind_plus_grounder_heu

    @rtaupe
    rtaupe committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    9968b47 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2019

  1. Extend decision counters when heuristic is added to chain

    @rtaupe
    rtaupe committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    9a7c175 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2019

  1. remove obsolete TODO

    @rtaupe
    rtaupe committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    2edc783 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2019

  1. Merge branch 'master' into domind_plus_grounder_heu

    @rtaupe
    rtaupe committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    27ea98a View commit details
    Browse the repository at this point in the history

Commits on May 3, 2019

  1. Minor simplifications in NaiveGrounder

    @rtaupe
    rtaupe committed May 3, 2019
    Configuration menu
    Copy the full SHA
    7c11a36 View commit details
    Browse the repository at this point in the history

  2. Refactoring NaiveGrounder

    @rtaupe
    rtaupe committed May 3, 2019
    Configuration menu
    Copy the full SHA
    b93ae0f View commit details
    Browse the repository at this point in the history

  3. Refactoring NaiveGrounder

    @rtaupe
    rtaupe committed May 3, 2019
    Configuration menu
    Copy the full SHA
    548760a View commit details
    Browse the repository at this point in the history

  4. Refactoring NaiveGrounder 

    as suggested by IntelliJ IDEA's code inspection
    @rtaupe
    rtaupe committed May 3, 2019
    Configuration menu
    Copy the full SHA
    b26aa81 View commit details
    Browse the repository at this point in the history

  5. Refactoring NaiveGrounder

    @rtaupe
    rtaupe committed May 3, 2019
    Configuration menu
    Copy the full SHA
    c0ef033 View commit details
    Browse the repository at this point in the history

  6. Fix control flow in NaiveGrounder.bindNextAtomInRule

    @rtaupe
    rtaupe committed May 3, 2019
    Configuration menu
    Copy the full SHA
    1468745 View commit details
    Browse the repository at this point in the history

  7. Refactoring NaiveGrounder

    @rtaupe
    rtaupe committed May 3, 2019
    Configuration menu
    Copy the full SHA
    f04413b View commit details
    Browse the repository at this point in the history

Commits on May 6, 2019

  1. Remove redundant check for facts in NaiveGrounder.bindNext...

    @rtaupe
    rtaupe committed May 6, 2019
    Configuration menu
    Copy the full SHA
    37771bc View commit details
    Browse the repository at this point in the history

  2. Additional NaiveGrounderTest

    @rtaupe
    rtaupe committed May 6, 2019
    Configuration menu
    Copy the full SHA
    92560da View commit details
    Browse the repository at this point in the history

Commits on May 7, 2019

  1. Simplify Substitution.equals(...)

    @rtaupe
    rtaupe committed May 7, 2019
    Configuration menu
    Copy the full SHA
    d3f3797 View commit details
    Browse the repository at this point in the history

  2. Avoid to ground constraints that have already been grounded

    @rtaupe
    rtaupe committed May 7, 2019
    Configuration menu
    Copy the full SHA
    e89eb27 View commit details
    Browse the repository at this point in the history

  3. Revert "Avoid to ground constraints that have already been grounded" 

    Because overhead of this exceeds gains
This reverts commit e89eb27
    @rtaupe
    rtaupe committed May 7, 2019
    Configuration menu
    Copy the full SHA
    71b557b View commit details
    Browse the repository at this point in the history

Commits on May 21, 2019

  1. Fix bug in accumulator grounder

    @rtaupe
    rtaupe committed May 21, 2019
    Configuration menu
    Copy the full SHA
    21f4782 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2019

  1. Merge branch 'master' into grounding_strategies

    @rtaupe
    rtaupe committed May 22, 2019
    Configuration menu
    Copy the full SHA
    ba2dd4c View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2019

  1. Add reference to ICLP 2019 paper

    @rtaupe
    rtaupe committed Sep 30, 2019
    Configuration menu
    Copy the full SHA
    1e72a79 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #201 from alpha-asp/references 

    Add reference to ICLP 2019 paper
    @AntoniusW
    AntoniusW authored Sep 30, 2019
    Configuration menu
    Copy the full SHA
    a3fb4dc View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2019

  1. Merge branch 'master' into grounding_strategies 

    # Conflicts:
#	src/main/java/at/ac/tuwien/kr/alpha/config/CommandLineParser.java
#	src/main/java/at/ac/tuwien/kr/alpha/config/SystemConfig.java
#	src/main/java/at/ac/tuwien/kr/alpha/solver/NaiveNoGoodStore.java
#	src/main/java/at/ac/tuwien/kr/alpha/solver/NoGoodStore.java
#	src/main/java/at/ac/tuwien/kr/alpha/solver/NoGoodStoreAlphaRoaming.java
    @rtaupe
    rtaupe committed Oct 3, 2019
    Configuration menu
    Copy the full SHA
    ddda826 View commit details
    Browse the repository at this point in the history

  2. Fix merge ddda826

    @rtaupe
    rtaupe committed Oct 3, 2019
    Configuration menu
    Copy the full SHA
    eeaa54d View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2019

  1. Use constants instead of magic numbers.

    @rtaupe
    rtaupe committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    5179a1a View commit details
    Browse the repository at this point in the history

  2. Make accumulator grounding strategy configurable via CLI 

    (-dir / --disableInstanceRemoval)
    @rtaupe
    rtaupe committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    567cc8e View commit details
    Browse the repository at this point in the history

  3. Test several grounder configurations.

    @rtaupe
    rtaupe committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    e479e44 View commit details
    Browse the repository at this point in the history

  4. Refactor NaiveGrounder#storeAtomAndTerminateIfAtomDoesNotHold

    @rtaupe
    rtaupe committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    66c653c View commit details
    Browse the repository at this point in the history

  5. Fix JavaDoc

    @rtaupe
    rtaupe committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    cbe56aa View commit details
    Browse the repository at this point in the history

  6. Improve NaiveGrounderTest

    @rtaupe
    rtaupe committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    41f52ac View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2019

  1. Reduce load of unit tests (on CI).

    @rtaupe
    rtaupe committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    cf59e94 View commit details
    Browse the repository at this point in the history

  2. Increase PigeonHoleTest time limits.

    @rtaupe
    rtaupe committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    8a4c93c View commit details
    Browse the repository at this point in the history

  3. Refactor NaiveGrounder#bindNextAtomInRule.

    @rtaupe
    rtaupe committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    313b10e View commit details
    Browse the repository at this point in the history

  4. Undo change in ArithmeticTerm#evaluateGroundTerm 

    that is apparently not necessary.
    @rtaupe
    rtaupe committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    272e5ec View commit details
    Browse the repository at this point in the history

  5. Give Travis more time to build.

    @rtaupe
    rtaupe committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    1591dfb View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2019

  1. Remove unused method.

    @rtaupe
    rtaupe committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    9fb8570 View commit details
    Browse the repository at this point in the history

  2. Correct log level.

    @rtaupe
    rtaupe committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    fbdf7f6 View commit details
    Browse the repository at this point in the history

  3. Add more unit tests to increase coverage.

    @rtaupe
    rtaupe committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    7edca34 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2019

  1. Update .travis.yml after release of Java 13

    @lorenzleutgeb
    lorenzleutgeb committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    e87f65e View commit details
    Browse the repository at this point in the history

  2. Upgrade to Gradle 6

    @lorenzleutgeb
    lorenzleutgeb committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    d0d16d1 View commit details
    Browse the repository at this point in the history

  3. ci: Disable Gradle Build Scans

    @lorenzleutgeb
    lorenzleutgeb committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    60ba8f0 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Merge pull request #199 from alpha-asp/java-13 

    Update CI after release of Java 13
    @rtaupe
    rtaupe authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    66267eb View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2019

  1. Address minor comments by @AntoniusW for #192

    @rtaupe
    rtaupe committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    eb4a55d View commit details
    Browse the repository at this point in the history

  2. Reduce nogood counters when nogoods are deleted. 

    Addressing #192 (comment) by @AntoniusW
    @rtaupe
    rtaupe committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    23c7568 View commit details
    Browse the repository at this point in the history

  3. Grow assignment before querying if atom is assigned 

    Addressing #192 (comment) by @AntoniusW
    @rtaupe
    rtaupe committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    b3e5b23 View commit details
    Browse the repository at this point in the history

  4. Update documentation 

    addressing #192 (comment) by @AntoniusW
    @rtaupe
    rtaupe committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    1e024fb View commit details
    Browse the repository at this point in the history

  5. Add documentation 

    addressing #192 (comment) by @AntoniusW
    @rtaupe
    rtaupe committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    2815960 View commit details
    Browse the repository at this point in the history

  6. Fix bug in NaiveGrounder#createBindings and add corresponding unit tests 

    addressing #192 (comment) by @AntoniusW
    @rtaupe
    rtaupe committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    e2aead9 View commit details
    Browse the repository at this point in the history

  7. Add documentation 

    addressing #192 (comment) by @AntoniusW
    @rtaupe
    rtaupe committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    983f6d1 View commit details
    Browse the repository at this point in the history

  8. Add documentation 

    addressing #192 (comment) by @AntoniusW
    @rtaupe
    rtaupe committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    1123595 View commit details
    Browse the repository at this point in the history

  9. Add documentation 

    addressing #192 (comment) by @AntoniusW
    @rtaupe
    rtaupe committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    3456be5 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into grounding_strategies 

    # Conflicts:
#	.travis.yml
    @rtaupe
    rtaupe committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    511b320 View commit details
    Browse the repository at this point in the history

  11. Simplify NaiveGrounder#storeAtomAndTerminateIfAtomDoesNotHold

    @rtaupe
    rtaupe committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    38edf79 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2019

  1. Add capability to count atoms for statistics.

    @rtaupe
    rtaupe committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    b624ed6 View commit details
    Browse the repository at this point in the history

  2. Fix bug in atom counter (missing default count)

    @rtaupe
    rtaupe committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    cd97a19 View commit details
    Browse the repository at this point in the history

  3. Unit tests for atom counter.

    @rtaupe
    rtaupe committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    f638e20 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2019

  1. Properly initialize atom store in test class.

    @rtaupe
    rtaupe committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    b92d2cf View commit details
    Browse the repository at this point in the history

  2. Add documentation.

    @rtaupe
    rtaupe committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    adfc6a3 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2019

  1. Replace * imports by single-class imports.

    @rtaupe
    rtaupe committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    f35d2dc View commit details
    Browse the repository at this point in the history

  2. Remove unused code.

    @rtaupe
    rtaupe committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    50bf1d0 View commit details
    Browse the repository at this point in the history

  3. Make SolverStatisticsTests more robust 

    by using DummyGrounder.
    @rtaupe
    rtaupe committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    6df645a View commit details
    Browse the repository at this point in the history

  4. Change some names to conform with published papers. 

    "disable instance removal" -> "enable accumulator"
"lax" -> "permissive"
    @rtaupe
    rtaupe committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    6b8dd0b View commit details
    Browse the repository at this point in the history

  5. JavaDoc for NaiveGrounderTest#testDeadEnd

    @rtaupe
    rtaupe committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    3a6faf0 View commit details
    Browse the repository at this point in the history

  6. Split some unit tests.

    @rtaupe
    rtaupe committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    3117719 View commit details
    Browse the repository at this point in the history

  7. JavaDoc for NaiveGrounderTest#testIfGrounderGroundsRule

    @rtaupe
    rtaupe committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    cc6277d View commit details
    Browse the repository at this point in the history

  8. Simplify test helper method.

    @rtaupe
    rtaupe committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    c165066 View commit details
    Browse the repository at this point in the history

  9. JavaDoc for NaiveGrounderTest#testIfGrounderGroundsRule

    @rtaupe
    rtaupe committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    fbe37e8 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. JavaDoc for some NaiveGrounderTest helper methods.

    @rtaupe
    rtaupe committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    feeb6cb View commit details
    Browse the repository at this point in the history

  2. Change some names to conform with published papers. 

    "disable instance removal" -> "enable accumulator"
    @rtaupe
    rtaupe committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    d5e508c View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2019

  1. Merge pull request #212 from alpha-asp/atom_counter 

    Add capability to count atoms for statistics
    @AntoniusW
    AntoniusW authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    6f01d28 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2019

  1. Merge branch 'master' into grounding_strategies 

    # Conflicts:
#	src/main/java/at/ac/tuwien/kr/alpha/solver/DefaultSolver.java
    @rtaupe
    rtaupe committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    702df5c View commit details
    Browse the repository at this point in the history

  2. Use placeholders in log statements.

    @rtaupe
    rtaupe committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    e7b022c View commit details
    Browse the repository at this point in the history

  3. Replace class TerminateOrTolerate by integer constants 

    as suggested by @AntoniusW in #192 (comment)
    @rtaupe
    rtaupe committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    ed5dd59 View commit details
    Browse the repository at this point in the history

  4. Add documentation.

    @rtaupe
    rtaupe committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    8dedbf8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #192 from alpha-asp/grounding_strategies 

    Adds various grounding strategies.
    @AntoniusW
    AntoniusW authored Dec 19, 2019
    Configuration menu
    Copy the full SHA
    b7d809f View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2020

  1. Fix deprecation warnings for gradle 7 

    * changed deprecated dependency config "compile" to "implementation"
* changed deprecated property "archiveName" to use "archiveFileName" for bundledJar task
* exclude all "LICENSE.txt" and "NOTICE.txt" files from bundled jar (to avoid handling duplicates in classpath, since all apache commons dependencies have their own files of that name which would have to be merged otherwise)
    @madmike200590
    madmike200590 committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    fbed03a View commit details
    Browse the repository at this point in the history

  2. separated logfiles for tests and bundled jar

    @madmike200590
    madmike200590 committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    cdf93cc View commit details
    Browse the repository at this point in the history

  3. set loglevels for solver package and NaiveGrounder to INFO to produce… 

    … less logging spam during tests
    @madmike200590
    madmike200590 committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    bd8d24c View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2020

  1. avoid overwriting license and notice files by numbering those files

    @madmike200590
    madmike200590 committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    2094e41 View commit details
    Browse the repository at this point in the history

  2. cleaned up main logback config - no file logging and info level

    @madmike200590
    madmike200590 committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    0bc0572 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2020

  1. Merge pull request #217 from alpha-asp/separate_logback_xmls 

    separate logback configs for tests and bundled jar
    @AntoniusW
    AntoniusW authored Feb 3, 2020
    Configuration menu
    Copy the full SHA
    c052546 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #216 from alpha-asp/gradle7_compliancy 

    Fix deprecation warnings for gradle 7
    @AntoniusW
    AntoniusW authored Feb 3, 2020
    Configuration menu
    Copy the full SHA
    3c27810 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2020

  1. Merge branch 'master' into phase_saving_and_restarts_merge_master 

    # Conflicts:
#	src/main/java/at/ac/tuwien/kr/alpha/config/CommandLineParser.java
#	src/main/java/at/ac/tuwien/kr/alpha/config/SystemConfig.java
#	src/main/java/at/ac/tuwien/kr/alpha/grounder/NaiveGrounder.java
#	src/test/java/at/ac/tuwien/kr/alpha/grounder/NaiveGrounderTest.java
#	src/test/java/at/ac/tuwien/kr/alpha/solver/LearnedNoGoodDeletionTest.java
    @rtaupe
    rtaupe committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    ab122e3 View commit details
    Browse the repository at this point in the history

  2. Fix merge ab122e3

    @rtaupe
    rtaupe committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    a6ccf70 View commit details
    Browse the repository at this point in the history