fix mask selection

combinators.nim

@@ -1,5 +1,5 @@
 import algorithm, random, sugar
-import fixedseq, game
+import faststack, fixedseq, game
 
 
 proc nextPermutation(x: var FixedSeq): bool =

faststack.nim

@@ -6,12 +6,12 @@ proc show(i: SomeInteger, bitlength = 16) =
 
 
 type
-  Color = enum
+  Color* = enum
     cRed, cGreen, cBlue, cYellow, cPurple
 
-  ColorStack = object
+  ColorStack* = object
     data: uint16
-    len: uint8
+    len*: uint8
 
 
 const
@@ -23,12 +23,13 @@ const
     0b0_000_111_111_111_111,
     0b0_111_111_111_111_111,
   ]
+  allColors* = ColorStack(len: 5, data: 0b0_000_001_010_011_100)
 
 
 template offset(s: ColorStack, idx: Natural): uint8 =
   # Compute the bit offset for a given index. 
   # Dependent on the stack's length.
-  (s.len - 1 - cast[uint8](idx)) * 3
+  (s.len - 1 - idx.uint8) * 3
   # items are stored from left to right but right-aligned, so we
   # need to shift right to access anything other than the last
 
@@ -36,10 +37,10 @@ template offset(s: ColorStack, idx: Natural): uint8 =
 template offset(s: ColorStack, idx: BackwardsIndex): uint8 =
   # for backwards index, we are still shifting right but
   # the lower the index the less we have to shift
-  (cast[uint8](idx) - 1) * 3
+  (idx.uint8 - 1) * 3
 
 
-proc add(s: var ColorStack, c: Color) =
+proc add*(s: var ColorStack, c: Color) =
   # e.g. if stack is 0b0000000000000100:
   # and color is 0b00000011
   # shift: 0b0000000000100000
@@ -49,70 +50,78 @@ proc add(s: var ColorStack, c: Color) =
   inc s.len
 
 
-proc high(s: ColorStack): uint8 = s.len - 1
+proc high*(s: ColorStack): uint8 = s.len - 1
 
-proc low(s: ColorStack): uint8 = 0 # just... always 0, I guess
+proc low*(s: ColorStack): uint8 = 0 # just... always 0, I guess
 
 
-proc `[]`(s: ColorStack, i: uint8 | BackwardsIndex): Color =
+proc `[]`*(s: ColorStack, i: uint8 | BackwardsIndex): Color =
   # shift, then mask everything but the three rightmost bits
