Skip to content

Fixing failing tests #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jzkelter merged 2 commits into from
Jul 7, 2025
Merged

Fixing failing tests #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfb5c16
fixing two failing tests with non-integer patch sizes
jzkelter Jul 3, 2025
39408e5
Fixing tests about size computed from the saved patch size and screen…
jzkelter Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Curricular Models/MaterialSim/MaterialSim Grain Growth.nlogox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ end
; Copyright 2005 Uri Wilensky.
; See Info tab for full copyright and license.]]></code>
<widgets>
<view x="345" wrappingAllowedX="false" y="5" frameRate="60.0" minPycor="-24" height="464" showTickCounter="true" patchSize="9.4" fontSize="10" wrappingAllowedY="false" width="464" tickCounterLabel="ticks" maxPycor="24" updateMode="1" maxPxcor="24" minPxcor="-24"></view>
<view x="345" wrappingAllowedX="false" y="5" frameRate="60.0" minPycor="-24" height="445" showTickCounter="true" patchSize="9.0" fontSize="9" wrappingAllowedY="false" width="445" tickCounterLabel="ticks" maxPycor="24" updateMode="1" maxPxcor="24" minPxcor="-24"></view>
<note x="30" y="570" backgroundDark="0" fontSize="11" width="139" markdown="false" height="18" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">Run model</note>
<note x="30" y="544" backgroundDark="0" fontSize="11" width="295" markdown="false" height="18" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">_____________________________________________</note>
<note x="5" y="75" backgroundDark="0" fontSize="30" width="25" markdown="false" height="36" textColorDark="-1" textColorLight="-5298144" backgroundLight="0">1</note>
Expand Down
6 changes: 3 additions & 3 deletions Sample Models/Biology/Disease Solo.nlogox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ end
; Copyright 2005 Uri Wilensky.
; See Info tab for full copyright and license.]]></code>
<widgets>
<view x="281" wrappingAllowedX="false" y="10" frameRate="10.0" minPycor="-12" height="475" showTickCounter="true" patchSize="19.0" fontSize="10" wrappingAllowedY="false" width="399" tickCounterLabel="ticks" maxPycor="12" updateMode="1" maxPxcor="10" minPxcor="-10"></view>
<view x="281" wrappingAllowedX="false" y="10" frameRate="10.0" minPycor="-12" height="479" showTickCounter="true" patchSize="19.0" fontSize="10" wrappingAllowedY="false" width="403" tickCounterLabel="ticks" maxPycor="12" updateMode="1" maxPxcor="10" minPxcor="-10"></view>
<button x="24" y="65" height="35" disableUntilTicks="false" forever="false" kind="Observer" width="102" display="setup/clear">setup-clear</button>
<button x="24" y="145" height="35" disableUntilTicks="true" forever="true" kind="Observer" width="102">go</button>
<button x="24" y="105" height="35" disableUntilTicks="false" forever="false" kind="Observer" width="102" display="setup/keep">setup-keep</button>
Expand All @@ -188,8 +188,8 @@ set-plot-pen-color item (run-number mod 5)
<button x="845" actionKey="L" y="80" height="35" disableUntilTicks="true" forever="false" kind="Observer" width="63" display="right">move 90</button>
<button x="790" actionKey="I" y="40" height="35" disableUntilTicks="true" forever="false" kind="Observer" width="69" display="up">move 0</button>
<button x="130" y="145" height="35" disableUntilTicks="true" forever="false" kind="Observer" width="102">infect</button>
<switch x="699" y="445" height="37" on="false" variable="chase?" width="103" display="chase?"></switch>
<switch x="699" y="405" height="37" on="false" variable="avoid?" width="103" display="avoid?"></switch>
<switch x="699" y="445" height="40" on="false" variable="chase?" width="103" display="chase?"></switch>
<switch x="699" y="405" height="40" on="false" variable="avoid?" width="103" display="avoid?"></switch>
<note x="695" y="375" backgroundDark="0" fontSize="11" width="150" markdown="false" height="24" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">androids:</note>
</widgets>
<info><![CDATA[## WHAT IS IT?
Expand Down
24 changes: 12 additions & 12 deletions Sample Models/Biology/Evolution/Baldwin Effect.nlogox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ end
; Copyright 2023 Uri Wilensky.
; See Info tab for full copyright and license.]]></code>
<widgets>
<view x="715" wrappingAllowedX="false" y="7" frameRate="30.0" minPycor="-5" height="555" showTickCounter="true" patchSize="5.0" fontSize="10" wrappingAllowedY="false" width="405" tickCounterLabel="ticks" maxPycor="105" updateMode="1" maxPxcor="40" minPxcor="-40"></view>
<view x="720" wrappingAllowedX="false" y="10" frameRate="30.0" minPycor="-5" height="559" showTickCounter="true" patchSize="5.0" fontSize="10" wrappingAllowedY="false" width="409" tickCounterLabel="ticks" maxPycor="105" updateMode="1" maxPxcor="40" minPxcor="-40"></view>
<slider x="20" step="1" y="7" max="500" width="250" display="num-pop" height="50" min="1" direction="Horizontal" default="200.0" variable="num-pop"></slider>
<slider x="20" step="1" y="60" max="100" width="250" display="gene-length" height="50" min="1" direction="Horizontal" default="30.0" variable="gene-length"></slider>
<slider x="20" step="0.01" y="115" max="1" width="250" display="plasticity" height="50" min="0" direction="Horizontal" default="0.5" variable="plasticity"></slider>
Expand All @@ -272,35 +272,35 @@ end
<slider x="20" step="1" y="215" max="100" width="250" display="num-trials" height="50" min="1" direction="Horizontal" default="20.0" variable="num-trials"></slider>
<slider x="20" step="0.1" y="270" max="10" width="250" display="mutation-rate" height="50" min="0" direction="Horizontal" default="5.0" variable="mutation-rate" units="E-4"></slider>
<slider x="20" step="0.01" y="325" max="1" width="250" display="smoothness" height="50" min="0" direction="Horizontal" default="0.15" variable="smoothness"></slider>
<plot x="369" autoPlotX="true" yMax="100.0" autoPlotY="true" yAxis="% Correct Alleles" y="385" xMin="0.0" height="225" legend="true" xMax="10.0" yMin="0.0" width="345" xAxis="Generations" display="Percentage of Correct Alleles">
<plot x="20" autoPlotX="true" yMax="100.0" autoPlotY="true" yAxis="% Plastic Alleles" y="385" xMin="0.0" height="225" legend="true" xMax="10.0" yMin="0.0" width="340" xAxis="Generations" display="Percentage of Plastic Alleles">
<setup></setup>
<update></update>
<pen interval="1.0" mode="0" display="Smart Learners" color="-13345367" legend="true">
<setup></setup>
<update>plot percentage-correct-alleles smart-learners</update>
<update>plot percentage-plastic-alleles smart-learners</update>
</pen>
<pen interval="1.0" mode="0" display="Random Learners" color="-2674135" legend="true">
<setup></setup>
<update>plot percentage-correct-alleles random-learners</update>
</pen>
<pen interval="1.0" mode="0" display="Non-Learners" color="-7500403" legend="true">
<setup></setup>
<update>plot percentage-correct-alleles non-learners</update>
<update>plot percentage-plastic-alleles random-learners</update>
</pen>
</plot>
<plot x="20" autoPlotX="true" yMax="100.0" autoPlotY="true" yAxis="% Plastic Alleles" y="385" xMin="0.0" height="225" legend="true" xMax="10.0" yMin="0.0" width="340" xAxis="Generations" display="Percentage of Plastic Alleles">
<plot x="365" autoPlotX="true" yMax="100.0" autoPlotY="true" yAxis="% Correct Alleles" y="385" xMin="0.0" height="225" legend="true" xMax="10.0" yMin="0.0" width="345" xAxis="Generations" display="Percentage of Correct Alleles">
<setup></setup>
<update></update>
<pen interval="1.0" mode="0" display="Smart Learners" color="-13345367" legend="true">
<setup></setup>
<update>plot percentage-plastic-alleles smart-learners</update>
<update>plot percentage-correct-alleles smart-learners</update>
</pen>
<pen interval="1.0" mode="0" display="Random Learners" color="-2674135" legend="true">
<setup></setup>
<update>plot percentage-plastic-alleles random-learners</update>
<update>plot percentage-correct-alleles random-learners</update>
</pen>
<pen interval="1.0" mode="0" display="Non-Learners" color="-7500403" legend="true">
<setup></setup>
<update>plot percentage-correct-alleles non-learners</update>
</pen>
</plot>
<plot x="280" autoPlotX="true" yMax="1.0" autoPlotY="true" yAxis="Average Fitness" y="7" xMin="0.0" height="370" legend="true" xMax="10.0" yMin="0.4" width="429" xAxis="Generations" display="Average Fitness">
<plot x="280" autoPlotX="true" yMax="1.0" autoPlotY="true" yAxis="Average Fitness" y="5" xMin="0.0" height="370" legend="true" xMax="10.0" yMin="0.4" width="429" xAxis="Generations" display="Average Fitness">
<setup></setup>
<update></update>
<pen interval="1.0" mode="0" display="Smart Learners" color="-13345367" legend="true">
Expand Down
34 changes: 17 additions & 17 deletions Sample Models/Biology/Evolution/Echo.nlogox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,16 +226,8 @@ end
; Copyright 2005 Uri Wilensky.
; See Info tab for full copyright and license.]]></code>
<widgets>
<view x="275" wrappingAllowedX="true" y="7" frameRate="30.0" minPycor="-5" height="444" showTickCounter="true" patchSize="44.1" fontSize="10" wrappingAllowedY="true" width="444" tickCounterLabel="ticks" maxPycor="5" updateMode="1" maxPxcor="5" minPxcor="-5"></view>
<slider x="12" step="25" y="23" max="1000" width="250" display="init-num-creatures" height="50" min="25" direction="Horizontal" default="400.0" variable="init-num-creatures"></slider>
<switch x="43" y="135" height="37" on="false" variable="selective-mating?" width="185" display="selective-mating?"></switch>
<slider x="8" step="0.1" y="335" max="10" width="250" display="mutation-rate" height="50" min="0" direction="Horizontal" default="0.0" variable="mutation-rate" units="%"></slider>
<slider x="8" step="0.1" y="284" max="5" width="250" display="replenish-speed" height="50" min="0" direction="Horizontal" default="1.0" variable="replenish-speed"></slider>
<slider x="8" step="0.1" y="230" max="10" width="250" display="replicate-chance" height="50" min="0" direction="Horizontal" default="0.0" variable="replicate-chance" units="%"></slider>
<slider x="10" step="1" y="175" max="6" width="250" display="mating-selectivity" height="50" min="-6" direction="Horizontal" default="0.0" variable="mating-selectivity"></slider>
<button x="35" y="85" height="40" disableUntilTicks="false" forever="false" kind="Observer" width="100">setup</button>
<button x="140" y="85" height="40" disableUntilTicks="true" forever="true" kind="Observer" width="95">go</button>
<plot x="730" autoPlotX="true" yMax="1.0" autoPlotY="true" y="7" xMin="0.0" height="180" legend="true" xMax="50.0" yMin="0.0" width="605" xAxis="ticks" display="Populations">
<view x="275" wrappingAllowedX="true" y="7" frameRate="30.0" minPycor="-5" height="488" showTickCounter="true" patchSize="44.0" fontSize="10" wrappingAllowedY="true" width="488" tickCounterLabel="ticks" maxPycor="5" updateMode="1" maxPxcor="5" minPxcor="-5"></view>
<plot x="775" autoPlotX="true" yMax="1.0" autoPlotY="true" y="5" xMin="0.0" height="180" legend="true" xMax="50.0" yMin="0.0" width="610" xAxis="ticks" display="Populations">
<setup></setup>
<update><![CDATA[set-current-plot-pen "largest species"
let biggest-mating modes [mating] of turtles
Expand All @@ -262,7 +254,7 @@ ifelse (length biggest-mating > 0)
<update></update>
</pen>
</plot>
<plot x="735" autoPlotX="true" yMax="1.0" autoPlotY="true" y="365" xMin="0.0" height="195" legend="true" xMax="50.0" yMin="0.0" width="600" xAxis="ticks" display="Speciation">
<plot x="775" autoPlotX="true" yMax="1.0" autoPlotY="true" y="360" xMin="0.0" height="195" legend="true" xMax="50.0" yMin="0.0" width="610" xAxis="ticks" display="Speciation">
<setup></setup>
<update></update>
<pen interval="1.0" mode="0" display="species" color="-2674135" legend="true">
Expand All @@ -278,23 +270,23 @@ ifelse (length biggest-mating > 0)
<update>plot length remove-duplicates [defense] of turtles</update>
</pen>
</plot>
<plot x="935" autoPlotX="true" yMax="1.0" autoPlotY="true" y="195" xMin="0.0" height="165" legend="false" xMax="39.0" yMin="0.0" width="200" display="Defense Tags">
<plot x="775" autoPlotX="true" yMax="1.0" autoPlotY="true" y="190" xMin="0.0" height="165" legend="false" xMax="39.0" yMin="0.0" width="200" display="Offense Tags">
<setup>set-plot-x-range 0 length all-tags</setup>
<update></update>
<pen interval="1.0" mode="1" display="default" color="-16777216" legend="true">
<setup></setup>
<update>histogram [position defense all-tags] of turtles</update>
<update>histogram [position offense all-tags] of turtles</update>
</pen>
</plot>
<plot x="733" autoPlotX="true" yMax="1.0" autoPlotY="true" y="195" xMin="0.0" height="165" legend="false" xMax="39.0" yMin="0.0" width="200" display="Offense Tags">
<plot x="980" autoPlotX="true" yMax="1.0" autoPlotY="true" y="190" xMin="0.0" height="165" legend="false" xMax="39.0" yMin="0.0" width="200" display="Defense Tags">
<setup>set-plot-x-range 0 length all-tags</setup>
<update></update>
<pen interval="1.0" mode="1" display="default" color="-16777216" legend="true">
<setup></setup>
<update>histogram [position offense all-tags] of turtles</update>
<update>histogram [position defense all-tags] of turtles</update>
</pen>
</plot>
<plot x="1137" autoPlotX="true" yMax="1.0" autoPlotY="true" y="195" xMin="0.0" height="165" legend="false" xMax="100.0" yMin="0.0" width="200" display="Species Counts">
<plot x="1185" autoPlotX="true" yMax="1.0" autoPlotY="true" y="190" xMin="0.0" height="165" legend="false" xMax="100.0" yMin="0.0" width="200" display="Species Counts">
<setup>set-plot-x-range 0 length all-tags</setup>
<update></update>
<pen interval="1.0" mode="1" display="default" color="-16777216" legend="true">
Expand All @@ -308,7 +300,15 @@ foreach all-tags [ the-tag ->
]]]></update>
</pen>
</plot>
<monitor x="1230" precision="17" y="125" height="60" fontSize="11" width="100" display="total pop.">count turtles</monitor>
<slider x="10" step="25" y="10" max="1000" width="250" display="init-num-creatures" height="50" min="25" direction="Horizontal" default="400.0" variable="init-num-creatures"></slider>
<button x="35" y="65" height="40" disableUntilTicks="false" forever="false" kind="Observer" width="100">setup</button>
<button x="140" y="65" height="40" disableUntilTicks="true" forever="true" kind="Observer" width="95">go</button>
<switch x="45" y="110" height="40" on="false" variable="selective-mating?" width="185" display="selective-mating?"></switch>
<slider x="10" step="1" y="155" max="6" width="250" display="mating-selectivity" height="50" min="-6" direction="Horizontal" default="0.0" variable="mating-selectivity"></slider>
<slider x="10" step="0.1" y="210" max="10" width="250" display="replicate-chance" height="50" min="0" direction="Horizontal" default="0.0" variable="replicate-chance" units="%"></slider>
<slider x="10" step="0.1" y="265" max="5" width="250" display="replenish-speed" height="50" min="0" direction="Horizontal" default="1.0" variable="replenish-speed"></slider>
<slider x="10" step="0.1" y="320" max="10" width="250" display="mutation-rate" height="50" min="0" direction="Horizontal" default="0.0" variable="mutation-rate" units="%"></slider>
<monitor x="1285" precision="17" y="120" height="60" fontSize="11" width="100" display="total pop.">count turtles</monitor>
</widgets>
<info><![CDATA[## WHAT IS IT?

Expand Down
2 changes: 1 addition & 1 deletion Sample Models/Biology/Evolution/Genetic Drift/GenDrift T interact.nlogox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ end
; Copyright 1997 Uri Wilensky.
; See Info tab for full copyright and license.]]></code>
<widgets>
<view x="455" wrappingAllowedX="true" y="10" frameRate="30.0" minPycor="-17" height="455" showTickCounter="true" patchSize="13.0" fontSize="10" wrappingAllowedY="true" width="455" tickCounterLabel="ticks" maxPycor="17" updateMode="1" maxPxcor="17" minPxcor="-17"></view>
<view x="455" wrappingAllowedX="true" y="10" frameRate="30.0" minPycor="-17" height="459" showTickCounter="true" patchSize="13.0" fontSize="10" wrappingAllowedY="true" width="459" tickCounterLabel="ticks" maxPycor="17" updateMode="1" maxPxcor="17" minPxcor="-17"></view>
<monitor x="255" precision="2" y="70" height="60" fontSize="11" width="117" display="% most populous">max-percent</monitor>
<plot x="10" autoPlotX="true" yMax="70.0" autoPlotY="true" yAxis="Number" y="135" xMin="0.0" height="223" legend="false" xMax="100.0" yMin="0.0" width="360" xAxis="Time" display="Turtle Populations">
<setup>set-plot-y-range 0 count turtles</setup>
Expand Down
2 changes: 1 addition & 1 deletion Sample Models/Biology/Evolution/Genetic Drift/GenDrift T reproduce.nlogox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ end
; Copyright 1997 Uri Wilensky.
; See Info tab for full copyright and license.]]></code>
<widgets>
<view x="400" wrappingAllowedX="true" y="7" frameRate="30.0" minPycor="-22" height="405" showTickCounter="true" patchSize="9.0" fontSize="10" wrappingAllowedY="true" width="405" tickCounterLabel="ticks" maxPycor="22" updateMode="1" maxPxcor="22" minPxcor="-22"></view>
<view x="400" wrappingAllowedX="true" y="7" frameRate="30.0" minPycor="-22" height="409" showTickCounter="true" patchSize="9.0" fontSize="10" wrappingAllowedY="true" width="409" tickCounterLabel="ticks" maxPycor="22" updateMode="1" maxPxcor="22" minPxcor="-22"></view>
<button x="4" y="7" height="50" disableUntilTicks="false" forever="false" kind="Observer" width="75" display="setup">setup</button>
<button x="90" y="7" height="50" disableUntilTicks="true" forever="true" kind="Observer" width="90" display="go">go</button>
<slider x="5" step="1" y="71" max="10" width="250" display="colors" height="50" min="2" direction="Horizontal" default="5.0" variable="colors"></slider>
Expand Down
4 changes: 2 additions & 2 deletions Sample Models/Biology/Evolution/Vision Evolution.nlogox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,15 +233,15 @@ end
; Copyright 2018 Uri Wilensky.
; See Info tab for full copyright and license.]]></code>
<widgets>
<view x="760" wrappingAllowedX="true" y="10" frameRate="30.0" minPycor="-50" height="559" showTickCounter="true" patchSize="5.5" fontSize="14" wrappingAllowedY="false" width="559" tickCounterLabel="ticks" maxPycor="50" updateMode="1" maxPxcor="50" minPxcor="-50"></view>
<view x="760" wrappingAllowedX="true" y="10" frameRate="30.0" minPycor="-50" height="509" showTickCounter="true" patchSize="5.0" fontSize="14" wrappingAllowedY="false" width="509" tickCounterLabel="ticks" maxPycor="50" updateMode="1" maxPxcor="50" minPxcor="-50"></view>
<slider x="260" step="1" y="10" max="250" width="250" display="initial-number-food" height="50" min="0" direction="Horizontal" default="80.0" variable="initial-number-food"></slider>
<slider x="5" step="1" y="10" max="250" width="250" display="initial-number-fish" height="50" min="0" direction="Horizontal" default="50.0" variable="initial-number-fish"></slider>
<slider x="5" step="1.0" y="107" max="300.0" width="250" display="energy-gain-from-food" height="50" min="0.0" direction="Horizontal" default="100.0" variable="energy-gain-from-food"></slider>
<slider x="5" step="1" y="159" max="100" width="250" display="food-replenish-rate" height="50" min="0" direction="Horizontal" default="65.0" variable="food-replenish-rate" units="%"></slider>
<slider x="260" step="0.01" y="161" max="1" width="250" display="mutation-rate" height="50" min="0" direction="Horizontal" default="0.1" variable="mutation-rate"></slider>
<slider x="260" step="1" y="109" max="100" width="250" display="reproduction-rate" height="50" min="0" direction="Horizontal" default="35.0" variable="reproduction-rate" units="%"></slider>
<slider x="5" step="0.1" y="211" max="10" width="250" display="eye-cost" height="50" min="0" direction="Horizontal" default="9.0" variable="eye-cost"></slider>
<switch x="300" y="65" height="37" on="true" variable="show-vision?" width="175" display="show-vision?"></switch>
<switch x="300" y="65" height="40" on="true" variable="show-vision?" width="175" display="show-vision?"></switch>
<slider x="260" step="1" y="213" max="10" width="250" display="max-eye-size" height="50" min="1" direction="Horizontal" default="5.0" variable="max-eye-size"></slider>
<button x="45" y="65" height="40" disableUntilTicks="false" forever="false" kind="Observer" width="90" display="setup">setup</button>
<button x="140" y="65" height="40" disableUntilTicks="true" forever="true" kind="Observer" width="85" display="go">go</button>
Expand Down
Loading
Loading