move abstract function base classes in package it.unibo.tuprolog.solv…

…e.function
tuProlog · Jun 12, 2020 · cdc872a · cdc872a
1 parent afc09b2
commit cdc872a
Show file tree

Hide file tree

Showing 35 changed files with 54 additions and 17 deletions.
diff --git a/...lve/stdlib/function/BinaryMathFunction.kt → ...olog/solve/function/BinaryMathFunction.kt b/...lve/stdlib/function/BinaryMathFunction.kt → ...olog/solve/function/BinaryMathFunction.kt
@@ -1,10 +1,9 @@
-package it.unibo.tuprolog.solve.stdlib.function
+package it.unibo.tuprolog.solve.function
 
 import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.function.Compute
 
 /**
  * Base class to implement unary math functions

diff --git a/...ib/function/IntegersBinaryMathFunction.kt → ...ve/function/IntegersBinaryMathFunction.kt b/...ib/function/IntegersBinaryMathFunction.kt → ...ve/function/IntegersBinaryMathFunction.kt
@@ -1,4 +1,4 @@
-package it.unibo.tuprolog.solve.stdlib.function
+package it.unibo.tuprolog.solve.function
 
 import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
@@ -15,11 +15,23 @@ import it.unibo.tuprolog.solve.ExecutionContext
 abstract class IntegersBinaryMathFunction(name: String) : BinaryMathFunction(name) {
 
     override fun mathFunction(real: Real, integer: Integer, context: ExecutionContext): Numeric =
-        throwTypeErrorBecauseOnlyIntegersAccepted(functor, real, context)
+        throwTypeErrorBecauseOnlyIntegersAccepted(
+            functor,
+            real,
+            context
+        )
 
     override fun mathFunction(integer: Integer, real: Real, context: ExecutionContext): Numeric =
-        throwTypeErrorBecauseOnlyIntegersAccepted(functor, real, context)
+        throwTypeErrorBecauseOnlyIntegersAccepted(
+            functor,
+            real,
+            context
+        )
 
     override fun mathFunction(real1: Real, real2: Real, context: ExecutionContext): Numeric =
-        throwTypeErrorBecauseOnlyIntegersAccepted(functor, real1, context)
+        throwTypeErrorBecauseOnlyIntegersAccepted(
+            functor,
+            real1,
+            context
+        )
 }
diff --git a/...log/solve/stdlib/function/MathFunction.kt → ...o/tuprolog/solve/function/MathFunction.kt b/...log/solve/stdlib/function/MathFunction.kt → ...o/tuprolog/solve/function/MathFunction.kt
@@ -1,11 +1,10 @@
-package it.unibo.tuprolog.solve.stdlib.function
+package it.unibo.tuprolog.solve.function
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Signature
 import it.unibo.tuprolog.solve.exception.error.EvaluationError
 import it.unibo.tuprolog.solve.exception.error.TypeError
-import it.unibo.tuprolog.solve.function.FunctionWrapper
 import kotlin.jvm.JvmStatic
 
 /**

diff --git a/...ve/stdlib/function/NullaryMathFunction.kt → ...log/solve/function/NullaryMathFunction.kt b/...ve/stdlib/function/NullaryMathFunction.kt → ...log/solve/function/NullaryMathFunction.kt
@@ -1,8 +1,7 @@
-package it.unibo.tuprolog.solve.stdlib.function
+package it.unibo.tuprolog.solve.function
 
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.function.Compute
 
 /**
  * Base class to implement nullary math functions (with no arguments)

diff --git a/...olve/stdlib/function/UnaryMathFunction.kt → ...rolog/solve/function/UnaryMathFunction.kt b/...olve/stdlib/function/UnaryMathFunction.kt → ...rolog/solve/function/UnaryMathFunction.kt
@@ -1,10 +1,9 @@
-package it.unibo.tuprolog.solve.stdlib.function
+package it.unibo.tuprolog.solve.function
 
 import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.function.Compute
 
 /**
  * Base class to implement unary math functions

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/AbsoluteValue.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/AbsoluteValue.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 
 /**
  * Implementation of `abs/1` arithmetic functor

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Addition.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Addition.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.BinaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 
 /**

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/ArcTangent.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/ArcTangent.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 import kotlin.math.atan
 

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/BitwiseAnd.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/BitwiseAnd.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.function
 import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.IntegersBinaryMathFunction
 
 /**
  * Implementation of `'/\'/2` arithmetic functor

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/BitwiseComplement.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/BitwiseComplement.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 
 /**
  * Implementation of `'\'/1` arithmetic functor

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/BitwiseLeftShift.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/BitwiseLeftShift.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.function
 import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.IntegersBinaryMathFunction
 
 /**
  * Implementation of `'<<'/2` arithmetic functor

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/BitwiseOr.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/BitwiseOr.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.function
 import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.IntegersBinaryMathFunction
 
 /**
  * Implementation of `'\/'/2` arithmetic functor

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/BitwiseRightShift.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/BitwiseRightShift.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.function
 import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.IntegersBinaryMathFunction
 
 /**
  * Implementation of `'>>'/2` arithmetic functor

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Ceiling.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Ceiling.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 import kotlin.math.ceil
 
 /**

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Cosine.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Cosine.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 import kotlin.math.cos
 

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Exponential.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Exponential.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 import kotlin.math.exp
 

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Exponentiation.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Exponentiation.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.BinaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 import kotlin.math.pow
 

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/FloatFractionalPart.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/FloatFractionalPart.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 import org.gciatto.kt.math.RoundingMode
 

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/FloatIntegerPart.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/FloatIntegerPart.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 import org.gciatto.kt.math.RoundingMode
 

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/FloatingPointDivision.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/FloatingPointDivision.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.BinaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 import org.gciatto.kt.math.MathContext
 

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Floor.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Floor.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 import org.gciatto.kt.math.RoundingMode
 

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/IntegerDivision.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/IntegerDivision.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.function
 import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.IntegersBinaryMathFunction
 import org.gciatto.kt.math.BigInteger
 
 /**

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Modulo.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Modulo.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.function
 import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.IntegersBinaryMathFunction
 import org.gciatto.kt.math.BigInteger
 
 /**

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Multiplication.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Multiplication.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.BinaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 
 /**

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/NaturalLogarithm.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/NaturalLogarithm.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 import kotlin.math.E
 import kotlin.math.log

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Remainder.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Remainder.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.function
 import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.IntegersBinaryMathFunction
 import org.gciatto.kt.math.BigInteger
 
 /**

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Round.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Round.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 import org.gciatto.kt.math.RoundingMode
 

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Sign.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Sign.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 
 /**
  * Implementation of `sign/1` arithmetic functor

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/SignReversal.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/SignReversal.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 
 /**
  * Implementation of `'-'/1` arithmetic functor

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Sine.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Sine.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 import kotlin.math.sin
 

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/SquareRoot.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/SquareRoot.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 
 /**

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Subtraction.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Subtraction.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.BinaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 
 /**

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/ToFloat.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/ToFloat.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 
 /**
  * Implementation of `float/1` arithmetic functor

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Truncate.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/function/Truncate.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 import org.gciatto.kt.math.BigDecimal
 import org.gciatto.kt.math.RoundingMode
 

diff --git a/.../src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/function/testutils/FunctionUtils.kt b/.../src/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/function/testutils/FunctionUtils.kt
@@ -3,14 +3,14 @@ package it.unibo.tuprolog.solve.stdlib.function.testutils
 import it.unibo.tuprolog.core.Integer
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.core.Term
-import it.unibo.tuprolog.solve.stdlib.function.BinaryMathFunction
-import it.unibo.tuprolog.solve.stdlib.function.UnaryMathFunction
-import it.unibo.tuprolog.solve.Signature
-import it.unibo.tuprolog.solve.function.Compute
-import it.unibo.tuprolog.solve.function.FunctionWrapper
 import it.unibo.tuprolog.solve.DummyInstances
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.Signature
 import it.unibo.tuprolog.solve.exception.error.TypeError
+import it.unibo.tuprolog.solve.function.BinaryMathFunction
+import it.unibo.tuprolog.solve.function.Compute
+import it.unibo.tuprolog.solve.function.FunctionWrapper
+import it.unibo.tuprolog.solve.function.UnaryMathFunction
 import kotlin.test.assertFailsWith
 
 /**