Refactor DataCollector model reporters for improved efficiency and readability

Author: adamamer20

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

@@ -175,7 +175,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": null,
    "id": "5f14f38c",
    "metadata": {},
    "outputs": [
@@ -198,8 +198,10 @@
     "model_csv.dc = DataCollector(\n",
     "    model=model_csv,\n",
     "    model_reporters={\n",
-    "        \"total_wealth\": lambda m: list(m.sets.df.values())[0][\"wealth\"].sum(),\n",
-    "        \"n_agents\": lambda m: len(list(m.sets.df.values())[0]),\n",
+    "        \"total_wealth\": lambda m: sum(\n",
+    "            s[\"wealth\"].sum() for s in m.sets if \"wealth\" in s.df.columns\n",
+    "        ),\n",
+    "        \"n_agents\": lambda m: len(m.sets.ids),\n",
     "    },\n",
     "    agent_reporters={\n",
     "        \"wealth\": \"wealth\",\n",
@@ -226,7 +228,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": null,
    "id": "8763a12b2bbd4a93a75aff182afb95dc",
    "metadata": {
     "editable": true
@@ -249,8 +251,10 @@
     "model_parq.dc = DataCollector(\n",
     "    model=model_parq,\n",
     "    model_reporters={\n",
-    "        \"total_wealth\": lambda m: list(m.sets.df.values())[0][\"wealth\"].sum(),\n",
-    "        \"n_agents\": lambda m: len(list(m.sets.df.values())[0]),\n",
+    "        \"total_wealth\": lambda m: sum(\n",
+    "            s[\"wealth\"].sum() for s in m.sets if \"wealth\" in s.df.columns\n",
+    "        ),\n",
+    "        \"n_agents\": lambda m: len(m.sets.ids),\n",
     "    },\n",
     "    agent_reporters={\n",
     "        \"wealth\": \"wealth\",\n",
@@ -279,7 +283,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 22,
+   "execution_count": null,
    "id": "7cdc8c89c7104fffa095e18ddfef8986",
    "metadata": {
     "editable": true
@@ -289,7 +293,14 @@
     "model_s3 = MoneyModel(1000)\n",
     "model_s3.dc = DataCollector(\n",
     "    model=model_s3,\n",
-    "    model_reporters={\n",
+    "    model_reporters = {\n",
+    "\"total_wealth\": lambda m: sum(\n",
+    "s[\"wealth\"].sum() for s in m.sets if \"wealth\" in s.df.columns\n",
+    "),\n",
+    "\"n_agents\": lambda m: len(m.sets.ids),\n",
+    "}\n",
+    "\n",
+    "\n",
     "        \"total_wealth\": lambda m: list(m.sets.df.values())[0][\"wealth\"].sum(),\n",
     "        \"n_agents\": lambda m: len(list(m.sets.df.values())[0]),\n",
     "    },\n",