Skip to content

Commit a73df5a

Browse files
committed
[UI] updates to Sample Models/Social Science models to fit new UI widget
sizes
2 parents 39d2e7b + cbac16a commit a73df5a

4 files changed

Lines changed: 146 additions & 141 deletions

File tree

Sample Models/Social Science/Language Change.nlogox

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,13 @@ end
239239
; Copyright 2007 Uri Wilensky.
240240
; See Info tab for full copyright and license.]]></code>
241241
<widgets>
242+
<<<<<<< HEAD
242243
<view x="375" wrappingAllowedX="false" y="10" frameRate="30.0" minPycor="-45" height="368" showTickCounter="true" patchSize="4.0" fontSize="10" wrappingAllowedY="false" width="368" tickCounterLabel="ticks" maxPycor="45" updateMode="1" maxPxcor="45" minPxcor="-45"></view>
243244
<plot x="5" autoPlotX="true" yMax="1.0" autoPlotY="true" yAxis="State" y="365" xMin="0.0" height="120" legend="false" xMax="100.0" yMin="0.0" xAxis="Time" display="Mean state of language users in the network" width="360" sizeVersion="0">
245+
=======
246+
<view x="375" maxPycor="45" updateMode="1" wrappingAllowedX="false" y="10" frameRate="30.0" minPycor="-45" height="368" showTickCounter="true" patchSize="4.0" fontSize="10" wrappingAllowedY="false" width="368" tickCounterLabel="ticks" maxPxcor="45" minPxcor="-45"></view>
247+
<plot x="5" yMax="1.0" yAxis="State" y="365" xMin="0.0" height="120" legend="false" xMax="100.0" autoPlotX="true" autoPlotY="true" yMin="0.0" width="360" sizeVersion="0" xAxis="Time" display="Mean state of language users in the network">
248+
>>>>>>> df500147 (Separated plot autoscale axes)
244249
<setup></setup>
245250
<update></update>
246251
<pen interval="1.0" mode="0" display="default" color="-16777216" legend="true">