-  result = cast[Color](
+  result = Color(
     (s.data shr s.offset(i)) and masks[1]
   )
 
 
-proc `[]=`(s: var ColorStack, i: uint8 | BackwardsIndex, c: Color) =
+proc `[]=`*(s: var ColorStack, i: uint8 | BackwardsIndex, c: Color) =
   let offset = s.offset(i)
-  s.data = (s.data and bitnot(masks[1] shl offset)) or (cast[uint16](c) shl offset)
+  s.data = (s.data and bitnot(masks[1] shl offset)) or (c.uint16 shl offset)
 
 
-iterator items(s: ColorStack): Color =
+iterator items*(s: ColorStack): Color =
   # s.len is unsigned so it will wrap around if we do s.len - 1 in that case
   if s.len != 0:
     for i in countdown(s.len - 1, 0'u8):
-      yield cast[Color]((s.data shr (i * 3)) and masks[1])
+      yield Color((s.data shr (i * 3)) and masks[1])
 
 
-iterator pairs(s: ColorStack): (int, Color) =
+iterator pairs*(s: ColorStack): (uint8, Color) =
-  var count = 0
+  var count = 0'u8
   for color in s:
     yield (count, color)
     inc count
 
 
-proc find(s: ColorStack, needle: Color): uint8 =
+proc find*(s: ColorStack, needle: Color): int8 =
   for i in 0'u8 .. s.high:
     if s[i] == needle:
-      return i
+      return i.int8
+  return -1
 
 
-proc moveSubstack(src, dst: var ColorStack, nToMove: uint8) =
+proc moveSubstack*(src, dst: var ColorStack, startIdx: uint8) =
+  if startIdx >= src.len:
+    raise newException(IndexDefect, "index " & $startIdx & " is out of bounds.")
   # Moves a sub-stack from the top of src to the top of dst
   # shift the dst stack by the length of the substack to make room
+  let nToMove = src.len - startIdx
   let shift = nToMove * 3
   dst.data = dst.data shl shift
   # then we mask the source data to present only the items 
   # being moved, and OR that with the shifted dst data
-  dst.data = dst.data or (src.data and masks[src.len])
+  dst.data = dst.data or (src.data and masks[nToMove])
   dst.len += nToMove
   # then we shift the source to get rid of the moved items
   src.data = src.data shr shift
   src.len -= nToMove
 
 
-proc moveSubstackPre(src, dst: var ColorStack, nToMove: uint8) =
+proc moveSubstackPre*(src, dst: var ColorStack, startIdx: uint8) =
+  if startIdx >= src.len:
+    raise newException(IndexDefect, "index " & $startIdx & " is out of bounds.")
   # Moves a sub-stack from the top of src to the bottom of dst
-  # shift src stack to position substack above its destination,
+  let nToMove = src.len - startIdx
+  # shift src to position the substack above its destination,
   # get rid of everything to the left of the substack,
   # and OR that with the existing dst data
-  dst.data = dst.data or ( (src.data shl (dst.len * 3)) and masks[src.len])
+  let newLen = dst.len + nToMove
-  dst.len += nToMove
+  dst.data = dst.data or ( (src.data shl (dst.len * 3)) and masks[newLen] )
+  dst.len = newLen
   # get rid of the substack we just moved
   src.data = src.data shr (nToMove * 3)
   src.len -= nToMove
 
 
-proc swap(s: var ColorStack, i1, i2: uint8) =
+proc swap*(s: var ColorStack, i1, i2: uint8) =
   # Swap the values at two indices in the stack
   if i1 == i2: return
 
@@ -134,15 +143,15 @@ proc swap(s: var ColorStack, i1, i2: uint8) =
   s.data = (s.data and mask.bitnot) or swapped
 
 
-proc shuffle(r: var Rand, s: var ColorStack) =
+proc shuffle*(r: var Rand, s: var ColorStack) =
   # Fisher-Yates shuffle
   for i in countdown(s.high, 1'u8):
-    let j = cast[uint8](r.rand(i))
+    let j = r.rand(i).uint8
     if j != i:
       s.swap(i, j)
 
 
-proc reverse(s: var ColorStack, first, last: uint8) =
+proc reverse*(s: var ColorStack, first, last: uint8) =
   var x = first
   var y = last
   while x < y:
@@ -151,10 +160,12 @@ proc reverse(s: var ColorStack, first, last: uint8) =
     dec y
 
 
-proc asInt(s: ColorStack): uint16 = s.data
+iterator asInt*(s: ColorStack): int8 =
+  for i in 0'u8 .. s.high:
+    yield int8(s[i]) # now we do have to convert
 
 
-proc `$`(s: ColorStack): string =
+proc `$`*(s: ColorStack): string =
   result = "St@["
   for c in s:
     if result[^1] != '[':
@@ -163,35 +174,31 @@ proc `$`(s: ColorStack): string =
   result.add("]")
 
 
-var one: ColorStack
+proc check(s: ColorStack) =
-one.add(cRed)
+  # ensure length is accurate
-one.add(cGreen)
+  var d = s.data
-one.add(cBlue)
+  for i in 0'u8 .. 4'u8:
-one.add(cYellow)
+    if (d and masks[1]) > 4:
-one.add(cPurple)
+      raise newException(RangeDefect, "Value out of range.")
+    if d > 0 and i >= s.len:
+      raise newException(RangeDefect, "Invalid length.")
+    else:
+      d = d shr 3
 
-var two: ColorStack
-# two.add(cPurple)
-two.add(cRed)
-# two.add(cYellow)
 
-echo "one: ", one
+when isMainModule:
-# echo "two: ", two
+  var one: ColorStack
+  one.add(cRed)
+  one.add(cGreen)
+  one.add(cBlue)
+  one.add(cYellow)
+  one.add(cPurple)
 
-one.reverse(0, 4)
+  var two: ColorStack
-echo "one: ", one
-# one[^2] = cPurple
-# echo "one: ", one
 
-# echo "one 0: ", one[0]
+  one.moveSubstack(two, 2)
-# echo "one 2: ", one[2]
-# echo "one 3: ", one[3]
 
-# echo "one ^1: ", one[^1]
-# echo "one ^2: ", one[^2]
-# echo "one ^4: ", one[^4]
 
-# echo "<move>"
+  echo one, " ", one.len
-# moveSubstack(one, two, 2)
+  echo two, " ", two.len
-# echo "one: ", one
+  echo two.find(cRed)
-# echo "two: ", two

game.nim

@@ -1,25 +1,26 @@
 import hashes, options
-import fixedseq
+import fixedseq, faststack
+
+export faststack.Color, faststack.ColorStack, faststack.allColors
 
 
-type
+# type
-  Color* = enum
+#   Color* = enum
-    cRed, cGreen, cBlue, cYellow, cPurple
+#     cRed, cGreen, cBlue, cYellow, cPurple
 
-  ColorStack* = FixedSeq[5, Color, int8]
+#   ColorStack* = FixedSeq[5, Color, int8]
 
 
-proc initColorStack*: ColorStack =
+# proc initColorStack*: ColorStack =
-  result.initFixedSeq
+#   result.initFixedSeq
 
 
-proc getAllColors: ColorStack = 
+# proc getAllColors: ColorStack = 
-  var i = 0
+#   var i = 0'u8
-  for c in Color.low .. Color.high:
+#   for c in Color.low .. Color.high:
-    result[i] = c
+#     result[i] = c
 
 const
-  allColors* = getAllColors()
   colorNames: array[Color, string] =
     ["Red", "Green", "Blue", "Yellow", "Purple"]
   colorAbbrevs: array[Color, char] = ['R', 'G', 'B', 'Y', 'P']
@@ -82,8 +83,8 @@ proc hash*(b: Board): Hash =
 
 
 proc init*(b: var Board) =
-  for sq in b.squares.mitems:
+  # for sq in b.squares.mitems:
-    sq.camels.initFixedSeq
+  #   sq.camels.initFixedSeq
   b.initialized = true
 
 
@@ -112,7 +113,7 @@ proc setState*(b: var Board;
   b.leader = some(leadCamel)
 
 
-proc diceRemaining*(b: Board): ColorStack =
+proc diceRemaining*(b: Board): FixedSeq[5, Color, int8] =
   result.initFixedSeq
   for color, isRolled in b.diceRolled:
     if not isRolled: result.add(color)
@@ -140,11 +141,11 @@ proc advance*(b: var Board, die: Die) =
     endPos += int(t)
     if t == tBackward: prepend = true
 
-  let stackStart = b[startPos].camels.find(color)
+  let stackStart = b[startPos].camels.find(color).uint8
   if prepend:
     b[startPos].camels.moveSubstackPre(b[endPos].camels, stackStart)
     let stackLen = b[startPos].camels.len - stackStart
-    for i in 0 ..< stackLen:
+    for i in 0'u8 ..< stackLen:
       # we know how many camels we added to the bottom, so set the position for each of those
       b.camels[b[endPos].camels[i]] = endPos
   else:

simulation.nim

@@ -1,5 +1,5 @@
 import cpuinfo, math, options, random, tables
-import combinators, game, fixedseq
+import combinators, game, faststack, fixedseq
 
 
 type
@@ -38,7 +38,7 @@ proc percents*(scores: ScoreSet): WinPercents =
 # ======================
 
 iterator legEndStates(b: Board): Board =
-  var diceRemaining: ColorStack
+  var diceRemaining: FixedSeq[5, Color, int8]
   diceRemaining.initFixedSeq
   for i, c in b.diceRolled:
     if not c: diceRemaining.add(i)
@@ -59,6 +59,39 @@ proc getLegScores*(b: Board): ScoreSet =
 # Full-game simulations
 # =====================
 
+# get rid of this later
+import strutils
+proc showSpaces*(b: Board; start, stop: Natural): string =
+  let numSpaces = stop - start + 1
+  let width = 4 * numSpaces - 1
+  var lines: array[7, string]
+  # start by building up an empty board
+  for i in 0 .. 6: # gotta initialize the strings
+    lines[i] = newString(width)
+    for c in lines[i].mitems:
+      c = ' '
+  # fill in the dividers
+  lines[5] = repeat("=== ", numSpaces - 1)
+  lines[5].add("===")
+
+  # now populate the board
+  for sp in 0 ..< numSpaces:
+    # fill in the square numbers
+    let squareNum = sp + start
+    let cellMid = 4 * sp + 1
+    for i, chr in $squareNum:
+      lines[6][cellMid + i] = chr
+
+    # fill in the camel stacks
+    for i, color in b.squares[squareNum].camels:
+      let lineNum = 4 - i # lines go to 6, but bottom 2 are reserved
+      let repr = '|' & color.abbrev & '|'
+      for j, chr in repr:
+        lines[lineNum][cellMid - 1 + j] = chr
+
+  result = lines.join("\n")
+# get rid of this later
+
 proc randomGame*(b: Board, r: var Rand): Color =
   var projection = b
   while true:

test.nim

@@ -43,13 +43,13 @@ proc newRandomGame(r: var Rand): Board =
   result.setState(dice, [])
 
 
-proc games(nTests, nSamples: SomeInteger): TestResults =
+proc games(nTests, nSamples: SomeInteger, parallel = true): TestResults =
   var r = getRand()
   var scores: ScoreSet
   for i in 1 .. nTests:
     let b = newRandomGame(r)
     let dur = executionTime:
-      let s = b.randomGames(nSamples)
+        let s = b.randomGames(nSamples, parallel = parallel)
     result.ops += s.sum()
     result.time += dur
 
@@ -94,17 +94,4 @@ proc testSpread(nTests, nSamples: Natural) =
 
 
 when isMainModule:
-  games(100, 1_000_000).summarize()
+  games(10, 10_000_000).summarize()
-  # let start_states = 2_000
-  # let executionTime = testLegs(start_states)
-  # echo "Execution time: ", executionTime
-  # echo "Leg simulations per second: ", float(start_states * 29_160) / executionTime
-
-  # for i in 1 .. 1:
-  #   let num_games = 100_000_005
-  #   let executionTime = testGames(num_games)
-  #   echo "Execution time: ", executionTime
-  #   echo "Full-game simulations per second: ", float(num_games) / executionTime
-  #   echo ""
-
-  # testSpread(100, 1_000_000)

ui.nim

@@ -1,5 +1,5 @@
 import os, math, strutils, strformat
-import fixedseq, game, simulation
+import faststack, fixedseq, game, simulation
 
 
 const help =