From 9de44861429763da1a652e754d37fcc92ba3f1d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petrus=20Hyv=C3=B6nen?= <petrus.hyvonen@sscspace.com>
Date: Sun, 16 Oct 2022 00:06:42 +0200
Subject: [PATCH] Updated notebook for recent pandas updates
---
examples/Event_Detectors.ipynb | 104 ++++++++++++++++-----------------
1 file changed, 50 insertions(+), 54 deletions(-)
diff --git a/examples/Event_Detectors.ipynb b/examples/Event_Detectors.ipynb
index 89eff39..afaf05e 100644
--- a/examples/Event_Detectors.ipynb
+++ b/examples/Event_Detectors.ipynb
@@ -23,15 +23,6 @@
"orekit, propagation, event detectors"
]
},
- {
- "cell_type": "code",
- "execution_count": 1,
- "metadata": {},
- "outputs": [],
- "source": [
- "%matplotlib inline"
- ]
- },
{
"cell_type": "markdown",
"metadata": {},
@@ -328,7 +319,7 @@
{
"data": {
"text/plain": [
- "<AbsoluteDate: 2020-01-02T00:00:00.000>"
+ "<AbsoluteDate: 2020-01-02T00:00:00.000Z>"
]
},
"execution_count": 15,
@@ -378,7 +369,7 @@
},
{
"cell_type": "code",
- "execution_count": 17,
+ "execution_count": 36,
"metadata": {},
"outputs": [
{
@@ -402,140 +393,140 @@
" <thead>\n",
" <tr style=\"text-align: right;\">\n",
" <th></th>\n",
- " <th>EclipseDuration</th>\n",
" <th>Start</th>\n",
" <th>Stop</th>\n",
+ " <th>EclipseDuration</th>\n",
" </tr>\n",
" </thead>\n",
" <tbody>\n",
" <tr>\n",
" <th>0</th>\n",
- " <td>18.077653</td>\n",
" <td>2020-01-01 00:08:45.102790</td>\n",
" <td>2020-01-01 00:26:49.761988</td>\n",
+ " <td>18.077653</td>\n",
" </tr>\n",
" <tr>\n",
" <th>1</th>\n",
- " <td>18.068964</td>\n",
" <td>2020-01-01 01:42:22.923764</td>\n",
" <td>2020-01-01 02:00:27.061606</td>\n",
+ " <td>18.068964</td>\n",
" </tr>\n",
" <tr>\n",
" <th>2</th>\n",
- " <td>18.060506</td>\n",
" <td>2020-01-01 03:16:00.738934</td>\n",
" <td>2020-01-01 03:34:04.369298</td>\n",
+ " <td>18.060506</td>\n",
" </tr>\n",
" <tr>\n",
" <th>3</th>\n",
- " <td>18.052280</td>\n",
" <td>2020-01-01 04:49:38.548244</td>\n",
" <td>2020-01-01 05:07:41.685056</td>\n",
+ " <td>18.052280</td>\n",
" </tr>\n",
" <tr>\n",
" <th>4</th>\n",
- " <td>18.044287</td>\n",
" <td>2020-01-01 06:23:16.351637</td>\n",
" <td>2020-01-01 06:41:19.008874</td>\n",
+ " <td>18.044287</td>\n",
" </tr>\n",
" <tr>\n",
" <th>5</th>\n",
- " <td>18.036528</td>\n",
" <td>2020-01-01 07:56:54.149057</td>\n",
" <td>2020-01-01 08:14:56.340741</td>\n",
+ " <td>18.036528</td>\n",
" </tr>\n",
" <tr>\n",
" <th>6</th>\n",
- " <td>18.029003</td>\n",
" <td>2020-01-01 09:30:31.940450</td>\n",
" <td>2020-01-01 09:48:33.680649</td>\n",
+ " <td>18.029003</td>\n",
" </tr>\n",
" <tr>\n",
" <th>7</th>\n",
- " <td>18.021714</td>\n",
" <td>2020-01-01 11:04:09.725763</td>\n",
" <td>2020-01-01 11:22:11.028587</td>\n",
+ " <td>18.021714</td>\n",
" </tr>\n",
" <tr>\n",
" <th>8</th>\n",
- " <td>18.014660</td>\n",
" <td>2020-01-01 12:37:47.504944</td>\n",
" <td>2020-01-01 12:55:48.384546</td>\n",
+ " <td>18.014660</td>\n",
" </tr>\n",
" <tr>\n",
" <th>9</th>\n",
- " <td>18.007843</td>\n",
" <td>2020-01-01 14:11:25.277944</td>\n",
" <td>2020-01-01 14:29:25.748515</td>\n",
+ " <td>18.007843</td>\n",
" </tr>\n",
" <tr>\n",
" <th>10</th>\n",
- " <td>18.001263</td>\n",
" <td>2020-01-01 15:45:03.044716</td>\n",
" <td>2020-01-01 16:03:03.120486</td>\n",
+ " <td>18.001263</td>\n",
" </tr>\n",
" <tr>\n",
" <th>11</th>\n",
- " <td>17.994921</td>\n",
" <td>2020-01-01 17:18:40.805211</td>\n",
" <td>2020-01-01 17:36:40.500451</td>\n",
+ " <td>17.994921</td>\n",
" </tr>\n",
" <tr>\n",
" <th>12</th>\n",
- " <td>17.988817</td>\n",
" <td>2020-01-01 18:52:18.559383</td>\n",
" <td>2020-01-01 19:10:17.888399</td>\n",
+ " <td>17.988817</td>\n",
" </tr>\n",
" <tr>\n",
" <th>13</th>\n",
- " <td>17.982952</td>\n",
" <td>2020-01-01 20:25:56.307186</td>\n",
" <td>2020-01-01 20:43:55.284322</td>\n",
+ " <td>17.982952</td>\n",
" </tr>\n",
" <tr>\n",
" <th>14</th>\n",
- " <td>17.977327</td>\n",
" <td>2020-01-01 21:59:34.048572</td>\n",
" <td>2020-01-01 22:17:32.688210</td>\n",
+ " <td>17.977327</td>\n",
" </tr>\n",
" <tr>\n",
" <th>15</th>\n",
- " <td>17.971943</td>\n",
" <td>2020-01-01 23:33:11.783493</td>\n",
" <td>2020-01-01 23:51:10.100051</td>\n",
+ " <td>17.971943</td>\n",
" </tr>\n",
" </tbody>\n",
"</table>\n",
"</div>"
],
"text/plain": [
- " EclipseDuration Start Stop\n",
- "0 18.077653 2020-01-01 00:08:45.102790 2020-01-01 00:26:49.761988\n",
- "1 18.068964 2020-01-01 01:42:22.923764 2020-01-01 02:00:27.061606\n",
- "2 18.060506 2020-01-01 03:16:00.738934 2020-01-01 03:34:04.369298\n",
- "3 18.052280 2020-01-01 04:49:38.548244 2020-01-01 05:07:41.685056\n",
- "4 18.044287 2020-01-01 06:23:16.351637 2020-01-01 06:41:19.008874\n",
- "5 18.036528 2020-01-01 07:56:54.149057 2020-01-01 08:14:56.340741\n",
- "6 18.029003 2020-01-01 09:30:31.940450 2020-01-01 09:48:33.680649\n",
- "7 18.021714 2020-01-01 11:04:09.725763 2020-01-01 11:22:11.028587\n",
- "8 18.014660 2020-01-01 12:37:47.504944 2020-01-01 12:55:48.384546\n",
- "9 18.007843 2020-01-01 14:11:25.277944 2020-01-01 14:29:25.748515\n",
- "10 18.001263 2020-01-01 15:45:03.044716 2020-01-01 16:03:03.120486\n",
- "11 17.994921 2020-01-01 17:18:40.805211 2020-01-01 17:36:40.500451\n",
- "12 17.988817 2020-01-01 18:52:18.559383 2020-01-01 19:10:17.888399\n",
- "13 17.982952 2020-01-01 20:25:56.307186 2020-01-01 20:43:55.284322\n",
- "14 17.977327 2020-01-01 21:59:34.048572 2020-01-01 22:17:32.688210\n",
- "15 17.971943 2020-01-01 23:33:11.783493 2020-01-01 23:51:10.100051"
+ " Start Stop EclipseDuration\n",
+ "0 2020-01-01 00:08:45.102790 2020-01-01 00:26:49.761988 18.077653\n",
+ "1 2020-01-01 01:42:22.923764 2020-01-01 02:00:27.061606 18.068964\n",
+ "2 2020-01-01 03:16:00.738934 2020-01-01 03:34:04.369298 18.060506\n",
+ "3 2020-01-01 04:49:38.548244 2020-01-01 05:07:41.685056 18.052280\n",
+ "4 2020-01-01 06:23:16.351637 2020-01-01 06:41:19.008874 18.044287\n",
+ "5 2020-01-01 07:56:54.149057 2020-01-01 08:14:56.340741 18.036528\n",
+ "6 2020-01-01 09:30:31.940450 2020-01-01 09:48:33.680649 18.029003\n",
+ "7 2020-01-01 11:04:09.725763 2020-01-01 11:22:11.028587 18.021714\n",
+ "8 2020-01-01 12:37:47.504944 2020-01-01 12:55:48.384546 18.014660\n",
+ "9 2020-01-01 14:11:25.277944 2020-01-01 14:29:25.748515 18.007843\n",
+ "10 2020-01-01 15:45:03.044716 2020-01-01 16:03:03.120486 18.001263\n",
+ "11 2020-01-01 17:18:40.805211 2020-01-01 17:36:40.500451 17.994921\n",
+ "12 2020-01-01 18:52:18.559383 2020-01-01 19:10:17.888399 17.988817\n",
+ "13 2020-01-01 20:25:56.307186 2020-01-01 20:43:55.284322 17.982952\n",
+ "14 2020-01-01 21:59:34.048572 2020-01-01 22:17:32.688210 17.977327\n",
+ "15 2020-01-01 23:33:11.783493 2020-01-01 23:51:10.100051 17.971943"
]
},
- "execution_count": 17,
+ "execution_count": 36,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"start_time = None\n",
- "result = pd.DataFrame()\n",
+ "result = []\n",
"\n",
"for event in logger.getLoggedEvents():\n",
" \n",
@@ -543,12 +534,12 @@
" start_time = event.getState().getDate()\n",
" elif start_time:\n",
" stop_time = event.getState().getDate()\n",
- " result = result.append({\"Start\":absolutedate_to_datetime(start_time), \n",
- " \"Stop\":absolutedate_to_datetime(stop_time), \n",
- " \"EclipseDuration\": stop_time.durationFrom(start_time)/60},\n",
- " ignore_index=True)\n",
+ " result.append({ \"Start\":absolutedate_to_datetime(start_time), \n",
+ " \"Stop\":absolutedate_to_datetime(stop_time), \n",
+ " \"EclipseDuration\": stop_time.durationFrom(start_time)/60})\n",
" start_time = None\n",
- "result"
+ "result_df = pd.DataFrame.from_dict(result)\n",
+ "result_df"
]
},
{
@@ -598,7 +589,7 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Python 3",
+ "display_name": "Python 3.10.6 ('scipy2')",
"language": "python",
"name": "python3"
},
@@ -612,7 +603,12 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.8.5"
+ "version": "3.10.6"
+ },
+ "vscode": {
+ "interpreter": {
+ "hash": "13ccaf138b729633bb423a5f6ddbd942405bb36fdc6db4bac965e2fe269ae733"
+ }
}
},
"nbformat": 4,
--
GitLab