Merge branch 'feature/arg2p-integration' into develop

tuProlog · Jun 25, 2020 · 5ed81d5 · 5ed81d5
2 parents 3930756 + 852da4e
commit 5ed81d5
Show file tree

Hide file tree

Showing 27 changed files with 511 additions and 35 deletions.
diff --git a/...ic/src/commonTest/kotlin/it/unibo/tuprolog/solve/systemtest/ClassicSolverSystemTesting.kt b/...ic/src/commonTest/kotlin/it/unibo/tuprolog/solve/systemtest/ClassicSolverSystemTesting.kt
@@ -303,4 +303,14 @@ class ClassicSolverSystemTesting : SolverFactory, SolverTest {
     override fun testUniv() {
         prototype.testUniv()
     }
+
+    @Test
+    override fun testRetractAll() {
+        prototype.testRetractAll()
+    }
+
+    @Test
+    override fun testAppend() {
+        prototype.testAppend()
+    }
 }
diff --git a/...ms/src/commonTest/kotlin/it/unibo/tuprolog/solve/systemtest/StreamsSolverSystemTesting.kt b/...ms/src/commonTest/kotlin/it/unibo/tuprolog/solve/systemtest/StreamsSolverSystemTesting.kt
@@ -303,4 +303,14 @@ class StreamsSolverSystemTesting : SolverFactory, SolverTest {
     override fun testFunctor() {
         prototype.testFunctor()
     }
+
+    @Test
+    override fun testRetractAll() {
+        prototype.testRetractAll()
+    }
+
+    @Test
+    override fun testAppend() {
+        prototype.testAppend()
+    }
 }
diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/CommonBuiltins.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/CommonBuiltins.kt
@@ -42,8 +42,13 @@ object CommonBuiltins : AliasedLibrary by Library.of(
         Number,
         Op,
         Retract,
+        RetractAll,
         Sleep,
+        TermGreaterThan,
+        TermGreaterThanOrEqualTo,
         TermIdentical,
+        TermLowerThan,
+        TermLowerThanOrEqualTo,
         TermNotIdentical,
         UnifiesWith,
         Univ,

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/CommonRules.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/CommonRules.kt
@@ -2,10 +2,7 @@ package it.unibo.tuprolog.solve.stdlib
 
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.rule.RuleWrapper
-import it.unibo.tuprolog.solve.stdlib.rule.Arrow
-import it.unibo.tuprolog.solve.stdlib.rule.Member
-import it.unibo.tuprolog.solve.stdlib.rule.Not
-import it.unibo.tuprolog.solve.stdlib.rule.Semicolon
+import it.unibo.tuprolog.solve.stdlib.rule.*
 import it.unibo.tuprolog.theory.Theory
 
 object CommonRules {
@@ -17,7 +14,9 @@ object CommonRules {
         Semicolon.Or.Left,
         Semicolon.Or.Right,
         Member.Base,
-        Member.Recursive
+        Member.Recursive,
+        Append.Base,
+        Append.Recursive
     )
 
     val theory: Theory

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/RetractAll.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/RetractAll.kt
@@ -0,0 +1,19 @@
+package it.unibo.tuprolog.solve.stdlib.primitive
+
+import it.unibo.tuprolog.core.*
+import it.unibo.tuprolog.core.Var
+import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.UnaryPredicate
+import it.unibo.tuprolog.theory.RetractResult
+import it.unibo.tuprolog.unify.Unificator.Companion.mguWith
+
+object RetractAll : UnaryPredicate.NonBacktrackable<ExecutionContext>("retractall") {
+    override fun Solve.Request<ExecutionContext>.computeOne(first: Term): Solve.Response {
+        ensuringArgumentIsStruct(0)
+        val clause = if (first is Clause) first else Rule.of(first as Struct, Var.anonymous())
+        val dynamicKb = context.dynamicKb
+        val result = dynamicKb.retractAll(clause)
+        return replySuccess(dynamicKb = result.theory)
+    }
+}
diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermGreaterThan.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermGreaterThan.kt
@@ -0,0 +1,13 @@
+package it.unibo.tuprolog.solve.stdlib.primitive
+
+import it.unibo.tuprolog.core.Term
+import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.BinaryRelation
+
+/** Implementation of '@>'/2 predicate */
+object TermGreaterThan : BinaryRelation.Predicative<ExecutionContext>("@>") {
+    override fun Solve.Request<ExecutionContext>.compute(first: Term, second: Term): Boolean {
+        return first > second
+    }
+}
diff --git a/...rc/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermGreaterThanOrEqualTo.kt b/...rc/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermGreaterThanOrEqualTo.kt
@@ -0,0 +1,13 @@
+package it.unibo.tuprolog.solve.stdlib.primitive
+
+import it.unibo.tuprolog.core.Term
+import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.BinaryRelation
+
+/** Implementation of '@>='/2 predicate */
+object TermGreaterThanOrEqualTo : BinaryRelation.Predicative<ExecutionContext>("@>=") {
+    override fun Solve.Request<ExecutionContext>.compute(first: Term, second: Term): Boolean {
+        return first >= second
+    }
+}
diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermLowerThan.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermLowerThan.kt
@@ -0,0 +1,13 @@
+package it.unibo.tuprolog.solve.stdlib.primitive
+
+import it.unibo.tuprolog.core.Term
+import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.BinaryRelation
+
+/** Implementation of '@<'/2 predicate */
+object TermLowerThan : BinaryRelation.Predicative<ExecutionContext>("@<") {
+    override fun Solve.Request<ExecutionContext>.compute(first: Term, second: Term): Boolean {
+        return first < second
+    }
+}
diff --git a/.../src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermLowerThanOrEqualTo.kt b/.../src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermLowerThanOrEqualTo.kt
@@ -0,0 +1,13 @@
+package it.unibo.tuprolog.solve.stdlib.primitive
+
+import it.unibo.tuprolog.core.Term
+import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.BinaryRelation
+
+/** Implementation of '@=<'/2 predicate */
+object TermLowerThanOrEqualTo : BinaryRelation.Predicative<ExecutionContext>("@=<") {
+    override fun Solve.Request<ExecutionContext>.compute(first: Term, second: Term): Boolean {
+        return first <= second
+    }
+}
diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/rule/Append.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/rule/Append.kt
@@ -0,0 +1,42 @@
+package it.unibo.tuprolog.solve.stdlib.rule
+
+import it.unibo.tuprolog.core.Scope
+import it.unibo.tuprolog.core.Term
+import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.Signature
+import it.unibo.tuprolog.solve.rule.RuleWrapper
+import kotlin.collections.List as KtList
+import kotlin.collections.listOf as ktListOf
+
+sealed class Append : RuleWrapper<ExecutionContext>(FUNCTOR, ARITY) {
+
+    abstract override val Scope.head: KtList<Term>
+
+    object Base : Append() {
+        override val Scope.head: KtList<Term>
+            get() = ktListOf(
+                emptyList(),
+                varOf("X"),
+                varOf("X")
+            )
+    }
+
+    object Recursive : Append() {
+        override val Scope.head: KtList<Term>
+            get() = ktListOf(
+                consOf(varOf("X"), varOf("Y")),
+                varOf("Z"),
+                consOf(varOf("X"), varOf("W"))
+            )
+
+        override val Scope.body: Term
+            get() = structOf("append", varOf("Y"), varOf("Z"), varOf("W"))
+    }
+
+    companion object {
+        const val FUNCTOR: String = "append"
+        const val ARITY: Int = 3
+        val SIGNATURE: Signature
+            get() = Signature(FUNCTOR, ARITY)
+    }
+}
diff --git a/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTest.kt b/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTest.kt
@@ -164,5 +164,7 @@ interface SolverTest {
     fun testNatural()
     fun testFunctor()
     fun testUniv()
+    fun testAppend()
+    fun testRetractAll()
 }
 
diff --git a/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTestImpl.kt b/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTestImpl.kt
@@ -51,10 +51,7 @@ import it.unibo.tuprolog.solve.exception.TimeOutException
 import it.unibo.tuprolog.solve.exception.error.InstantiationError
 import it.unibo.tuprolog.solve.exception.error.TypeError
 import it.unibo.tuprolog.solve.stdlib.primitive.*
-import it.unibo.tuprolog.solve.stdlib.rule.Arrow
-import it.unibo.tuprolog.solve.stdlib.rule.Member
-import it.unibo.tuprolog.solve.stdlib.rule.Not
-import it.unibo.tuprolog.solve.stdlib.rule.Semicolon
+import it.unibo.tuprolog.solve.stdlib.rule.*
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
@@ -79,6 +76,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver
                 assertHasPredicateInAPI(Member.SIGNATURE)
                 assertHasPredicateInAPI(Not)
                 assertHasPredicateInAPI(Semicolon.SIGNATURE)
+                assertHasPredicateInAPI(Append.SIGNATURE)
                 assertHasPredicateInAPI(ArithmeticEqual)
                 assertHasPredicateInAPI(ArithmeticGreaterThan)
                 assertHasPredicateInAPI(ArithmeticGreaterThanOrEqualTo)
@@ -105,8 +103,13 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver
                 assertHasPredicateInAPI(NotUnifiableWith)
                 assertHasPredicateInAPI(Number)
                 assertHasPredicateInAPI(Retract)
+                assertHasPredicateInAPI(RetractAll)
                 assertHasPredicateInAPI(Sleep)
+                assertHasPredicateInAPI(TermGreaterThan)
+                assertHasPredicateInAPI(TermGreaterThanOrEqualTo)
                 assertHasPredicateInAPI(TermIdentical)
+                assertHasPredicateInAPI(TermLowerThan)
+                assertHasPredicateInAPI(TermLowerThanOrEqualTo)
                 assertHasPredicateInAPI(TermNotIdentical)
                 assertHasPredicateInAPI(UnifiesWith)
                 assertHasPredicateInAPI(Univ)
@@ -1045,4 +1048,89 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver
             )
         }
     }
