-
Notifications
You must be signed in to change notification settings - Fork 10
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.
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
Extended support for domain-specific heuristics #213
Open
rtaupe
wants to merge
386
commits into
master
Choose a base branch
from
domspec_heuristics_extended
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
# Conflicts: # src/main/java/at/ac/tuwien/kr/alpha/common/AtomStoreImpl.java # src/main/java/at/ac/tuwien/kr/alpha/grounder/NaiveGrounder.java # src/main/java/at/ac/tuwien/kr/alpha/grounder/RuleGroundingOrder.java # src/test/java/at/ac/tuwien/kr/alpha/grounder/NaiveGrounderTest.java
# Conflicts: # src/main/java/at/ac/tuwien/kr/alpha/Alpha.java # src/main/java/at/ac/tuwien/kr/alpha/Main.java # src/main/java/at/ac/tuwien/kr/alpha/common/Program.java # src/main/java/at/ac/tuwien/kr/alpha/solver/DefaultSolver.java # src/test/java/at/ac/tuwien/kr/alpha/AlphaTest.java
lost during merge eafde39
(which can then be used as input for ReplayHeuristic)
Fixes #172 (implementation specific to domspec_heuristics)
for new heuristic nogoods (caused by the bugfix e5797c0)
when converting back from function terms
T in positive condition, TM in negative condition
This reverts commit e2e4472.
This reverts commit dc786b7.
(all related to handling of domain-specific heuristics, mostly suggested by @AntoniusW)
…ring heuristic directive condition enhancement
…ring heuristic directive condition enhancement
…istic rule, to avoid superfluous grounding
… of heuristic rule, to avoid superfluous grounding" This reverts commit 129d50b.
* directive and rule are now matched using the MGU of the head, which allows for an exact matching (allowing additional matches not possible before, and avoiding futile matches) * variable names of the directive are preferably left unchanged
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.
Support for domain-specific heuristics specified declaratively within ASP programs in the form of heuristic directives, as described in our upcoming research paper Domain-Specific Heuristics in Answer Set Programming: A Declarative Non-Monotonic Approach.
This is continuation of our work in #133.