Skip to content

Commit 631ea47

Browse files
jzkelterjzkelter
authored
Merge pull request #425 from NetLogo/remaining-art-resize
Resize remaining art models
2 parents e57f895 + 31abfca commit 631ea47

2 files changed

Lines changed: 66 additions & 66 deletions

File tree

‎Sample Models/Art/GenJam - Duple.nlogox‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<model version="NetLogo 7.0.0-beta0" snapToGrid="true">
2+
<model version="NetLogo 7.0.0-beta1" snapToGrid="true">
33
<code><![CDATA[extensions [ sound ]
44
55
globals [
@@ -385,14 +385,42 @@ end
385385
; Copyright 2017 Uri Wilensky.
386386
; See Info tab for full copyright and license.]]></code>
387387
<widgets>
388-
<view x="290" wrappingAllowedX="false" y="10" frameRate="30.0" minPycor="0" height="340" showTickCounter="true" patchSize="21.0" fontSize="10" wrappingAllowedY="false" width="340" tickCounterLabel="ticks" maxPycor="15" updateMode="1" maxPxcor="15" minPxcor="0"></view>
389-
<button x="5" y="50" height="33" disableUntilTicks="false" forever="false" kind="Observer" display="setup" width="66" sizeVersion="0">setup
388+
<view x="340" wrappingAllowedX="false" y="10" frameRate="30.0" minPycor="0" height="340" showTickCounter="true" patchSize="21.0" fontSize="10" wrappingAllowedY="false" width="340" tickCounterLabel="ticks" maxPycor="15" updateMode="1" maxPxcor="15" minPxcor="0"></view>
389+
<slider x="5" step="1" y="10" max="12" width="170" display="num-chromosomes" height="50" min="2" direction="Horizontal" default="4.0" variable="num-chromosomes"></slider>
390+
<button x="75" y="65" height="35" disableUntilTicks="true" forever="false" kind="Observer" width="135" display="go-once-no-evolve">repeat num-chromosomes * 4 [go-no-evolve]</button>
391+
<button x="5" y="65" height="35" disableUntilTicks="false" forever="false" kind="Observer" width="66" display="setup">setup
390392
sound:play-note "TRUMPET" 60 62 2
391393
wait 2</button>
392-
<button x="215" y="90" height="33" disableUntilTicks="true" forever="true" kind="Observer" display="go" width="70" sizeVersion="0">go</button>
393-
<slider x="5" step="1" y="10" max="12" display="num-chromosomes" height="33" min="2" direction="Horizontal" default="4.0" variable="num-chromosomes" width="145" sizeVersion="0"></slider>
394-
<switch x="155" y="10" height="33" on="true" variable="shuffle-parts?" display="shuffle-parts?" width="130" sizeVersion="0"></switch>
395-
<plot x="545" autoPlotX="true" yMax="10.0" autoPlotY="true" yAxis="Number of Hits" y="370" xMin="0.0" height="150" legend="false" xMax="16.0" yMin="0.0" xAxis="Drummer" display="Hits per Drummer (total)" width="235" sizeVersion="0">
394+
<switch x="5" y="105" height="37" on="true" variable="sound?" width="95" display="sound?"></switch>
395+
<button x="105" y="105" height="35" disableUntilTicks="true" forever="true" kind="Observer" width="105">go-no-evolve</button>
396+
<slider x="5" step="1" y="200" max="200" width="150" display="hit-limit" height="50" min="50" direction="Horizontal" default="120.0" variable="hit-limit"></slider>
397+
<slider x="5" step="1" y="255" max="10" width="150" display="num-mutations" height="50" min="1" direction="Horizontal" default="1.0" variable="num-mutations"></slider>
398+
<slider x="160" step="0.01" y="200" max="1" width="170" display="hit-density-modifier" height="50" min="0" direction="Horizontal" default="0.5" variable="hit-density-modifier"></slider>
399+
<slider x="160" step="1" y="255" max="8" width="170" display="mutation-strength" height="50" min="0" direction="Horizontal" default="1.0" variable="mutation-strength"></slider>
400+
<switch x="180" y="10" height="50" on="true" variable="shuffle-parts?" width="150" display="shuffle-parts?"></switch>
401+
<slider x="5" step="1" y="145" max="200" width="325" display="tempo-bpm" height="50" min="40" direction="Horizontal" default="135.0" variable="tempo-bpm"></slider>
402+
<button x="215" y="65" height="35" disableUntilTicks="true" forever="false" kind="Observer" width="115" display="go-once">repeat num-chromosomes * 4 [ go ]</button>
403+
<button x="215" y="105" height="35" disableUntilTicks="true" forever="true" kind="Observer" width="115" display="go">go</button>
404+
<chooser x="55" y="310" height="60" variable="soloer" current="0" width="100" display="soloer">
405+
<choice type="double" value="0.0"></choice>
406+
<choice type="double" value="1.0"></choice>
407+
<choice type="double" value="2.0"></choice>
408+
<choice type="double" value="3.0"></choice>
409+
<choice type="double" value="4.0"></choice>
410+
<choice type="double" value="5.0"></choice>
411+
<choice type="double" value="6.0"></choice>
412+
<choice type="double" value="7.0"></choice>
413+
<choice type="double" value="8.0"></choice>
414+
<choice type="double" value="9.0"></choice>
415+
<choice type="double" value="10.0"></choice>
416+
<choice type="double" value="11.0"></choice>
417+
<choice type="double" value="12.0"></choice>
418+
<choice type="double" value="13.0"></choice>
419+
<choice type="double" value="14.0"></choice>
420+
<choice type="double" value="15.0"></choice>
421+
</chooser>
422+
<switch x="160" y="310" height="60" on="false" variable="solo?" width="100" display="solo?"></switch>
423+
<plot x="550" autoPlotX="true" yMax="10.0" autoPlotY="true" yAxis="Number of Hits" y="375" xMin="0.0" height="240" legend="false" xMax="16.0" yMin="0.0" width="315" xAxis="Drummer" display="Hits per Drummer (total)">
396424
<setup></setup>
397425
<update></update>
398426
<pen interval="1.0" mode="1" display="low" color="-2674135" legend="true">
@@ -411,7 +439,24 @@ ask med-drums [plotxy who hits]</update>
411439
ask high-drums [plotxy who hits]</update>
412440
</pen>
413441
</plot>
414-
<plot x="5" autoPlotX="true" yMax="1.0" autoPlotY="true" yAxis="Fitness" y="370" xMin="0.0" height="150" legend="true" xMax="1.0" yMin="0.0" xAxis="Ticks" display="Average Fitness" width="280" sizeVersion="0">
442+
<plot x="295" autoPlotX="true" yMax="10.0" autoPlotY="true" yAxis="Number of Hits" y="375" xMin="0.0" height="240" legend="false" xMax="10.0" yMin="0.0" width="250" xAxis="Drummer" display="Hits Since Evolution">
443+
<setup></setup>
444+
<update></update>
445+
<pen interval="1.0" mode="1" display="low" color="-2674135" legend="true">
446+
<setup></setup>
447+
<update>plot-pen-reset
448+
ask low-drums [ plotxy who hits-since-evolve ]</update>
449+
</pen>
450+
<pen interval="1.0" mode="1" display="pen-1" color="-10899396" legend="true">
451+
<setup></setup>
452+
<update>plot-pen-reset ask med-drums [ plotxy who hits-since-evolve ]</update>
453+
</pen>
454+
<pen interval="1.0" mode="1" display="pen-2" color="-13345367" legend="true">
455+
<setup></setup>
456+
<update>plot-pen-reset ask high-drums [ plotxy who hits-since-evolve ]</update>
457+
</pen>
458+
</plot>
459+
<plot x="10" autoPlotX="true" yMax="1.0" autoPlotY="true" yAxis="Fitness" y="375" xMin="0.0" height="240" legend="true" xMax="1.0" yMin="0.0" width="280" xAxis="Ticks" display="Average Fitness">
415460
<setup></setup>
416461
<update></update>
417462
<pen interval="1.0" mode="0" display="all" color="-16777216" legend="true">
@@ -431,53 +476,8 @@ ask high-drums [plotxy who hits]</update>
431476
<update>plot mean [fitness] of high-drums</update>
432477
</pen>
433478
</plot>
434-
<slider x="110" step="0.01" y="170" max="1" display="hit-density-modifier" height="33" min="0" direction="Horizontal" default="0.5" variable="hit-density-modifier" width="175" sizeVersion="0"></slider>
435-
<switch x="5" y="90" height="33" on="true" variable="sound?" display="sound?" width="103" sizeVersion="0"></switch>
436-
<slider x="5" step="1" y="210" max="10" display="num-mutations" height="33" min="1" direction="Horizontal" default="1.0" variable="num-mutations" width="125" sizeVersion="0"></slider>
437-
<slider x="135" step="1" y="210" max="8" display="mutation-strength" height="33" min="0" direction="Horizontal" default="1.0" variable="mutation-strength" width="150" sizeVersion="0"></slider>
438-
<chooser x="40" y="310" height="45" variable="soloer" current="0" display="soloer" width="92" sizeVersion="0">
439-
<choice type="double" value="0.0"></choice>
440-
<choice type="double" value="1.0"></choice>
441-
<choice type="double" value="2.0"></choice>
442-
<choice type="double" value="3.0"></choice>
443-
<choice type="double" value="4.0"></choice>
444-
<choice type="double" value="5.0"></choice>
445-
<choice type="double" value="6.0"></choice>
446-
<choice type="double" value="7.0"></choice>
447-
<choice type="double" value="8.0"></choice>
448-
<choice type="double" value="9.0"></choice>
449-
<choice type="double" value="10.0"></choice>
450-
<choice type="double" value="11.0"></choice>
451-
<choice type="double" value="12.0"></choice>
452-
<choice type="double" value="13.0"></choice>
453-
<choice type="double" value="14.0"></choice>
454-
<choice type="double" value="15.0"></choice>
455-
</chooser>
456-
<monitor x="40" precision="17" y="255" height="45" fontSize="11" width="90" sizeVersion="0">generations</monitor>
457-
<button x="110" y="90" height="33" disableUntilTicks="true" forever="true" kind="Observer" width="100" sizeVersion="0">go-no-evolve</button>
458-
<button x="75" y="50" height="33" disableUntilTicks="true" forever="false" kind="Observer" display="go-once-no-evolve" width="135" sizeVersion="0">repeat num-chromosomes * 4 [go-no-evolve]</button>
459-
<button x="215" y="50" height="33" disableUntilTicks="true" forever="false" kind="Observer" display="go-once" width="70" sizeVersion="0">repeat num-chromosomes * 4 [ go ]</button>
460-
<switch x="135" y="315" height="33" on="false" variable="solo?" display="solo?" width="103" sizeVersion="0"></switch>
461-
<slider x="5" step="1" y="130" max="200" display="tempo-bpm" height="33" min="40" direction="Horizontal" default="135.0" variable="tempo-bpm" width="280" sizeVersion="0"></slider>
462-
<monitor x="135" precision="17" y="255" height="45" fontSize="11" display="Density" width="87" sizeVersion="0">precision (count patches with [(pcolor != black) and (pcolor != yellow)] / (count patches)) 3</monitor>
463-
<plot x="290" autoPlotX="true" yMax="10.0" autoPlotY="true" yAxis="Number of Hits" y="370" xMin="0.0" height="150" legend="false" xMax="10.0" yMin="0.0" xAxis="Drummer" display="Hits Since Evolution" width="250" sizeVersion="0">
464-
<setup></setup>
465-
<update></update>
466-
<pen interval="1.0" mode="1" display="low" color="-2674135" legend="true">
467-
<setup></setup>
468-
<update>plot-pen-reset
469-
ask low-drums [ plotxy who hits-since-evolve ]</update>
470-
</pen>
471-
<pen interval="1.0" mode="1" display="pen-1" color="-10899396" legend="true">
472-
<setup></setup>
473-
<update>plot-pen-reset ask med-drums [ plotxy who hits-since-evolve ]</update>
474-
</pen>
475-
<pen interval="1.0" mode="1" display="pen-2" color="-13345367" legend="true">
476-
<setup></setup>
477-
<update>plot-pen-reset ask high-drums [ plotxy who hits-since-evolve ]</update>
478-
</pen>
479-
</plot>
480-
<slider x="5" step="1" y="170" max="200" display="hit-limit" height="33" min="50" direction="Horizontal" default="120.0" variable="hit-limit" width="100" sizeVersion="0"></slider>
479+
<monitor x="690" precision="17" y="112" height="60" fontSize="11" width="100">generations</monitor>
480+
<monitor x="690" precision="17" y="175" height="60" fontSize="11" width="100" display="density">precision (count patches with [(pcolor != black) and (pcolor != yellow)] / (count patches)) 3</monitor>
481481
</widgets>
482482
<info><![CDATA[## WHAT IS IT?
483483
@@ -1472,7 +1472,7 @@ To inquire about commercial licenses for either NetLogo or specific models from
14721472
</shape>
14731473
</linkShapes>
14741474
<hubNetClient>
1475-
<view x="71" wrappingAllowedX="true" y="41" frameRate="30.0" minPycor="0" height="320" showTickCounter="true" patchSize="12.0" fontSize="13" wrappingAllowedY="true" width="560" tickCounterLabel="ticks" maxPycor="15" updateMode="1" maxPxcor="15" minPxcor="0"></view>
1475+
<view x="71" wrappingAllowedX="false" y="41" frameRate="30.0" minPycor="0" height="320" showTickCounter="true" patchSize="21.0" fontSize="13" wrappingAllowedY="false" width="560" tickCounterLabel="ticks" maxPycor="15" updateMode="1" maxPxcor="15" minPxcor="0"></view>
14761476
</hubNetClient>
14771477
<previewCommands>set sound? False
14781478
set tempo-bpm 1000

‎Sample Models/Art/Kaleidoscope.nlogox‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<model version="NetLogo 7.0.0-beta0" snapToGrid="true">
2+
<model version="NetLogo 7.0.0-beta1" snapToGrid="true">
33
<code><![CDATA[globals [ curr-color-sep ] ; spread of the colors in the kaleidoscope
44
55
; INITIALIZATION PROCEDURES
@@ -86,15 +86,15 @@ end
8686
; Copyright 1998 Uri Wilensky.
8787
; See Info tab for full copyright and license.]]></code>
8888
<widgets>
89-
<view x="295" wrappingAllowedX="false" y="10" frameRate="30.0" minPycor="-50" height="408" showTickCounter="true" patchSize="4.0" fontSize="10" wrappingAllowedY="false" width="408" tickCounterLabel="ticks" maxPycor="50" updateMode="1" maxPxcor="50" minPxcor="-50"></view>
90-
<monitor x="75" precision="3" y="130" height="45" fontSize="11" display="current-color-sep" width="140" sizeVersion="0">curr-color-sep</monitor>
91-
<slider x="145" step="1.0" y="10" max="60.0" display="color-sep" height="33" min="1.0" direction="Horizontal" default="1.0" variable="color-sep" width="140" sizeVersion="0"></slider>
92-
<button x="5" y="50" height="33" disableUntilTicks="false" forever="false" kind="Observer" display="setup" width="80" sizeVersion="0">setup</button>
93-
<button x="90" y="50" height="33" disableUntilTicks="true" forever="true" kind="Observer" display="pattern-1" width="93" sizeVersion="0">pattern-1</button>
94-
<switch x="145" y="90" height="33" on="true" variable="increase-color?" display="increase-color?" width="140" sizeVersion="0"></switch>
95-
<button x="190" y="50" height="33" disableUntilTicks="true" forever="true" kind="Observer" display="pattern-2" width="95" sizeVersion="0">pattern-2</button>
96-
<slider x="5" step="1" y="10" max="24" display="num-turtles" height="33" min="1" direction="Horizontal" default="6.0" variable="num-turtles" width="135" sizeVersion="0"></slider>
97-
<switch x="5" y="90" height="33" on="true" variable="color-shift?" display="color-shift?" width="136" sizeVersion="0"></switch>
89+
<view x="310" wrappingAllowedX="false" y="7" frameRate="30.0" minPycor="-50" height="408" showTickCounter="true" patchSize="4.0" fontSize="10" wrappingAllowedY="false" width="408" tickCounterLabel="ticks" maxPycor="50" updateMode="1" maxPxcor="50" minPxcor="-50"></view>
90+
<button x="5" y="60" height="35" disableUntilTicks="false" forever="false" kind="Observer" width="80" display="setup">setup</button>
91+
<slider x="0" step="1" y="7" max="24" width="150" display="num-turtles" height="50" min="1" direction="Horizontal" default="6.0" variable="num-turtles"></slider>
92+
<slider x="155" step="1.0" y="7" max="60.0" width="150" display="color-sep" height="50" min="1.0" direction="Horizontal" default="1.0" variable="color-sep"></slider>
93+
<button x="200" y="60" height="35" disableUntilTicks="true" forever="true" kind="Observer" width="105" display="pattern-2">pattern-2</button>
94+
<button x="90" y="60" height="35" disableUntilTicks="true" forever="true" kind="Observer" width="105" display="pattern-1">pattern-1</button>
95+
<switch x="5" y="100" height="37" on="true" variable="color-shift?" width="145" display="color-shift?"></switch>
96+
<switch x="155" y="100" height="37" on="true" variable="increase-color?" width="150" display="increase-color?"></switch>
97+
<monitor x="85" precision="3" y="145" height="60" fontSize="11" width="140" display="current-color-sep">curr-color-sep</monitor>
9898
</widgets>
9999
<info><![CDATA[## WHAT IS IT?
100100

0 commit comments

Comments
 (0)