Bugfix: Use '.nlogox' to refer to files in this repo

NetLogo · Jan 31, 2025 · dcdf5d5 · dcdf5d5
1 parent d6804f9
commit dcdf5d5
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 41 deletions.
diff --git a/Code Examples/Extensions Examples/ls/Model Interactions Example.nlogox b/Code Examples/Extensions Examples/ls/Model Interactions Example.nlogox
@@ -12,10 +12,10 @@ to setup
   clear-all
 
   ; create the two models
-  ls:create-interactive-models 1 "../../../Sample Models/Earth Science/Climate Change.nlogo"
+  ls:create-interactive-models 1 "../../../Sample Models/Earth Science/Climate Change.nlogox"
   set climate-change-model last ls:models
 
-  ls:create-interactive-models 1 "../../../Sample Models/Biology/Wolf Sheep Predation.nlogo"
+  ls:create-interactive-models 1 "../../../Sample Models/Biology/Wolf Sheep Predation.nlogox"
   set wolf-sheep-predation-model last ls:models
   ls:ask wolf-sheep-predation-model [ set model-version "sheep-wolves-grass" ]
 

diff --git a/Code Examples/Extensions Examples/ls/Model Visualizer and Plotter Example.nlogox b/Code Examples/Extensions Examples/ls/Model Visualizer and Plotter Example.nlogox
@@ -8,7 +8,7 @@ to setup
   clear-all
   create-turtles num-models [    ; create a turtle for each created model
     ; create a Wolf Sheep Predation child model
-    ls:create-models 1 "../../../Sample Models/Biology/Wolf Sheep Predation.nlogo"
+    ls:create-models 1 "../../../Sample Models/Biology/Wolf Sheep Predation.nlogox"
 
     set model-id last ls:models  ; and assign model-id to the turtle
     ; In order for the model to behave deterministically for a given random seed

diff --git a/Curricular Models/GenEvo/GenEvo 4 Competition.nlogox b/Curricular Models/GenEvo/GenEvo 4 Competition.nlogox
@@ -54,7 +54,7 @@ to generate-cells
       user-message "Select a Genetic Switch model to use..."
       set my-model-path user-file
     ][
-      set my-model-path "GenEvo 1 Genetic Switch.nlogo"
+      set my-model-path "GenEvo 1 Genetic Switch.nlogox"
     ]
 
     create-my-model

diff --git a/Sample Models/Biology/CRISPR/CRISPR Ecosystem LevelSpace.nlogox b/Sample Models/Biology/CRISPR/CRISPR Ecosystem LevelSpace.nlogox
@@ -64,7 +64,7 @@ to setup
 
   set virus-replication-rate 20
 
-  ls:create-models 1 "CRISPR Bacterium LevelSpace.nlogo"
+  ls:create-models 1 "CRISPR Bacterium LevelSpace.nlogox"
   set bacterium-model last ls:models
 
   setup-world

diff --git a/Sample Models/Chemistry & Physics/Kicked Rotators.nlogox b/Sample Models/Chemistry & Physics/Kicked Rotators.nlogox
@@ -63,7 +63,7 @@ to inspect-rotator
     ls:let parent-position (mouse-xcor - min-pxcor) / (world-width - 1) * (2 * pi)
 
     ; create a new Kicked Rotator model with the appropriate initial conditions
