Tests Passing: New Stage Options Tests(3/3)

Phuire-Research · Mar 28, 2024 · c2239c0 · c2239c0
1 parent c20351d
commit c2239c0
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 31 deletions.
diff --git a/src/concepts/axium/axium.close.principle.ts b/src/concepts/axium/axium.close.principle.ts
@@ -29,7 +29,7 @@ export const axiumClosePrinciple: PrincipleFunction = (
         });
         plan.conclude();
       }
-    }, [axiumSelectPrepareClose], Infinity),
+    }, { selectors: [axiumSelectPrepareClose], priority: Infinity}),
     createStage(() => {
       //
     })

diff --git a/src/concepts/axium/axium.principle.ts b/src/concepts/axium/axium.principle.ts
@@ -90,7 +90,7 @@ export const axiumPrinciple: PrincipleFunction = (
           throttle: 50
         });
       }
-    }, [axiumSelectAddConceptQue], Infinity - 1),
+    }, { selectors: [axiumSelectAddConceptQue], priority: Infinity - 1}),
   ]);
 
   const removeConceptsPlan = concepts$.plan('Remove Concepts Plan', [
@@ -171,7 +171,7 @@ export const axiumPrinciple: PrincipleFunction = (
           throttle: 50
         });
       }
-    }, [axiumSelectRemoveConceptQue], Infinity - 2)
+    }, { selectors: [axiumSelectRemoveConceptQue], priority: Infinity - 2})
   ]);
   observer.next(strategy.begin(strategy.create({
     topic: 'Register Axium Add/Remove Plans',

diff --git a/src/model/stagePlanner.ts b/src/model/stagePlanner.ts
@@ -87,7 +87,7 @@ export const stageWaitForOpenThenIterate = (func: () => Action): Staging => (cre
       iterateStage: true
     });
   }
-}, [axiumSelectOpen]));
+}, { selectors: [axiumSelectOpen] }));
 
 export const stageWaitForOwnershipThenIterate =
   (func: () => Action): Staging => (createStage((concepts: Concepts, dispatch: Dispatcher) => {
@@ -96,7 +96,7 @@ export const stageWaitForOwnershipThenIterate =
         iterateStage: true
       });
     }
-  }, [ownershipSelectInitialized]));
+  }, { selectors: [ownershipSelectInitialized] }));
 
 /**
  * Helper function to aid readability of composing plans, otherwise you may directly create a Staging Entity, selectors non optional
@@ -106,13 +106,20 @@ export const stageWaitForOwnershipThenIterate =
  * @param beat - Will fire once, then if informed again within your supplied beat, will fire after such time
  * @returns stage: Stage, selectors: KeyedSelector[], priority?: number, beat?: number
  */
-export const createStage = (stage: Stage, selectors?: KeyedSelector[], priority?: number, beat?: number): Staging => {
-  return {
-    stage,
-    selectors: selectors ? selectors : [],
-    priority,
-    beat
-  };
+export const createStage = (stage: Stage, options?: { selectors?: KeyedSelector[], priority?: number, beat?: number}): Staging => {
+  if (options) {
+    return {
+      stage,
+      selectors: options.selectors ? options.selectors : [],
+      priority: options.priority,
+      beat: options.beat
+    };
+  } else {
+    return {
+      stage,
+      selectors: []
+    };
+  }
 };
 
 // Token to denote ALL, using a selector that utilizes this token should return undefined
@@ -200,7 +207,7 @@ const handleStageDelimiter =
     ];
   };
 
