fix bug in bin-vec.sml 'deleteMin' function: we previously deleted two elements, but we are supposed to delete one, and now this is fixed

fcore/bin-vec.sml

@@ -40,7 +40,7 @@ struct
       Vector.fromList []
     else
       let
-        val len = Vector.length vec - 2
+        val len = Vector.length vec - 1
         val slice = VectorSlice.slice (vec, 1, SOME len)
       in
         VectorSlice.vector slice

fcore/build-graph.sml

@@ -0,0 +1,121 @@
+structure BuildGraph =
+struct
+    fun insertIfNotExistsOrShorter
+      (dist, eKeys, eVals, foldPlatID, q, fromPlatID) =
+      let
+        val pos = IntSet.findInsPos (foldPlatID, eKeys)
+      in
+        if pos <> ~1 andalso pos <> Vector.length eKeys then
+          let
+            val key = IntSet.sub (eKeys, pos)
+          in
+            if pos = key then
+              (* may need to update record in eVals if it is shorter *)
+              let
+                val {distance = oldDist, ...} = ValSet.sub (eVals, pos)
+              in
+                if dist < oldDist then
+                  (* update values as we found a shorter path *)
+                  let
+                    val eVals =
+                      ValSet.updateAtIdx
+                        (eVals, {distance = dist, from = fromPlatID}, pos)
+                    val _ = print "UPDATE foldPlatID\n"
+                  in
+                    (eVals, q)
+                  end
+                else
+                  (* return existing *)
+                  (eVals, q)
+              end
+            else
+              (* key not explored, so add to queue *)
+              let
+                val insRecord =
+                  {distance = dist, id = foldPlatID, comesFrom = fromPlatID}
+                val insPos = DistVec.findInsPos (insRecord, q)
+                val q = DistVec.insert (q, insRecord, insPos)
+                    val _ = print "INSERT NEW PLAT\n"
+              in
+                (eVals, q)
+              end
+          end
+        else
+          (* key not explored, so add to queue *)
+          let
+            val insRecord =
+              {distance = dist, id = foldPlatID, comesFrom = fromPlatID}
+            val insPos = DistVec.findInsPos (insRecord, q)
+            val q = DistVec.insert (q, insRecord, insPos)
+                    val _ = print "UPDATE foldPlatID\n"
+          in
+            (eVals, q)
+          end
+      end
+
+         type env =
+           { platforms: GameType.platform vector
+           , currentPlat: GameType.platform
+           , eKeys: IntSet.elem vector
+           , distSoFar: int
+           }
+
+  (* adds platforms to queue if they have not been explored
+   * or, if they have been explored and distance is smaller than previous, 
+   * updates their distance.
+   * Only intended for platforms which can be reached vertically 
+   * (jumped to or dropped to without moving left or right at the same time). 
+   * *)
+  structure Vertical =
+    MakeQuadTreeFold
+      (struct
+        type env = env
+
+         type state = ValSet.elem vector * DistVec.elem vector
+
+         fun fold (foldPlatID, env: env, (eVals, q)) =
+           let
+             val {platforms, currentPlat, eKeys, distSoFar} = env
+
+             val _ = print ("foldPlatID = " ^ Int.toString foldPlatID ^ "\n")
+
+             val {y = foldPlatY, ...} = Platform.find (foldPlatID, platforms)
+             val {y = currentPlatY, id = fromPlatID, ...} = currentPlat
+             val newDist = abs (foldPlatY - currentPlatY) + distSoFar
+           in
+             insertIfNotExistsOrShorter
+              (newDist, eKeys, eVals, foldPlatID, q, fromPlatID)
+           end
+       end)
+
+  fun helpPrint (pos, vec) =
+    if pos = Vector.length vec then
+      ()
+    else
+      let
+        val {id, distance, comesFrom} = DistVec.sub (vec, pos)
+        val _ = print ("contains (id = " ^ Int.toString id ^")\n")
+      in
+        helpPrint (pos + 1, vec)
+      end
+
+  fun start (currentPlat: GameType.platform, env: env, state, platformTree) =
+    let
+      val {x, y, width, ...} = currentPlat
+
+      (* calculate area to search in y axis *)
+      val searchY = y - Constants.jumpLimit
+      val height = Constants.worldHeight - searchY
+
+      val _ = print "start fold\n"
+      val (eVals, q) =
+        Vertical.foldRegion (x, searchY, width, height, env, state, platformTree)
+      val _ = print "finish fold\n"
+
+      val _ = print "BuildGraph q contains IDs:\n"
+      val _ = helpPrint (0, q)
+      val _ = print "\n"
+    in
+      (eVals, q)
+    end
+end