-    ls:create-interactive-models 1 "Kicked Rotator.nlogo"
+    ls:create-interactive-models 1 "Kicked Rotator.nlogox"
     ls:ask last ls:models [
       ; ask the model to start with the given conditions
       set continuous-motion? false

diff --git a/bin/ModelLengths.scala b/bin/ModelLengths.scala
@@ -19,7 +19,7 @@ def hasActualCode(line:String):Boolean =
 
 val hash = collection.mutable.HashMap[String,Int]()
 for {
-   path <- Process(Seq("find", "./", "-name", "*.nlogo", "-o", "-name", "*.nlogo3d")).lineStream
+   path <- Process(Seq("find", "./", "-name", "*.nlogo", "-o", "-name", "*.nlogo3d", "-o", "-name", "*.nlogox")).lineStream
     name = path.split("/").last.stripSuffix(".nlogo")
     if !path.containsSlice("/System Dynamics/")
     // The below exception was likely due to the fact that the GasLab models are

diff --git a/crossReference.conf b/crossReference.conf
@@ -1,46 +1,46 @@
 org.nlogo.models.crossReference.singleModels: [
-  { source: "Sample Models/Biology/HIV.nlogo",                referenceIn: "Sample Models/Social Science" }
-  { source: "Sample Models/Biology/Membrane Formation.nlogo", referenceIn: "Sample Models/Chemistry & Physics/Materials Science"}
-  { source: "Sample Models/Biology/Simple Birth Rates.nlogo", referenceIn: "Sample Models/Social Science" }
+  { source: "Sample Models/Biology/HIV.nlogox",                referenceIn: "Sample Models/Social Science" }
+  { source: "Sample Models/Biology/Membrane Formation.nlogox", referenceIn: "Sample Models/Chemistry & Physics/Materials Science"}
+  { source: "Sample Models/Biology/Simple Birth Rates.nlogox", referenceIn: "Sample Models/Social Science" }
 
-  { source: "Sample Models/Networks/Team Assembly.nlogo",     referenceIn: "Sample Models/Social Science" }
+  { source: "Sample Models/Networks/Team Assembly.nlogox",     referenceIn: "Sample Models/Social Science" }
 
-  { source: "Sample Models/Games/Ant Adaptation.nlogo",       referenceIn: "Sample Models/Biology" }
+  { source: "Sample Models/Games/Ant Adaptation.nlogox",       referenceIn: "Sample Models/Biology" }
 
-  { source: "Code Examples/Extensions Examples/vid/Video Camera Example.nlogo", referenceIn: "Code Examples/Extensions Examples/bitmap" }
+  { source: "Code Examples/Extensions Examples/vid/Video Camera Example.nlogox", referenceIn: "Code Examples/Extensions Examples/bitmap" }
 
-  { source: "Sample Models/Chemistry & Physics/Materials Science/Radical Polymerization with Chains.nlogo", referenceIn: "Sample Models/Chemistry & Physics/Chemical Reactions" }
+  { source: "Sample Models/Chemistry & Physics/Materials Science/Radical Polymerization with Chains.nlogox", referenceIn: "Sample Models/Chemistry & Physics/Chemical Reactions" }
 
   // BEAGLE curricular models
-  { source: "Sample Models/Biology/Wolf Sheep Predation.nlogo",                        referenceIn: "Curricular Models/BEAGLE Evolution" }
-  { source: "Sample Models/Biology/Evolution/Genetic Drift/GenDrift T interact.nlogo", referenceIn: "Curricular Models/BEAGLE Evolution" }
-  { source: "Sample Models/Biology/Evolution/Bug Hunt Speeds.nlogo",                   referenceIn: "Curricular Models/BEAGLE Evolution" }
-  { source: "Sample Models/Biology/Evolution/Bug Hunt Camouflage.nlogo",               referenceIn: "Curricular Models/BEAGLE Evolution" }
-  { source: "Sample Models/Biology/Evolution/Mimicry.nlogo",                           referenceIn: "Curricular Models/BEAGLE Evolution" }
-  { source: "Sample Models/Biology/Daisyworld.nlogo",                                  referenceIn: "Curricular Models/BEAGLE Evolution" }
+  { source: "Sample Models/Biology/Wolf Sheep Predation.nlogox",                        referenceIn: "Curricular Models/BEAGLE Evolution" }
+  { source: "Sample Models/Biology/Evolution/Genetic Drift/GenDrift T interact.nlogox", referenceIn: "Curricular Models/BEAGLE Evolution" }
+  { source: "Sample Models/Biology/Evolution/Bug Hunt Speeds.nlogox",                   referenceIn: "Curricular Models/BEAGLE Evolution" }
+  { source: "Sample Models/Biology/Evolution/Bug Hunt Camouflage.nlogox",               referenceIn: "Curricular Models/BEAGLE Evolution" }
+  { source: "Sample Models/Biology/Evolution/Mimicry.nlogox",                           referenceIn: "Curricular Models/BEAGLE Evolution" }
+  { source: "Sample Models/Biology/Daisyworld.nlogox",                                  referenceIn: "Curricular Models/BEAGLE Evolution" }
 
   // copy MaterialSim model to Materials Science
-  { source: "Curricular Models/MaterialSim/MaterialSim Grain Growth.nlogo", referenceIn: "Sample Models/Chemistry & Physics/Materials Science"}
+  { source: "Curricular Models/MaterialSim/MaterialSim Grain Growth.nlogox", referenceIn: "Sample Models/Chemistry & Physics/Materials Science"}
 
   // copy NIELS HubNet model to HubNet Activities
-  { source: "Curricular Models/NIELS/Current in a Wire HubNet.nlogo", referenceIn: "HubNet Activities" }
+  { source: "Curricular Models/NIELS/Current in a Wire HubNet.nlogox", referenceIn: "HubNet Activities" }
 
   // Oil Cartel HubNet to HubNet Activities
-  { source: "Sample Models/Social Science/Economics/Oil Cartel HubNet.nlogo", referenceIn: "HubNet Activities" }
+  { source: "Sample Models/Social Science/Economics/Oil Cartel HubNet.nlogox", referenceIn: "HubNet Activities" }
 
   // IABM Textbook models duplicated in Sample Models and Code Examples
-  { source: "IABM Textbook/chapter 2/Simple Economy.nlogo",  referenceIn: "Sample Models/Social Science/Economics" }
-  { source: "IABM Textbook/chapter 3/El Farol Extensions/El Farol.nlogo",  referenceIn: "Sample Models/Social Science" }
-  { source: "IABM Textbook/chapter 3/DLA Extensions/DLA Simple.nlogo",     referenceIn: "Sample Models/Chemistry & Physics/Diffusion Limited Aggregation" }
-  { source: "IABM Textbook/chapter 8/Arduino Example.nlogo",               referenceIn: "Code Examples/Extensions Examples/arduino" }
+  { source: "IABM Textbook/chapter 2/Simple Economy.nlogox",  referenceIn: "Sample Models/Social Science/Economics" }
+  { source: "IABM Textbook/chapter 3/El Farol Extensions/El Farol.nlogox",  referenceIn: "Sample Models/Social Science" }
+  { source: "IABM Textbook/chapter 3/DLA Extensions/DLA Simple.nlogox",     referenceIn: "Sample Models/Chemistry & Physics/Diffusion Limited Aggregation" }
+  { source: "IABM Textbook/chapter 8/Arduino Example.nlogox",               referenceIn: "Code Examples/Extensions Examples/arduino" }
 
   // Time extension models to duplicate in Sample Models
-  { source: "Sample Models/Social Science/Distribution Center Discrete Event Simulator/Distribution Center Discrete Event Simulator.nlogo", referenceIn: "Code Examples/Extensions Examples/time/Distribution Center Discrete Event Simulator.nlogo"}
+  { source: "Sample Models/Social Science/Distribution Center Discrete Event Simulator/Distribution Center Discrete Event Simulator.nlogox", referenceIn: "Code Examples/Extensions Examples/time/Distribution Center Discrete Event Simulator.nlogox"}
 
   // Copy Turbulence mode to Computer Science folder
-  { source: "Sample Models/Chemistry & Physics/Turbulence.nlogo", referenceIn: "Sample Models/Computer Science/Turbulence.nlogo"}
+  { source: "Sample Models/Chemistry & Physics/Turbulence.nlogox", referenceIn: "Sample Models/Computer Science/Turbulence.nlogox"}
 
-  { source: "Sample Models/Biology/Virus Using Discrete Event Simulator.nlogo", referenceIn: "Code Examples/Extensions Examples/time/Virus Using Discrete Event Simulator.nlogo"}
+  { source: "Sample Models/Biology/Virus Using Discrete Event Simulator.nlogox", referenceIn: "Code Examples/Extensions Examples/time/Virus Using Discrete Event Simulator.nlogox"}
 ]
 
 org.nlogo.models.crossReference.directories: [

diff --git a/src/main/scala/org/nlogo/models/ModelResaver.scala b/src/main/scala/org/nlogo/models/ModelResaver.scala
@@ -104,8 +104,7 @@ object ModelResaver {
     }
 
     def visitFile(path: Path, attrs: BasicFileAttributes): FileVisitResult = {
-      val fileName = path.getFileName.toString
-      if (fileName.endsWith(".nlogo") || fileName.endsWith(".nlogo3d"))
+      if (path.getFileName.toString.endsWith(".nlogox"))
         resave(path)
       FileVisitResult.CONTINUE
     }

diff --git a/test/Artificial-Neural-Net.txt b/test/Artificial-Neural-Net.txt
@@ -1,7 +1,7 @@
 # takes a while (12 seconds or so) - ST 4/1/11
 
 artificial-neural-net-or_2D
-  OPEN> models/Sample Models/Computer Science/Artificial Neural Net - Multilayer.nlogo
+  OPEN> models/Sample Models/Computer Science/Artificial Neural Net - Multilayer.nlogox
   O> random-seed 571
   O> setup
   O> set target-function "or"
@@ -13,7 +13,7 @@ artificial-neural-net-or_2D
   result-for-inputs 1 1 = target-answer => true
 
 artificial-neural-net-xor_2D
-  OPEN> models/Sample Models/Computer Science/Artificial Neural Net - Multilayer.nlogo
+  OPEN> models/Sample Models/Computer Science/Artificial Neural Net - Multilayer.nlogox
   O> random-seed 1
   O> setup
   O> set target-function "xor"

diff --git a/test/Fire.txt b/test/Fire.txt
@@ -1,12 +1,12 @@
 fire_2D
-  OPEN> models/Sample Models/Earth Science/Fire.nlogo
+  OPEN> models/Sample Models/Earth Science/Fire.nlogox
   O> random-seed 473
   O> setup
   O> repeat 10 [ go ]
   burned-trees => 765
 
 fire-resized_2D
-  OPEN> models/Sample Models/Earth Science/Fire.nlogo
+  OPEN> models/Sample Models/Earth Science/Fire.nlogox
   O> random-seed 473
   O> resize-world -10 10 -10 10
   count patches => 441

diff --git a/test/GasLab.txt b/test/GasLab.txt
@@ -1,5 +1,5 @@
 gaslab-gas-in-a-box_2D
-  OPEN> models/Sample Models/Chemistry & Physics/GasLab/GasLab Gas in a Box.nlogo
+  OPEN> models/Sample Models/Chemistry & Physics/GasLab/GasLab Gas in a Box.nlogox
   O> random-seed 571
   O> setup
   avg-speed => 10

diff --git a/test/HubNet-Template.txt b/test/HubNet-Template.txt
@@ -1,5 +1,5 @@
 Simple_Login_2D
-  OPEN> models/HubNet Activities/Code Examples/Template HubNet.nlogo
+  OPEN> models/HubNet Activities/Code Examples/Template HubNet.nlogox
   O> startup
   O> setup
   O> __hubnet-create-client

diff --git a/test/LayoutTests.txt b/test/LayoutTests.txt
@@ -1,5 +1,5 @@
 Spring_2D
-  OPEN> models/test/Preferential Attachment Tester.nlogo
+  OPEN> models/test/Preferential Attachment Tester.nlogox
   O> random-seed 0
   O> setup
   O> repeat 100 [ go ]

diff --git a/test/SDM.txt b/test/SDM.txt
@@ -1,11 +1,11 @@
 sdm-order-of-operations_2D
-  OPEN> models/test/sdm-order-of-operations.nlogo
+  OPEN> models/test/sdm-order-of-operations.nlogox
   O> setup
   O> repeat 2 [ go ]
   stock => 33
 
 sdm-dt-increment_2D
-  OPEN> models/test/sdm-dt-increment.nlogo
+  OPEN> models/test/sdm-dt-increment.nlogox
   O> setup
   ticks => 0
   O> repeat 50 [ go ]