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 =

config.nims

@@ -1,5 +1,5 @@
---threads: on
+# --threads: on
---d: release
+# --d: release
---opt: speed
+# --opt: speed
---passC: -flto
+# --passC: -flto
---passL: -flto
+# --passL: -flto

faststack.nim

@@ -0,0 +1,204 @@
+import bitops, strutils, random
+
+
+proc show(i: SomeInteger, bitlength = 16) =
+  echo BiggestInt(i).toBin(bitlength)
+
+
+type
+  Color* = enum
+    cRed, cGreen, cBlue, cYellow, cPurple
+
+  ColorStack* = object
+    data: uint16
+    len*: uint8
+
+
+const
+  masks = [
+    0'u16, # dummy value just to get the indices right
+    0b0_000_000_000_000_111,
+    0b0_000_000_000_111_111,
+    0b0_000_000_111_111_111,
+    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 - 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
+
+
+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
+  (idx.uint8 - 1) * 3
+
+
+proc add*(s: var ColorStack, c: Color) =
+  # e.g. if stack is 0b0000000000000100:
+  # and color is 0b00000011
+  # shift: 0b0000000000100000
+  # bitor: 0b0000000000100000 and 0b00000011
+  # results in 0b0000000000100011
+  s.data = (s.data shl 3).bitor(cast[uint8](c))
+  inc s.len
+
+
+proc high*(s: ColorStack): uint8 = s.len - 1
+
+proc low*(s: ColorStack): uint8 = 0 # just... always 0, I guess
+
+
+proc `[]`*(s: ColorStack, i: uint8 | BackwardsIndex): Color =
+  # shift, then mask everything but the three rightmost bits
+  result = Color(
+    (s.data shr s.offset(i)) and masks[1]
+  )
+
+
+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 (c.uint16 shl offset)
+
+
+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 Color((s.data shr (i * 3)) and masks[1])
+
+
+iterator pairs*(s: ColorStack): (uint8, Color) =
+  var count = 0'u8
+  for color in s:
+    yield (count, color)
+    inc count
+
+
+proc find*(s: ColorStack, needle: Color): int8 =
+  for i in 0'u8 .. s.high:
+    if s[i] == needle:
+      return i.int8
+  return -1
+
+
+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[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, 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
+  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
+  let newLen = 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) =
+  # Swap the values at two indices in the stack
+  if i1 == i2: return
+
+  # i1 and i2 are unsigned, so we have to watch out for underflows
+  let diff = if i1 > i2:
+    (i1 - i2) * 3
+  else:
+    (i2 - i1) * 3
+
+  # take masks[1] from above (rightmost position) and shift to position of i1.
+  # then do the same for i2, and OR them together.
+  let mask = (masks[1] shl s.offset(i1)) or (masks[1] shl s.offset(i2))
+  # get rid of everything but the two values we're swapping
+  let masked = s.data and mask
+  # shift by the distance between values in both directions, combine, then mask
+  let swapped = ((masked shl diff) or (masked shr diff)) and mask
+  # finally, AND with the inverse of mask so that only the values being 
+  # swapped are erased, and combine that with the swapped values
+  s.data = (s.data and mask.bitnot) or swapped
+
+
+proc shuffle*(r: var Rand, s: var ColorStack) =
+  # Fisher-Yates shuffle
+  for i in countdown(s.high, 1'u8):
+    let j = r.rand(i).uint8
+    if j != i:
+      s.swap(i, j)
+
+
+proc reverse*(s: var ColorStack, first, last: uint8) =
+  var x = first
+  var y = last
+  while x < y:
+    s.swap(x, y)
+    inc x
+    dec y
+
+
+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 =
+  result = "St@["
+  for c in s:
+    if result[^1] != '[':
+      result.add(", ")
+    result.add($c)
+  result.add("]")
+
+
+proc check(s: ColorStack) =
+  # ensure length is accurate
+  var d = s.data
+  for i in 0'u8 .. 4'u8:
+    if (d and masks[1]) > 4:
+      raise newException(RangeDefect, "Value out of range.")
+    if d > 0 and i >= s.len:
+      raise newException(RangeDefect, "Invalid length.")
+    else:
+      d = d shr 3
+
+
+when isMainModule:
+  var one: ColorStack
+  one.add(cRed)
+  one.add(cGreen)
+  one.add(cBlue)
+  one.add(cYellow)
+  one.add(cPurple)
+
+  var two: ColorStack
+
+  one.moveSubstack(two, 2)
+
+
+  echo one, " ", one.len
+  echo two, " ", two.len
+  echo two.find(cRed)

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']
@@ -57,7 +58,7 @@ type
     squares*: array[1..16, Square]
     camels*: array[Color, range[1..16]]
     diceRolled*: array[Color, bool]
-    winner*: Option[Color]
+    leader*: Option[Color]
     gameOver*: bool
     initialized: bool
 
@@ -66,10 +67,6 @@ type
 template `[]`*[T](b: var Board, idx: T): var Square =
   b.squares[idx]
 
-# apparently we need separate ones for mutable and non-mutable
-template `[]`*[T](b: Board, idx: T): Square =
-  b.squares[idx]
-
 
 proc hash*(b: Board): Hash =
   var h: Hash = 0
@@ -86,16 +83,11 @@ 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
 
 
-proc leader*(b: Board): Color =
-  let leadSquare = max(b.camels)
-  result = b[leadSquare].camels[^1]
-
-
 proc display*(b: Board, start, stop: int) =
   for i in start..stop:
     let sq = b.squares[i]
@@ -117,15 +109,18 @@ proc setState*(b: var Board;
   for (tile, dest) in tiles:
     b[dest].tile = some(tile)
 
+  let leadCamel = b[max(b.camels)].camels[^1] # top camel in the last currently-occupied space
+  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)
 
 
 proc resetDice*(b: var Board) =
-  for c in Color:
+  for c, rolled in b.diceRolled:
     b.diceRolled[c] = false
 
 
@@ -136,7 +131,7 @@ proc advance*(b: var Board, die: Die) =
   var endPos = startPos + roll
   
   if endPos > 16: # camel has passed the finish line
-    b.winner = some(b[startPos].camels[^1])
+    b.leader = some(b[startPos].camels[^1])
     b.gameOver = true
     return
 
@@ -146,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:
@@ -160,4 +155,8 @@ proc advance*(b: var Board, die: Die) =
     for i in (dstPrevHigh + 1) .. b[endPos].camels.high:
       b.camels[b[endPos].camels[i]] = endPos
   
+  # if we are stacking on or moving past the previous leader
+  if endPos >= b.camels[b.leader.get]:
+    b.leader = some(b[endPos].camels[^1])
+  
   b.diceRolled[color] = true

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)
@@ -52,20 +52,53 @@ iterator legEndStates(b: Board): Board =
 
 proc getLegScores*(b: Board): ScoreSet =
   for prediction in b.legEndStates:
-    inc result[prediction.winner.get]
+    inc result[prediction.leader.get]
 
 
 # =====================
 # 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:
     for roll in randomFuture(projection.diceRemaining, r):
       projection.advance(roll)
       if projection.gameOver:
-        return projection.winner.get
+        return projection.leader.get
     projection.resetDice()
 
 

ui.nim

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