Skip to content

Commit f97341c

Browse files
committed
Merge branch 'modelsint1' into netlogo7-model-updates
Merge fixes to tests for NetLogo 7
2 parents e2290aa + 4c1152f commit f97341c

641 files changed

Lines changed: 641 additions & 642 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3D/Code Examples/Airplane Landing Example 3D.nlogox3d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ end
4646
; To the extent possible under law, Uri Wilensky has waived all
4747
; copyright and related or neighboring rights to this model.]]></code>
4848
<widgets>
49-
<view3d wrappingAllowedZ="true" x="0" maxPycor="13" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="13" minPycor="-13" height="355" showTickCounter="true" patchSize="12.0" fontSize="10" wrappingAllowedY="true" width="334" tickCounterLabel="ticks" maxPxcor="13" minPxcor="-13" minPzcor="-13"></view3d>
49+
<view3d wrappingAllowedZ="true" x="0" maxPycor="13" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="13" minPycor="-13" height="350" showTickCounter="true" patchSize="12.0" fontSize="10" wrappingAllowedY="true" width="330" tickCounterLabel="ticks" maxPxcor="13" minPxcor="-13" minPzcor="-13"></view3d>
5050
<button x="58" y="52" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="70">setup</button>
5151
<button x="130" y="52" height="33" disableUntilTicks="true" forever="true" kind="Observer" width="69">go</button>
5252
<button x="58" y="98" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="141">reset-perspective</button>

3D/Code Examples/Bouncing Balls Example 3D.nlogox3d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ end
7070
; To the extent possible under law, Uri Wilensky has waived all
7171
; copyright and related or neighboring rights to this model.]]></code>
7272
<widgets>
73-
<view3d wrappingAllowedZ="true" x="0" maxPycor="9" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="9" minPycor="-9" height="259" showTickCounter="true" patchSize="12.0" fontSize="10" wrappingAllowedY="true" width="245" tickCounterLabel="ticks" maxPxcor="9" minPxcor="-9" minPzcor="-9"></view3d>
73+
<view3d wrappingAllowedZ="true" x="0" maxPycor="9" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="9" minPycor="-9" height="254" showTickCounter="true" patchSize="12.0" fontSize="10" wrappingAllowedY="true" width="241" tickCounterLabel="ticks" maxPxcor="9" minPxcor="-9" minPzcor="-9"></view3d>
7474
<button x="63" y="53" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="85">setup</button>
7575
<button x="149" y="53" height="33" disableUntilTicks="true" forever="true" kind="Observer" width="85">go</button>
7676
<slider x="62" step="1" y="18" height="33" min="0" direction="Horizontal" max="50" default="15.0" variable="ball-count" width="172" sizeVersion="0" display="ball-count"></slider>

3D/Code Examples/Hill Climbing Example 3D.nlogox3d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ end
8787
; To the extent possible under law, Uri Wilensky has waived all
8888
; copyright and related or neighboring rights to this model.]]></code>
8989
<widgets>
90-
<view3d wrappingAllowedZ="true" x="0" maxPycor="10" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="5" minPycor="-10" height="157" showTickCounter="true" patchSize="6.0" fontSize="10" wrappingAllowedY="true" width="245" tickCounterLabel="ticks" maxPxcor="10" minPxcor="-10" minPzcor="0"></view3d>
90+
<view3d wrappingAllowedZ="true" x="0" maxPycor="10" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="5" minPycor="-10" height="152" showTickCounter="true" patchSize="6.0" fontSize="10" wrappingAllowedY="true" width="241" tickCounterLabel="ticks" maxPxcor="10" minPxcor="-10" minPzcor="0"></view3d>
9191
<button x="24" y="51" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="91">setup</button>
9292
<button x="24" y="90" height="33" disableUntilTicks="true" forever="true" kind="Observer" width="91">go</button>
9393
</widgets>

