refactoring directions
This commit is contained in:
parent
f5201b6be0
commit
639a255aaf
@ -3,6 +3,7 @@
|
|||||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||||
*/
|
*/
|
||||||
@file:UseSerializers(Euclidean2DSpace.VectorSerializer::class)
|
@file:UseSerializers(Euclidean2DSpace.VectorSerializer::class)
|
||||||
|
|
||||||
package space.kscience.kmath.trajectory
|
package space.kscience.kmath.trajectory
|
||||||
|
|
||||||
import kotlinx.serialization.KSerializer
|
import kotlinx.serialization.KSerializer
|
||||||
@ -22,6 +23,19 @@ import kotlin.math.atan2
|
|||||||
public interface DubinsPose2D : DoubleVector2D {
|
public interface DubinsPose2D : DoubleVector2D {
|
||||||
public val coordinates: DoubleVector2D
|
public val coordinates: DoubleVector2D
|
||||||
public val bearing: Angle
|
public val bearing: Angle
|
||||||
|
|
||||||
|
public companion object {
|
||||||
|
public fun bearingToVector(bearing: Angle): Vector2D<Double> =
|
||||||
|
Euclidean2DSpace.vector(cos(bearing), sin(bearing))
|
||||||
|
|
||||||
|
public fun vectorToBearing(vector2D: DoubleVector2D): Angle {
|
||||||
|
require(vector2D.x != 0.0 || vector2D.y != 0.0) { "Can't get bearing of zero vector" }
|
||||||
|
return atan2(vector2D.y, vector2D.x).radians
|
||||||
|
}
|
||||||
|
|
||||||
|
public fun of(point: DoubleVector2D, direction: DoubleVector2D): DubinsPose2D =
|
||||||
|
DubinsPose2D(point, vectorToBearing(direction))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
|
@ -22,7 +22,7 @@ internal data class Tangent(
|
|||||||
val endObstacle: Obstacle,
|
val endObstacle: Obstacle,
|
||||||
val lineSegment: LineSegment2D,
|
val lineSegment: LineSegment2D,
|
||||||
val startDirection: Trajectory2D.Direction,
|
val startDirection: Trajectory2D.Direction,
|
||||||
val endDirection: Trajectory2D.Direction = startDirection
|
val endDirection: Trajectory2D.Direction = startDirection,
|
||||||
)
|
)
|
||||||
|
|
||||||
private class TangentPath(val tangents: List<Tangent>) {
|
private class TangentPath(val tangents: List<Tangent>) {
|
||||||
@ -465,22 +465,22 @@ private fun TangentPath.toTrajectory(): CompositeTrajectory2D = CompositeTraject
|
|||||||
)
|
)
|
||||||
|
|
||||||
internal fun findAllPaths(
|
internal fun findAllPaths(
|
||||||
startingPoint: DoubleVector2D,
|
start: DubinsPose2D,
|
||||||
startingDirection: DoubleVector2D,
|
|
||||||
startingRadius: Double,
|
startingRadius: Double,
|
||||||
finalPoint: DoubleVector2D,
|
finish: DubinsPose2D,
|
||||||
finalDirection: DoubleVector2D,
|
|
||||||
finalRadius: Double,
|
finalRadius: Double,
|
||||||
obstacles: List<Obstacle>,
|
obstacles: List<Obstacle>,
|
||||||
): List<CompositeTrajectory2D> {
|
): List<CompositeTrajectory2D> {
|
||||||
|
fun DubinsPose2D.direction() = vector(cos(bearing),sin(bearing))
|
||||||
|
|
||||||
val initialCircles = constructTangentCircles(
|
val initialCircles = constructTangentCircles(
|
||||||
startingPoint,
|
start,
|
||||||
startingDirection,
|
start.direction(),
|
||||||
startingRadius
|
startingRadius
|
||||||
)
|
)
|
||||||
val finalCircles = constructTangentCircles(
|
val finalCircles = constructTangentCircles(
|
||||||
finalPoint,
|
finish,
|
||||||
finalDirection,
|
finish.direction(),
|
||||||
finalRadius
|
finalRadius
|
||||||
)
|
)
|
||||||
val trajectories = mutableListOf<CompositeTrajectory2D>()
|
val trajectories = mutableListOf<CompositeTrajectory2D>()
|
||||||
@ -495,7 +495,7 @@ internal fun findAllPaths(
|
|||||||
initialCircles[i]!!,
|
initialCircles[i]!!,
|
||||||
Obstacle(listOf(initialCircles[i]!!)),
|
Obstacle(listOf(initialCircles[i]!!)),
|
||||||
Obstacle(listOf(initialCircles[i]!!)),
|
Obstacle(listOf(initialCircles[i]!!)),
|
||||||
LineSegment2D(startingPoint, startingPoint),
|
LineSegment2D(start, start),
|
||||||
i
|
i
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@ -596,7 +596,7 @@ internal fun findAllPaths(
|
|||||||
end,
|
end,
|
||||||
Obstacle(end),
|
Obstacle(end),
|
||||||
Obstacle(end),
|
Obstacle(end),
|
||||||
LineSegment2D(finalPoint, finalPoint),
|
LineSegment2D(finish, finish),
|
||||||
startDirection = lastDirection,
|
startDirection = lastDirection,
|
||||||
endDirection = j
|
endDirection = j
|
||||||
)
|
)
|
||||||
|
@ -29,11 +29,9 @@ class ObstacleTest {
|
|||||||
)
|
)
|
||||||
|
|
||||||
val outputTangents = findAllPaths(
|
val outputTangents = findAllPaths(
|
||||||
startPoint,
|
DubinsPose2D.of(startPoint, startDirection),
|
||||||
startDirection,
|
|
||||||
startRadius,
|
startRadius,
|
||||||
finalPoint,
|
DubinsPose2D.of(finalPoint, finalDirection),
|
||||||
finalDirection,
|
|
||||||
finalRadius,
|
finalRadius,
|
||||||
obstacles
|
obstacles
|
||||||
)
|
)
|
||||||
@ -68,11 +66,9 @@ class ObstacleTest {
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
val paths = findAllPaths(
|
val paths = findAllPaths(
|
||||||
startPoint,
|
DubinsPose2D.of(startPoint, startDirection),
|
||||||
startDirection,
|
|
||||||
startRadius,
|
startRadius,
|
||||||
finalPoint,
|
DubinsPose2D.of(finalPoint, finalDirection),
|
||||||
finalDirection,
|
|
||||||
finalRadius,
|
finalRadius,
|
||||||
obstacles
|
obstacles
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user