+
+    override fun testRetractAll() {
+        prolog {
+            val solver = solverFactory.solverWithDefaultBuiltins(
+                dynamicKb = theoryOf(
+                    factOf(structOf("f", numOf(1))),
+                    ruleOf(structOf("f", numOf(2)), atomOf("false"))
+                )
+            )
+
+            var query = "retractall"("f"("X"))
+
+            var solutions = solver.solve(query, mediumDuration).toList()
+
+            assertSolutionEquals(
+                ktListOf(
+                    query.yes()
+                ),
+                solutions
+            )
+
+            assertEquals(
+                ktListOf(),
+                solver.dynamicKb.toList()
+            )
+            assertEquals(0L, solver.dynamicKb.size)
+
+            query = "retractall"("f"("X"))
+            solutions = solver.solve(query, mediumDuration).toList()
+
+            assertSolutionEquals(
+                ktListOf(
+                    query.yes()
+                ),
+                solutions
+            )
+        }
+    }
+
+    override fun testAppend() {
+        prolog {
+            val solver = solverFactory.solverWithDefaultBuiltins()
+
+            var query = "append"(listOf(1, 2, 3), listOf(4, 5, 6), "X")
+            var solutions = solver.solve(query, mediumDuration).toList()
+
+            assertSolutionEquals(
+                ktListOf(query.yes("X" to listOf(1, 2, 3, 4, 5, 6))),
+                solutions
+            )
+
+            query = "append"(listOf(1, 2, 3), "X", listOf(1, 2, 3, 4, 5, 6))
+            solutions = solver.solve(query, mediumDuration).toList()
+
+            assertSolutionEquals(
+                ktListOf(query.yes("X" to listOf(4, 5, 6))),
+                solutions
+            )
+
+            query = "append"("X", "X", listOf(1, 2, 3, 4, 5, 6))
+            solutions = solver.solve(query, mediumDuration).toList()
+
+            assertSolutionEquals(
+                ktListOf(query.no()),
+                solutions
+            )
+
+            query = "append"("X", "Y", listOf(1, 2, 3, 4, 5, 6))
+            solutions = solver.solve(query, mediumDuration).toList()
+
+            assertSolutionEquals(
+                ktListOf(
+                    query.yes("X" to emptyList(), "Y" to listOf(1, 2, 3, 4, 5, 6)),
+                    query.yes("X" to listOf(1), "Y" to listOf(2, 3, 4, 5, 6)),
+                    query.yes("X" to listOf(1, 2), "Y" to listOf(3, 4, 5, 6)),
+                    query.yes("X" to listOf(1, 2, 3), "Y" to listOf(4, 5, 6)),
+                    query.yes("X" to listOf(1, 2, 3, 4), "Y" to listOf(5, 6)),
+                    query.yes("X" to listOf(1, 2, 3, 4, 5), "Y" to listOf(6)),
+                    query.yes("X" to listOf(1, 2, 3, 4, 5, 6), "Y" to emptyList())
+                ),
+                solutions
+            )
+
+        }
+    }
 }
