patches.oneOf

- patches.oneOf:
    const patch = this.patches.oneOf()
    t.setxy(patch.x, patch.y)
    =>
    t.moveTo(this.patches.oneOf())
  - Hello3ZModel HelloModel HelloPlusModel KelpForestModel
    LinkTravelModel PheromoneModel

Author: backspaces

models/CountiesModel.js

@@ -1,5 +1,5 @@
 import * as util from 'https://code.agentscript.org/src/utils.js'
-import HelloModel from './HelloModel.js'
+import HelloModel from 'https://code.agentscript.org/models/HelloModel.js'
 import { booleanPointInPolygon } from '../vendor/turfImports.js'
 
 const url = import.meta.resolve('./data/nmcounties.json')

models/Hello3ZModel.js

@@ -20,8 +20,7 @@ export default class HelloModel extends Model {
         this.turtles.setDefault('atEdge', 'bounce')
 
         this.turtles.create(this.population, t => {
-            const patch = this.patches.oneOf()
-            t.setxy(patch.x, patch.y)
+            t.moveTo(this.patches.oneOf())
             this.moveToSphere(t)
         })
 

models/HelloModel.js

@@ -19,10 +19,9 @@ class HelloModel extends Model {
         this.turtles.setDefault('atEdge', 'bounce')
 
         // create "population" turtles placed on random patches
-        this.turtles.create(this.population, t => {
-            const patch = this.patches.oneOf()
-            t.setxy(patch.x, patch.y)
-        })
+        this.turtles.create(this.population, t =>
+            t.moveTo(this.patches.oneOf())
+        )
 
         // If links.too is true, create a link from every turtle to another turtle
         if (this.linksToo) {

models/HelloPlusModel.js

@@ -38,10 +38,7 @@ export default class HelloPlusModel extends HelloModel {
         if (delta < 0) {
             util.repeat(-delta, () => this.turtles.oneOf().die())
         } else {
-            this.turtles.create(delta, t => {
-                const patch = this.patches.oneOf()
-                t.setxy(patch.x, patch.y)
-            })
+            this.turtles.create(delta, t => t.moveTo(this.patches.oneOf()))
         }
         // make sure all turtles have at least one link
         this.turtles.ask(t => {

models/KelpForestModel.js

@@ -21,19 +21,16 @@ class KelpForestModel extends Model {
         this.turtleBreeds('kelp urchin seaStar')
 
         this.kelp.create(this.numKelp, t => {
-            const patch = this.patches.oneOf()
-            t.setxy(patch.x, patch.y)
+            t.moveTo(this.patches.oneOf())
         })
 
         this.seaStar.create(this.numSeastar, t => {
-            const patch = this.patches.oneOf()
-            t.setxy(patch.x, patch.y)
+            t.moveTo(this.patches.oneOf())
         })
         this.seaStar.setDefault('atEdge', 'bounce')
 
         this.urchin.create(this.numUrchin, t => {
-            const patch = this.patches.oneOf()
-            t.setxy(patch.x, patch.y)
+            t.moveTo(this.patches.oneOf())
         })
     }
 
@@ -52,17 +49,15 @@ class KelpForestModel extends Model {
     spawnUrchin() {
         if (this.day() === 0 && this.year() > 1) {
             this.urchin.create(this.urchin.length * 2, t => {
-                const patch = this.patches.oneOf()
-                t.setxy(patch.x, patch.y)
+                t.moveTo(this.patches.oneOf())
             })
         }
     }
 
     reseedKelp() {
         if (this.day() === 0 && this.year() > 1) {
             this.kelp.create(this.kelp.length * 3, t => {
-                const patch = this.patches.oneOf()
-                t.setxy(patch.x, patch.y)
+                t.moveTo(this.patches.oneOf())
             })
         }
     }
@@ -71,8 +66,7 @@ class KelpForestModel extends Model {
         if (this.day() === 0 && this.year() > 1) {
             if (this.seaStar.length > 0) {
                 this.seaStar.create(2, t => {
-                    const patch = this.patches.oneOf()
-                    t.setxy(patch.x, patch.y)
+                    t.moveTo(this.patches.oneOf())
                 })
             }
         }

models/LinkTravelModel.js

@@ -19,17 +19,16 @@ export default class LinkTravelModel extends Model {
     setup() {
         this.turtleBreeds('nodes drivers')
 
-        // Create the graph node turtles
-        this.patches.nOf(this.numNodes).ask(p => {
-            p.sprout(1, this.nodes, t => {
-                if (this.nodes.length > 2) {
-                    this.links.create(t, this.turtles.otherNOf(2, t))
-                }
-            })
-        })
+        this.nodes.create(this.numNodes)
+
+        // create two links per node to random other nodes.
+        // two so that there is always an outgoing link other than the incomming one.
+        this.nodes.ask(n => this.links.create(n, this.nodes.otherNOf(2, n)))
 
         if (this.layoutCircle) {
             this.nodes.layoutCircle(this.world.maxX - 1)
+        } else {
+            this.nodes.ask(n => n.moveTo(this.patches.oneOf()))
         }
 
         util.repeat(this.numDrivers, () => {

models/PheromoneModel.js

@@ -20,8 +20,7 @@ export default class PheromoneModel extends Model {
     setup() {
         // create population turtles, placing them randomly on the patches
         this.turtles.create(this.population, turtle => {
-            const patch = this.patches.oneOf()
-            turtle.setxy(patch.x, patch.y)
+            turtle.moveTo(this.patches.oneOf())
         })
 
         // initialize the patches with the pheromone value of 0

mvc/helloElements.html

@@ -46,7 +46,7 @@
         anim.stop() // let uielements start/stop animator
         anim.setSteps(-1) // in case you want to run forever
 
-        await UI.setAppState(model, view, anim) // connect model to uielements
+        UI.setAppState(model, view, anim) // connect model to uielements
 
         UI.createElements() // use minElements, editable
         // UI.createElements(elements, true) // use elements from file, editable

uielements/uielements.js

@@ -568,7 +568,6 @@ function loadElementsFromJSON() {
 let minJsonString = `[{"id":1729270887157,"type":"output","name":"ticks","position":{"x":342,"y":21},"monitor":"model.ticks","fps":"10","command":null},{"id":1729463191305,"type":"range","name":"patchesSize","command":"view.setValue('patchesSize', value)","position":{"x":172,"y":21},"min":"1","max":"20","step":"1","value":"12"},{"id":1730141024864,"type":"checkbox","name":"Run","command":"checked ? anim.start() : anim.stop()","position":{"x":20,"y":21},"checked":false},{"id":1733442807622,"type":"dropdown","name":"fps","command":"anim.setFps(value)","position":{"x":100,"y":21},"options":["2","5","10","20","30","60"],"selected":"30"},{"id":1729535684833,"type":"button","name":"Save","command":"downloadJson()","position":{"x":405,"y":21}}]`
 const minJson = JSON.parse(minJsonString)
 
-// userName, modelName set in setAppState()
 const persistentStorage = {
     // autoDownload: false,
     // userName: null,
@@ -597,7 +596,7 @@ function jsonToStorage() {
 //     persistentStorage.autoDownload = bool
 // }
 
-export async function setAppState(model, view, anim) {
+export function setAppState(model, view, anim) {
     const modelName = model.constructor.name
     const elementsName =
         modelName.replace('Model', '').toLowerCase() + 'Elements.js'
@@ -615,7 +614,8 @@ export async function setAppState(model, view, anim) {
 }
 
 let initialJson, isStaticMode
-export async function createElements(json = null, isEditable = json == null) {
+// Three modes: new editable, static file, editable file. Any need for new static?
+export function createElements(json = null, isEditable = json == null) {
     isStaticMode = !isEditable
     if (isEditable) {
         // Show control panel
@@ -624,7 +624,12 @@ export async function createElements(json = null, isEditable = json == null) {
 
     params.json = json == null ? minJson : json
     initialJson = json == null ? '[]' : JSON.stringify(params.json)
+
     console.log('hasUnsavedChanges:', hasUnsavedChanges())
+    // if (json == null) downloadJson() // need user geesture
+    if (json == null && isEditable) {
+        alert('You can use "Save" at any time to download your new Elements.')
+    }
 
     jsonToStorage()
     loadElementsFromJSON()