-const handleNewStageOptions = (plan: Plan, options: dispatchOptions): boolean => {
+const handleNewStageOptions = (plan: Plan, options: dispatchOptions, next: number): boolean => {
   let evaluate = false;
   if (options.newPriority) {
     plan.stages[plan.stage].priority = options.newPriority;
@@ -212,6 +219,9 @@ const handleNewStageOptions = (plan: Plan, options: dispatchOptions): boolean =>
   }
   if (options.newBeat) {
     plan.stages[plan.stage].beat = options.newBeat;
+    if (next === -1) {
+      plan.beat = options.newBeat;
+    }
     evaluate = true;
   }
   return evaluate;
@@ -280,7 +290,7 @@ export class UnifiedSubject extends Subject<Concepts> {
     }
   }
 
-  protected createPlan(title: string, stages: PartialStaging[], beat?: number): Plan {
+  protected createPlan(title: string, stages: PartialStaging[]): Plan {
   // [TODO Unify Streams]
   // protected createPlan(title: string, stages: PartialStaging[], outer: boolean, beat?: number): Plan {
     const planId = this.planId;
@@ -293,7 +303,8 @@ export class UnifiedSubject extends Subject<Concepts> {
         beat: s.beat
       };
     });
-    return {id: planId, title, stages: staged, stage: 0, stageFailed: -1, beat: beat ? beat : -1, offBeat: -1, timer: []};
+    const beat = staged[0].beat;
+    return {id: planId, title, stages: staged, stage: 0, stageFailed: -1, beat: beat !== undefined ? beat : -1, offBeat: -1, timer: []};
     // [TODO Unify Streams]
     // return {id: planId, outer, title, stages: staged, stage: 0, stageFailed: -1, beat: beat ? beat : -1, offBeat: -1, timer: []};
   }
@@ -317,10 +328,10 @@ export class UnifiedSubject extends Subject<Concepts> {
   //   return this.initPlan(this.createPlan(title, stages, true, beat));
   // }
 
-  plan(title: string, stages: Staging[], beat?: number): StagePlanner {
+  plan(title: string, stages: Staging[]): StagePlanner {
     // [TODO Unify Streams]
     // return this.initPlan(this.createPlan(title, stages, false, beat));
-    return this.initPlan(this.createPlan(title, stages, beat));
+    return this.initPlan(this.createPlan(title, stages));
   }
 
   protected deletePlan(planId: number) {
@@ -513,19 +524,20 @@ export class UnifiedSubject extends Subject<Concepts> {
           // Double check this logic while writing the unit test.
           if (plan.stages[plan.stage]) {
             this.handleRemoveSelector(plan.stages[plan.stage].selectors, plan.id);
-            handleNewStageOptions(plan, options);
           }
           plan.stage = next;
           this.manageQues();
           if (plan.stages[plan.stage]) {
             this.handleAddSelector(plan.stages[plan.stage].selectors, plan.id);
           }
+          const beat = plan.stages[plan.stage].beat;
+          plan.beat = beat !== undefined ? beat : -1;
           stageDelimiter.prevActions = [];
           stageDelimiter.unionExpiration = [];
           stageDelimiter.runOnceMap = new Map();
           this.stageDelimiters.set(plan.id, stageDelimiter);
         }
-        const evaluate = handleNewStageOptions(plan, options);
+        const evaluate = handleNewStageOptions(plan, options, next);
         if (evaluate && next === -1) {
           this.handleRemoveSelector(plan.stages[plan.stage].selectors, plan.id);
           this.handleAddSelector(plan.stages[plan.stage].selectors, plan.id);
@@ -571,6 +583,7 @@ export class UnifiedSubject extends Subject<Concepts> {
     if (index < plan.stages.length) {
       const timer = plan.timer;
       const now = Date.now();
+      // console.log('CHECK', plan.title, plan.beat);
       if (plan.beat > -1) {
         if (plan.offBeat < now) {
           plan.offBeat = Date.now() + plan.beat;

diff --git a/src/test/addConcepts.test.ts b/src/test/addConcepts.test.ts
@@ -43,7 +43,7 @@ test('Axium add Concepts Strategy Test', (done) => {
           }
         });
       }
-    }, [axiumSelectOpen]),
+    }, { selectors: [axiumSelectOpen] }),
     createStage((concepts) => {
       const axiumState = concepts[0].state as AxiumState;
       console.log('Check for final counting topic', axiumState.lastStrategy, concepts[1]?.state);

diff --git a/src/test/newPlanOptions/newPlanOptions.test.ts b/src/test/newPlanOptions/newPlanOptions.test.ts
@@ -132,7 +132,7 @@ test('New Plan Options Priority Test', (done) => {
           });
         }
       }
-    }, undefined, 100),
+    }, { priority: 100 }),
     createStage(() => {
       planOne.conclude();
       setTimeout(() => {
@@ -170,7 +170,7 @@ test('New Plan Options Priority Test', (done) => {
           });
         }
       }
-    }, undefined, 50),
+    }, { priority: 50 }),
     createStage(() => {
       planTwo.conclude();
     })