diff --git a/...lve/src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticEqualTest.kt b/...lve/src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticEqualTest.kt
@@ -1,6 +1,6 @@
 package it.unibo.tuprolog.solve.stdlib.primitive
 
-import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ArithmeticUtils.assertCorrectResponse
+import it.unibo.tuprolog.solve.stdlib.primitive.testutils.BinaryRelationUtils.assertCorrectResponse
 import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ArithmeticUtils.equalQueryToResult
 import kotlin.test.Test
 

diff --git a/...est/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticGreaterThanOrEqualToTest.kt b/...est/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticGreaterThanOrEqualToTest.kt
@@ -1,6 +1,6 @@
 package it.unibo.tuprolog.solve.stdlib.primitive
 
-import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ArithmeticUtils.assertCorrectResponse
+import it.unibo.tuprolog.solve.stdlib.primitive.testutils.BinaryRelationUtils.assertCorrectResponse
 import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ArithmeticUtils.greaterOrEqualQueryToResult
 import kotlin.test.Test
 

diff --git a/...c/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticGreaterThanTest.kt b/...c/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticGreaterThanTest.kt
@@ -1,6 +1,6 @@
 package it.unibo.tuprolog.solve.stdlib.primitive
 
-import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ArithmeticUtils.assertCorrectResponse
+import it.unibo.tuprolog.solve.stdlib.primitive.testutils.BinaryRelationUtils.assertCorrectResponse
 import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ArithmeticUtils.greaterQueryToResult
 import kotlin.test.Test
 

diff --git a/...nTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticLowerThanOrEqualToTest.kt b/...nTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticLowerThanOrEqualToTest.kt
@@ -1,6 +1,6 @@
 package it.unibo.tuprolog.solve.stdlib.primitive
 
-import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ArithmeticUtils.assertCorrectResponse
+import it.unibo.tuprolog.solve.stdlib.primitive.testutils.BinaryRelationUtils.assertCorrectResponse
 import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ArithmeticUtils.lowerOrEqualQueryToResult
 import kotlin.test.Test
 

diff --git a/...src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticLowerThanTest.kt b/...src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticLowerThanTest.kt
@@ -1,6 +1,6 @@
 package it.unibo.tuprolog.solve.stdlib.primitive
 
-import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ArithmeticUtils.assertCorrectResponse
+import it.unibo.tuprolog.solve.stdlib.primitive.testutils.BinaryRelationUtils.assertCorrectResponse
 import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ArithmeticUtils.lowerQueryToResult
 import kotlin.test.Test
 

diff --git a/.../src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticNotEqualTest.kt b/.../src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticNotEqualTest.kt
@@ -1,6 +1,6 @@
 package it.unibo.tuprolog.solve.stdlib.primitive
 
-import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ArithmeticUtils.assertCorrectResponse
+import it.unibo.tuprolog.solve.stdlib.primitive.testutils.BinaryRelationUtils.assertCorrectResponse
 import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ArithmeticUtils.notEqualQueryToResult
 import kotlin.test.Test
 

diff --git a/...ommonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermGreaterThanOrEqualToTest.kt b/...ommonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermGreaterThanOrEqualToTest.kt
@@ -0,0 +1,19 @@
+package it.unibo.tuprolog.solve.stdlib.primitive
+
+import it.unibo.tuprolog.solve.stdlib.primitive.testutils.BinaryRelationUtils.assertCorrectResponse
+import it.unibo.tuprolog.solve.stdlib.primitive.testutils.TermUtils.greaterOrEqualQueryToResult
+import kotlin.test.Test
+
+/**
+ * Test class for [TermGreaterThanOrEqualTo]
+ *
+ */
+internal class TermGreaterThanOrEqualToTest {
+
+    @Test
+    fun computesCorrectResult() {
+        greaterOrEqualQueryToResult.forEach { (input, result) ->
+            assertCorrectResponse(TermGreaterThanOrEqualTo, input, result)
+        }
+    }
+}