Skip to content

Commit e4ef663

Browse files
ERSUCCERSUCC
committed
Ensure that all models compile in headless mode
1 parent 477dd6f commit e4ef663

File tree

4 files changed

+56
-41
lines changed

4 files changed

+56
-41
lines changed

‎examples/DiscreteEventScheduling.nlogox‎

Lines changed: 6 additions & 2 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-beta2" snapToGrid="false">
2+
<model version="NetLogo 7.0.0" snapToGrid="false">
33
<code><![CDATA[extensions [time]
44
55
globals[
@@ -55,6 +55,10 @@ to setup
5555
;;time:clear-schedule
5656
end
5757
58+
to go
59+
time:go
60+
end
61+
5862
;; Note: in this example model, go-forward occurs inside a turtle context, so self refers to the turtle performing the event
5963
to go-forward
6064
print (word self " going forward at " current-time "(" ticks ")")
@@ -838,5 +842,5 @@ end]]></code>
838842
</indicator>
839843
</shape>
840844
</linkShapes>
841-
<previewCommands>setup repeat 75 [ go ]</previewCommands>
845+
<previewCommands>setup go-until</previewCommands>
842846
</model>

‎examples/TimeSeriesTest-CSVReadWrite.nlogox‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<model version="NetLogo 7.0.0-beta2" snapToGrid="false">
3-
<code>extensions [time]
2+
<model version="NetLogo 7.0.0" snapToGrid="false">
3+
<code>extensions [ csv time ]
4+
5+
__includes [ "../time-series.nls" ]
46

57
globals [ts ts_out]
68

79
to setup
810
let random_flow0 (random 100)
911
let random_flow1 (random 100)
10-
set ts time:ts-create ["flow" "temp"]
11-
time:ts-add-row ts (list (time:create "2000-01-01") random_flow0 2)
12-
time:ts-add-row ts (list (time:create "2000-01-02") random_flow1 5)
13-
time:ts-write ts "new-ts-output.csv"
12+
set ts ts-create ["flow" "temp"]
13+
set ts ts-add-row ts (list (time:create "2000-01-01") random_flow0 2)
14+
set ts ts-add-row ts (list (time:create "2000-01-02") random_flow1 5)
15+
ts-write ts "new-ts-output.csv"
1416

15-
set ts_out time:ts-load "new-ts-output.csv"
16-
let flow_value0 time:ts-get ts_out (time:create "2000-01-01") "flow"
17-
let flow_value1 time:ts-get ts_out (time:create "2000-01-02") "flow"
17+
set ts_out ts-load "new-ts-output.csv"
18+
let flow_value0 ts-get ts_out (time:create "2000-01-01") "flow"
19+
let flow_value1 ts-get ts_out (time:create "2000-01-02") "flow"
1820
if(flow_value0 != random_flow0)
1921
[ error "Read and Write Error" ]
2022
if (flow_value1 != random_flow1)
2123
[ error "Read and Write Error" ]
2224

23-
let flow_value0e time:ts-get-exact ts_out (time:create "2000-01-01") "flow"
24-
let flow_value1e time:ts-get-exact ts_out (time:create "2000-01-02") "flow"
25+
let flow_value0e ts-get-exact ts_out (time:create "2000-01-01") "flow"
26+
let flow_value1e ts-get-exact ts_out (time:create "2000-01-02") "flow"
2527
if(flow_value0e != random_flow0)
2628
[ error "Read and Write Error" ]
2729
if (flow_value1e != random_flow1)
2830
[ error "Read and Write Error" ]
2931

30-
let flow_value0i time:ts-get-interp ts_out (time:create "2000-01-01") "flow"
31-
let flow_value1i time:ts-get-interp ts_out (time:create "2000-01-02") "flow"
32+
let flow_value0i ts-get-interp ts_out (time:create "2000-01-01") "flow"
33+
let flow_value1i ts-get-interp ts_out (time:create "2000-01-02") "flow"
3234
if(flow_value0i != random_flow0)
3335
[ error "Read and Write Error" ]
3436
if (flow_value1i != random_flow1)

‎examples/TimeTests_JZK_2020-05.nlogox‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<model version="NetLogo 7.0.0-beta2" snapToGrid="false">
2+
<model version="NetLogo 7.0.0" snapToGrid="false">
33
<code>extensions [ time csv ]
44

5+
__includes ["../time-series.nls"]
6+
57
globals [
68
time-series
79
ts
@@ -23,12 +25,12 @@ to test-ts-get
2325
; https://github.com/NetLogo/Time-Extension/issues/26
2426
print "*********testing ts-get************"
2527

26-
set time-series time:ts-create ["x"]
28+
set time-series ts-create ["x"]
2729
let true-val 1
28-
time:ts-add-row time-series (sentence (time:create "2020-06-16 12:00") 1)
29-
time:ts-add-row time-series (sentence (time:create "2020-06-17 12:00") 2)
30+
set time-series ts-add-row time-series (sentence (time:create "2020-06-16 12:00") 1)
31+
set time-series ts-add-row time-series (sentence (time:create "2020-06-17 12:00") 2)
3032

31-
let ret-val (time:ts-get time-series (time:create "2020-06-16 23:00") "x") ; should be 1, because 23:00 on 6/16 is closer to 12:00 on 6/16 than 12:00 on 6/17
33+
let ret-val (ts-get time-series (time:create "2020-06-16 23:00") "x") ; should be 1, because 23:00 on 6/16 is closer to 12:00 on 6/16 than 12:00 on 6/17
3234
ifelse true-val = ret-val [
3335
print "test passed"
3436
] [
@@ -40,13 +42,13 @@ end
4042
to test-ts-get-range
4143
; https://github.com/NetLogo/Time-Extension/issues/27
4244
print "*********testing ts-get-range************"
43-
set time-series time:ts-create ["x"]
44-
time:ts-add-row time-series (sentence (time:create "2020-06-16 12:00") 1)
45-
time:ts-add-row time-series (sentence (time:create "2020-06-17 12:00") 2)
45+
set time-series ts-create ["x"]
46+
set time-series ts-add-row time-series (sentence (time:create "2020-06-16 12:00") 1)
47+
set time-series ts-add-row time-series (sentence (time:create "2020-06-17 12:00") 2)
4648

47-
let cond1 length (time:ts-get-range time-series (time:create "2020-06-16 12:00") (time:create "2020-06-17 12:00") "x") = 2
49+
let cond1 length (ts-get-range time-series (time:create "2020-06-16 12:00") (time:create "2020-06-17 12:00") "x") = 2
4850

49-
let cond2 length (time:ts-get-range time-series (time:create "2020-06-17 12:00") (time:create "2020-06-17 12:00") "x") = 1
51+
let cond2 length (ts-get-range time-series (time:create "2020-06-17 12:00") (time:create "2020-06-17 12:00") "x") = 1
5052
; print (time:ts-get-range time-series (time:create "2020-06-18 12:00") (time:create "2020-06-19 12:00") "x")
5153
ifelse cond1 and cond2 [; and cond3 [
5254
print "test passed"
@@ -59,10 +61,10 @@ end
5961
to test-ts-get-interp
6062
; https://github.com/NetLogo/Time-Extension/issues/25
6163
print "*********testing ts-get-interp************"
62-
set time-series time:ts-create ["flow"]
63-
time:ts-add-row time-series (sentence (time:create "2000-01-01 00:00:00") 0)
64-
time:ts-add-row time-series (sentence (time:create "2000-01-01 01:00:00") 10)
65-
let ret-val time:ts-get-interp time-series time:create "2000-01-01 00:30:00" "flow"
64+
set time-series ts-create ["flow"]
65+
set time-series ts-add-row time-series (sentence (time:create "2000-01-01 00:00:00") 0)
66+
set time-series ts-add-row time-series (sentence (time:create "2000-01-01 01:00:00") 10)
67+
let ret-val ts-get-interp time-series time:create "2000-01-01 00:30:00" "flow"
6668
print ret-val
6769
ifelse ret-val = 5 [
6870
print "test passed"
@@ -85,23 +87,23 @@ to test-ts-load
8587
print "============================"
8688

8789

88-
set time-series time:ts-load "time-series-data-with-comments.csv"
90+
set time-series ts-load "time-series-data-with-comments.csv"
8991

90-
print time:ts-get time-series time:create "2000-01-01 01:30:00" "flow"
91-
print time:ts-get time-series time:create "2000-01-01 10:20:00" "flow"
92-
print time:ts-get time-series time:create "2000-01-01 10:30:00" "flow"
93-
print time:ts-get time-series time:create "2005-01-02 10:50:01" "flow"
94-
print time:ts-get-exact time-series time:create "2000-01-01 10:00" "flow"
92+
print ts-get time-series time:create "2000-01-01 01:30:00" "flow"
93+
print ts-get time-series time:create "2000-01-01 10:20:00" "flow"
94+
print ts-get time-series time:create "2000-01-01 10:30:00" "flow"
95+
print ts-get time-series time:create "2005-01-02 10:50:01" "flow"
96+
print ts-get-exact time-series time:create "2000-01-01 10:00" "flow"
9597

96-
print time:ts-get-exact time-series time:create "2000-01-01 00:00" "flow"
97-
print time:ts-get-exact time-series time:create "2000-01-01 00:00" "temp" ; This line has a comment and it creates an error
98+
print ts-get-exact time-series time:create "2000-01-01 00:00" "flow"
99+
print ts-get-exact time-series time:create "2000-01-01 00:00" "temp" ; This line has a comment and it creates an error
98100

99101
; print time:ts-get-interp time-series time:create "2000-01-01 10:30:00" "flow"
100102
; print time:ts-get-interp time-series time:create "2000-01-03 00:30:00" "all"
101103
;
102104
; print time:ts-get-range time-series time:create "2000-01-02 12:30:00" time:create "2000-01-03 00:30:00" "all"
103105
;
104-
; set ts time:ts-create ["flow" "temp"]
106+
; set ts ts-create ["flow" "temp"]
105107
; time:ts-add-row ts ["2000-01-08" 5 4]
106108
; time:ts-add-row ts ["2000-01-01" 6 7]
107109
; time:ts-write ts "new-ts-file.csv"

‎tests/time-series.nlogox‎

Lines changed: 10 additions & 3 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-beta2" snapToGrid="false">
2+
<model version="NetLogo 7.0.0" snapToGrid="false">
33
<code>extensions [time csv]
44
__includes ["../time-series.nls"]
55

@@ -10,7 +10,14 @@ globals [
1010
start-time end-time
1111
time-series
1212
ts1 ts2
13-
]</code>
13+
]
14+
15+
to setup
16+
end
17+
18+
to start
19+
end
20+
</code>
1421
<widgets>
1522
<view x="436" wrappingAllowedX="false" y="10" frameRate="30.0" minPycor="-16" height="339" showTickCounter="true" patchSize="10.0" fontSize="10" wrappingAllowedY="false" width="338" tickCounterLabel="ticks" maxPycor="16" updateMode="0" maxPxcor="16" minPxcor="-16"></view>
1623
<button x="7" y="18" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="71" sizeVersion="0">setup</button>
@@ -757,5 +764,5 @@ Prepared by Colin Sheppard and Steve Railsback, 7 Nov 2013.]]></info>
757764
</indicator>
758765
</shape>
759766
</linkShapes>
760-
<previewCommands>setup repeat 75 [ go ]</previewCommands>
767+
<previewCommands>setup start</previewCommands>
761768
</model>

0 commit comments

Comments
 (0)