refactor: Herstructurering
This commit is contained in:
parent
1acd1cfb67
commit
e3c84e1761
GPG key ID:
38297DE43F75FFE2
33 changed files with 290 additions and 178 deletions
|
|
@ -3,14 +3,15 @@ package prolog
|
|||
import org.junit.jupiter.api.Assertions.*
|
||||
import org.junit.jupiter.api.BeforeEach
|
||||
import org.junit.jupiter.api.Test
|
||||
import prolog.ast.logic.Fact
|
||||
import prolog.ast.logic.Rule
|
||||
import prolog.builtins.Conjunction
|
||||
import prolog.builtins.Disjunction
|
||||
import prolog.components.Program
|
||||
import prolog.components.expressions.Fact
|
||||
import prolog.components.expressions.Rule
|
||||
import prolog.components.terms.Atom
|
||||
import prolog.components.terms.Structure
|
||||
import prolog.components.terms.Variable
|
||||
import prolog.builtins.Query
|
||||
import prolog.builtins.equivalent
|
||||
import prolog.ast.terms.Atom
|
||||
import prolog.ast.terms.Structure
|
||||
import prolog.ast.terms.Variable
|
||||
|
||||
class EvaluationTest {
|
||||
@BeforeEach
|
||||
|
|
@ -25,7 +26,7 @@ class EvaluationTest {
|
|||
|
||||
val result = Program.query(Atom("a"))
|
||||
|
||||
assertTrue(result)
|
||||
assertTrue(result.any())
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -35,7 +36,7 @@ class EvaluationTest {
|
|||
|
||||
val result = Program.query(Atom("b"))
|
||||
|
||||
assertFalse(result)
|
||||
assertFalse(result.any())
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -44,9 +45,9 @@ class EvaluationTest {
|
|||
val fact2 = Fact(Atom("b"))
|
||||
Program.load(listOf(fact1, fact2))
|
||||
|
||||
assertTrue(Program.query(Atom("a")))
|
||||
assertTrue(Program.query(Atom("b")))
|
||||
assertFalse(Program.query(Atom("c")))
|
||||
assertTrue(Program.query(Atom("a")).any())
|
||||
assertTrue(Program.query(Atom("b")).any())
|
||||
assertFalse(Program.query(Atom("c")).any())
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -54,7 +55,7 @@ class EvaluationTest {
|
|||
val structure = Structure(Atom("f"), listOf(Atom("a"), Atom("b")))
|
||||
Program.load(listOf(Fact(structure)))
|
||||
|
||||
assertTrue(Program.query(Structure(Atom("f"), listOf(Atom("a"), Atom("b")))))
|
||||
assertTrue(Program.query(Structure(Atom("f"), listOf(Atom("a"), Atom("b")))).any())
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -63,9 +64,9 @@ class EvaluationTest {
|
|||
val structure2 = Structure(Atom("g"), listOf(Atom("c"), Atom("d")))
|
||||
Program.load(listOf(Fact(structure1), Fact(structure2)))
|
||||
|
||||
assertTrue(Program.query(Structure(Atom("f"), listOf(Atom("a"), Atom("b")))))
|
||||
assertTrue(Program.query(Structure(Atom("g"), listOf(Atom("c"), Atom("d")))))
|
||||
assertFalse(Program.query(Structure(Atom("h"), listOf(Atom("e")))))
|
||||
assertTrue(Program.query(Structure(Atom("f"), listOf(Atom("a"), Atom("b")))).any())
|
||||
assertTrue(Program.query(Structure(Atom("g"), listOf(Atom("c"), Atom("d")))).any())
|
||||
assertFalse(Program.query(Structure(Atom("h"), listOf(Atom("e")))).any())
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -89,8 +90,8 @@ class EvaluationTest {
|
|||
|
||||
Program.load(listOf(father, mother, parent1, parent2))
|
||||
|
||||
assertTrue(Program.query(Structure(Atom("parent"), listOf(Atom("john"), Atom("jimmy")))))
|
||||
assertTrue(Program.query(Structure(Atom("parent"), listOf(Atom("jane"), Atom("jimmy")))))
|
||||
assertTrue(Program.query(Structure(Atom("parent"), listOf(Atom("john"), Atom("jimmy")))).any())
|
||||
assertTrue(Program.query(Structure(Atom("parent"), listOf(Atom("jane"), Atom("jimmy")))).any())
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -110,19 +111,20 @@ class EvaluationTest {
|
|||
Structure(Atom("father"), listOf(variable1, variable2)),
|
||||
/* ; */
|
||||
Structure(Atom("mother"), listOf(variable1, variable2))
|
||||
))
|
||||
)
|
||||
)
|
||||
|
||||
Program.load(listOf(father, mother, parent))
|
||||
|
||||
val result1 = Program.query(Structure(Atom("parent"), listOf(Atom("john"), Atom("jimmy"))))
|
||||
assertTrue(result1)
|
||||
assertTrue(result1.toList().isNotEmpty())
|
||||
val result2 = Program.query(Structure(Atom("parent"), listOf(Atom("jane"), Atom("jimmy"))))
|
||||
assertTrue(result2)
|
||||
assertTrue(result2.toList().isNotEmpty())
|
||||
|
||||
val result3 = Program.query(Structure(Atom("parent"), listOf(Atom("john"), Atom("jane"))))
|
||||
assertFalse(result3)
|
||||
assertFalse(result3.any())
|
||||
val result4 = Program.query(Structure(Atom("father"), listOf(Atom("john"), Atom("jane"))))
|
||||
assertFalse(result4)
|
||||
assertFalse(result4.any())
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -162,18 +164,55 @@ class EvaluationTest {
|
|||
Program.load(listOf(male, female, parent1, parent2, isFather, isMother))
|
||||
|
||||
val result1 = Program.query(Structure(Atom("isFather"), listOf(Atom("john"), Atom("jimmy"))))
|
||||
assertTrue(result1)
|
||||
assertTrue(result1.any())
|
||||
|
||||
val result2 = Program.query(Structure(Atom("isMother"), listOf(Atom("jane"), Atom("jimmy"))))
|
||||
assertTrue(result2)
|
||||
assertTrue(result2.any())
|
||||
|
||||
val result3 = Program.query(Structure(Atom("isFather"), listOf(Atom("jane"), Atom("jimmy"))))
|
||||
assertFalse(result3)
|
||||
assertFalse(result3.any())
|
||||
|
||||
val result4 = Program.query(Structure(Atom("isMother"), listOf(Atom("john"), Atom("jimmy"))))
|
||||
assertFalse(result4)
|
||||
assertFalse(result4.any())
|
||||
|
||||
val result5 = Program.query(Structure(Atom("parent"), listOf(Atom("trudy"), Atom("jimmy"))))
|
||||
assertFalse(result5)
|
||||
assertFalse(result5.any())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun requires_backtracking() {
|
||||
val fact1 = Fact(Structure(Atom("a"), listOf(Atom("b"))))
|
||||
val fact2 = Fact(Structure(Atom("a"), listOf(Atom("c"))))
|
||||
val fact3 = Fact(Structure(Atom("a"), listOf(Atom("d"))))
|
||||
|
||||
Program.load(listOf(fact1, fact2, fact3))
|
||||
|
||||
assertTrue(Program.query(Structure(Atom("a"), listOf(Atom("b")))).any())
|
||||
assertTrue(Program.query(Structure(Atom("a"), listOf(Atom("c")))).any())
|
||||
assertTrue(Program.query(Structure(Atom("a"), listOf(Atom("d")))).any())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun multiple_choices() {
|
||||
val fact1 = Fact(Structure(Atom("a"), listOf(Atom("b"))))
|
||||
val fact2 = Fact(Structure(Atom("a"), listOf(Atom("c"))))
|
||||
val fact3 = Fact(Structure(Atom("a"), listOf(Atom("d"))))
|
||||
|
||||
Program.load(listOf(fact1, fact2, fact3))
|
||||
|
||||
val results = Query(Structure(Atom("a"), listOf(Variable("X")))).prove(emptyMap())
|
||||
|
||||
val expectedResults = listOf(
|
||||
mapOf(Variable("X") to Atom("b")),
|
||||
mapOf(Variable("X") to Atom("c")),
|
||||
mapOf(Variable("X") to Atom("d"))
|
||||
)
|
||||
val actualResults = results.toList()
|
||||
|
||||
assertEquals(expectedResults.size, actualResults.size, "Number of results should match")
|
||||
for (i in expectedResults.indices) {
|
||||
assertEquals(expectedResults[i].size, actualResults[i].size, "Substitution size should match")
|
||||
assertTrue(expectedResults[i].all { actualResults[i][it.key]?.let { it1 -> equivalent(it.value, it1) } ?: false }, "Substitution values should match")
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in a new issue