forked from kscience/kmath
update geometry
This commit is contained in:
parent
7a4e9e70f9
commit
5129f29084
@ -77,4 +77,4 @@ ksciencePublish {
|
|||||||
|
|
||||||
apiValidation.nonPublicMarkers.add("space.kscience.kmath.UnstableKMathAPI")
|
apiValidation.nonPublicMarkers.add("space.kscience.kmath.UnstableKMathAPI")
|
||||||
|
|
||||||
val multikVersion by extra("0.2.0")
|
val multikVersion by extra("0.2.2")
|
||||||
|
@ -19,19 +19,13 @@ import org.ejml.sparse.csc.factory.DecompositionFactory_DSCC
|
|||||||
import org.ejml.sparse.csc.factory.DecompositionFactory_FSCC
|
import org.ejml.sparse.csc.factory.DecompositionFactory_FSCC
|
||||||
import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
|
import org.ejml.sparse.csc.factory.LinearSolverFactory_DSCC
|
||||||
import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
|
import org.ejml.sparse.csc.factory.LinearSolverFactory_FSCC
|
||||||
|
import space.kscience.kmath.UnstableKMathAPI
|
||||||
import space.kscience.kmath.linear.*
|
import space.kscience.kmath.linear.*
|
||||||
import space.kscience.kmath.linear.Matrix
|
import space.kscience.kmath.linear.Matrix
|
||||||
import space.kscience.kmath.UnstableKMathAPI
|
|
||||||
import space.kscience.kmath.nd.StructureFeature
|
import space.kscience.kmath.nd.StructureFeature
|
||||||
import space.kscience.kmath.structures.Float64
|
|
||||||
import space.kscience.kmath.structures.Float32
|
|
||||||
import space.kscience.kmath.operations.Float64Field
|
|
||||||
import space.kscience.kmath.operations.Float32Field
|
import space.kscience.kmath.operations.Float32Field
|
||||||
import space.kscience.kmath.operations.DoubleField
|
import space.kscience.kmath.operations.Float64Field
|
||||||
import space.kscience.kmath.operations.FloatField
|
|
||||||
import space.kscience.kmath.operations.invoke
|
import space.kscience.kmath.operations.invoke
|
||||||
import space.kscience.kmath.structures.Float64Buffer
|
|
||||||
import space.kscience.kmath.structures.Float32Buffer
|
|
||||||
import space.kscience.kmath.structures.DoubleBuffer
|
import space.kscience.kmath.structures.DoubleBuffer
|
||||||
import space.kscience.kmath.structures.FloatBuffer
|
import space.kscience.kmath.structures.FloatBuffer
|
||||||
import kotlin.reflect.KClass
|
import kotlin.reflect.KClass
|
||||||
|
@ -6,16 +6,26 @@
|
|||||||
package space.kscience.kmath.geometry.euclidean2d
|
package space.kscience.kmath.geometry.euclidean2d
|
||||||
|
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
|
import space.kscience.kmath.geometry.Vector2D
|
||||||
import kotlin.math.PI
|
import kotlin.math.PI
|
||||||
|
|
||||||
|
|
||||||
|
public interface Circle2D<T>{
|
||||||
|
public val center: Vector2D<T>
|
||||||
|
public val radius: Double
|
||||||
|
}
|
||||||
|
|
||||||
|
public val Circle2D<*>.circumference: Double get() = radius * 2 * PI
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A circle in 2D space
|
* A circle in 2D space
|
||||||
*/
|
*/
|
||||||
@Serializable
|
@Serializable
|
||||||
public data class Circle2D(
|
public data class Float64Circle2D(
|
||||||
@Serializable(Float64Space2D.VectorSerializer::class) public val center: DoubleVector2D,
|
@Serializable(Float64Space2D.VectorSerializer::class) override val center: Float64Vector2D,
|
||||||
public val radius: Double
|
override val radius: Double
|
||||||
)
|
): Circle2D<Double>
|
||||||
|
|
||||||
|
public fun Circle2D(center: Float64Vector2D, radius: Double): Circle2D<Double> = Float64Circle2D(center, radius)
|
||||||
|
|
||||||
|
|
||||||
public val Circle2D.circumference: Double get() = radius * 2 * PI
|
|
||||||
|
@ -19,12 +19,10 @@ import kotlin.math.pow
|
|||||||
import kotlin.math.sqrt
|
import kotlin.math.sqrt
|
||||||
|
|
||||||
@Serializable(Float32Space2D.VectorSerializer::class)
|
@Serializable(Float32Space2D.VectorSerializer::class)
|
||||||
public interface Float32Vector2D: Vector2D<Float>
|
public interface Float32Vector2D : Vector2D<Float>
|
||||||
|
|
||||||
|
|
||||||
public object Float32Space2D :
|
public object Float32Space2D : GeometrySpace<Float32Vector2D>, ScaleOperations<Float32Vector2D> {
|
||||||
GeometrySpace<Float32Vector2D>,
|
|
||||||
ScaleOperations<Float32Vector2D> {
|
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
@SerialName("Float32Vector2D")
|
@SerialName("Float32Vector2D")
|
||||||
|
@ -14,13 +14,11 @@ import kotlinx.serialization.encoding.Encoder
|
|||||||
import space.kscience.kmath.geometry.GeometrySpace
|
import space.kscience.kmath.geometry.GeometrySpace
|
||||||
import space.kscience.kmath.geometry.Vector2D
|
import space.kscience.kmath.geometry.Vector2D
|
||||||
import space.kscience.kmath.operations.Float64Field
|
import space.kscience.kmath.operations.Float64Field
|
||||||
import space.kscience.kmath.operations.Norm
|
|
||||||
import space.kscience.kmath.operations.ScaleOperations
|
import space.kscience.kmath.operations.ScaleOperations
|
||||||
import kotlin.math.pow
|
import kotlin.math.pow
|
||||||
import kotlin.math.sqrt
|
import kotlin.math.sqrt
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public typealias DoubleVector2D = Vector2D<Double>
|
public typealias DoubleVector2D = Vector2D<Double>
|
||||||
public typealias Float64Vector2D = Vector2D<Double>
|
public typealias Float64Vector2D = Vector2D<Double>
|
||||||
|
|
||||||
@ -30,9 +28,7 @@ public val Vector2D<Double>.r: Double get() = Float64Space2D.norm(this)
|
|||||||
/**
|
/**
|
||||||
* 2D Euclidean space
|
* 2D Euclidean space
|
||||||
*/
|
*/
|
||||||
public object Float64Space2D : GeometrySpace<DoubleVector2D>,
|
public object Float64Space2D : GeometrySpace<DoubleVector2D>, ScaleOperations<DoubleVector2D> {
|
||||||
ScaleOperations<DoubleVector2D>,
|
|
||||||
Norm<DoubleVector2D, Double> {
|
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
@SerialName("Float64Vector2D")
|
@SerialName("Float64Vector2D")
|
||||||
@ -72,4 +68,6 @@ public object Float64Space2D : GeometrySpace<DoubleVector2D>,
|
|||||||
public val yAxis: DoubleVector2D = vector(0.0, 1.0)
|
public val yAxis: DoubleVector2D = vector(0.0, 1.0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public fun Float64Vector2D(x: Number, y: Number): Float64Vector2D = Float64Space2D.vector(x, y)
|
||||||
|
|
||||||
public val Float64Field.euclidean2D: Float64Space2D get() = Float64Space2D
|
public val Float64Field.euclidean2D: Float64Space2D get() = Float64Space2D
|
@ -8,13 +8,7 @@ package space.kscience.kmath.geometry
|
|||||||
import space.kscience.kmath.complex.Quaternion
|
import space.kscience.kmath.complex.Quaternion
|
||||||
import space.kscience.kmath.complex.QuaternionAlgebra
|
import space.kscience.kmath.complex.QuaternionAlgebra
|
||||||
import space.kscience.kmath.complex.conjugate
|
import space.kscience.kmath.complex.conjugate
|
||||||
import space.kscience.kmath.complex.normalized
|
|
||||||
import space.kscience.kmath.geometry.euclidean3d.Float32Space3D
|
|
||||||
import space.kscience.kmath.geometry.euclidean3d.Float32Vector3D
|
|
||||||
import space.kscience.kmath.geometry.euclidean3d.theta
|
import space.kscience.kmath.geometry.euclidean3d.theta
|
||||||
import kotlin.math.asin
|
|
||||||
import kotlin.math.atan2
|
|
||||||
import kotlin.math.pow
|
|
||||||
|
|
||||||
public operator fun Quaternion.times(other: Quaternion): Quaternion = QuaternionAlgebra.multiply(this, other)
|
public operator fun Quaternion.times(other: Quaternion): Quaternion = QuaternionAlgebra.multiply(this, other)
|
||||||
|
|
||||||
@ -50,11 +44,11 @@ public infix fun Quaternion.dot(other: Quaternion): Double = w * other.w + x * o
|
|||||||
// return Float32Vector3D(roll, pitch, yaw)
|
// return Float32Vector3D(roll, pitch, yaw)
|
||||||
//}
|
//}
|
||||||
|
|
||||||
/**
|
///**
|
||||||
* Quaternion to XYZ Cardan angles
|
// * Quaternion to XYZ Cardan angles
|
||||||
*/
|
// */
|
||||||
public fun Quaternion.toEuler(): Float32Vector3D = if (QuaternionAlgebra.norm(this) == 0.0) {
|
//public fun Quaternion.toEuler(): Float32Vector3D = if (QuaternionAlgebra.norm(this) == 0.0) {
|
||||||
Float32Space3D.zero
|
// Float32Space3D.zero
|
||||||
} else {
|
//} else {
|
||||||
normalized().normalizedToEuler()
|
// normalized().normalizedToEuler()
|
||||||
}
|
//}
|
Loading…
Reference in New Issue
Block a user