fixes #78

Author: GrosSacASac

js/ai/qlearn/examples/eatFoodAvoidDanger/eatFoodAvoidDanger.js

@@ -1,14 +1,9 @@
+export { start };
 import { createIntelligence, learn, decide } from "../../source/qlearn.js";
 import { draw, report } from "./draw.js";
 import { initialState } from "./initialState.js";
 import { scheduleNext } from "../scheduleNext.js";
 
-const MAX_FRAMES = 2000;
-const display = false;
-
-let frame = 0;
-
-const intelligence = createIntelligence();
 
 const reduceStateAndAction = (state) => {
     // we omit actions because they are always the same 
@@ -53,8 +48,9 @@ const actions = {
         state.position[1] = futureY;
     },
 };
+const actionNames = Object.keys(actions);
 
-const updateGame = (action, state) => {
+const updateGame = (action, state, frame) => {
     action(state);
     const [x, y] = state.position;
     state.dangers.forEach(([dangerX, dangerY]) => {
@@ -74,35 +70,39 @@ const updateGame = (action, state) => {
 };
 
 
-const actionNames = Object.keys(actions);
-const step = () => {
-    const state = initialState;
-    const stateActions = reduceStateAndAction(state);
-    const scoreBefore = state.score;
-    const actionName = decide({ intelligence, stateActions, actionNames });
-    const action = actions[actionName];
-    updateGame(action, state); // reward and changes state
-    if (display) {
-        draw(state, frame);
-    }
-    const stateActionsAfter = reduceStateAndAction(state);
-    const scoreAfter = state.score;
-    const reward = scoreAfter - scoreBefore;
-    learn({
-        intelligence,
-        previousStateActions: stateActions,
-        stateActions: stateActionsAfter,
-        previousAction: actionName,
-        actionNames,
-        reward,
-    });
-    frame += 1;
-    if (frame < MAX_FRAMES) {
-        scheduleNext(step);
-    } else {
-        report(intelligence.qualityMap, state, frame);
-    }
-};
+const start = ({ display, MAX_FRAMES }) => {
+
+    let frame = 0;
 
+    const intelligence = createIntelligence();
+    const step = () => {
+        const state = initialState;
+        const stateActions = reduceStateAndAction(state);
+        const scoreBefore = state.score;
+        const actionName = decide({ intelligence, stateActions, actionNames });
+        const action = actions[actionName];
+        updateGame(action, state, frame); // reward and changes state
+        if (display) {
+            draw(state, frame);
+        }
+        const stateActionsAfter = reduceStateAndAction(state);
+        const scoreAfter = state.score;
+        const reward = scoreAfter - scoreBefore;
+        learn({
+            intelligence,
+            previousStateActions: stateActions,
+            stateActions: stateActionsAfter,
+            previousAction: actionName,
+            actionNames,
+            reward,
+        });
+        frame += 1;
+        if (frame < MAX_FRAMES) {
+            scheduleNext(step);
+        } else {
+            report(intelligence.qualityMap, state, frame);
+        }
+    };
 
-step();
+    step();
+};

js/ai/qlearn/examples/eatFoodAvoidDanger/index.html

@@ -9,6 +9,6 @@
     <p>Open console</p>
 
 
-    <script src="./eatFoodAvoidDanger.js" type="module"></script>
+    <script src="./visualDemo.js" type="module"></script>
 </body>
 </html>

js/ai/qlearn/examples/eatFoodAvoidDanger/start.js

@@ -0,0 +1,6 @@
+import { start } from "./eatFoodAvoidDanger.js";
+
+const MAX_FRAMES = 2000;
+const display = false;
+
+start({ MAX_FRAMES, display });

js/ai/qlearn/examples/eatFoodAvoidDanger/visualDemo.js

@@ -0,0 +1,6 @@
+import { start } from "./eatFoodAvoidDanger.js";
+
+const MAX_FRAMES = 4000;
+const display = true;
+
+start({ MAX_FRAMES, display });

js/ai/qlearn/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qlearn",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "type": "module",
   "module": "./source/qlearn.js",
   "license": "CC0-1.0",
@@ -18,11 +18,16 @@
   "scripts": {
     "lint-fix": "eslint --fix source examples",
     "lint": "eslint source examples",
-    "node-1": "node --experimental-modules examples/eatFoodAvoidDanger/eatFoodAvoidDanger.js",
-    "deno-1": "deno examples/eatFoodAvoidDanger/eatFoodAvoidDanger.js",
+
+    "node-1": "node --experimental-modules examples/eatFoodAvoidDanger/start.js",
+    "node-1-visual": "node --experimental-modules examples/eatFoodAvoidDanger/visualDemo.js",
+    "deno-1": "deno examples/eatFoodAvoidDanger/start.js",
+    "deno-1-visual": "deno examples/eatFoodAvoidDanger/visualDemo.js",
+    
     "node-2": "node --experimental-modules examples/dodgeShoot/start.js",
+    "node-2-visual": "node --experimental-modules examples/dodgeShoot/visualDemo.js",
     "deno-2": "deno examples/dodgeShoot/start.js",
-    "visual": "deno examples/dodgeShoot/visualDemo.js",
+    "deno-2-visual": "deno examples/dodgeShoot/visualDemo.js",
     "serve": "serve ."
   },
   "dependencies": {},