@@ -203,7 +203,7 @@ test('New Plan Options Priority Test', (done) => {
           });
         }
       }
-    }, undefined, 5),
+    }, { priority: 5 }),
     createStage(() => {
       planThree.conclude();
     })

diff --git a/src/test/priority/priority.test.ts b/src/test/priority/priority.test.ts
@@ -37,7 +37,7 @@ test('Priority Test', (done) => {
         iterateStage: true
       });
     }
-  }, [experimentPriorityReadySelector], priority);
+  }, {selectors: [experimentPriorityReadySelector], priority});
   const secondStage = (name: string, newValue: number, priority: number) => createStage((concepts, dispatch) => {
     const priorityState = select.state<ExperimentPriorityState>(concepts, experimentName);
     if (priorityState) {
@@ -46,7 +46,7 @@ test('Priority Test', (done) => {
         iterateStage: true
       });
     }
-  }, undefined, priority);
+  }, {priority});
   const thirdStage = (name: string, expected: number, priority: number) => createStage((concepts, dispatch) => {
     const priorityState = select.state<ExperimentPriorityState>(concepts, experimentName);
     if (priorityState) {
@@ -56,7 +56,7 @@ test('Priority Test', (done) => {
         iterateStage: true
       });
     }
-  }, [experimentPriorityValueSelector], priority);
+  }, {selectors: [experimentPriorityValueSelector], priority});
   const concludePlan = (name: string, func: () => StagePlanner) => createStage(() => {
     console.log(`${name} Priority END`);
     func().conclude();

diff --git a/src/test/stagePlannerBeat.test.ts b/src/test/stagePlannerBeat.test.ts
@@ -22,24 +22,29 @@ test('Stage Planner Beat Test', (done) => {
   const axium = createAxium('axium test stage planner beat', [
     createCounterConcept()
   ], true, true);
+  const beat = 105;
   const plan = axium.plan('Stage Planner Beat Test', [
     createStage((concepts, dispatch) => {
+      console.log('HIT 1');
       timerActive = true;
       setTimeout(() => {
+        console.log('FIRE');
         timerActive = false;
       }, 1000);
       if (selectSlice(concepts, axiumSelectOpen)) {
         dispatch(axiumKick(), {
           iterateStage: true,
         });
       }
-    }),
+    }, {beat}),
     createStage((___, dispatch) => {
+      console.log('HIT 2');
       dispatch(counterAdd(), {
         iterateStage: true
       });
-    }),
+    }, {beat}),
     createStage((concepts, dispatch) => {
+      // console.log('HIT 3', timerActive, selectState<CounterState>(concepts, counterName));
       if (!timerActive) {
         const state = selectState<CounterState>(concepts, counterName);
         if (state) {
@@ -55,10 +60,11 @@ test('Stage Planner Beat Test', (done) => {
           throttle: 1
         });
       }
-    }),
+    }, {beat}),
     createStage(() => {
+      console.log('HIT 4');
       //
-    })
-  ], 105);
+    }, {beat})
+  ]);
 });
 /*#>*/