updated fig 4

nwlandry · Oct 20, 2024 · 859038d · 859038d
1 parent f573044
commit 859038d
Show file tree

Hide file tree

Showing 7 changed files with 158 additions and 142 deletions.
diff --git a/Data/cm_convergence.json b/Data/cm_convergence.json
@@ -13,40 +13,40 @@
       14419
     ],
     "sf": [
+      0.2938388625592417,
       0.29067930489731436,
-      0.27488151658767773,
-      0.23380726698262244,
-      0.17535545023696683,
-      0.07898894154818326,
-      0.017377567140600316,
-      0.00631911532385466,
-      0.001579778830963665,
+      0.21484992101105846,
+      0.16587677725118483,
+      0.11532385466034756,
+      0.0315955766192733,
+      0.00315955766192733,
       0.007898894154818325,
-      0.004739336492890996
+      0.007898894154818325,
+      0.00315955766192733
     ],
     "es": [
-      0.052140584321666184,
-      0.051939631884162375,
-      0.050509650075309116,
-      0.049706997587038955,
-      0.0480955239810553,
-      0.04421142997301938,
-      0.03957732949087416,
-      0.03684775387131395,
-      0.03600319584540098,
-      0.03591710670519079
+      0.042850896370791425,
+      0.0423878871101796,
+      0.04154430198409853,
+      0.0399379604497867,
+      0.03590483540820777,
+      0.03166143206116556,
+      0.02472104924634355,
+      0.02205086222832542,
+      0.020863965928104244,
+      0.020901338596624464
     ],
     "fes": [
-      0.48357244807781674,
-      0.47520984548942924,
-      0.44710490288664656,
-      0.3705538909539753,
-      0.2994093494482693,
-      0.19976483250021454,
-      0.12913811932709507,
-      0.11633814622536806,
-      0.1166150247910307,
-      0.10912757547417791
+      0.4869795192193366,
+      0.4783450120380002,
+      0.4334695393713991,
+      0.38786642201367305,
+      0.32457282998272186,
+      0.19284284762057424,
+      0.12348178884617245,
+      0.11675924630450052,
+      0.1166422970440415,
+      0.11263391473665396
     ]
   },
   "contact-high-school": {
@@ -63,90 +63,90 @@
       78180
     ],
     "sf": [
-      0.8012931034482759,
-      0.7857758620689655,
-      0.7357758620689655,
-      0.6663793103448276,
-      0.4706896551724138,
-      0.1879310344827586,
-      0.03146551724137931,
-      0.0034482758620689655,
-      0.0021551724137931034,
-      0.00603448275862069
+      0.7982758620689655,
+      0.7926724137931035,
+      0.7379310344827587,
+      0.6689655172413793,
+      0.4517241379310345,
+      0.21293103448275863,
+      0.020689655172413793,
+      0.003017241379310345,
+      0.003017241379310345,
+      0.0017241379310344827
     ],
     "es": [
-      0.9243319933790494,
-      0.9219339622641509,
-      0.9144929231489063,
-      0.8889141557703241,
-      0.8373139123915605,
-      0.732228153975836,
-      0.6157360006300701,
-      0.5464839927303229,
-      0.5273880194279547,
-      0.5292445166531276
+      0.9052297460701331,
+      0.9011137868753762,
+      0.8913919140683276,
+      0.8617651307236747,
+      0.7899543378995434,
+      0.6749854227405248,
+      0.5356460244648318,
+      0.45496650401124805,
+      0.44090763309813985,
+      0.4413156839149619
     ],
     "fes": [
-      0.9199345335515838,
-      0.9115002727768972,
-      0.8935037157875514,
-      0.8509850107066398,
-      0.7406449351559721,
-      0.514491331370637,
-      0.258974358974358,
-      0.1492154312960558,
-      0.12693390804597626,
-      0.13487710219922472
+      0.9197813012575178,
+      0.915099217185509,
+      0.8956086091517446,
+      0.8522678185745138,
+      0.7363739669421527,
+      0.5368702791461337,
+      0.26541045338150926,
+      0.1481743634009649,
+      0.13500646830532437,
+      0.13382247158684057
     ]
   },
   "ndc-substances": {
     "num-swaps": [
       10,
       25,
       65,
-      168,
-      430,
-      1103,
-      2827,
-      7243,
-      18556,
-      47539
+      165,
+      422,
+      1078,
+      2749,
+      7011,
+      17878,
+      45590
     ],
     "sf": [
-      0.019315673289183224,
-      0.019315673289183224,
-      0.018211920529801324,
-      0.013520971302428256,
-      0.009657836644591612,
-      0.0027593818984547464,
-      0.0,
+      0.02052291256676975,
+      0.02052291256676975,
+      0.019117233623840314,
+      0.015743604160809672,
+      0.007028394714647174,
+      0.0033736294630306437,
+      0.000281135788585887,
       0.0,
       0.0,
       0.0
     ],
     "es": [
-      0.005273608661408588,
-      0.00526549549818964,
-      0.005252023089457839,
-      0.005234691225891131,
-      0.005174219023798795,
-      0.0049973510045159064,
-      0.004760355074023822,
-      0.004539486562489556,
-      0.004441247360849013,
-      0.004424671686382547
+      0.0018423670732157227,
+      0.0018330486510971244,
+      0.001812406473039152,
+      0.0017721121319991262,
+      0.00167403284771106,
+      0.0014402455665963876,
+      0.001186509876661468,
+      0.0009877425758366698,
+      0.0009572788455480818,
+      0.0009632167500297495
     ],
     "fes": [
-      0.0700004502534732,
-      0.06996248971999788,
-      0.06702173955125817,
-      0.06503162293967095,
-      0.055558582340249414,
-      0.0373328716788586,
-      0.016797177256499703,
-      0.00654900702819897,
-      0.008172103404121178,
-      0.009215746539068028
+      0.07016326043329613,
+      0.06963769690600075,
+      0.0679336275431397,
+      0.06476201378706925,
+      0.055623921233879825,
+      0.04033488965442278,
+      0.01941824759678501,
+      0.010015979165930222,
+      0.007797510244952899,
+      0.007267645053525951
     ]
   },
   "tags-ask-ubuntu": {
@@ -163,40 +163,40 @@
       1450530
     ],
     "sf": [
-      0.1513578240602147,
-      0.15134927083778812,
-      0.1506479065988111,
-      0.14606337937818073,
-      0.13814309541119618,
-      0.11073857075653253,
-      0.06456827609801993,
-      0.040627806526108715,
-      0.04788949236624898,
-      0.051541718342385495
+      0.15134071761536158,
+      0.15105846127528547,
+      0.15076765171278278,
+      0.14720095796091176,
+      0.13680023949022793,
+      0.10920754394218021,
+      0.06375571996749775,
+      0.04085874353162554,
+      0.047718427917718,
+      0.05110550399863149
     ],
     "es": [
-      0.2486918445163768,
-      0.2486620015291411,
-      0.2485167259176768,
-      0.24795384615384616,
-      0.24606899967937898,
-      0.23937876677514539,
-      0.22071833544841188,
-      0.1899034464700684,
-      0.1703277670203884,
-      0.1685261671982015
+      0.11259864683975729,
+      0.11256182518681679,
+      0.11241855194463557,
+      0.11196404487122535,
+      0.10994232304297469,
+      0.10357657575303758,
+      0.08606231210420046,
+      0.0581601447066975,
+      0.046365980737855916,
+      0.0459599209664161
     ],
     "fes": [
-      0.4575823700823959,
-      0.45754091396902674,
-      0.4568359372088732,
-      0.4533850232978587,
-      0.4444367974304541,
-      0.4126181592717865,
-      0.333120064901915,
-      0.24140223065075372,
-      0.23041213052038867,
-      0.2322091713985058
+      0.45760367873655616,
+      0.4573086654369639,
+      0.4569307321579483,
+      0.4537258228327089,
+      0.4443668005950496,
+      0.4123838676527226,
+      0.3333457132734391,
+      0.2426971838465556,
+      0.22998259466031679,
+      0.23324842991972872
     ]
   }
 }
