azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove test code

Browse Source
This commit is contained in:
MaximZaitsev
2016-08-26 10:44:58 +03:00
parent ad4ce41acd
commit 60f8a04e98
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/main/java/algorithm/AbstractAlgorithm.kt
+1 -1
View File
@@ -58,7 +58,7 @@ abstract class AbstractAlgorithm(val thisCar: Car, val exchanger: Exchanger<IntA
} }
} }
if (sum != 0) { if (sum != 0) {
result[i] = (sum.toDouble()) / (100000*copyElemCount) result[i] = (sum.toDouble()) / (copyElemCount)
} }
} }
return result return result
server/src/main/java/algorithm/RoomBypassingAlgorithm.kt
+14 -17
View File
@@ -155,8 +155,8 @@ class RoomBypassingAlgorithm(thisCar: Car, exchanger: Exchanger<IntArray>) : Abs
wallLength = 0.0 wallLength = 0.0
RoomModel.lines.add(nextLine) RoomModel.lines.add(nextLine)
resultBuilder.setDirections(getIntArray(LEFT, FORWARD, LEFT)) resultBuilder.setDirections(getIntArray(LEFT, FORWARD, LEFT))
resultBuilder.setTimes(getIntArray((radiansToDegrees(wallAngleWithOX) / (2 * ROTATION_VELOCITY)).toInt(), resultBuilder.setTimes(getIntArray((wallsAngleInDegrees / (2 * ROTATION_VELOCITY)).toInt(),
(40 / MOVE_VELOCITY).toInt(), (radiansToDegrees(wallAngleWithOX) / (2 * ROTATION_VELOCITY)).toInt())) (40 / MOVE_VELOCITY).toInt(), (wallsAngleInDegrees / (2 * ROTATION_VELOCITY)).toInt()))
return resultBuilder.build() return resultBuilder.build()
} }
CarState.OUTER -> { CarState.OUTER -> {
@@ -186,25 +186,22 @@ class RoomBypassingAlgorithm(thisCar: Car, exchanger: Exchanger<IntArray>) : Abs
return result return result
} }
//returns coef in y=kx+b (first is k, second is b)
private fun approximatePointsByLine(points: Array<Pair<Double, Double>>): Line { private fun approximatePointsByLine(points: Array<Pair<Double, Double>>): Line {
val p1 = points.first() // val p1 = points.first()
val p2 = points[1] // val p2 = points[1]
// return Line(p2.second - p1.second, p1.first - p2.first, -p1.first * p2.second + p1.second * p2.first)
return Line(p2.second - p1.second, p1.first - p2.first, -p1.first * p2.second + p1.second * p2.first) val sumX = points.sumByDouble { it.first }
val sumXQuad = points.sumByDouble { it.first * it.first }
val sumY = points.sumByDouble { it.second }
val sumXY = points.sumByDouble { it.second * it.first }
// val pointsCount = points.size
// val sumX = points.sumByDouble { it.first } val k = (pointsCount * sumXY - sumX * sumY) / (pointsCount * sumXQuad - sumX * sumX)
// val sumXQuad = points.sumByDouble { it.first * it.first } val b = (sumY - sumX * k) / pointsCount
// val sumY = points.sumByDouble { it.second }
// val sumXY = points.sumByDouble { it.second * it.first } return Line(-k, 1.0, -b)
//
// val pointsCount = points.size
// val k = (pointsCount * sumXY - sumX * sumY) / (pointsCount * sumXQuad - sumX * sumX)
// val b = (sumY - sumX * k) / pointsCount
//
// return Line(-k, 1.0, -b)
} }