Skip to content

Commit

Permalink
Review of Tutorial Notebooks
Browse files Browse the repository at this point in the history
  • Loading branch information
fabriciocravo committed May 18, 2024
1 parent 9fd4931 commit 8147dbd
Show file tree
Hide file tree
Showing 14 changed files with 158 additions and 92 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,7 @@ Version 2.2 - Added MobsPy expressions

Version 2.3 - MobsPy standard output is now always concentration.

Version 2.4.4 - Assignments completely added (both notations)



32 changes: 24 additions & 8 deletions example_models/Tutorial Notebooks/01_Basic_Intro.ipynb

Large diffs are not rendered by default.

32 changes: 9 additions & 23 deletions example_models/Tutorial Notebooks/02_Reaction_Inheritance.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
{
"data": {
"text/plain": [
"<mobspy.modules.meta_class.Reactions at 0x7fec96aa6a90>"
"<mobspy.modules.meta_class.Reactions at 0x7fc0ef2a1610>"
]
},
"execution_count": 2,
Expand Down Expand Up @@ -130,26 +130,12 @@
"execution_count": 6,
"id": "5f0c9765-b7d0-4e26-98ed-8660fcd74f26",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"(<mobspy.modules.meta_class.Species at 0x7fec96a7f760>,\n",
" <mobspy.modules.meta_class.Species at 0x7fec96aa6370>,\n",
" <mobspy.modules.meta_class.Species at 0x7fec96a7ffa0>,\n",
" <mobspy.modules.meta_class.Species at 0x7fec96aa66a0>)"
]
},
"execution_count": 6,
"metadata": {},
"output_type": "execute_result"
}
],
"outputs": [],
"source": [
"S = Simulation(Ecoli | Strepto | Glucose | Amino)\n",
"\n",
"# Adding some counts\n",
"Ecoli(50), Strepto(25), Glucose(10), Amino(100)"
"Ecoli(50), Strepto(25), Glucose(10), Amino(100)\n",
"\n",
"S = Simulation(Ecoli | Strepto | Glucose | Amino)"
]
},
{
Expand Down Expand Up @@ -180,10 +166,10 @@
"text": [
"\n",
"Species\n",
"Amino,0\n",
"Ecoli,0\n",
"Glucose,0\n",
"Strepto,0\n",
"Amino,100\n",
"Ecoli,50\n",
"Glucose,10\n",
"Strepto,25\n",
"\n",
"Mappings\n",
"Amino :\n",
Expand Down
6 changes: 3 additions & 3 deletions example_models/Tutorial Notebooks/03_Characteristics.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{
"data": {
"text/plain": [
"<mobspy.modules.meta_class.Reactions at 0x7f9367aa3580>"
"<mobspy.modules.meta_class.Reactions at 0x7ff51e2a9670>"
]
},
"execution_count": 1,
Expand Down Expand Up @@ -89,7 +89,7 @@
{
"data": {
"text/plain": [
"<mobspy.modules.meta_class.Reactions at 0x7f9367a42220>"
"<mobspy.modules.meta_class.Reactions at 0x7ff51e280e50>"
]
},
"execution_count": 3,
Expand Down Expand Up @@ -134,7 +134,7 @@
{
"data": {
"text/plain": [
"<mobspy.modules.meta_class.Reactions at 0x7f9367aae070>"
"<mobspy.modules.meta_class.Reactions at 0x7ff523a39ca0>"
]
},
"execution_count": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"text": [
"\u001b[91mERROR: The same characteristic can only be shared through inheritance. There are two characteristics directly added to two meta-species \n",
"Repetition in: C, A \n",
"Characteristics: {'aaa', 'ccc'}, {'bbb', 'aaa'} \n",
"Characteristics: {'aaa', 'ccc'}, {'aaa', 'bbb'} \n",
"\u001b[0m\n"
]
}
Expand Down
6 changes: 3 additions & 3 deletions example_models/Tutorial Notebooks/07_Initial_Condition.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[{'characteristics': 'std$', 'quantity': 100}, {'characteristics': {'big', 'red'}, 'quantity': 150}]\n"
"[{'characteristics': 'std$', 'quantity': 100}, {'characteristics': {'red', 'big'}, 'quantity': 150}]\n"
]
}
],
Expand All @@ -109,7 +109,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[{'characteristics': 'std$', 'quantity': 100}, {'characteristics': {'big', 'red'}, 'quantity': 150}, {'characteristics': {'all$'}, 'quantity': 10}]\n"
"[{'characteristics': 'std$', 'quantity': 100}, {'characteristics': {'red', 'big'}, 'quantity': 150}, {'characteristics': {'all$'}, 'quantity': 10}]\n"
]
}
],
Expand Down Expand Up @@ -138,7 +138,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[{'characteristics': 'std$', 'quantity': 100}, {'characteristics': {'big', 'red'}, 'quantity': 150}, {'characteristics': {'all$'}, 'quantity': 10}, {'characteristics': {'big', 'all$'}, 'quantity': 100}]\n"
"[{'characteristics': 'std$', 'quantity': 100}, {'characteristics': {'red', 'big'}, 'quantity': 150}, {'characteristics': {'all$'}, 'quantity': 10}, {'characteristics': {'all$', 'big'}, 'quantity': 100}]\n"
]
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
{
"data": {
"text/plain": [
"<mobspy.modules.meta_class.Reactions at 0x7fc81629f9a0>"
"<mobspy.modules.meta_class.Reactions at 0x7fb17f9de8b0>"
]
},
"execution_count": 3,
Expand Down
44 changes: 36 additions & 8 deletions example_models/Tutorial Notebooks/09_Result_Data.ipynb

Large diffs are not rendered by default.

45 changes: 26 additions & 19 deletions example_models/Tutorial Notebooks/10_Reaction_Rates.ipynb

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"{'a1', 'a2', 'a3'}\n",
"{'a3', 'a1', 'a2'}\n",
"{'b1', 'b2', 'b3'}\n"
]
},
Expand Down
42 changes: 24 additions & 18 deletions example_models/Tutorial Notebooks/13_Events.ipynb

