kscience/kmath
9
0
Fork 1
Code Issues Pull Requests 6 Packages Projects Releases 16 Wiki Activity

Added Rings for Int and Short

Browse Source
This commit is contained in:
Alexander Nozik 2019-01-07 17:44:10 +03:00
parent 83e24acdc5
commit 2bf34f2a07
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kmath-core/src/commonMain/kotlin/scientifik/kmath/operations/Fields.kt
View File

@ -32,7 +32,7 @@ inline class Real(val value: Double) : FieldElement<Double, Real, RealField> {
/** /**
* A field for double without boxing. Does not produce appropriate field element * A field for double without boxing. Does not produce appropriate field element
*/ */
object RealField : AbstractField<Double>(),ExtendedField<Double>, Norm<Double, Double> { object RealField : AbstractField<Double>(), ExtendedField<Double>, Norm<Double, Double> {
override val zero: Double = 0.0 override val zero: Double = 0.0
override fun add(a: Double, b: Double): Double = a + b override fun add(a: Double, b: Double): Double = a + b
override fun multiply(a: Double, @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE") b: Double): Double = a * b override fun multiply(a: Double, @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE") b: Double): Double = a * b
@ -52,15 +52,25 @@ object RealField : AbstractField<Double>(),ExtendedField<Double>, Norm<Double, D
} }
/** /**
* A field for double without boxing. Does not produce appropriate field element * A field for [Int] without boxing. Does not produce corresponding field element
*/ */
object IntField : Field<Int> { object IntRing : Ring<Int> {
override val zero: Int = 0 override val zero: Int = 0
override fun add(a: Int, b: Int): Int = a + b override fun add(a: Int, b: Int): Int = a + b
override fun multiply(a: Int, b: Int): Int = a * b override fun multiply(a: Int, b: Int): Int = a * b
override fun multiply(a: Int, k: Double): Int = (k * a).toInt() override fun multiply(a: Int, k: Double): Int = (k * a).toInt()
override val one: Int = 1 override val one: Int = 1
override fun divide(a: Int, b: Int): Int = a / b }
/**
* A field for [Short] without boxing. Does not produce appropriate field element
*/
object ShortRing : Ring<Short> {
override val zero: Short = 0
override fun add(a: Short, b: Short): Short = (a + b).toShort()
override fun multiply(a: Short, b: Short): Short = (a * b).toShort()
override fun multiply(a: Short, k: Double): Short = (a * k).toShort()
override val one: Short = 1
} }
//interface FieldAdapter<T, R> : Field<R> { //interface FieldAdapter<T, R> : Field<R> {

10
kmath-core/src/commonMain/kotlin/scientifik/kmath/structures/NDField.kt
View File

@ -32,7 +32,6 @@ interface NDField<T, F : Field<T>, N : NDStructure<T>> : Field<N> {
* Create a nd-field for [Double] values * Create a nd-field for [Double] values
*/ */
fun real(shape: IntArray) = RealNDField(shape) fun real(shape: IntArray) = RealNDField(shape)
/** /**
* Create a nd-field with boxing generic buffer * Create a nd-field with boxing generic buffer
*/ */
@ -42,12 +41,11 @@ interface NDField<T, F : Field<T>, N : NDStructure<T>> : Field<N> {
/** /**
* Create a most suitable implementation for nd-field using reified class. * Create a most suitable implementation for nd-field using reified class.
*/ */
inline fun <reified T : Any, F : Field<T>> auto(shape: IntArray, field: F): StridedNDField<T, F> =
if (T::class == Double::class) {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
real(shape) as StridedNDField<T, F> inline fun <reified T : Any, F : Field<T>> auto(shape: IntArray, field: F): StridedNDField<T, F> =
} else { when {
BufferNDField(shape, field, Buffer.Companion::auto) T::class == Double::class -> real(shape) as StridedNDField<T, F>
else -> BufferNDField(shape, field, Buffer.Companion::auto)
} }
} }
} }