[notation] Rename countAnimatedMoves to countAnimatedLeaves.

This reflects the (current) inclusion of `Pause`.

src/cubing/notation/CountAnimatedMoves.ts → src/cubing/notation/CountAnimatedLeaves.ts

@@ -11,7 +11,7 @@ import {
 } from "../alg";
 
 // TODO: Include Pause, include amounts
-class CountAnimatedMoves extends TraversalUp<number, number> {
+class CountAnimatedLeaves extends TraversalUp<number, number> {
   public traverseAlg(alg: Alg): number {
     let total = 0;
     for (const part of alg.units()) {
@@ -51,6 +51,6 @@ class CountAnimatedMoves extends TraversalUp<number, number> {
   }
 }
 
-const countAnimatedMovesInstance = new CountAnimatedMoves();
-export const countAnimatedMoves: (alg: Alg) => number =
-  countAnimatedMovesInstance.traverseAlg.bind(countAnimatedMovesInstance);
+const countAnimatedLeavesInstance = new CountAnimatedLeaves();
+export const countAnimatedLeaves: (alg: Alg) => number =
+  countAnimatedLeavesInstance.traverseAlg.bind(countAnimatedLeavesInstance);

src/cubing/notation/index.ts

@@ -1,4 +1,4 @@
 // Note: this folder is purposely not built as a package entry point (yet).
 
 export { countMoves } from "./CountMoves";
-export { countAnimatedMoves } from "./CountAnimatedMoves";
+export { countAnimatedLeaves } from "./CountAnimatedLeaves";

src/cubing/puzzle-geometry/PGPuzzles.spec.ts

@@ -101,7 +101,7 @@ describe("PuzzleGeometry-Puzzles", () => {
       algo = new Alg(bms);
       const ksp = new KSolvePuzzle(kpuzzledef);
       const tai = new TreeAlgIndexer(ksp, algo);
-      const tr = tai.transformAtIndex(tai.numMoves());
+      const tr = tai.transformAtIndex(tai.numAnimatedLeaves());
       const o = transformationOrder(kpuzzledef, tr as Transformation);
       let dat =
         name +

src/cubing/twisty/animation/cursor/AlgCursor.ts

@@ -99,7 +99,7 @@ export class AlgCursor
 
   /** @deprecated */
   experimentalTimestampForStartOfLastMove(): MillisecondTimestamp {
-    const numMoves = this.indexer.numMoves();
+    const numMoves = this.indexer.numAnimatedLeaves();
     if (numMoves > 0) {
       return this.indexer.indexToMoveStartTimestamp(numMoves - 1);
     }
@@ -137,7 +137,7 @@ export class AlgCursor
         movesInProgress: [],
       };
 
-      if (this.indexer.numMoves() > 0) {
+      if (this.indexer.numAnimatedLeaves() > 0) {
         const move = this.indexer.getMove(idx)?.as(Move);
         if (!move) {
           return; // TODO
@@ -193,7 +193,7 @@ export class AlgCursor
     timestamp: MillisecondTimestamp,
     direction: Direction.Backwards | Direction.Forwards,
   ): MillisecondTimestamp | null {
-    if (this.indexer.numMoves() === 0) {
+    if (this.indexer.numAnimatedLeaves() === 0) {
       return null;
     }
     // TODO: define semantics of indexing edge cases and remove this hack.

src/cubing/twisty/animation/indexer/AlgIndexer.ts

@@ -11,7 +11,7 @@ export interface AlgIndexer<P extends PuzzleWrapper> {
   indexToMoveStartTimestamp(index: number): Timestamp;
   stateAtIndex(index: number, startTransformation?: State<P>): State<P>;
   transformAtIndex(index: number): State<P>;
-  numMoves(): number;
+  numAnimatedLeaves(): number;
   timestampToIndex(timestamp: Timestamp): number;
   algDuration(): Duration;
   moveDuration(index: number): number;

src/cubing/twisty/animation/indexer/SimpleAlgIndexer.ts

@@ -1,5 +1,5 @@
 import { Alg, Move, TraversalUp } from "../../../alg";
-import { countAnimatedMoves } from "../../../notation";
+import { countAnimatedLeaves } from "../../../notation";
 import type { PuzzleWrapper, State } from "../../3D/puzzles/KPuzzleWrapper";
 import type { Duration, Timestamp } from "../cursor/CursorTypes";
 import { AlgDuration, defaultDurationForAmount } from "./AlgDuration";
@@ -31,7 +31,7 @@ export class SimpleAlgIndexer<P extends PuzzleWrapper>
   public timestampToIndex(timestamp: Timestamp): number {
     let cumulativeTime = 0;
     let i;
-    for (i = 0; i < this.numMoves(); i++) {
+    for (i = 0; i < this.numAnimatedLeaves(); i++) {
       cumulativeTime += this.durationFn.traverseMove(this.getMove(i));
       if (cumulativeTime >= timestamp) {
         return i;
@@ -62,9 +62,9 @@ export class SimpleAlgIndexer<P extends PuzzleWrapper>
     return this.durationFn.traverseAlg(this.moves);
   }
 
-  public numMoves(): number {
+  public numAnimatedLeaves(): number {
     // TODO: Cache internally once performance matters.
-    return countAnimatedMoves(this.moves);
+    return countAnimatedLeaves(this.moves);
   }
 
   public moveDuration(index: number): number {

src/cubing/twisty/animation/indexer/simultaneous-moves/SimultaneousMoveIndexer.ts

@@ -156,7 +156,7 @@ export class SimultaneousMoveIndexer<P extends PuzzleWrapper>
     return max;
   }
 
-  public numMoves(): number {
+  public numAnimatedLeaves(): number {
     // TODO: Cache internally once performance matters.
     return this.moves.length;
   }

src/cubing/twisty/animation/indexer/tree/TreeAlgIndexer.ts

@@ -74,7 +74,7 @@ export class TreeAlgIndexer implements AlgIndexer<PuzzleWrapper> {
     return this.walker.st;
   }
 
-  public numMoves(): number {
+  public numAnimatedLeaves(): number {
     return this.decoration.moveCount;
   }