Large diffs are not rendered by default.

Large diffs are not rendered by default.

13 changes: 10 additions & 3 deletions example_models/Tutorial Notebooks/15_Assignments.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 2,
"id": "74f390fe-b828-4d46-95ec-158ec4a414ff",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -139,7 +139,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 3,
"id": "4d52afbc-a46b-4998-bd3b-4611d30156a5",
"metadata": {},
"outputs": [
Expand All @@ -152,6 +152,13 @@
"Simulation is Over\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"\n"
]
},
{
"data": {
"image/png": "iVBORw0KGgoAAAANSUhEUgAAAX4AAAEGCAYAAABiq/5QAAAAOXRFWHRTb2Z0d2FyZQBNYXRwbG90bGliIHZlcnNpb24zLjMuNCwgaHR0cHM6Ly9tYXRwbG90bGliLm9yZy8QVMy6AAAACXBIWXMAAAsTAAALEwEAmpwYAAAfBklEQVR4nO3dd5SV1dXH8e8WdSlYCaBGyAsxFoZR2oiKXTSS2IItWBKjIBYsWBL1Tawhxhg1oBI6SlRAKQICgjRBEIGhD0VFBEFRRqwI0ma/f5zx1YDiAPfec+99fp+1WDNzGeb53aVutuc5zz7m7oiISHLsEjuAiIhklgq/iEjCqPCLiCSMCr+ISMKo8IuIJMyusQNURLVq1bx27dqxY4iI5JQZM2Z87O7Vt3w9Jwp/7dq1KS4ujh1DRCSnmNmy73tdSz0iIgmjwi8ikjAq/CIiCaPCLyKSMCr8IiIJk7bCb2a9zGyVmZV857WqZjbazN4u/7h/uq4vIiLfL50d/9NA8y1euxMY6+6HAmPLvxYRkQxKW+F394nAJ1u8fB7Qu/zz3sBv0nV9EZGctno1tGsHn3+e8h+d6TX+A9x9JUD5xxo/9I1m1sbMis2suLS0NGMBt9eLL76ImbFo0aLYUUQkH7hD//5QUACdOsHEiSm/RNbe3HX3bu5e5O5F1atv9cRx1ujbty8nnHAC/fr1ix1FRHLdypVw/vlw8cVQqxbMmAHnnJPyy2S68H9kZgcBlH9cleHrp9SaNWuYPHkyPXv2VOEXkR3nDr16Qd26MHIk/POf8MYbcNRRablcpmf1DAWuAB4q/zgkFT+03ch2zP5wdip+1P9rcGADOjTvsM3vGTx4MM2bN+ewww6jatWqzJw5k0aNGqU0h4jkuSVLoE0bGDsWTj4ZuneHQw9N6yXTuZ2zLzAFONzMVphZK0LBP8PM3gbOKP86Z/Xt25eWLVsC0LJlS/r27Rs5kYjkjM2boUMHOPJImDYNunSBcePSXvQBLBcOWy8qKvJsm865evVqatasSY0aNTAzNm/ejJmxbNkyzCx2PBHJZgsWQKtWYTnnrLNC0a9ZM+WXMbMZ7l605etZe3M32w0YMIDf//73LFu2jKVLl7J8+XLq1KnDpEmTYkcTkWy1YQP89a/QsCG8/TY89xy89FJaiv62qPDvoL59+9KiRYv/eu2CCy6gT58+kRKJSFYrLoaiIrjnnrBzZ+FCuPRSiLBCoKUeEZF0WrsW7rsPHn0UDjwQOneGc8/NyKV/aKknJ07gEhHJSRMmQOvWsHhx2Lnz8MOw776xU2mpR0Qk5T7/HK69Fk45JezRHzcOunbNiqIPKvwiIqk1fDgUFob9+LffDnPnwqmnxk71X1T4RURSobQULrsMzj4b9tsPpkwJT+BWrhw72VZU+EVEdoY79OsXhqr17x9u5M6YAU2axE72g3RzV0RkR73/Plx3XdiLf/TR0LNneBI3y6nj3wmVKlWiQYMGFBYWctFFF7F27drYkUQkE9zDGn5BAYwZE7ZqTpmSE0UfVPh3yp577sns2bMpKSlh9913p0uXLrEjiUi6vfMONGsWtmc2bgzz5sGtt0KlSrGTVZgKf4qceOKJLF68OHYMEUmXzZtDZ3/kkWENv1u3MFHzkENiJ9tu+bHG364dzJ6d2p/ZoEGYnFcBmzZt4uWXX6Z58y2PGBaRvFBSAlddBdOnh4NROneGgw+OnWqH5Ufhj2TdunU0aNAACB1/q1at4gYSkdTasAEefDD82m+/sHvn4oujzNdJpfwo/BXszFPtmzV+EclD06aFLn/+/DBMrWNHqFYtdqqU0Bq/iMh3rV0Lt90Gxx0XRi8MGxbGJ+dJ0Yd86fhFRFJh/PgwVG3JErjmmjBUbZ99YqdKOXX8O2HNmjWxI4hIKnz2WdieedppsMsu8Oqr4VSsPCz6oMIvIkk3dCjUqxeeur39dpgzJxx6nsdU+EUkmVatgpYt4bzz4Cc/galTs3aoWqqp8ItIsriHm7UFBTBoEDzwwLfHIiaEbu6KSHIsXx6Gqg0fDsccA716hb8AEkYdv4jkv7KycLO2Xr2wc6dDB5g8OZFFH9Txi0i+e+stuPpqmDgRTj89zNipUyd2qqjU8YtIftq0KezDr18/HH/Yqxe88kriiz6o4xeRfDRnDrRqFaZotmgBnTrBQQfFTpU11PGLSP5Yvx7uvjvs0Fm+HF54AQYOVNHfgjp+EckPU6aELn/hQvj97+Gxx8L+fNmKOn4RyW1ffRXO5Dj++PD5yy9D794q+tugjl9EcteYMWHHztKlcP318NBDsPfesVNlPXX8IpJ7Pv00LOuccQbsvnvYqtmpk4p+BUUp/GZ2i5nNN7MSM+trZnvEyCEiOWjw4PDgVe/ecOedYQfPiSfGTpVTMl74zexg4CagyN0LgUpAy0znEJEc89FH4djDFi3gwAPDCVl//zvsob5xe8Va6tkV2NPMdgUqAx9EyiEi2c4d/vMfqFsXhgyB9u1D0W/UKHaynJXxwu/u7wOPAO8BK4HP3f2VLb/PzNqYWbGZFZeWlmY6pohkg2XL4Ne/hiuuCIV/zhz4859ht91iJ8tpMZZ69gfOA+oAPwWqmNnlW36fu3dz9yJ3L6pevXqmY4pITGVl4WZtYSG89ho8/ni4gXvEEbGT5YUYSz2nA++6e6m7bwQGAU0j5BCRbPTmm+EErBtugKZNoaQEbrwRKlWKnSxvxCj87wHHmlllMzOgGbAwQg4RySYbN4Z9+PXrw/z58PTTMHIk1K4dO1neyfgDXO4+1cwGADOBTcAsoFumc4hIFpk1K+zLnzULLrwQnngi7NyRtIiyq8fd73X3I9y90N1/5+7rY+QQkci+/jrcrD36aPjggzBQrX9/Ff0008gGEYlj0iRo3Tqs6f/hD2Go2v77x06VCBrZICKZ9eWX4WbtSSeFjn/UKHjqKRX9DFLhF5HMGTUqbNHs1Cns2ikpgV/+MnaqxFHhF5H0++STsJzTvDlUrvzt3vy99oqdLJFU+EUkvQYODEPVnn023MidNSvMzpdodHNXRNJj5cqwnDNoEDRsGPbkN2gQO5Wgjl9EUs093KwtKIDhw8NDWdOmqehnEXX8IpI6S5dCmzYwejSccAL06AGHHx47lWxBHb+I7LyysnCztrAwHHr+5JMwYYKKfpZSxy8iO2fhwvAg1uuvh107XbvCz34WO5Vsgzp+EdkxGzfC3/4W1u4XLQqHpYwYoaKfA9Txi8j2mzEDrroK5s4NxyE+/jgccEDsVFJB6vhFpOLWrYM77oBjjoHSUnjxRXj+eRX9HKOOX0QqZuLEsJb/9tthhPI//6n5OjlKHb+IbNuXX8L114dTsTZtgjFjwjZNFf2cpcIvIj/s5ZehXj3o0gXatYN586BZs9ipZCdpqUdEtrZ6NdxyCzzzTHgC9/XX4dhjY6eSFFHHLyLfcocXXoC6daFvX7jnHpg5U0U/z6jjF5Hggw+gbVsYPBiKisJa/lFHxU4laaCOXyTp3KFnz7CkM3Jk2K0zZYqKfh5Txy+SZEuWhKFqY8eGXTvdu8Ohh8ZOJWmmjl8kiTZvhg4d4Mgjw8jkLl1g3DgV/YRQxy+SNPPnhwewpk6Fs86Czp2hVq3YqSSD1PGLJMWGDfDAA+E0rMWL4bnn4KWXVPQTSB2/SBJMnx66/Hnz4JJLoGNHqF49diqJRB2/SD5buxb++MewD/+TT2DoUOjTR0U/4dTxi+SrV1+Fq68Oyzpt2sDDD8O++8ZOJVlAHb9Ivvn8c7j2Wjj11LBHf9y4cCqWir6UU+EXySfDhoWhat27w+23h4NSTj01dirJMir8IvmgtBQuvRTOOSeMS54yJTyBW7ly7GSShaIUfjPbz8wGmNkiM1toZsfFyCGS89zDMLWCAhgwAO6/PxyL2KRJ7GSSxWLd3O0IjHT3C81sd0Bticj2WrECrrsuLO80aRLm7RQWxk4lOSDjHb+Z7QOcBPQEcPcN7v5ZpnOI5KyyMujWLazljx0Ljz0W5uWr6EsFxVjq+TlQCjxlZrPMrIeZVdnym8ysjZkVm1lxaWlp5lOKZKPFi8MJWNdcA40bhweybrkFKlWKnUxySIzCvyvQCOjs7g2Br4A7t/wmd+/m7kXuXlRdD5tI0m3aBI8+GkYlz5wZdu2MHQuHHBI7meSgGIV/BbDC3aeWfz2A8BeBiHyfefOgadOwPfOMM2DBAmjdGsxiJ5MclfHC7+4fAsvN7PDyl5oBCzKdQyTrrV8P994LjRrB0qXQr184Hevgg2MnkxwXa1fPjcBz5Tt6lgBXRsohkp3eeCMMVVuwAC67LMzOr1YtdirJE1EKv7vPBopiXFskq331Fdx9dyj0Bx8Mw4fDr38dO5XkGQ1pE8kWY8eGoWrvvhv25z/0EOyzT+xUkoc0skEkts8+CwX/9NNh111hwgT4979V9CVtVPhFYhoyJIxb6NUL/vQnmDMHTjopdirJcyr8IjGsWgUtW8JvfgM1aoQDz//xD9hzz9jJJAF2uPCb2bBUBhFJBHd49lmoWxdefBH++tdwLGLjxrGTSYLszM3dq1OWQiQJli8PB6SMGAHHHReGqtWtGzuVJFCFOn4zq2Jmu3zn612Az9OWSiSflJVB585hLf/VV8NB56+9pqIv0VR0qWcs/z06uTIwJvVxRPLMW2+FE7Cuvz4ceF5SAjfdpKFqElVFC/8e7r7mmy/KP9cMfZEfsmlTONy8fv1w/GGvXvDKK1CnTuxkIhUu/F+Z2f8PUjOzxsC69EQSyXFz5sAxx8Add8CvfhXGLlx5pYaqSdao6M3ddkB/M/ug/OuDgN+mJZFIrvr6a2jfPmzLrFoV+veHCy5QwZesU6HC7+7TzewI4HDAgEXuvjGtyURyyZQpcNVVsGgRXHFFOBWratXYqUS+1/Zs5zwaqF3+ZxqaGe7+n7SkEskVa9bAn/8MTzwBtWrByJFw5pmxU4lsU4UKv5k9AxwCzAY2l7/sgAq/JNfo0dCmTZiVf8MN8OCDsPfesVOJ/KiKdvxFQIG7ezrDiOSETz+F226Dp56Cww4Le/JPOCF2KpEKq+iunhLgwHQGEckJgweHB7H+8x+4666wg0dFX3JMRTv+asACM5sGrP/mRXc/Ny2pRLLNRx/BjTeGnToNGoQDUhrpqGjJTRUt/PelM4RI1nKHZ56Bdu1g7dqwjn/77bDbbrGTieywim7nnGBmBxB29gBMc/dV6YslkgWWLYNrroFRo6Bp0zBU7YgjYqcS2WkVHdJ2MTANuAi4GJhqZhemM5hINGVl0KkTFBbCpElhq+Zrr6noS96o6FLPn4Gjv+nyzaw6YUjbgHQFE4nizTehdetQ8H/5S+jaFWrXjp1KJKUquqtnly2WdlZvx58VyX4bN8Lf/x6Gqs2fD08/HR7GUtGXPFTRjn+kmY0C+pZ//VtgRHoiiWTYrFnQqlX4eMEF8OSTcKB2L0v+2mbhN7NfAAe4+x/N7HzgBMKsninAcxnIJ5I+X38NDzwQxidXqwYDB8L558dOJZJ2P9bxdwD+F8DdBwGDAMysqPz3zkljNpH0mTw5dPlvvgl/+EMYqrb//rFTiWTEj63T13b3uVu+6O7FhIFtIrllzZrwINaJJ8L69eFwlKeeUtGXRPmxwr/HNn5vz1QGEUm7UaOgXr2wVfPGG2HePDjjjNipRDLuxwr/dDO7essXzawVMCM9kURS7JNPwoz85s2hcuWwVbNjR9hrr9jJRKL4sTX+dsCLZnYZ3xb6ImB3oEUac4nsPPdww/aGG2D16jA3/y9/gT229T+yIvlvm4Xf3T8CmprZqUBh+cvD3X1c2pOJ7IyVK6FtW3jxxTBMbeTIMFxNRCo8q2c8MD7NWUR2nnt4+OrWW2HdOnjooTA7f9ftOWxOJL9Fe/rWzCqZ2SwzGxYrg+SZd98Nxx5edVWYszN3Ltxxh4q+yBZijl24GVgY8fqSLzZvDjdrCwvDoeedOsGECeF0LBHZSpTCb2Y1gbOAHjGuL3lkwYKwJ79dOzj55DBn5/rrYReNkhL5IbH+6+gA/Ako+6FvMLM2ZlZsZsWlpaUZCyY5YuNGaN8eGjaEt94Kh6UMHw4/+1nsZCJZL+OF38zOBla5+zafA3D3bu5e5O5F1atXz1A6yQkzZkBREdx9N7RoEbr+yy8Hs9jJRHJCjI7/eOBcM1sK9ANOM7NnI+SQXLNuXbhZ26QJlJbCkCHQrx/UqBE7mUhOyXjhd/e73L2mu9cGWgLj3P3yTOeQHDNxYpiV//DDcOWVocs/99zYqURyku6ASXb74otws/bkk2HTJhgzBnr0gP32i51MJGdF3eDs7q8Cr8bMIFlsxAi49lpYsSLs2mnfHqpUiZ1KJOfpyRbJPh9/DLfcAs8+CwUF8PrrcOyxsVOJ5A0t9Uj2cIfnnw/Fvl8/uPdemDlTRV8kxdTxS3b44AO47joYOjRs1RwzBo46KnYqkbykjl/icg83awsKwmlYjzwSxi6o6IukjTp+iWfJErj6ahg3Luza6dEDfvGL2KlE8p46fsm8zZvhX/8KQ9WmT4euXUPxV9EXyQh1/JJZJSXQujVMnQpnnQVdukDNmrFTiSSKOn7JjA0b4P77w2lY77wDffrASy+p6ItEoI5f0m/69HA4SkkJXHJJmJ2vwXsi0ajjl/RZuxZuvz3sw//007BVs08fFX2RyNTxS3qMHx/W8pcsgTZtwnC1ffeNnUpEUMcvqfb553DNNXDaaWE+/vjxYdeOir5I1lDhl9QZNgzq1Qv78W+7LRx2fsopsVOJyBZU+GXnlZbCpZfCOedA1arwxhvhCdzKlWMnE5HvocIvO8493KytWxcGDID77oPiYjj66NjJRGQbdHNXdsyKFWGo2rBhcMwx0LNnWOYRkaynjl+2T1lZuFlbUBDGLPzrXzB5soq+SA5Rxy8V9/bbYajahAnQrBl06wY//3nsVCKyndTxy4/btCncrD3qKJg9G7p3h9GjVfRFcpQ6ftm2uXOhVatw0/bcc6FzZ/jpT2OnEpGdoI5fvt/69eHow8aNYdmycBTi4MEq+iJ5QB2/bO2NN0KXv2ABXH45dOgAP/lJ7FQikiLq+OVbX30Ft94KTZvCF1/A8OHwzDMq+iJ5Rh2/BOPGhR07S5aE/fkPPQT77BM7lYikgTr+pPvss1DwmzWDSpXCVs1//1tFXySPqfAn2ZAh4UGsp56CO+6AOXPgpJNipxKRNNNSTxJ99BHcdBO88ALUrx+OQGzcOHYqEckQdfxJ4h5u1hYUhK2Z7duHYxFV9EUSRR1/Urz3Hlx7Lbz8Mhx3XBiqVrdu7FQiEoE6/nxXVhZu1tarF27cduwIr72moi+SYBkv/GZWy8zGm9lCM5tvZjdnOkNivPVWOAGrbdvQ5c+fH9b2K1WKnUxEIorR8W8CbnP3usCxQFszK4iQI39t2gT/+EcYqjZvHvTqBaNGQe3asZOJSBbI+Bq/u68EVpZ//qWZLQQOBhZkOktemjMHrroKZs6EFi2gUyc46KDYqUQki0Rd4zez2kBDYOr3/F4bMys2s+LS0tKMZ8s5X38Nf/kLFBXB+++HoxAHDVLRF5GtRCv8ZrYXMBBo5+5fbPn77t7N3Yvcvah69eqZD5hLXn8dGjaEv/0NLrssDFe74ILYqUQkS0Up/Ga2G6HoP+fug2JkyAtr1sDNN8MJJ8DatTByJDz9NFStGjuZiGSxjK/xm5kBPYGF7v5Ypq+fN155Bdq0Cfvz27aFBx+EvfeOnUpEckCMjv944HfAaWY2u/zXryPkyE2ffhpu3p55JuyxB0ycCE88oaIvIhUWY1fPJMAyfd28MGhQ6O5LS+Guu+Cee0LxFxHZDhrZkAs+/BBuuAEGDoQGDWDEiHAzV0RkB2hkQzZzh969w1C1YcPCOv60aSr6IrJT1PFnq2XL4JprwhO3xx8PPXrAEUfETiUieUAdf7YpK4MnnwxD1SZPDk/eTpyooi8iKaOOP5ssWgStW4eCf+aZ0LUr/M//xE4lInlGHX822LgxrN/Xrx+euu3dO8zNV9EXkTRQxx/brFlhX/7s2XDhhWGZ54ADYqcSkTymjj+Wr78Oe/GPPjps1xw4EPr3V9EXkbRTxx/DpEnQqlU4KOXKK+HRR2H//WOnEpGEUMefSV9+CTfeCCedBBs2wOjR4ZAUFX0RySAV/kwZORIKC8P2zJtuCidjnX567FQikkAq/Om2ejVccQX86ldQpUrYqtmhA+y1V+xkIpJQKvzp4h5u1hYUQJ8+4XSsWbPCoeciIhHl9c3ddiPbMfvD2Rm/btXP1nPLM29z4szVvFl7Lx5uW593fvYa9D0z41lEJLc1OLABHZp3SOnPzOvCn3HuNJ/0EW37vcPuG8voclEd+p9Zi82VNIVaRLKHuXvsDD+qqKjIi4uLY8fYtnffDSdijRkTdu107w6HHRY7lYgkmJnNcPeiLV/XGv/O2rwZOnYMO3amToXOnWH8eBV9EclaWurZGQsWhKFqU6aEXTtdu0KtWrFTiYhskzr+HbFxI7RvHw5EeestePZZGD5cRV9EcoI6/u01Y0YYqjZ3Lvz2t/D441CjRuxUIiIVpo6/otatgzvugCZN4OOPYcgQ6NdPRV9Eco46/oqYMCGs5S9eDFdfDQ8/DPvtFzuViMgOUce/LV98AdddB6ecEo5EHDsWunVT0ReRnKbC/0OGDw/n3nbrBrfeGtb0TzstdioRkZ2mwr+ljz+Gyy+Hs8+GffaB118P8/KrVImdTEQkJVT4v+EebtbWrQvPPw/33gszZ8Ixx8ROJiKSUrq5C/D++3D99TB0aDgKsWdPOPLI2KlERNIi2R2/O/ToEUYnjx4NjzwSnsJV0ReRPJbcjv+dd8LWzPHjw66d7t3hF7+InUpEJO2S1/Fv3gyPPRa6+hkzwnydsWNV9EUkMZLV8ZeUQKtWMG1a2LXTuTPUrBk7lYhIRkXp+M2suZm9aWaLzezOtF9wwwa4/35o1AiWLAlHIQ4dqqIvIomU8Y7fzCoBnYAzgBXAdDMb6u4L0nLBadNCl19SApdeGg46r149LZcSEckFMTr+JsBid1/i7huAfsB5ablS+/bhcPNPP4WXXoLnnlPRF5HEi1H4DwaWf+frFeWv/Rcza2NmxWZWXFpaumNXOuSQsHNn/vywpi8iIlEK//edPL7Vwb/u3s3di9y9qPqOdumXXAJdusC+++7YnxcRyUMxCv8K4LtHVdUEPoiQQ0QkkWIU/unAoWZWx8x2B1oCQyPkEBFJpIzv6nH3TWZ2AzAKqAT0cvf5mc4hIpJUUR7gcvcRwIgY1xYRSbrkjWwQEUk4FX4RkYRR4RcRSRgVfhGRhDH3rZ6dyjpmVgos28E/Xg34OIVxcoHeczLoPSfDzrzn/3H3rZ6AzYnCvzPMrNjdi2LnyCS952TQe06GdLxnLfWIiCSMCr+ISMIkofB3ix0gAr3nZNB7ToaUv+e8X+MXEZH/loSOX0REvkOFX0QkYfK68Gf8UPfIzKyWmY03s4VmNt/Mbo6dKRPMrJKZzTKzYbGzZIKZ7WdmA8xsUfk/6+NiZ0o3M7ul/N/pEjPra2Z7xM6UambWy8xWmVnJd16ramajzezt8o/7p+JaeVv4v3Oo+6+AAuASMyuImyrtNgG3uXtd4FigbQLeM8DNwMLYITKoIzDS3Y8A6pPn793MDgZuAorcvZAwzr1l3FRp8TTQfIvX7gTGuvuhwNjyr3da3hZ+Mnmoe5Zw95XuPrP88y8JBWGr84zziZnVBM4CesTOkglmtg9wEtATwN03uPtnUUNlxq7Anma2K1CZPDy1z90nAp9s8fJ5QO/yz3sDv0nFtfK58FfoUPd8ZWa1gYbA1MhR0q0D8CegLHKOTPk5UAo8Vb681cPMqsQOlU7u/j7wCPAesBL43N1fiZsqYw5w95UQGjugRip+aD4X/god6p6PzGwvYCDQzt2/iJ0nXczsbGCVu8+InSWDdgUaAZ3dvSHwFSn63/9sVb6ufR5QB/gpUMXMLo+bKrflc+FP5KHuZrYboeg/5+6DYudJs+OBc81sKWEp7zQzezZupLRbAaxw92/+T24A4S+CfHY68K67l7r7RmAQ0DRypkz5yMwOAij/uCoVPzSfC3/iDnU3MyOs/S5098di50k3d7/L3Wu6e23CP99x7p7XnaC7fwgsN7PDy19qBiyIGCkT3gOONbPK5f+ONyPPb2h/x1DgivLPrwCGpOKHRjlzNxMSeqj78cDvgHlmNrv8tf8tP+NY8seNwHPlDc0S4MrIedLK3aea2QBgJmHn2izycHSDmfUFTgGqmdkK4F7gIeAFM2tF+AvwopRcSyMbRESSJZ+XekRE5Huo8IuIJIwKv4hIwqjwi4gkjAq/iEjCqPCLfIeZ/cTMZpf/+tDM3i//fI2Z/Tt2PpFU0HZOkR9gZvcBa9z9kdhZRFJJHb9IBZjZKd/M+zez+8yst5m9YmZLzex8M3vYzOaZ2cjysRmYWWMzm2BmM8xs1DeP3ovEpsIvsmMOIYyDPg94Fhjv7kcC64Czyov/E8CF7t4Y6AX8LVZYke/K25ENImn2srtvNLN5hJEgI8tfnwfUBg4HCoHRYbwMlQgjhUWiU+EX2THrAdy9zMw2+rc3y8oI/10ZMN/d8/5YRMk9WuoRSY83gerfnIdrZruZWb3ImUQAFX6RtCg/7vNC4B9mNgeYTXJmyEuW03ZOEZGEUccvIpIwKvwiIgmjwi8ikjAq/CIiCaPCLyKSMCr8IiIJo8IvIpIw/wevjAVIXgoBEwAAAABJRU5ErkJggg==\n",
Expand Down Expand Up @@ -193,7 +200,7 @@
},
{
"cell_type": "code",
"execution_count": 13,
"execution_count": 4,
"id": "34a015fb-057a-47a7-a617-3bdb29cad5a1",
"metadata": {},
"outputs": [
Expand Down
4 changes: 2 additions & 2 deletions mobspy/plot_scripts/default_plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ def set_plot_units(new_plot_params):
if new_plot_params['unit_x'] is not None and not ("ignore_unit_label_x" in new_plot_params and
new_plot_params["ignore_unit_label_x"]):
if not isinstance(new_plot_params['unit_x'], Quantity):
new_plot_params['xlabel'] += f' ({new_plot_params["unit_x"]})'
new_plot_params['xlabel'] += f' ({new_plot_params["unit_x"]}s)'
else:
new_plot_params['xlabel'] += f' ({new_plot_params["unit_x"].units})'
new_plot_params['xlabel'] += f' ({new_plot_params["unit_x"].units}s)'

if 'ylabel' not in new_plot_params:
if new_plot_params['output_concentration']:
Expand Down

0 comments on commit 8147dbd

Please sign in to comment.