From 85231d62415cea57d61a08ab0c4c942b3b825890 Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Tue, 28 Aug 2018 11:59:55 +0200 Subject: [PATCH] Did some changes on work computer. --- src/main/kotlin/be/nielandt/CrossSolver.kt | 6 +++++- src/main/kotlin/be/nielandt/counter/VariableCounter.kt | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/be/nielandt/CrossSolver.kt b/src/main/kotlin/be/nielandt/CrossSolver.kt index 29a7f0d..7a1a8ec 100644 --- a/src/main/kotlin/be/nielandt/CrossSolver.kt +++ b/src/main/kotlin/be/nielandt/CrossSolver.kt @@ -63,7 +63,11 @@ fun main(args: Array) { // do a fixed scramble for testing purposes // noskip Move.enum 30s, skip Move.enum 32s - val fixedMoves = parseMoves("L_, D, U, L2, F, D, B, D, U2, D, B_, F2, D2, U_, R, D2, R_, L, B_, R") +// val fixedMoves = parseMoves("L_, D, U, L2, F, D, B, D, U2, D, B_, F2, D2, U_, R, D2, R_, L, B_, R") + val moveString: String = "U2 F2 U2 D R2 F2 R2 B2 U' D2 L B L2 U2 L B' U L R B".replace('\'', '_') + val s = "L_, D, U, L2, F, D, B, D, U2, D, B_, F2, D2, U_, R, D2, R_, L, B_, R" + + val fixedMoves = parseMoves(moveString) println("fixedMoves = ${fixedMoves}") // scramble random val randomMoves = randomMoves(20) diff --git a/src/main/kotlin/be/nielandt/counter/VariableCounter.kt b/src/main/kotlin/be/nielandt/counter/VariableCounter.kt index 4275d0a..e7b76a3 100644 --- a/src/main/kotlin/be/nielandt/counter/VariableCounter.kt +++ b/src/main/kotlin/be/nielandt/counter/VariableCounter.kt @@ -5,14 +5,14 @@ import java.util.* /** * The variable counter has irregular base size for each digit. * - * basesize: [1,2,1] + * basesize: [1,3,2] * iterates: * - [0,0,0] * - [0,0,1] * - [0,1,0] * - [0,1,1] * - [0,2,0] - * - ... + * - [0,2,1] */ class VariableCounter(internal val baseSizes: IntArray) : Iterator {