3D/Code Examples/Neighborhoods Example 3D.nlogox3d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ end
6565
; To the extent possible under law, Uri Wilensky has waived all
6666
; copyright and related or neighboring rights to this model.</code>
6767
<widgets>
68-
<view3d wrappingAllowedZ="true" x="0" maxPycor="17" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="6" minPycor="-17" height="346" showTickCounter="true" patchSize="9.0" fontSize="10" wrappingAllowedY="true" width="325" tickCounterLabel="ticks" maxPxcor="17" minPxcor="-17" minPzcor="-6"></view3d>
68+
<view3d wrappingAllowedZ="true" x="0" maxPycor="17" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="6" minPycor="-17" height="341" showTickCounter="true" patchSize="9.0" fontSize="10" wrappingAllowedY="true" width="321" tickCounterLabel="ticks" maxPxcor="17" minPxcor="-17" minPzcor="-6"></view3d>
6969
<button x="76" y="29" height="37" disableUntilTicks="false" forever="false" kind="Observer" width="127">setup</button>
7070
<button x="10" y="90" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="120">paint-neighbors</button>
7171
<slider x="132" step="1" y="124" height="33" min="1" direction="Horizontal" max="5" default="2.0" variable="radius" width="133" sizeVersion="0" display="radius"></slider>

3D/Code Examples/Network Example 3D.nlogox3d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ end
4949
; To the extent possible under law, Uri Wilensky has waived all
5050
; copyright and related or neighboring rights to this model.]]></code>
5151
<widgets>
52-
<view3d wrappingAllowedZ="true" x="0" maxPycor="20" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="20" minPycor="-20" height="441" showTickCounter="true" patchSize="10.0" fontSize="10" wrappingAllowedY="true" width="420" tickCounterLabel="ticks" maxPxcor="20" minPxcor="-20" minPzcor="-20"></view3d>
52+
<view3d wrappingAllowedZ="true" x="0" maxPycor="20" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="20" minPycor="-20" height="436" showTickCounter="true" patchSize="10.0" fontSize="10" wrappingAllowedY="true" width="416" tickCounterLabel="ticks" maxPxcor="20" minPxcor="-20" minPzcor="-20"></view3d>
5353
<button x="100" y="112" height="33" disableUntilTicks="true" forever="true" kind="Observer" width="77">go</button>
5454
<slider x="9" step="1" y="75" height="33" min="0" direction="Horizontal" max="100" default="30.0" variable="number-of-nodes" width="179" sizeVersion="0" display="number-of-nodes"></slider>
5555
<button x="22" y="112" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="77">setup</button>

3D/Code Examples/Shapes Example 3D.nlogox3d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ end
3030
; To the extent possible under law, Uri Wilensky has waived all
3131
; copyright and related or neighboring rights to this model.]]></code>
3232
<widgets>
33-
<view3d wrappingAllowedZ="true" x="0" maxPycor="16" updateMode="0" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="2" minPycor="-16" height="427" showTickCounter="false" patchSize="12.0" fontSize="10" wrappingAllowedY="true" width="502" tickCounterLabel="ticks" maxPxcor="20" minPxcor="-20" minPzcor="-2"></view3d>
33+
<view3d wrappingAllowedZ="true" x="0" maxPycor="16" updateMode="0" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="2" minPycor="-16" height="422" showTickCounter="false" patchSize="12.0" fontSize="10" wrappingAllowedY="true" width="498" tickCounterLabel="ticks" maxPxcor="20" minPxcor="-20" minPzcor="-2"></view3d>
3434
<button x="105" y="45" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="82">setup
3535
</button>
3636
<button x="32" y="160" height="33" disableUntilTicks="false" forever="true" kind="Turtle" width="112">roll-right 0.1</button>

3D/Code Examples/Spherical Path Example 3D.nlogox3d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ end
6969
; To the extent possible under law, Uri Wilensky has waived all
7070
; copyright and related or neighboring rights to this model.</code>
7171
<widgets>
72-
<view3d wrappingAllowedZ="true" x="0" maxPycor="16" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="16" minPycor="-16" height="460" showTickCounter="false" patchSize="13.0" fontSize="10" wrappingAllowedY="true" width="439" tickCounterLabel="ticks" maxPxcor="16" minPxcor="-16" minPzcor="-16"></view3d>
72+
<view3d wrappingAllowedZ="true" x="0" maxPycor="16" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="16" minPycor="-16" height="455" showTickCounter="false" patchSize="13.0" fontSize="10" wrappingAllowedY="true" width="435" tickCounterLabel="ticks" maxPxcor="16" minPxcor="-16" minPzcor="-16"></view3d>
7373
<chooser x="35" y="120" height="45" variable="step-size" current="1" width="175" sizeVersion="0" display="step-size">
7474
<choice type="double" value="10.0"></choice>
7575
<choice type="double" value="1.0"></choice>

