Skip to content

Eliminate use of no-display #132

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
nicolaspayette merged 6 commits into from
Nov 6, 2015
Merged

Eliminate use of no-display #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54feca8
test for use of `no-display`
nicolaspayette Sep 21, 2015
edfcef5
4 Block Stalagmites: widen slider for Linux
nicolaspayette Nov 6, 2015
122e199
4 Block Stalagmites: move plotting code to plot
nicolaspayette Nov 6, 2015
6998507
4 Block (two) Stalagmites: avoid `no-display`
nicolaspayette Nov 6, 2015
201787a
Oil Cartel Alternate HubNet: avoid `no-display`
nicolaspayette Nov 6, 2015
471a351
Urban Suite Tijuana Bordertowns: avoid `no-display`
nicolaspayette Nov 6, 2015
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
84 changes: 26 additions & 58 deletions Curricular Models/ProbLab/4 Block Stalagmites.nlogo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,30 @@ sample-organizers-own [
original-pycor
]

to go-org
to go
if stop-all? [ stop ]
super-go
organize-results
end

to super-go
if stop-all? [ stop ]
ifelse popping? [
no-display
unpop
go
pop
display
] [
go
display
let popped? popping?
if popped? [ unpop ]

;; The model keeps track of which different combinations have been
;; discovered. Each column-kid reports whether or not its column has
;; all the possible combinations. When bound? is true, a report from
;; ALL column-kids that their columns are full will stop the run.
if stop-at-all-found? and all? column-kids [ column-full? ] [
stop
]
sample
ifelse magnify? [ magnify-on-side ] [ ask baby-dudes [ die ] ]
drop-in-bin

if popped? [ pop ]
tick
end

to go-org
go
organize-results
end

;; the popping? global controls the popping visuals
Expand Down Expand Up @@ -256,23 +262,6 @@ to setup
reset-ticks
end

to go
if stop-all? [ stop ]
;; The model keeps track of which different combinations have been
;; discovered. Each column-kid reports whether or not its column has
;; all the possible combinations. When bound? is true, a report from
;; ALL column-kids that their columns are full will stop the run.
if stop-at-all-found? and all? column-kids [ column-full? ] [
stop
]
sample
ifelse magnify? [ magnify-on-side ] [ ask baby-dudes [ die ] ]
drop-in-bin

tick
if plot? [ histogram-blocks ]
end

to-report column-full?
report length remove-duplicates sample-list = binomial-coefficient
end
Expand Down Expand Up @@ -490,27 +479,6 @@ to-report total-samples-to-find
report precision (2 ^ (side ^ 2)) 0
end

to histogram-blocks
let sample-value-summaries [ sample-summary-value ] of sample-organizers
let possible-values n-values (2 ^ (side * side)) [ ? ]
let results []
foreach possible-values [
let i ?
set results lput length filter [ ? = i ] sample-value-summaries results
]

set-current-plot "Events by Number of Outcomes"
let max-results max results
if mean results > 0 [ set-plot-x-range 0 (max-results + 1) ]
set-current-plot-pen "Histogram"
histogram results
set-current-plot-pen "Mean"
let mean-results mean results
plot-pen-reset
plotxy mean-results 0
plotxy mean-results plot-y-max
end


; Copyright 2006 Uri Wilensky.
; See Info tab for full copyright and license.
Expand Down Expand Up @@ -543,9 +511,9 @@ ticks
30.0

SLIDER
300
285
570
529
535
603
probability-to-be-target-color
probability-to-be-target-color
Expand All @@ -563,7 +531,7 @@ BUTTON
265
103
Go
super-go
go
T
1
T
Expand Down Expand Up @@ -641,7 +609,7 @@ BUTTON
135
103
Go Once
super-go
go
NIL
1
T
Expand Down Expand Up @@ -751,7 +719,7 @@ Number of Outcomes per Event
15.0
true
false
"" ""
"" "if plot? [\n let sample-value-summaries [ sample-summary-value ] of sample-organizers\n let possible-values n-values (2 ^ (side * side)) [ ? ]\n let results []\n foreach possible-values [\n let i ?\n set results lput length filter [ ? = i ] sample-value-summaries results\n ]\n\n let max-results max results\n if mean results > 0 [ set-plot-x-range 0 (max-results + 1) ]\n set-current-plot-pen \"Histogram\"\n histogram results\n set-current-plot-pen \"Mean\"\n let mean-results mean results\n plot-pen-reset\n plotxy mean-results 0\n plotxy mean-results plot-y-max\n]"
PENS
"histogram" 1.0 1 -16777216 true "" ""
"Mean" 1.0 0 -2674135 true "" ""
Expand Down
54 changes: 25 additions & 29 deletions Curricular Models/ProbLab/4 Block Two Stalagmites.nlogo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,32 +49,39 @@ sample-organizers-own [
original-pycor
]

to go-org
super-go
organize-results
end

to super-go
to go

if stop-all? [
ifelse stop-at-top? [
stop
] [
bump-down
]
]
ifelse popping? [
no-display
unpop
go
pop
display
] [
go
display
]

let popped? popping?
if popped? [ unpop ]

;; The model keeps track of which different combinations
;; have been discovered. Each column-kid reports whether
;; or not its column has all the possible combinations.
;; When bound? is true, a report from ALL column-kids
;; that their columns are full will stop the run.
sample
drop-in-bin

if popped? [ pop ]

tick
plot-it
end

to go-org
go
organize-results
end

;; global controls the popping visuals
to pop
set popping? true
Expand Down Expand Up @@ -325,17 +332,6 @@ to bump-down
recolor-columns
end

to go
;; The model keeps track of which different combinations
;; have been discovered. Each column-kid reports whether
;; or not its column has all the possible combinations.
;; When bound? is true, a report from ALL column-kids
;; that their columns are full will stop the run.
sample
drop-in-bin
tick
end

;; This procedure creates a square sample of dimensions
;; side-times-side, e.g., 3-by-3, located to the left of
;; the columns. Each patch in this sample sprouts a turtle.
Expand Down Expand Up @@ -661,7 +657,7 @@ BUTTON
245
128
Go
super-go
go
T
1
T
Expand All @@ -678,7 +674,7 @@ BUTTON
165
128
Go Once
super-go
go
NIL
1
T
Expand All @@ -693,7 +689,7 @@ BUTTON
10
135
165
166
168
Organize Results
organize-results
NIL
Expand Down
4 changes: 2 additions & 2 deletions Curricular Models/Urban Suite/Urban Suite - Tijuana Bordertowns.nlogo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ BUTTON
70
43
1 clear
clear-all\nwithout-interruption\n[ no-display\nclear-all\nask patches [ set pcolor white ]\ndisplay ]\nreset-ticks
clear-all\nask patches [ set pcolor white ]\nreset-ticks
NIL
1
T
Expand Down Expand Up @@ -1631,7 +1631,7 @@ Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270

@#$#@#$#@
NetLogo 5.2.1
NetLogo 5.2.1-RC1
@#$#@#$#@
ask patches [ set pcolor white ]
reset-ticks
Expand Down
12 changes: 7 additions & 5 deletions HubNet Activities/Unverified/Oil Cartel Alternate HubNet.nlogo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,12 @@ end
to run-market
if (market-running? != true) [ plot-supply-and-demand ]

;; Turn off the display if needed
ifelse (perfect-information? = true)
[ display ]
[ no-display ]
;; Hide buyers when perfect information is turned off
ask buyers [ set hidden? not perfect-information? ]

;; Since there is no `setup` procedure where `reset-ticks` could be
;; called in this model, we have to use `display` instead of `tick`.
display

set market-running? true

Expand Down Expand Up @@ -1457,7 +1459,7 @@ Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270

@#$#@#$#@
NetLogo 5.2.0
NetLogo 5.2.1-RC1
@#$#@#$#@
need-to-manually-make-preview-for-this-model
@#$#@#$#@
Expand Down
1 change: 1 addition & 0 deletions src/test/scala/org/nlogo/models/CodeTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class CodeTests extends TestModels {
"ht" -> Seq.empty,
"in-cone-nowrap" -> Seq.empty,
"in-radius-nowrap" -> Seq.empty,
"no-display" -> Seq.empty,
"pd" -> Seq.empty,
"ppd" -> Seq.empty,
"ppu" -> Seq.empty,
Expand Down