Merge master into phase_saving_and_restarts #222
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(i.e. heuristics that allow to ground more rules than just those whose positive body is satisfied)
* removed NaiveGrounder.predicatesDefinedOnlyByFacts again, because it does not provide additional benefit over ProgramAnalysis * comments on design decisions in NaiveGrounder.bindNextAtomInRule * bugfix 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.
i.e. a situation in which it has to terminate binding, but where it could (potentially) continue if the grounding order were different
terminate binding if more than N positive body literals are unassigned
# 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
(which is just a temporary workaround)
because this might lead to necessary rules not being grounded at all
to be left in grounded rules
by using DummyGrounder.
"disable instance removal" -> "enable accumulator" "lax" -> "permissive"
"disable instance removal" -> "enable accumulator"
Add capability to count atoms for statistics
# Conflicts: # src/main/java/at/ac/tuwien/kr/alpha/solver/DefaultSolver.java
as suggested by @AntoniusW in #192 (comment)
Adds various grounding strategies.
* 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)
… less logging spam during tests
separate logback configs for tests and bundled jar
Fix deprecation warnings for gradle 7
# 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
Codecov Report
@@ Coverage Diff @@
## phase_saving_and_restarts #222 +/- ##
===============================================================
+ Coverage 78.83% 79.17% +0.33%
- Complexity 2077 2158 +81
===============================================================
Files 146 150 +4
Lines 6639 6848 +209
Branches 1162 1185 +23
===============================================================
+ Hits 5234 5422 +188
- Misses 1003 1018 +15
- Partials 402 408 +6
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.