Backtracking fixed
This commit is contained in:
parent
a85169dced
commit
fd16c4cedc
18 changed files with 213 additions and 39 deletions
|
@ -7,13 +7,16 @@ import prolog.ast.logic.LogicOperator
|
|||
import prolog.ast.terms.Atom
|
||||
import prolog.ast.terms.Body
|
||||
import prolog.ast.terms.Goal
|
||||
import prolog.ast.terms.Structure
|
||||
import prolog.flags.AppliedCut
|
||||
import prolog.logic.applySubstitution
|
||||
|
||||
/**
|
||||
* Always fail.
|
||||
*/
|
||||
object Fail : Atom("fail"), Body {
|
||||
override fun satisfy(subs: Substitutions): Answers = emptySequence()
|
||||
override fun applySubstitution(subs: Substitutions): Fail = Fail
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -26,6 +29,7 @@ typealias False = Fail
|
|||
*/
|
||||
object True : Atom("true"), Body {
|
||||
override fun satisfy(subs: Substitutions): Answers = sequenceOf(Result.success(emptyMap()))
|
||||
override fun applySubstitution(subs: Substitutions): True = True
|
||||
}
|
||||
|
||||
// TODO Repeat/0
|
||||
|
@ -34,6 +38,8 @@ class Cut() : Atom("!") {
|
|||
override fun satisfy(subs: Substitutions): Answers {
|
||||
return sequenceOf(Result.failure(AppliedCut(emptyMap())))
|
||||
}
|
||||
|
||||
override fun applySubstitution(subs: Substitutions): Cut = Cut()
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -94,6 +100,11 @@ class Conjunction(val left: LogicOperand, private val right: LogicOperand) :
|
|||
)
|
||||
}
|
||||
}
|
||||
|
||||
override fun applySubstitution(subs: Substitutions): Conjunction = Conjunction(
|
||||
applySubstitution(left, subs) as LogicOperand,
|
||||
applySubstitution(right, subs) as LogicOperand
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -105,6 +116,11 @@ open class Disjunction(private val left: LogicOperand, private val right: LogicO
|
|||
yieldAll(left.satisfy(subs))
|
||||
yieldAll(right.satisfy(subs))
|
||||
}
|
||||
|
||||
override fun applySubstitution(subs: Substitutions): Disjunction = Disjunction(
|
||||
applySubstitution(left, subs) as LogicOperand,
|
||||
applySubstitution(right, subs) as LogicOperand
|
||||
)
|
||||
}
|
||||
|
||||
@Deprecated("Use Disjunction instead")
|
||||
|
@ -127,4 +143,6 @@ class Not(private val goal: Goal) : LogicOperator(Atom("\\+"), rightOperand = go
|
|||
// If the goal cannot be proven, return a sequence with an empty map
|
||||
return sequenceOf(Result.success(emptyMap()))
|
||||
}
|
||||
|
||||
override fun applySubstitution(subs: Substitutions): Not = Not(applySubstitution(goal, subs) as Goal)
|
||||
}
|
||||
|
|
Reference in a new issue