diff --git a/Figures/Fig4/cm_convergence.pdf b/Figures/Fig4/cm_convergence.pdf
diff --git a/Figures/Fig4/cm_convergence.png b/Figures/Fig4/cm_convergence.png
diff --git a/draw.py b/draw.py
@@ -666,7 +666,14 @@ def draw_multilayer(
         )
         ax.add_collection3d(between_lines)
 
-    (x, y, s, c, ec, lw,) = zip(
+    (
+        x,
+        y,
+        s,
+        c,
+        ec,
+        lw,
+    ) = zip(
         *[
             (
                 pos[i][0],

diff --git a/plot_cm_convergence.ipynb b/plot_cm_convergence.ipynb
diff --git a/plot_model_fitting.ipynb b/plot_model_fitting.ipynb
@@ -20,7 +20,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -55,7 +55,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -82,7 +82,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -189,18 +189,11 @@
     "plt.savefig(\"Figures/Fig2/model_fitting.pdf\", dpi=1000)\n",
     "plt.show()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "hyper",
+   "display_name": "xgi",
    "language": "python",
    "name": "python3"
   },
@@ -214,7 +207,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.0"
+   "version": "3.12.4"
   },
   "orig_nbformat": 4
  },

diff --git a/print_simplicial_assortativity.ipynb b/print_simplicial_assortativity.ipynb
@@ -31,7 +31,12 @@
     "for dataset, d in data.items():\n",
     "    rows.append([f\"\\\\texttt{{{dataset}}}\", d[\"sf\"], d[\"es\"], d[\"fes\"]])\n",
     "\n",
-    "column_labels = [\"Dataset\", \"$\\\\rho_{\\mathrm{SF}}$\", \"$\\\\rho_{\\mathrm{SF}}$\", \"$\\\\rho_{\\mathrm{SF}}$\"]"
+    "column_labels = [\n",
+    "    \"Dataset\",\n",
+    "    \"$\\\\rho_{\\mathrm{SF}}$\",\n",
+    "    \"$\\\\rho_{\\mathrm{SF}}$\",\n",
+    "    \"$\\\\rho_{\\mathrm{SF}}$\",\n",
+    "]"
    ]
   },
   {