diff --git a/CHANGELOG.md b/CHANGELOG.md index f99b213dae3fa17c9031e9fedd706c48c09eee80..9f1586c2f0a2c1146c73a7052e6e38fb895d58d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# v1.0.2 +## 20/01/2020 + +**Improved:** + +* Removed unnecessary descriptor from tutorial + # v1.0.1 ## 17/01/2020 diff --git a/tcmi.ipynb b/tcmi.ipynb index cc16309926d6eca564523e784760c7117a6af83e..fcc157cf0af217fe1cfc0d70efd3294d2e51a02c 100644 --- a/tcmi.ipynb +++ b/tcmi.ipynb @@ -25,7 +25,7 @@ " Matthias Scheffler<sup>1</sup>,\n", " and Luca Ghiringhelli<sup> 1</sup> <br><br>\n", "<sup>1</sup> Fritz Haber Institute of the Max Planck Society, Faradayweg 4-6, D-14195 Berlin, Germany <br>\n", - "<span class=\"nomad--last-updated\" data-version=\"v1.0.1\">[Last updated: January 17, 2020]</span>\n", + "<span class=\"nomad--last-updated\" data-version=\"v1.0.2\">[Last updated: January 20, 2020]</span>\n", "</p>\n", " \n", "<div> \n", @@ -75,8 +75,8 @@ "execution_count": 1, "metadata": { "ExecuteTime": { - "end_time": "2020-01-17T09:14:38.542016Z", - "start_time": "2020-01-17T09:14:38.539754Z" + "end_time": "2020-01-20T09:39:22.700649Z", + "start_time": "2020-01-20T09:39:22.698564Z" }, "init_cell": true }, @@ -100,8 +100,8 @@ "execution_count": 2, "metadata": { "ExecuteTime": { - "end_time": "2020-01-17T09:14:39.810527Z", - "start_time": "2020-01-17T09:14:38.543402Z" + "end_time": "2020-01-20T09:39:24.010953Z", + "start_time": "2020-01-20T09:39:22.704342Z" }, "hidden": true, "init_cell": true @@ -2442,7 +2442,7 @@ "\n", "$$\n", "\\begin{equation}\n", - " D1 = \\frac{\\text{IP}(B) - \\text{EA}(B)}{r_p(A)^2}\\ ,\\quad \\ D2 = \\frac{|r_s(A) - r_p(B)|}{\\exp[r_s(A)]}\\ ,\\quad D3 = \\frac{|r_s(B) - r_p(B)|}{\\exp[r_d(A)]} \\ .\n", + " D1 = \\frac{\\text{IP}(B) - \\text{EA}(B)}{r_p(A)^2}\\ ,\\quad \\ D2 = \\frac{|r_s(A) - r_p(B)|}{\\exp[r_s(A)]} \\ .\n", "\\end{equation}\n", "$$" ] @@ -2462,11 +2462,11 @@ }, { "cell_type": "code", - "execution_count": 21, + "execution_count": 3, "metadata": { "ExecuteTime": { - "end_time": "2020-01-17T09:14:14.881245Z", - "start_time": "2020-01-17T09:14:14.835250Z" + "end_time": "2020-01-17T09:32:40.231624Z", + "start_time": "2020-01-17T09:32:40.167835Z" }, "scrolled": true }, @@ -2560,8 +2560,7 @@ "# Add extra features from PRL\n", "extra = {\n", " 'D1': (data['EA(B)'] - data['IP(B)']) / data['rp(A)']**2,\n", - " 'D2': np.abs(data['rs(A)'] - data['rp(B)']) / np.exp(data['rs(A)']),\n", - " 'D3': np.abs(data['rp(B)'] - data['rs(B)']) / np.exp(data['rd(A)'])\n", + " 'D2': np.abs(data['rs(A)'] - data['rp(B)']) / np.exp(data['rs(A)'])\n", "}\n", "# for k, v in extra.items():\n", "# data[k] = v\n", diff --git a/tcmi/__init__.py b/tcmi/__init__.py index bf8f7238b88c8f8abd4c13fbe87a48a54464482a..f10e91e8272a07bfdbd342c69d4a213b191ea155 100644 --- a/tcmi/__init__.py +++ b/tcmi/__init__.py @@ -12,7 +12,7 @@ You may not use this file except in compliance with the License. # Metadata __name__ = 'tcmi' -__version__ = '1.0.1' +__version__ = '1.0.2' __description__ = 'A Python package for estimating mutual dependencies of multivariate continuous distributions' __author__ = 'Benjamin Regler <regler@fhi-berlin.mpg.de>' __url__ = 'https://github.com/sommerregen/tcmi'