natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce method isBasis to Rule class, use that for feedback 

Feedback basis are calculated for rules in history that
are marked as "basis" instead of "principal".
This commit is contained in:
Fedor Isakov 2021-04-12 12:13:32 +02:00
parent 87a843088c
commit 0cef5ad298
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ControllerImpl.kt
View File

@ -175,7 +175,7 @@ internal class ControllerImpl (
if (status.feedback?.alreadyHandled() == false) { if (status.feedback?.alreadyHandled() == false) {
status.feedback.handle(match, status.feedback.handle(match,
newParent.match.feedbackKey, newParent.match.feedbackKey,
processing.principalRuleTags(newParent), processing.basisRuleTags(newParent),
supervisor) supervisor)
} }
} }
@ -199,7 +199,7 @@ internal class ControllerImpl (
} else if (status.feedback?.alreadyHandled() == false } else if (status.feedback?.alreadyHandled() == false
&& status.failure.handle(match, && status.failure.handle(match,
newParent.match.feedbackKey, newParent.match.feedbackKey,
processing.principalRuleTags(newParent), processing.basisRuleTags(newParent),
supervisor)) { supervisor)) {
status.recover() status.recover()

2
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/MatchJournal.kt
View File

@ -121,7 +121,7 @@ interface MatchJournal : EvidenceSource {
*/ */
fun index(): Index fun index(): Index
fun principalRuleTags(chunk: Chunk): List<Any> fun basisRuleTags(chunk: Chunk): List<Any>
/** /**
* Simplifies some search operations on [MatchJournal]. * Simplifies some search operations on [MatchJournal].

4
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/MatchJournalImpl.kt
View File

@ -243,12 +243,12 @@ internal open class MatchJournalImpl(
override fun index(): MatchJournal.Index = IndexImpl(hist) override fun index(): MatchJournal.Index = IndexImpl(hist)
override fun principalRuleTags(chunk: Chunk): List<Any> { override fun basisRuleTags(chunk: Chunk): List<Any> {
val ptags = mutableListOf<Any>() val ptags = mutableListOf<Any>()
chunk.justifications().forEach { jn -> chunk.justifications().forEach { jn ->
// hist is sequential, random access can be expensive // hist is sequential, random access can be expensive
(lookupChunkByEvidence(jn) as? MatchChunk)?.let { (lookupChunkByEvidence(jn) as? MatchChunk)?.let {
if (it.match.isPrincipal) { if (it.match.rule().isBasis) {
ptags.add(it.ruleUniqueTag) ptags.add(it.ruleUniqueTag)
} }
} }

2
reactor/Core/src/jetbrains/mps/logic/reactor/program/Rule.java
View File

@ -40,6 +40,8 @@ public abstract class Rule {
return Collections.emptyList(); return Collections.emptyList();
} }
public boolean isBasis() { return false; }
/** /**
* A tag uniquely identifies the rule. * A tag uniquely identifies the rule.
*/ */