Skip to content

Commit 352f2af

Browse files
adamamer20adamamer20
committed
Fix execution counts in DataCollector tutorial notebook for consistency
1 parent 95cf996 commit 352f2af

File tree

1 file changed

+38
-43
lines changed

1 file changed

+38
-43
lines changed

‎docs/general/user-guide/4_datacollector.ipynb‎

Lines changed: 38 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
{
2828
"cell_type": "code",
29-
"execution_count": 18,
29+
"execution_count": 6,
3030
"id": "9a63283cbaf04dbcab1f6479b197f3a8",
3131
"metadata": {
3232
"editable": true
@@ -48,7 +48,7 @@
4848
},
4949
{
5050
"cell_type": "code",
51-
"execution_count": null,
51+
"execution_count": 7,
5252
"id": "72eea5119410473aa328ad9291626812",
5353
"metadata": {
5454
"editable": true
@@ -63,33 +63,33 @@
6363
" │ --- ┆ --- ┆ --- ┆ --- ┆ --- │\n",
6464
" │ i64 ┆ str ┆ i64 ┆ f64 ┆ i64 │\n",
6565
" ╞══════╪═════════════════════════════════╪═══════╪══════════════╪══════════╡\n",
66-
" │ 2 ┆ 162681765859364298619846106603… ┆ 0 ┆ 1000.0 ┆ 1000 │\n",
67-
" │ 4 ┆ 162681765859364298619846106603… ┆ 0 ┆ 1000.0 ┆ 1000 │\n",
68-
" │ 6 ┆ 162681765859364298619846106603… ┆ 0 ┆ 1000.0 ┆ 1000 │\n",
69-
" │ 8 ┆ 162681765859364298619846106603… ┆ 0 ┆ 1000.0 ┆ 1000 │\n",
70-
" │ 10 ┆ 162681765859364298619846106603… ┆ 0 ┆ 1000.0 ┆ 1000 │\n",
66+
" │ 2 ┆ 332212815818606584686857770936… ┆ 0 ┆ 1000.0 ┆ 1000 │\n",
67+
" │ 4 ┆ 332212815818606584686857770936… ┆ 0 ┆ 1000.0 ┆ 1000 │\n",
68+
" │ 6 ┆ 332212815818606584686857770936… ┆ 0 ┆ 1000.0 ┆ 1000 │\n",
69+
" │ 8 ┆ 332212815818606584686857770936… ┆ 0 ┆ 1000.0 ┆ 1000 │\n",
70+
" │ 10 ┆ 332212815818606584686857770936… ┆ 0 ┆ 1000.0 ┆ 1000 │\n",
7171
" └──────┴─────────────────────────────────┴───────┴──────────────┴──────────┘,\n",
7272
" 'agent': shape: (5_000, 4)\n",
7373
" ┌────────────────────┬──────┬─────────────────────────────────┬───────┐\n",
7474
" │ wealth_MoneyAgents ┆ step ┆ seed ┆ batch │\n",
7575
" │ --- ┆ --- ┆ --- ┆ --- │\n",
7676
" │ f64 ┆ i32 ┆ str ┆ i32 │\n",
7777
" ╞════════════════════╪══════╪═════════════════════════════════╪═══════╡\n",
78-
" │ 0.0 ┆ 2 ┆ 162681765859364298619846106603… ┆ 0 │\n",
79-
" │ 3.0 ┆ 2 ┆ 162681765859364298619846106603… ┆ 0 │\n",
80-
" │ 1.0 ┆ 2 ┆ 162681765859364298619846106603… ┆ 0 │\n",
81-
" │ 3.0 ┆ 2 ┆ 162681765859364298619846106603… ┆ 0 │\n",
82-
" │ 6.0 ┆ 2 ┆ 162681765859364298619846106603… ┆ 0 │\n",
78+
" │ 3.0 ┆ 2 ┆ 332212815818606584686857770936… ┆ 0 │\n",
79+
" │ 0.0 ┆ 2 ┆ 332212815818606584686857770936… ┆ 0 │\n",
80+
" │ 2.0 ┆ 2 ┆ 332212815818606584686857770936… ┆ 0 │\n",
81+
" │ 1.0 ┆ 2 ┆ 332212815818606584686857770936… ┆ 0 │\n",
82+
" │ 0.0 ┆ 2 ┆ 332212815818606584686857770936… ┆ 0 │\n",
8383
" │ … ┆ … ┆ … ┆ … │\n",
84-
" │ 4.0 ┆ 10 ┆ 162681765859364298619846106603… ┆ 0 │\n",
85-
" │ 1.0 ┆ 10 ┆ 162681765859364298619846106603… ┆ 0 │\n",
86-
" │ 0.0 ┆ 10 ┆ 162681765859364298619846106603… ┆ 0 │\n",
87-
" │ 0.0 ┆ 10 ┆ 162681765859364298619846106603… ┆ 0 │\n",
88-
" │ 0.0 ┆ 10 ┆ 162681765859364298619846106603… ┆ 0 │\n",
84+
" │ 0.0 ┆ 10 ┆ 332212815818606584686857770936… ┆ 0 │\n",
85+
" │ 0.0 ┆ 10 ┆ 332212815818606584686857770936… ┆ 0 │\n",
86+
" │ 0.0 ┆ 10 ┆ 332212815818606584686857770936… ┆ 0 │\n",
87+
" │ 0.0 ┆ 10 ┆ 332212815818606584686857770936… ┆ 0 │\n",
88+
" │ 0.0 ┆ 10 ┆ 332212815818606584686857770936… ┆ 0 │\n",
8989
" └────────────────────┴──────┴─────────────────────────────────┴───────┘}"
9090
]
9191
},
92-
"execution_count": 19,
92+
"execution_count": 7,
9393
"metadata": {},
9494
"output_type": "execute_result"
9595
}
@@ -175,7 +175,7 @@
175175
},
176176
{
177177
"cell_type": "code",
178-
"execution_count": null,
178+
"execution_count": 8,
179179
"id": "5f14f38c",
180180
"metadata": {},
181181
"outputs": [
@@ -185,7 +185,7 @@
185185
"[]"
186186
]
187187
},
188-
"execution_count": 20,
188+
"execution_count": 8,
189189
"metadata": {},
190190
"output_type": "execute_result"
191191
}
@@ -228,7 +228,7 @@
228228
},
229229
{
230230
"cell_type": "code",
231-
"execution_count": null,
231+
"execution_count": 9,
232232
"id": "8763a12b2bbd4a93a75aff182afb95dc",
233233
"metadata": {
234234
"editable": true
@@ -240,7 +240,7 @@
240240
"[]"
241241
]
242242
},
243-
"execution_count": 21,
243+
"execution_count": 9,
244244
"metadata": {},
245245
"output_type": "execute_result"
246246
}
@@ -283,7 +283,7 @@
283283
},
284284
{
285285
"cell_type": "code",
286-
"execution_count": null,
286+
"execution_count": 10,
287287
"id": "7cdc8c89c7104fffa095e18ddfef8986",
288288
"metadata": {
289289
"editable": true
@@ -293,16 +293,11 @@
293293
"model_s3 = MoneyModel(1000)\n",
294294
"model_s3.dc = DataCollector(\n",
295295
" model=model_s3,\n",
296-
" model_reporters = {\n",
297-
"\"total_wealth\": lambda m: sum(\n",
298-
"s[\"wealth\"].sum() for s in m.sets if \"wealth\" in s.df.columns\n",
299-
"),\n",
300-
"\"n_agents\": lambda m: len(m.sets.ids),\n",
301-
"}\n",
302-
"\n",
303-
"\n",
304-
" \"total_wealth\": lambda m: list(m.sets.df.values())[0][\"wealth\"].sum(),\n",
305-
" \"n_agents\": lambda m: len(list(m.sets.df.values())[0]),\n",
296+
" model_reporters={\n",
297+
" \"total_wealth\": lambda m: sum(\n",
298+
" s[\"wealth\"].sum() for s in m.sets if \"wealth\" in s.df.columns\n",
299+
" ),\n",
300+
" \"n_agents\": lambda m: len(m.sets.ids),\n",
306301
" },\n",
307302
" agent_reporters={\n",
308303
" \"wealth\": \"wealth\",\n",
@@ -330,7 +325,7 @@
330325
},
331326
{
332327
"cell_type": "code",
333-
"execution_count": 23,
328+
"execution_count": 11,
334329
"id": "938c804e27f84196a10c8828c723f798",
335330
"metadata": {
336331
"editable": true
@@ -392,7 +387,7 @@
392387
},
393388
{
394389
"cell_type": "code",
395-
"execution_count": 24,
390+
"execution_count": 12,
396391
"id": "59bbdb311c014d738909a11f9e486628",
397392
"metadata": {
398393
"editable": true
@@ -421,7 +416,7 @@
421416
},
422417
{
423418
"cell_type": "code",
424-
"execution_count": 25,
419+
"execution_count": 13,
425420
"id": "8a65eabff63a45729fe45fb5ade58bdc",
426421
"metadata": {
427422
"editable": true
@@ -437,7 +432,7 @@
437432
" white-space: pre-wrap;\n",
438433
"}\n",
439434
"</style>\n",
440-
"<small>shape: (5, 5)</small><table border=\"1\" class=\"dataframe\"><thead><tr><th>step</th><th>seed</th><th>batch</th><th>total_wealth</th><th>n_agents</th></tr><tr><td>i64</td><td>str</td><td>i64</td><td>f64</td><td>i64</td></tr></thead><tbody><tr><td>2</td><td>&quot;732054881101029867447298951813…</td><td>0</td><td>100.0</td><td>100</td></tr><tr><td>4</td><td>&quot;732054881101029867447298951813…</td><td>0</td><td>100.0</td><td>100</td></tr><tr><td>6</td><td>&quot;732054881101029867447298951813…</td><td>0</td><td>100.0</td><td>100</td></tr><tr><td>8</td><td>&quot;732054881101029867447298951813…</td><td>0</td><td>100.0</td><td>100</td></tr><tr><td>10</td><td>&quot;732054881101029867447298951813…</td><td>0</td><td>100.0</td><td>100</td></tr></tbody></table></div>"
435+
"<small>shape: (5, 5)</small><table border=\"1\" class=\"dataframe\"><thead><tr><th>step</th><th>seed</th><th>batch</th><th>total_wealth</th><th>n_agents</th></tr><tr><td>i64</td><td>str</td><td>i64</td><td>f64</td><td>i64</td></tr></thead><tbody><tr><td>2</td><td>&quot;540832786058427425452319829502…</td><td>0</td><td>100.0</td><td>100</td></tr><tr><td>4</td><td>&quot;540832786058427425452319829502…</td><td>0</td><td>100.0</td><td>100</td></tr><tr><td>6</td><td>&quot;540832786058427425452319829502…</td><td>0</td><td>100.0</td><td>100</td></tr><tr><td>8</td><td>&quot;540832786058427425452319829502…</td><td>0</td><td>100.0</td><td>100</td></tr><tr><td>10</td><td>&quot;540832786058427425452319829502…</td><td>0</td><td>100.0</td><td>100</td></tr></tbody></table></div>"
441436
],
442437
"text/plain": [
443438
"shape: (5, 5)\n",
@@ -446,15 +441,15 @@
446441
"│ --- ┆ --- ┆ --- ┆ --- ┆ --- │\n",
447442
"│ i64 ┆ str ┆ i64 ┆ f64 ┆ i64 │\n",
448443
"╞══════╪═════════════════════════════════╪═══════╪══════════════╪══════════╡\n",
449-
"│ 2 ┆ 732054881101029867447298951813… ┆ 0 ┆ 100.0 ┆ 100 │\n",
450-
"│ 4 ┆ 732054881101029867447298951813… ┆ 0 ┆ 100.0 ┆ 100 │\n",
451-
"│ 6 ┆ 732054881101029867447298951813… ┆ 0 ┆ 100.0 ┆ 100 │\n",
452-
"│ 8 ┆ 732054881101029867447298951813… ┆ 0 ┆ 100.0 ┆ 100 │\n",
453-
"│ 10 ┆ 732054881101029867447298951813… ┆ 0 ┆ 100.0 ┆ 100 │\n",
444+
"│ 2 ┆ 540832786058427425452319829502… ┆ 0 ┆ 100.0 ┆ 100 │\n",
445+
"│ 4 ┆ 540832786058427425452319829502… ┆ 0 ┆ 100.0 ┆ 100 │\n",
446+
"│ 6 ┆ 540832786058427425452319829502… ┆ 0 ┆ 100.0 ┆ 100 │\n",
447+
"│ 8 ┆ 540832786058427425452319829502… ┆ 0 ┆ 100.0 ┆ 100 │\n",
448+
"│ 10 ┆ 540832786058427425452319829502… ┆ 0 ┆ 100.0 ┆ 100 │\n",
454449
"└──────┴─────────────────────────────────┴───────┴──────────────┴──────────┘"
455450
]
456451
},
457-
"execution_count": 25,
452+
"execution_count": 13,
458453
"metadata": {},
459454
"output_type": "execute_result"
460455
}

0 commit comments

Comments
 (0)