Sample Models/Social Science/Prisoner's Dilemma/Prisoner's Dilemma N-Person Iterated.nlogox

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -310,9 +310,26 @@ end
310310
; Copyright 2002 Uri Wilensky.
311311
; See Info tab for full copyright and license.]]></code>
312312
<widgets>
313-
<view x="303" wrappingAllowedX="true" y="8" frameRate="30.0" minPycor="-10" height="424" showTickCounter="true" patchSize="20.0" fontSize="10" wrappingAllowedY="true" width="424" tickCounterLabel="ticks" maxPycor="10" updateMode="1" maxPxcor="10" minPxcor="-10"></view>
314-
<button x="8" y="19" height="43" disableUntilTicks="false" forever="false" kind="Observer" width="78" sizeVersion="0">setup</button>
315-
<plot x="8" autoPlotX="true" yMax="5.0" autoPlotY="true" yAxis="Ave Payoff" y="330" xMin="0.0" height="217" legend="true" xMax="10.0" yMin="0.0" xAxis="Iterations" display="Average Payoff" width="284" sizeVersion="0">
313+
<view x="650" wrappingAllowedX="true" y="8" frameRate="30.0" minPycor="-10" height="424" showTickCounter="true" patchSize="20.0" fontSize="10" wrappingAllowedY="true" width="424" tickCounterLabel="ticks" maxPycor="10" updateMode="1" maxPxcor="10" minPxcor="-10"></view>
314+
<note x="347" y="22" backgroundDark="0" fontSize="11" width="236" markdown="false" height="153" textColorDark="-1" textColorLight="-16777216" backgroundLight="0"> PAYOFF:
315+
Partner
316+
Turtle C D
317+
-------------------------
318+
C 3 0
319+
-------------------------
320+
D 5 1
321+
-------------------------
322+
(C = Cooperate, D = Defect)</note>
323+
<slider x="8" step="1" y="80" max="20" width="150" display="n-random" height="50" min="0" direction="Horizontal" default="10.0" variable="n-random"></slider>
324+
<slider x="169" step="1" y="208" max="20" width="165" display="n-unknown" height="50" min="0" direction="Horizontal" default="10.0" variable="n-unknown"></slider>
325+
<slider x="8" step="1" y="144" max="20" width="150" display="n-cooperate" height="50" min="0" direction="Horizontal" default="10.0" variable="n-cooperate"></slider>
326+
<slider x="8" step="1" y="208" max="20" width="150" display="n-defect" height="50" min="0" direction="Horizontal" default="10.0" variable="n-defect"></slider>
327+
<slider x="169" step="1" y="80" max="20" width="165" display="n-tit-for-tat" height="50" min="0" direction="Horizontal" default="10.0" variable="n-tit-for-tat"></slider>
328+
<slider x="169" step="1" y="144" max="20" width="165" display="n-unforgiving" height="50" min="0" direction="Horizontal" default="10.0" variable="n-unforgiving"></slider>
329+
<button x="8" y="27" height="43" disableUntilTicks="false" forever="false" kind="Observer" width="84">setup</button>
330+
<button x="101" y="27" height="43" disableUntilTicks="true" forever="true" kind="Observer" width="111">go</button>
331+
<button x="221" y="27" height="44" disableUntilTicks="true" forever="false" kind="Observer" width="113" display="go once">go</button>
332+
<plot x="8" autoPlotX="true" yMax="5.0" autoPlotY="true" yAxis="Ave Payoff" y="266" xMin="0.0" height="224" legend="true" xMax="10.0" yMin="0.0" width="634" xAxis="Iterations" display="Average Payoff">
316333
<setup></setup>
317334
<update></update>
318335
<pen interval="1.0" mode="0" display="random" color="-7500403" legend="true">
@@ -340,23 +357,6 @@ end
340357
<update><![CDATA[if num-unknown-games > 0 [ plot unknown-score / (num-unknown-games) ]]]></update>
341358
</pen>
342359
</plot>
343-
<button x="85" y="19" height="43" disableUntilTicks="true" forever="true" kind="Observer" width="89" sizeVersion="0">go</button>
344-
<slider x="8" step="1" y="61" max="20" display="n-random" height="33" min="0" direction="Horizontal" default="10.0" variable="n-random" width="126" sizeVersion="0"></slider>
345-
<slider x="8" step="1" y="94" max="20" display="n-cooperate" height="33" min="0" direction="Horizontal" default="10.0" variable="n-cooperate" width="126" sizeVersion="0"></slider>
346-
<slider x="8" step="1" y="127" max="20" display="n-defect" height="33" min="0" direction="Horizontal" default="10.0" variable="n-defect" width="126" sizeVersion="0"></slider>
347-
<slider x="133" step="1" y="61" max="20" display="n-tit-for-tat" height="33" min="0" direction="Horizontal" default="10.0" variable="n-tit-for-tat" width="126" sizeVersion="0"></slider>
348-
<slider x="133" step="1" y="94" max="20" display="n-unforgiving" height="33" min="0" direction="Horizontal" default="10.0" variable="n-unforgiving" width="126" sizeVersion="0"></slider>
349-
<slider x="133" step="1" y="127" max="20" display="n-unknown" height="33" min="0" direction="Horizontal" default="10.0" variable="n-unknown" width="126" sizeVersion="0"></slider>
350-
<note x="12" y="175" height="140" textColorLight="-16777216" fontSize="11" width="236" markdown="false"> PAYOFF:
351-
Partner
352-
Turtle C D
353-
-------------------------
354-
C 3 0
355-
-------------------------
356-
D 5 1
357-
-------------------------
358-
(C = Cooperate, D = Defect)</note>
359-
<button x="174" y="19" height="44" disableUntilTicks="true" forever="false" kind="Observer" display="go once" width="86" sizeVersion="0">go</button>
360360
</widgets>
361361
<info><![CDATA[## WHAT IS IT?
362362

0 commit comments

Comments
 (0)