diff --git a/Comparator.ipynb b/Comparator.ipynb
index 926f20d..6dfe264 100644
--- a/Comparator.ipynb
+++ b/Comparator.ipynb
@@ -32,11 +32,103 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 1,
"metadata": {
"scrolled": false
},
- "outputs": [],
+ "outputs": [
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "Please set the required parameters:\n"
+ ]
+ },
+ {
+ "data": {
+ "application/vnd.jupyter.widget-view+json": {
+ "model_id": "284ba85fbdca4ada8de7ec99b5240668",
+ "version_major": 2,
+ "version_minor": 0
+ },
+ "text/plain": [
+ "interactive(children=(SelectMultiple(description='1.) Integrator:', index=(0, 1, 2, 3), options=('Euler', 'Ver…"
+ ]
+ },
+ "metadata": {},
+ "output_type": "display_data"
+ },
+ {
+ "data": {
+ "application/vnd.jupyter.widget-view+json": {
+ "model_id": "e417f001cb384785a6475dfdc950da87",
+ "version_major": 2,
+ "version_minor": 0
+ },
+ "text/plain": [
+ "interactive(children=(BoundedIntText(value=36524, description='2.) Total integration time [days]:', max=365242…"
+ ]
+ },
+ "metadata": {},
+ "output_type": "display_data"
+ },
+ {
+ "data": {
+ "application/vnd.jupyter.widget-view+json": {
+ "model_id": "afd61c0eba774fddbb22eef2e685d2df",
+ "version_major": 2,
+ "version_minor": 0
+ },
+ "text/plain": [
+ "interactive(children=(IntRangeSlider(value=(4, 6), continuous_update=False, description='3.) TimeStep range:',…"
+ ]
+ },
+ "metadata": {},
+ "output_type": "display_data"
+ },
+ {
+ "data": {
+ "application/vnd.jupyter.widget-view+json": {
+ "model_id": "cb5d85a9054c468ab06c1ebc5894b376",
+ "version_major": 2,
+ "version_minor": 0
+ },
+ "text/plain": [
+ "interactive(children=(IntRangeSlider(value=(5, 7), continuous_update=False, description='4.) RKDP tolerance: 1…"
+ ]
+ },
+ "metadata": {},
+ "output_type": "display_data"
+ },
+ {
+ "data": {
+ "application/vnd.jupyter.widget-view+json": {
+ "model_id": "292506b1917e4709986d7b7a1afb700b",
+ "version_major": 2,
+ "version_minor": 0
+ },
+ "text/plain": [
+ "interactive(children=(Checkbox(value=True, description='Include 67P/C-G'), Output()), _dom_classes=('widget-in…"
+ ]
+ },
+ "metadata": {},
+ "output_type": "display_data"
+ },
+ {
+ "data": {
+ "application/vnd.jupyter.widget-view+json": {
+ "model_id": "4a16f3e1d0554833b80834e90a8ad9f5",
+ "version_major": 2,
+ "version_minor": 0
+ },
+ "text/plain": [
+ "interactive(children=(Checkbox(value=False, description='Include inner planets'), Output()), _dom_classes=('wi…"
+ ]
+ },
+ "metadata": {},
+ "output_type": "display_data"
+ }
+ ],
"source": [
"%run ./src/jupyter_init.py"
]
@@ -50,11 +142,60 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 2,
"metadata": {
"scrolled": false
},
- "outputs": [],
+ "outputs": [
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "Do you want to clear library of previous logs? [y/n]: y\n",
+ "Library cleared.\n",
+ "\n",
+ "Number of objects: 6 \n",
+ "Total time [days]: 36524 \n",
+ "TimeStep range: 4 - 6 \n",
+ "Tolerance range: 1.0E-5 - 1.0E-7\n",
+ "\n",
+ "Euler integration...\n",
+ "4 days timestep:\t7.4549 seconds.\n",
+ "\n",
+ "5 days timestep:\t5.9784 seconds.\n",
+ "\n",
+ "6 days timestep:\t4.9209 seconds.\n",
+ "\n",
+ "Verlet integration...\n",
+ "4 days timestep:\t7.8832 seconds.\n",
+ "\n",
+ "5 days timestep:\t6.3254 seconds.\n",
+ "\n",
+ "6 days timestep:\t5.2161 seconds.\n",
+ "\n",
+ "RK4 integration...\n",
+ "4 days timestep:\t32.1129 seconds.\n",
+ "\n",
+ "5 days timestep:\t25.7982 seconds.\n",
+ "\n",
+ "6 days timestep:\t21.3877 seconds.\n",
+ "\n",
+ "Runge-Kutta Dormand-Prince integration...\n",
+ "1e-05 tolerance:\t3.2741 seconds.\n",
+ "\n",
+ "1e-06 tolerance:\t5.1323 seconds.\n",
+ "\n",
+ "1e-07 tolerance:\t8.0667 seconds.\n",
+ "\n",
+ "Whole program took 134.03 seconds.\n",
+ "\n",
+ "IPython CPU timings (estimated):\n",
+ " User : 143.24 s.\n",
+ " System : 0.00 s.\n",
+ "Wall time: 143.23 s.\n"
+ ]
+ }
+ ],
"source": [
"%run -i -t ./src/comp.py"
]
@@ -76,9 +217,356 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 3,
"metadata": {},
- "outputs": [],
+ "outputs": [
+ {
+ "data": {
+ "text/html": [
+ "\n",
+ " \n",
+ "
\n",
+ "
Loading BokehJS ...\n",
+ "
\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"BokehJS does not appear to have successfully loaded. If loading BokehJS from CDN, this \\n\"+\n",
+ " \"may be due to a slow or bad network connection. Possible fixes:\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"- re-rerun `output_notebook()` to attempt to load from CDN again, or
\\n\"+\n",
+ " \"- use INLINE resources instead, as so:
\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"from bokeh.resources import INLINE\\n\"+\n",
+ " \"output_notebook(resources=INLINE)\\n\"+\n",
+ " \"\\n\"+\n",
+ " \"
\\n\"+\n \"
\\n\"+\n \"BokehJS does not appear to have successfully loaded. If loading BokehJS from CDN, this \\n\"+\n \"may be due to a slow or bad network connection. Possible fixes:\\n\"+\n \"
\\n\"+\n \"
\\n\"+\n \"- re-rerun `output_notebook()` to attempt to load from CDN again, or
\\n\"+\n \"- use INLINE resources instead, as so:
\\n\"+\n \"
\\n\"+\n \"
\\n\"+\n \"from bokeh.resources import INLINE\\n\"+\n \"output_notebook(resources=INLINE)\\n\"+\n \"\\n\"+\n \"
\n",
+ "
\n",
+ "
Loading BokehJS ...\n",
+ "
\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"BokehJS does not appear to have successfully loaded. If loading BokehJS from CDN, this \\n\"+\n",
+ " \"may be due to a slow or bad network connection. Possible fixes:\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"- re-rerun `output_notebook()` to attempt to load from CDN again, or
\\n\"+\n",
+ " \"- use INLINE resources instead, as so:
\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"from bokeh.resources import INLINE\\n\"+\n",
+ " \"output_notebook(resources=INLINE)\\n\"+\n",
+ " \"\\n\"+\n",
+ " \"
\\n\"+\n \"
\\n\"+\n \"BokehJS does not appear to have successfully loaded. If loading BokehJS from CDN, this \\n\"+\n \"may be due to a slow or bad network connection. Possible fixes:\\n\"+\n \"
\\n\"+\n \"
\\n\"+\n \"- re-rerun `output_notebook()` to attempt to load from CDN again, or
\\n\"+\n \"- use INLINE resources instead, as so:
\\n\"+\n \"
\\n\"+\n \"
\\n\"+\n \"from bokeh.resources import INLINE\\n\"+\n \"output_notebook(resources=INLINE)\\n\"+\n \"\\n\"+\n \"
\n",
+ "
\n",
+ "
Loading BokehJS ...\n",
+ "
\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"BokehJS does not appear to have successfully loaded. If loading BokehJS from CDN, this \\n\"+\n",
+ " \"may be due to a slow or bad network connection. Possible fixes:\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"- re-rerun `output_notebook()` to attempt to load from CDN again, or
\\n\"+\n",
+ " \"- use INLINE resources instead, as so:
\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"
\\n\"+\n",
+ " \"from bokeh.resources import INLINE\\n\"+\n",
+ " \"output_notebook(resources=INLINE)\\n\"+\n",
+ " \"\\n\"+\n",
+ " \"
\\n\"+\n \"
\\n\"+\n \"BokehJS does not appear to have successfully loaded. If loading BokehJS from CDN, this \\n\"+\n \"may be due to a slow or bad network connection. Possible fixes:\\n\"+\n \"
\\n\"+\n \"
\\n\"+\n \"- re-rerun `output_notebook()` to attempt to load from CDN again, or
\\n\"+\n \"- use INLINE resources instead, as so:
\\n\"+\n \"
\\n\"+\n \"
\\n\"+\n \"from bokeh.resources import INLINE\\n\"+\n \"output_notebook(resources=INLINE)\\n\"+\n \"\\n\"+\n \"