3D/Code Examples/Three Loops Example 3D.nlogox3d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ end
2323
; To the extent possible under law, Uri Wilensky has waived all
2424
; copyright and related or neighboring rights to this model.</code>
2525
<widgets>
26-
<view3d wrappingAllowedZ="true" x="0" maxPycor="9" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="9" minPycor="-9" height="259" showTickCounter="true" patchSize="12.0" fontSize="10" wrappingAllowedY="true" width="245" tickCounterLabel="ticks" maxPxcor="9" minPxcor="-9" minPzcor="-9"></view3d>
26+
<view3d wrappingAllowedZ="true" x="0" maxPycor="9" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="9" minPycor="-9" height="254" showTickCounter="true" patchSize="12.0" fontSize="10" wrappingAllowedY="true" width="241" tickCounterLabel="ticks" maxPxcor="9" minPxcor="-9" minPzcor="-9"></view3d>
2727
<button x="50" y="57" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="63">setup</button>
2828
<button x="50" y="99" height="33" disableUntilTicks="true" forever="true" kind="Observer" width="63">go</button>
2929
</widgets>

3D/Code Examples/Trails Example 3D.nlogox3d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ end
2424
; To the extent possible under law, Uri Wilensky has waived all
2525
; copyright and related or neighboring rights to this model.</code>
2626
<widgets>
27-
<view3d wrappingAllowedZ="true" x="0" maxPycor="20" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="20" minPycor="-20" height="441" showTickCounter="true" patchSize="10.0" fontSize="10" wrappingAllowedY="true" width="420" tickCounterLabel="ticks" maxPxcor="20" minPxcor="-20" minPzcor="-20"></view3d>
27+
<view3d wrappingAllowedZ="true" x="0" maxPycor="20" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="20" minPycor="-20" height="436" showTickCounter="true" patchSize="10.0" fontSize="10" wrappingAllowedY="true" width="416" tickCounterLabel="ticks" maxPxcor="20" minPxcor="-20" minPzcor="-20"></view3d>
2828
<slider x="10" step="1" y="40" height="33" min="0" direction="Horizontal" max="100" default="10.0" variable="number-of-drawers" width="179" sizeVersion="0" display="number-of-drawers"></slider>
2929
<button x="38" y="82" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="118">setup</button>
3030
<button x="38" y="117" height="33" disableUntilTicks="true" forever="true" kind="Observer" width="118">go</button>

3D/Code Examples/Turtle Dance Example 3D.nlogox3d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ end
2424
; To the extent possible under law, Uri Wilensky has waived all
2525
; copyright and related or neighboring rights to this model.</code>
2626
<widgets>
27-
<view3d wrappingAllowedZ="true" x="0" maxPycor="9" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="9" minPycor="-9" height="259" showTickCounter="true" patchSize="12.0" fontSize="10" wrappingAllowedY="true" width="245" tickCounterLabel="ticks" maxPxcor="9" minPxcor="-9" minPzcor="-9"></view3d>
27+
<view3d wrappingAllowedZ="true" x="0" maxPycor="9" updateMode="1" wrappingAllowedX="true" y="0" frameRate="30.0" maxPzcor="9" minPycor="-9" height="254" showTickCounter="true" patchSize="12.0" fontSize="10" wrappingAllowedY="true" width="241" tickCounterLabel="ticks" maxPxcor="9" minPxcor="-9" minPzcor="-9"></view3d>
2828
<button x="20" y="68" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="90">setup</button>
2929
<button x="113" y="68" height="33" disableUntilTicks="true" forever="true" kind="Observer" width="90">go</button>
3030
<slider x="26" step="1" y="32" height="33" min="0" direction="Horizontal" max="100" default="30.0" variable="number-of-turtles" width="172" sizeVersion="0" display="number-of-turtles"></slider>

0 commit comments

Comments
 (0)