move Solve in it.unibo.tuprolog.solve.primitive

tuProlog · Jul 1, 2020 · 8e07392 · 8e07392
1 parent 48bbe1f
commit 8e07392
Show file tree

Hide file tree

Showing 80 changed files with 91 additions and 93 deletions.
diff --git a/examples/src/main/kotlin/it/unibo/tuprolog/examples/solve/SolverExample.kt b/examples/src/main/kotlin/it/unibo/tuprolog/examples/solve/SolverExample.kt
@@ -7,6 +7,7 @@ import it.unibo.tuprolog.solve.*
 import it.unibo.tuprolog.solve.exception.error.TypeError
 import it.unibo.tuprolog.solve.library.Libraries
 import it.unibo.tuprolog.solve.library.Library
+import it.unibo.tuprolog.solve.primitive.Solve
 
 val gtSignature = Signature("gt", 2)
 

diff --git a/solve-classic/src/commonMain/kotlin/it/unibo/tuprolog/solve/ChoicePointContext.kt b/solve-classic/src/commonMain/kotlin/it/unibo/tuprolog/solve/ChoicePointContext.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve
 
 import it.unibo.tuprolog.core.Rule
 import it.unibo.tuprolog.core.Struct
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.utils.Cursor
 
 sealed class ChoicePointContext(

diff --git a/solve-classic/src/commonMain/kotlin/it/unibo/tuprolog/solve/ClassicExecutionContext.kt b/solve-classic/src/commonMain/kotlin/it/unibo/tuprolog/solve/ClassicExecutionContext.kt
@@ -6,6 +6,7 @@ import it.unibo.tuprolog.solve.channel.InputChannel
 import it.unibo.tuprolog.solve.channel.OutputChannel
 import it.unibo.tuprolog.solve.exception.PrologWarning
 import it.unibo.tuprolog.solve.library.Libraries
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.theory.Theory
 import it.unibo.tuprolog.utils.Cursor
 import kotlin.collections.List as KtList

diff --git a/solve-classic/src/commonMain/kotlin/it/unibo/tuprolog/solve/fsm/Utils.kt b/solve-classic/src/commonMain/kotlin/it/unibo/tuprolog/solve/fsm/Utils.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.fsm
 
 import it.unibo.tuprolog.core.*
 import it.unibo.tuprolog.solve.*
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.utils.Cursor
 import it.unibo.tuprolog.utils.cursor
 

diff --git a/solve-classic/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Throw.kt b/solve-classic/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Throw.kt
@@ -3,7 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 import it.unibo.tuprolog.core.Struct
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.exception.PrologError
 import it.unibo.tuprolog.solve.exception.TuPrologRuntimeException
 import it.unibo.tuprolog.solve.exception.error.MessageError

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/StreamsSolver.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/StreamsSolver.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Struct
 import it.unibo.tuprolog.core.Var
 import it.unibo.tuprolog.core.operators.OperatorSet
 import it.unibo.tuprolog.solve.library.Libraries
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.solver.StreamsExecutionContext
 import it.unibo.tuprolog.solve.solver.fsm.FinalState
 import it.unibo.tuprolog.solve.solver.fsm.StateMachineExecutor

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/SideEffectManagerImpl.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/SideEffectManagerImpl.kt
@@ -2,8 +2,8 @@ package it.unibo.tuprolog.solve.solver
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.SideEffectManager
-import it.unibo.tuprolog.solve.Solve
 import it.unibo.tuprolog.solve.StreamsSolver
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.stdlib.primitive.Call
 import it.unibo.tuprolog.solve.stdlib.primitive.Catch
 import it.unibo.tuprolog.solve.stdlib.primitive.Cut

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/SolverUtils.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/SolverUtils.kt
@@ -9,9 +9,9 @@ package it.unibo.tuprolog.solve.solver
 
 import it.unibo.tuprolog.core.*
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.Solve
 import it.unibo.tuprolog.solve.TimeInstant
 import it.unibo.tuprolog.solve.extractSignature
+import it.unibo.tuprolog.solve.primitive.Solve
 import kotlin.jvm.JvmName
 
 /** Check whether the receiver term is a well-formed predication */

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/AbstractState.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/AbstractState.kt
@@ -1,6 +1,6 @@
 package it.unibo.tuprolog.solve.solver.fsm
 
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 
 /**
  * Base class for all States refactoring common behaviour

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/FinalState.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/FinalState.kt
@@ -1,6 +1,6 @@
 package it.unibo.tuprolog.solve.solver.fsm
 
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 
 /**
  * Represents a Final [State] of the Prolog solver state-machine

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/IntermediateState.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/IntermediateState.kt
@@ -1,8 +1,8 @@
 package it.unibo.tuprolog.solve.solver.fsm
 
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.Solve
-import it.unibo.tuprolog.solve.Solve.Response
+import it.unibo.tuprolog.solve.primitive.Solve
+import it.unibo.tuprolog.solve.primitive.Solve.Response
 
 /**
  * Represents an Intermediate [State] of the Prolog solver state-machine

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/State.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/State.kt
@@ -1,7 +1,7 @@
 package it.unibo.tuprolog.solve.solver.fsm
 
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 
 /**
  * Represents a State of Prolog solver state-machine

diff --git a/...reams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/AbstractTimedState.kt b/...reams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/AbstractTimedState.kt
@@ -1,8 +1,12 @@
 package it.unibo.tuprolog.solve.solver.fsm.impl
 
-import it.unibo.tuprolog.solve.*
-import it.unibo.tuprolog.solve.Solve.Response
+import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.TimeDuration
+import it.unibo.tuprolog.solve.TimeInstant
+import it.unibo.tuprolog.solve.currentTimeInstant
 import it.unibo.tuprolog.solve.exception.TimeOutException
+import it.unibo.tuprolog.solve.primitive.Solve
+import it.unibo.tuprolog.solve.primitive.Solve.Response
 import it.unibo.tuprolog.solve.solver.fsm.AbstractState
 import it.unibo.tuprolog.solve.solver.fsm.IntermediateState
 import it.unibo.tuprolog.solve.solver.fsm.State

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateEnd.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateEnd.kt
@@ -1,9 +1,13 @@
 package it.unibo.tuprolog.solve.solver.fsm.impl
 
 import it.unibo.tuprolog.core.Substitution
-import it.unibo.tuprolog.solve.*
+import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.SideEffect
+import it.unibo.tuprolog.solve.SideEffectManager
+import it.unibo.tuprolog.solve.Solution
 import it.unibo.tuprolog.solve.exception.HaltException
 import it.unibo.tuprolog.solve.exception.TuPrologRuntimeException
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.solver.StreamsExecutionContext
 import it.unibo.tuprolog.solve.solver.fsm.AbstractState
 import it.unibo.tuprolog.solve.solver.fsm.FinalState

diff --git a/...eams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateGoalEvaluation.kt b/...eams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateGoalEvaluation.kt
@@ -2,11 +2,11 @@ package it.unibo.tuprolog.solve.solver.fsm.impl
 
 import it.unibo.tuprolog.core.Struct
 import it.unibo.tuprolog.solve.Solution
-import it.unibo.tuprolog.solve.Solve
 import it.unibo.tuprolog.solve.StreamsSolver
 import it.unibo.tuprolog.solve.currentTimeInstant
 import it.unibo.tuprolog.solve.exception.HaltException
 import it.unibo.tuprolog.solve.exception.PrologError
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.solver.StreamsExecutionContext
 import it.unibo.tuprolog.solve.solver.fsm.State
 import it.unibo.tuprolog.solve.solver.getSideEffectManager

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateInit.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateInit.kt
@@ -1,7 +1,7 @@
 package it.unibo.tuprolog.solve.solver.fsm.impl
 
-import it.unibo.tuprolog.solve.Solve
 import it.unibo.tuprolog.solve.extractSignature
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.solver.StreamsExecutionContext
 import it.unibo.tuprolog.solve.solver.fsm.State
 import it.unibo.tuprolog.solve.solver.isWellFormed

diff --git a/...reams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateRuleSelection.kt b/...reams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateRuleSelection.kt
@@ -4,7 +4,11 @@ import it.unibo.tuprolog.core.Rule
 import it.unibo.tuprolog.core.Struct
 import it.unibo.tuprolog.core.Var
 import it.unibo.tuprolog.core.prepareForExecution
-import it.unibo.tuprolog.solve.*
+import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.Solution
+import it.unibo.tuprolog.solve.currentTimeInstant
+import it.unibo.tuprolog.solve.forEachWithLookahead
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.solver.*
 import it.unibo.tuprolog.solve.solver.fsm.*
 import it.unibo.tuprolog.unify.Unificator.Companion.mguWith

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Call.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Call.kt
@@ -1,6 +1,6 @@
 package it.unibo.tuprolog.solve.stdlib.primitive
 
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.StreamsSolver
 import it.unibo.tuprolog.solve.exception.error.TypeError
 import it.unibo.tuprolog.solve.primitive.PrimitiveWrapper

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Catch.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Catch.kt
@@ -2,7 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Struct
 import it.unibo.tuprolog.core.Term
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.StreamsSolver
 import it.unibo.tuprolog.solve.currentTimeInstant
 import it.unibo.tuprolog.solve.primitive.PrimitiveWrapper

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Conjunction.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Conjunction.kt
@@ -5,6 +5,7 @@ import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.core.Tuple
 import it.unibo.tuprolog.solve.*
 import it.unibo.tuprolog.solve.primitive.PrimitiveWrapper
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.solver.*
 
 /**

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Cut.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Cut.kt
@@ -1,6 +1,6 @@
 package it.unibo.tuprolog.solve.stdlib.primitive
 
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.primitive.PrimitiveWrapper
 import it.unibo.tuprolog.solve.solver.StreamsExecutionContext
 

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Not.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Not.kt
@@ -2,7 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Struct
 import it.unibo.tuprolog.solve.Solution
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.StreamsSolver
 import it.unibo.tuprolog.solve.primitive.PrimitiveWrapper
 import it.unibo.tuprolog.solve.solver.StreamsExecutionContext

diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Throw.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Throw.kt
@@ -4,7 +4,7 @@ import it.unibo.tuprolog.core.Struct
 import it.unibo.tuprolog.core.Substitution
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.exception.PrologError
 import it.unibo.tuprolog.solve.exception.error.ErrorUtils
 import it.unibo.tuprolog.solve.exception.error.SystemError

diff --git a/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/solver/SolverUtilsTest.kt b/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/solver/SolverUtilsTest.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.*
 import it.unibo.tuprolog.solve.*
 import it.unibo.tuprolog.solve.exception.HaltException
 import it.unibo.tuprolog.solve.library.Libraries
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.theory.Theory
 import kotlin.test.*
 

diff --git a/...s/src/commonTest/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/AbstractTimedStateTest.kt b/...s/src/commonTest/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/AbstractTimedStateTest.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.solver.fsm.impl
 import it.unibo.tuprolog.core.Truth
 import it.unibo.tuprolog.solve.*
 import it.unibo.tuprolog.solve.exception.TimeOutException
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.solver.fsm.State
 import it.unibo.tuprolog.solve.testutils.SolverTestUtils.createSolveRequest
 import kotlin.test.Test

diff --git a/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateInitTest.kt b/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateInitTest.kt
@@ -5,7 +5,7 @@ import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.core.Truth
 import it.unibo.tuprolog.core.prepareForExecution
 import it.unibo.tuprolog.solve.DummyInstances
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.SolverStrategies
 import it.unibo.tuprolog.solve.solver.fsm.impl.testutils.StateInitUtils.allRequests
 import it.unibo.tuprolog.solve.solver.fsm.impl.testutils.StateInitUtils.allWellFormedGoalRequests

diff --git a/...s/src/commonTest/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateRuleSelectionTest.kt b/...s/src/commonTest/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateRuleSelectionTest.kt
@@ -2,7 +2,7 @@ package it.unibo.tuprolog.solve.solver.fsm.impl
 
 import it.unibo.tuprolog.core.Var
 import it.unibo.tuprolog.dsl.theory.prolog
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.extractSignature
 import it.unibo.tuprolog.solve.library.Libraries
 import it.unibo.tuprolog.solve.library.Library

diff --git a/...kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/integrationtest/StateIntegrationTesting.kt b/...kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/integrationtest/StateIntegrationTesting.kt
@@ -8,7 +8,7 @@ import it.unibo.tuprolog.solve.PrologStandardExampleTheories.prologStandardExamp
 import it.unibo.tuprolog.solve.PrologStandardExampleTheories.prologStandardExampleWithCutTheory
 import it.unibo.tuprolog.solve.PrologStandardExampleTheories.prologStandardExampleWithCutTheoryNotableGoalToSolution
 import it.unibo.tuprolog.solve.Solution
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.TestingClauseTheories.customReverseListTheory
 import it.unibo.tuprolog.solve.TestingClauseTheories.customReverseListTheoryNotableGoalToSolution
 import it.unibo.tuprolog.solve.TestingClauseTheories.cutConjunctionAndBacktrackingTheory

diff --git a/...Test/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/testutils/StateGoalEvaluationUtils.kt b/...Test/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/testutils/StateGoalEvaluationUtils.kt
@@ -1,7 +1,7 @@
 package it.unibo.tuprolog.solve.solver.fsm.impl.testutils
 
 import it.unibo.tuprolog.core.Var
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.StreamsSolver
 import it.unibo.tuprolog.solve.exception.HaltException
 import it.unibo.tuprolog.solve.exception.PrologError

diff --git a/...src/commonTest/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/testutils/StateInitUtils.kt b/...src/commonTest/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/testutils/StateInitUtils.kt
@@ -5,7 +5,7 @@ import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.core.Truth
 import it.unibo.tuprolog.core.Var
 import it.unibo.tuprolog.solve.Signature
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.solver.StreamsExecutionContext
 import it.unibo.tuprolog.solve.solver.fsm.impl.StateGoalEvaluation
 import it.unibo.tuprolog.solve.solver.fsm.impl.StateInit

diff --git a/...ams/src/commonTest/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/testutils/StateUtils.kt b/...ams/src/commonTest/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/testutils/StateUtils.kt
@@ -4,7 +4,7 @@ import it.unibo.tuprolog.core.Struct
 import it.unibo.tuprolog.core.Substitution
 import it.unibo.tuprolog.solve.SideEffectManager
 import it.unibo.tuprolog.solve.Solution
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.solver.fsm.State
 import it.unibo.tuprolog.solve.solver.getSideEffectManager
 import kotlin.test.assertEquals

diff --git a/...mmonTest/kotlin/it/unibo/tuprolog/solve/solver/fsm/testutils/StateMachineExecutorUtils.kt b/...mmonTest/kotlin/it/unibo/tuprolog/solve/solver/fsm/testutils/StateMachineExecutorUtils.kt
@@ -1,7 +1,7 @@
 package it.unibo.tuprolog.solve.solver.fsm.testutils
 
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.solver.fsm.State
 import it.unibo.tuprolog.solve.solver.fsm.StateMachineExecutor
 import kotlin.reflect.KClass

diff --git a/...streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ConjunctionTest.kt b/...streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ConjunctionTest.kt
@@ -5,6 +5,7 @@ import it.unibo.tuprolog.solve.*
 import it.unibo.tuprolog.solve.library.Libraries
 import it.unibo.tuprolog.solve.library.Library
 import it.unibo.tuprolog.solve.primitive.PrimitiveWrapper
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.solver.StreamsExecutionContext
 import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ConjunctionUtils.failedRequests
 import it.unibo.tuprolog.solve.stdlib.primitive.testutils.ConjunctionUtils.myRequestToSolutions

diff --git a/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/CutTest.kt b/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/CutTest.kt
@@ -5,7 +5,7 @@ import it.unibo.tuprolog.core.Substitution
 import it.unibo.tuprolog.core.Truth
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Signature
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.solver.StreamsExecutionContext
 import it.unibo.tuprolog.solve.solver.getSideEffectManager
 import it.unibo.tuprolog.solve.stdlib.primitive.testutils.PrimitiveUtils.assertOnlyOneSolution

diff --git a/...ams/src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/testutils/CallUtils.kt b/...ams/src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/testutils/CallUtils.kt
@@ -7,6 +7,7 @@ import it.unibo.tuprolog.solve.TestingClauseTheories.simpleFactTheoryNotableGoal
 import it.unibo.tuprolog.solve.exception.PrologError
 import it.unibo.tuprolog.solve.exception.error.InstantiationError
 import it.unibo.tuprolog.solve.exception.error.TypeError
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.solver.StreamsExecutionContext
 import it.unibo.tuprolog.solve.solver.fsm.impl.StateEnd
 import it.unibo.tuprolog.solve.solver.fsm.impl.StateGoalEvaluation

diff --git a/...rc/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/testutils/PrimitiveUtils.kt b/...rc/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/testutils/PrimitiveUtils.kt
@@ -1,7 +1,7 @@
 package it.unibo.tuprolog.solve.stdlib.primitive.testutils
 
 import it.unibo.tuprolog.solve.Solution
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.exception.PrologError
 import kotlin.reflect.KClass
 import kotlin.test.assertEquals

diff --git a/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/testutils/SolverTestUtils.kt b/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/testutils/SolverTestUtils.kt
@@ -2,7 +2,7 @@ package it.unibo.tuprolog.solve.testutils
 
 import it.unibo.tuprolog.core.Struct
 import it.unibo.tuprolog.solve.Signature
-import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.Solve
 import it.unibo.tuprolog.solve.Solver
 import it.unibo.tuprolog.solve.extractSignature
 import it.unibo.tuprolog.solve.library.Libraries

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/primitive/ArithmeticRelation.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/primitive/ArithmeticRelation.kt
@@ -3,7 +3,6 @@ package it.unibo.tuprolog.solve.primitive
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.Solve
 import it.unibo.tuprolog.solve.function.ArithmeticEvaluator
 
 /** Base class for implementing arithmetic relation between [Numeric] terms */

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/primitive/BinaryRelation.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/primitive/BinaryRelation.kt
@@ -3,7 +3,6 @@ package it.unibo.tuprolog.solve.primitive
 import it.unibo.tuprolog.core.Substitution
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.Solve
 
 /** Base class to implement primitives that relate two [Term]s and provide a single response */
 abstract class BinaryRelation<E : ExecutionContext>(operator: String) : PrimitiveWrapper<E>(operator, 2) {

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/primitive/PredicateWithoutArguments.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/primitive/PredicateWithoutArguments.kt
@@ -3,7 +3,6 @@ package it.unibo.tuprolog.solve.primitive
 import it.unibo.tuprolog.core.Substitution
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.Solve
 
 /** A base class to implement predicates with zero argument */
 abstract class PredicateWithoutArguments<E : ExecutionContext>(operator: String) : PrimitiveWrapper<E>(operator, 0) {

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/primitive/Primitive.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/primitive/Primitive.kt
@@ -2,7 +2,6 @@ package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Signature
-import it.unibo.tuprolog.solve.Solve
 import kotlin.js.JsName
 
 /** A typealias for a primitive function that accepts a [Solve.Request] and returns a Sequence of [Solve.Response]s */

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/primitive/PrimitiveWrapper.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/primitive/PrimitiveWrapper.kt
@@ -5,7 +5,6 @@ import it.unibo.tuprolog.core.operators.Specifier
 import it.unibo.tuprolog.solve.AbstractWrapper
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Signature
-import it.unibo.tuprolog.solve.Solve
 import it.unibo.tuprolog.solve.exception.error.DomainError
 import it.unibo.tuprolog.solve.exception.error.InstantiationError
 import it.unibo.tuprolog.solve.exception.error.TypeError