diff --git a/server/src/main/java/algorithm/RoomBypassingAlgorithm.kt b/server/src/main/java/algorithm/RoomBypassingAlgorithm.kt index 7473537b50a..60aaaeef7e5 100644 --- a/server/src/main/java/algorithm/RoomBypassingAlgorithm.kt +++ b/server/src/main/java/algorithm/RoomBypassingAlgorithm.kt @@ -14,13 +14,12 @@ class RoomBypassingAlgorithm(thisCar: Car, exchanger: Exchanger) : Abs public var wallAngleWithOX = 0.0//in radian public var wallLength = 0.0//sm -// var xPos = 0.0 -// var yPos = 0.0 -// var carAngle = 0.0 + var xPos = 0.0 + var yPos = 0.0 + var carAngle = 0.0 private var prevPoint = Pair(0.0, 0.0) - override fun getCarState(anglesDistances: Map): CarState { val dist0 = anglesDistances[0] val dist90 = anglesDistances[90] @@ -117,7 +116,7 @@ class RoomBypassingAlgorithm(thisCar: Car, exchanger: Exchanger) : Abs if (Math.abs(dist120 - dist60) > 10) { val rotationDirection = if (dist120 > dist60) LEFT else RIGHT resultBuilder.setDirections(getIntArray(rotationDirection)) - resultBuilder.setTimes(getIntArray((3.0 / ROTATION_VELOCITY).toInt())) + resultBuilder.setTimes(getIntArray((4 * 3.0 / ROTATION_VELOCITY).toInt()))//todo calibrate return resultBuilder.build() }