updated cite and notebooks

dtamayo · Aug 7, 2024 · 45fd18e · 45fd18e
1 parent 4739003
commit 45fd18e
Show file tree

Hide file tree

Showing 5 changed files with 214 additions and 184 deletions.
diff --git a/jupyter_examples/GiantImpactEmulator.ipynb b/jupyter_examples/GiantImpactEmulator.ipynb
@@ -47,7 +47,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "231647\n"
+      "236297\n"
      ]
     }
    ],
@@ -96,11 +96,11 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Predicted P1: 1.2250376725562897\n",
-      "Predicted e1: 0.058889485476765806 \n",
+      "Predicted P1: 1.225037672556297\n",
+      "Predicted e1: 0.05888948547676769 \n",
       "\n",
       "Predicted P2: 1.412646240582396\n",
-      "Predicted e2: 0.029298374243317323\n"
+      "Predicted e2: 0.02929837424331723\n"
      ]
     }
    ],
@@ -126,7 +126,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 5,
    "id": "31c42e0b",
    "metadata": {},
    "outputs": [],
@@ -144,7 +144,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 6,
    "id": "7ee40783-9d4f-403e-abf9-541b9a49875c",
    "metadata": {},
    "outputs": [],
@@ -163,8 +163,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "CPU times: user 1.34 s, sys: 713 ms, total: 2.05 s\n",
-      "Wall time: 1.1 s\n"
+      "CPU times: user 3.79 s, sys: 10.3 s, total: 14.1 s\n",
+      "Wall time: 3.6 s\n"
      ]
     }
    ],
@@ -173,151 +173,6 @@
     "pred_sim = emulator.predict(sim)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 3,
-   "id": "0e665e39",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "0\n",
-      "1\n",
-      "2\n",
-      "3\n",
-      "4\n",
-      "5\n",
-      "6\n",
-      "7\n",
-      "8\n",
-      "9\n",
-      "10\n",
-      "11\n",
-      "12\n",
-      "13\n",
-      "14\n",
-      "15\n",
-      "16\n",
-      "17\n",
-      "18\n",
-      "19\n",
-      "20\n",
-      "21\n",
-      "22\n",
-      "23\n",
-      "24\n",
-      "25\n",
-      "26\n",
-      "27\n",
-      "28\n",
-      "29\n",
-      "30\n",
-      "31\n",
-      "32\n",
-      "33\n",
-      "34\n",
-      "35\n",
-      "36\n",
-      "37\n",
-      "38\n",
-      "39\n",
-      "40\n",
-      "41\n",
-      "42\n",
-      "43\n",
-      "44\n",
-      "45\n",
-      "46\n",
-      "47\n",
-      "48\n",
-      "49\n",
-      "50\n",
-      "51\n",
-      "52\n",
-      "53\n",
-      "54\n",
-      "55\n",
-      "56\n",
-      "57\n",
-      "58\n",
-      "59\n",
-      "60\n",
-      "61\n",
-      "62\n",
-      "63\n",
-      "64\n",
-      "65\n",
-      "66\n",
-      "67\n",
-      "68\n",
-      "69\n",
-      "70\n",
-      "71\n",
-      "72\n",
-      "73\n",
-      "74\n",
-      "75\n",
-      "76\n",
-      "77\n",
-      "78\n",
-      "79\n",
-      "80\n",
-      "81\n",
-      "82\n",
-      "83\n",
-      "84\n",
-      "85\n",
-      "86\n",
-      "87\n",
-      "88\n",
-      "89\n",
-      "90\n",
-      "91\n",
-      "92\n",
-      "93\n",
-      "94\n",
-      "95\n",
-      "96\n",
-      "97\n",
-      "98\n",
-      "99\n",
-      "CPU times: user 1min 45s, sys: 1min 4s, total: 2min 49s\n",
-      "Wall time: 1min 26s\n"
-     ]
-    }
-   ],
-   "source": [
-    "%%time\n",
-    "for i in range(100):\n",
-    "    print(i)\n",
-    "    emulator = GiantImpactPhaseEmulator(seed=0)\n",
-    "    pred_sim = emulator.predict(sim)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 4,
-   "id": "0604d5bb",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'0.6.0'"
-      ]
-     },
-     "execution_count": 4,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "import einops\n",
-    "einops.__version__"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": 8,
@@ -328,15 +183,19 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "t = 999999999.9999985 \n",
+      "t = 999999999.9999993 \n",
+      "\n",
+      "Predicted m1 = 2e-05\n",
+      "Predicted P1 = 1.1423167995914096\n",
+      "Predicted e1 = 0.024555185595986646 \n",
       "\n",
-      "Predicted m1 = 3.0000000000000004e-05\n",
-      "Predicted P1 = 1.4789032321188267\n",
-      "Predicted e1 = 0.027463762835280816 \n",
+      "Predicted m2 = 1e-05\n",
+      "Predicted P2 = 2.241317603301388\n",
+      "Predicted e2 = 0.028255655743078135 \n",
       "\n",
-      "Predicted m2 = 2e-05\n",
-      "Predicted P2 = 3.519481719959543\n",
-      "Predicted e2 = 0.02516227040146231 \n",
+      "Predicted m3 = 2e-05\n",
+      "Predicted P3 = 3.514830496498667\n",
+      "Predicted e3 = 0.0180188346495417 \n",
       "\n"
      ]
     }