From 77fba88678517d85d0f3c069aa9a9fa4993d38c6 Mon Sep 17 00:00:00 2001 From: kaiguender Date: Thu, 6 Apr 2023 23:05:03 +0000 Subject: [PATCH] added correct inheritance to RandomForestWSAA_LGBM.predict --- .ipynb_checkpoints/settings-checkpoint.ini | 2 +- _proc/03_wSAA.ipynb | 31 ++++----- conda/dddex/meta.yaml | 6 +- conda/out/index.html | 2 +- conda/out/linux-64/index.html | 2 +- conda/out/noarch/index.html | 2 +- dddex/__pycache__/__init__.cpython-38.pyc | Bin 125 -> 125 bytes dddex/__pycache__/_modidx.cpython-38.pyc | Bin 9968 -> 9968 bytes dddex/__pycache__/baseClasses.cpython-38.pyc | Bin 7661 -> 7661 bytes .../crossValidation.cpython-38.pyc | Bin 18202 -> 18202 bytes .../levelSetKDEx_multivariate.cpython-38.pyc | Bin 6585 -> 6585 bytes .../levelSetKDEx_univariate.cpython-38.pyc | Bin 25726 -> 25726 bytes dddex/__pycache__/loadData.cpython-38.pyc | Bin 1525 -> 1525 bytes dddex/__pycache__/utils.cpython-38.pyc | Bin 6006 -> 6006 bytes dddex/__pycache__/wSAA.cpython-38.pyc | Bin 6519 -> 6591 bytes dddex/wSAA.py | 7 +- .../03_wSAA-checkpoint.ipynb | 62 ++++++++---------- nbs/03_wSAA.ipynb | 28 +++----- settings.ini | 2 +- 19 files changed, 58 insertions(+), 86 deletions(-) diff --git a/.ipynb_checkpoints/settings-checkpoint.ini b/.ipynb_checkpoints/settings-checkpoint.ini index b728e6b..2135227 100644 --- a/.ipynb_checkpoints/settings-checkpoint.ini +++ b/.ipynb_checkpoints/settings-checkpoint.ini @@ -5,7 +5,7 @@ ### Python library ### repo = dddex lib_name = %(repo)s -version = 0.0.18 +version = 0.0.22 min_python = 3.7 license = apache2 diff --git a/_proc/03_wSAA.ipynb b/_proc/03_wSAA.ipynb index d32851d..708b3fc 100644 --- a/_proc/03_wSAA.ipynb +++ b/_proc/03_wSAA.ipynb @@ -27,16 +27,7 @@ "metadata": { "language": "python" }, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "The autoreload extension is already loaded. To reload it, use:\n", - " %reload_ext autoreload\n" - ] - } - ], + "outputs": [], "source": [] }, { @@ -81,7 +72,7 @@ "text/markdown": [ "---\n", "\n", - "[source](https://github.com/kaiguender/dddex/blob/main/dddex/wSAA.py#L23){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n", + "[source](https://github.com/kaiguender/dddex/blob/main/dddex/wSAA.py#L24){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n", "\n", "### RandomForestWSAA\n", "\n", @@ -128,7 +119,7 @@ "text/plain": [ "---\n", "\n", - "[source](https://github.com/kaiguender/dddex/blob/main/dddex/wSAA.py#L23){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n", + "[source](https://github.com/kaiguender/dddex/blob/main/dddex/wSAA.py#L24){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n", "\n", "### RandomForestWSAA\n", "\n", @@ -238,7 +229,7 @@ "text/markdown": [ "---\n", "\n", - "[source](https://github.com/kaiguender/dddex/blob/main/dddex/wSAA.py#L113){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n", + "[source](https://github.com/kaiguender/dddex/blob/main/dddex/wSAA.py#L114){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n", "\n", "### RandomForestWSAA_LGBM\n", "\n", @@ -263,7 +254,7 @@ "text/plain": [ "---\n", "\n", - "[source](https://github.com/kaiguender/dddex/blob/main/dddex/wSAA.py#L113){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n", + "[source](https://github.com/kaiguender/dddex/blob/main/dddex/wSAA.py#L114){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n", "\n", "### RandomForestWSAA_LGBM\n", "\n", @@ -315,7 +306,7 @@ "text/markdown": [ "---\n", "\n", - "[source](https://github.com/kaiguender/dddex/blob/main/dddex/wSAA.py#L203){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n", + "[source](https://github.com/kaiguender/dddex/blob/main/dddex/wSAA.py#L204){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n", "\n", "### SampleAverageApproximation\n", "\n", @@ -327,7 +318,7 @@ "text/plain": [ "---\n", "\n", - "[source](https://github.com/kaiguender/dddex/blob/main/dddex/wSAA.py#L203){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n", + "[source](https://github.com/kaiguender/dddex/blob/main/dddex/wSAA.py#L204){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n", "\n", "### SampleAverageApproximation\n", "\n", @@ -448,16 +439,16 @@ "# n_estimators = 10,\n", "# n_jobs = 1,\n", "# boosting_type = 'rf',\n", - "# subsample_freq = 0,\n", - "# subsample = 1)" + "# subsample_freq = 1,\n", + "# subsample = 0.9)" ] } ], "metadata": { "kernelspec": { - "display_name": "python3", + "display_name": "dddex", "language": "python", - "name": "python3" + "name": "dddex" } }, "nbformat": 4, diff --git a/conda/dddex/meta.yaml b/conda/dddex/meta.yaml index 9670f29..6840398 100644 --- a/conda/dddex/meta.yaml +++ b/conda/dddex/meta.yaml @@ -1,9 +1,9 @@ package: name: dddex - version: 0.0.20 + version: 0.0.22 source: - sha256: c869ddd31bf525b2870ea2189eebfaeedb1b1d89812cfbbe14172522bffb9d8d - url: https://files.pythonhosted.org/packages/af/5e/d09093dcf3d4668c78a13f446584763a3a8c2fef77a7033ac4e662aa39a9/dddex-0.0.20.tar.gz + sha256: 759e3ae5c6d12c2aefa286e84d6ff623d80b8a3de31ea4d3c27e94dad66b9b61 + url: https://files.pythonhosted.org/packages/9a/c3/6f95fdd11a54f6e82dfaec9d1bdd952e832fe852b97a0228a42704a620f5/dddex-0.0.22.tar.gz about: description: "dddex: Data-Driven Density Estimation x\n================\n\n\n\n## Install\n\n```\ diff --git a/conda/out/index.html b/conda/out/index.html index 0653ca7..cbd5365 100644 --- a/conda/out/index.html +++ b/conda/out/index.html @@ -78,6 +78,6 @@

RSS Feed   c linux-64noarch Summary -
Updated: 2023-03-27 17:34:50 +0000 - Files: 0
+
Updated: 2023-04-06 23:03:38 +0000 - Files: 0
\ No newline at end of file diff --git a/conda/out/linux-64/index.html b/conda/out/linux-64/index.html index 957b333..09c209f 100644 --- a/conda/out/linux-64/index.html +++ b/conda/out/linux-64/index.html @@ -77,6 +77,6 @@

out/linux-64

56be0331bc34198bc13979c50d4ffb9a1ff97c287af6c769227ee736291b3ab2 bade2f88b3685cbb93aa4b5f34d36659 -
Updated: 2023-03-27 17:34:50 +0000 - Files: 0
+
Updated: 2023-04-06 23:03:38 +0000 - Files: 0
\ No newline at end of file diff --git a/conda/out/noarch/index.html b/conda/out/noarch/index.html index 86f145c..e8a4f98 100644 --- a/conda/out/noarch/index.html +++ b/conda/out/noarch/index.html @@ -77,6 +77,6 @@

out/noarch

32d48c11b6d5ee61a54a9076f8c06a62ba795f69b671db3e44b1301fa0efae0e 1ecb5b301b9a2ba831f0a68a7ace5f00 -
Updated: 2023-03-27 17:34:50 +0000 - Files: 0
+
Updated: 2023-04-06 23:03:38 +0000 - Files: 0
\ No newline at end of file diff --git a/dddex/__pycache__/__init__.cpython-38.pyc b/dddex/__pycache__/__init__.cpython-38.pyc index 23c98cb71cebb89196c122be457003124612a407..c33989d7a3c2bcbe45febaae558cbf99c5bffd85 100644 GIT binary patch delta 17 Wcmb=e>u=22hGss;c*k_D9j diff --git a/dddex/__pycache__/baseClasses.cpython-38.pyc b/dddex/__pycache__/baseClasses.cpython-38.pyc index e5e67d606bf87dd2eee1bb513b7af80282dde106..f09dc083b4ed16e1428ac39f5995a81763457380 100644 GIT binary patch delta 46 zcmaEB{nna0l$V!_0SF%Z>u=;%5n+s)Y#_3M@z&;tBKH^>JvSc^Yhz>dp6o8W3;;+Y B4z>UQ delta 46 zcmaEB{nna0l$V!_0SMS<>22gz5n;SF*+66iW7Ot{BKH^>y*3{ZYhz>dnd~mR3;;M8 B4kiEq diff --git a/dddex/__pycache__/crossValidation.cpython-38.pyc b/dddex/__pycache__/crossValidation.cpython-38.pyc index 235b0fa8d31bb2252e2563661e21cf23866ad321..cbc679baabfb025eca0ac64d55aad2b122c8f044 100644 GIT binary patch delta 35 pcmbQ$$2hBxkvo)^mx}=ip7`r;u==Nkzl;F*+PPskuhqrn`AKnk0l6d delta 33 ncmdmKywjLFl$V!_0SMS<>22iJkzkD4Y$3tR$arhAn`AKnfAj~~ diff --git a/dddex/__pycache__/levelSetKDEx_univariate.cpython-38.pyc b/dddex/__pycache__/levelSetKDEx_univariate.cpython-38.pyc index 2dc1daeb60ebc4930faaeffb990c2a3716472ed6..eed482dde5fdc0bea4c4566a5198f43318d81d25 100644 GIT binary patch delta 2397 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 Htn$Kt7t2#L diff --git a/dddex/__pycache__/loadData.cpython-38.pyc b/dddex/__pycache__/loadData.cpython-38.pyc index bf246b93d0f4eb3312c5c79e271d841b48cde4ec..9bf6a638cda12f2fee2dcd7d45e060c370bec3e3 100644 GIT binary patch delta 103 zcmey${gs>u==NXX1|HC`v6UEy|0CjGFAqWX7ntxrWJ)ky{a{qzFtX eZNAE^k0LOcpEZo}*5owSPyvK8h}y}gS+xM~P8Om7 delta 103 zcmey${gs22iJXX3uaQIuLzT9g+Nd26yOlNqD(<{BnHMs8)Gk|Hpn fviT~rK8nC(e%3I?sL5%pp#lhH5Vey}vuXhV{$UoS diff --git a/dddex/__pycache__/utils.cpython-38.pyc b/dddex/__pycache__/utils.cpython-38.pyc index 9511af79c81ea5e5425effad38f4ab6d99fa3ca5..21e3103403444ac922515e25f46600ce4e2f7e31 100644 GIT binary patch delta 20 acmeyS_f3yGl$V!_0SKP>>u==F76$-7Wd&^j delta 20 acmeyS_f3yGl$V!_0SMS<>22iB76$-37X;b> diff --git a/dddex/__pycache__/wSAA.cpython-38.pyc b/dddex/__pycache__/wSAA.cpython-38.pyc index 860ead3e9ec6b3107749e86b5e168255a15bff9c..47495639f89e5590e532f6858c65d9193330dda6 100644 GIT binary patch delta 1784 zcmZ8hO>7%Q6!!Sv-d+DCcATVX+!QO`gd}ZfXi1`kq=8V;rYQ*uT18sf-K}e7{nOdC zR1i`R;Q|7o=pDHu`G_hmAcVvry;K6J5}>6QR4(*@I3RK1zY7JM@S{iN1 zkPW5m(=yv0BW6e+;EXAmL&tt?1ZU!gj5D&Sh?y+TBn$;-XzbHQ4d0$eO`bg06qUJ= z>)V?*ZqyCadbq`6j7hNPEwea$?Oh2bFgBiqf4nP!AvDKe)wjzM@QLp^3&VYXJ~t&C z2+kvDvU#srv<}Ql`L1KDaUOwh{G(Eu)^h|I_|-qZL@D!OgqF;+WQ$`26|wLc1WmEb z;+<FE8geRbkA5Kw2YDadiC$IEo!k ziPbmyd4*p{*KLRE`j7B??2rl7yM~%HSO!J)Xk5@fQ;mZl4@q#-Cu%e3*DE zO`^2?d=@`$kedy&=C8Q`xm+$NolBFehWXYpPq(6R!S@nkJ6t?Jx>x8Gv`>^p20zRGSs&=M9s#N|?T-af*+ z&TE{mgDaJawt3Ym+O}!8AHG1-saUp9$Ho3DT9&SJdP%rwaH8)iRp(qcyjrarP0L)P aMzC`TG7Hnsi~ni-$gK18MSUqPrTq(gD^r00 delta 1701 zcmZ8hO>7%g5cYa)uf6N_|6fScv`*4^L)wP4357&SX%VG>OxmUmY*Vcq@7A@nvE8>@ z2_YmT;7+Z%pojw;K=_8}1-Mk@%7H`SvK)|54}drzA&SI_nYZA-J$yUwy?OKZ&71qD z{$5tEs;V5oPdYeZUhb+>!q?p=&FhjGwNv|PJuL)G$&A^V{j8ovSvD0j-VpWNg@CD= z@_V>rDOUR3keH#Dal&x9EEefVub%LVvdF381QzOM~{K zG_)YQgg-CTVeP$ftCZL*JkGzb49y_8TR1Ar!WV@z3T4G!C8)q(h2?q5#8a5%ST2%l zT5ov5Hr8T1B&Zg5#(AS2Ou$#g-ATXIgsLX9=g9Oqg7X9#ER{-?u@^t!f=j#_an$}6 zI;Cl$1b0iX2@CLR>74Eoh Z-*20DY-@uUcMijc6HiE@EN1kK{x5$+Mdttj diff --git a/dddex/wSAA.py b/dddex/wSAA.py index 5bf28bf..e40256a 100644 --- a/dddex/wSAA.py +++ b/dddex/wSAA.py @@ -13,6 +13,7 @@ from sklearn.ensemble import RandomForestRegressor from lightgbm import LGBMRegressor from sklearn.base import MetaEstimatorMixin +from lightgbm.sklearn import LGBMModel from .baseClasses import BaseWeightsBasedEstimator from .utils import restructureWeightsDataList @@ -184,9 +185,9 @@ def predict(self : BaseWeightsBasedEstimator, __doc__ = BaseWeightsBasedEstimator.predict.__doc__ - return super(MetaEstimatorMixin, self).predict(X = X, - probs = probs, - scalingList = scalingList) + return super(LGBMModel, self).predict(X = X, + probs = probs, + scalingList = scalingList) #--- diff --git a/nbs/.ipynb_checkpoints/03_wSAA-checkpoint.ipynb b/nbs/.ipynb_checkpoints/03_wSAA-checkpoint.ipynb index 914572a..aa777aa 100644 --- a/nbs/.ipynb_checkpoints/03_wSAA-checkpoint.ipynb +++ b/nbs/.ipynb_checkpoints/03_wSAA-checkpoint.ipynb @@ -2,19 +2,10 @@ "cells": [ { "cell_type": "code", - "execution_count": 42, + "execution_count": 1, "id": "6a9df2e7-fdc8-44e7-b16c-d8b15ed01db9", "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "The autoreload extension is already loaded. To reload it, use:\n", - " %reload_ext autoreload\n" - ] - } - ], + "outputs": [], "source": [ "%load_ext autoreload\n", "%autoreload 2" @@ -32,7 +23,7 @@ }, { "cell_type": "code", - "execution_count": 43, + "execution_count": 2, "id": "8c687b2c-941e-4e2a-9855-aa227ccb8490", "metadata": {}, "outputs": [], @@ -42,7 +33,7 @@ }, { "cell_type": "code", - "execution_count": 44, + "execution_count": 3, "id": "6a1faac0-5c0d-4c70-80e9-7d959811b1b7", "metadata": {}, "outputs": [], @@ -63,7 +54,7 @@ }, { "cell_type": "code", - "execution_count": 45, + "execution_count": 4, "id": "b86f92e6-67ad-492b-9779-7b9acfc3d3df", "metadata": {}, "outputs": [], @@ -81,6 +72,7 @@ "from sklearn.ensemble import RandomForestRegressor\n", "from lightgbm import LGBMRegressor\n", "from sklearn.base import MetaEstimatorMixin\n", + "from lightgbm.sklearn import LGBMModel\n", "from dddex.baseClasses import BaseWeightsBasedEstimator\n", "from dddex.utils import restructureWeightsDataList" ] @@ -95,7 +87,7 @@ }, { "cell_type": "code", - "execution_count": 46, + "execution_count": 5, "id": "36b775c4-ca57-4539-a0b8-e282bdf963cf", "metadata": {}, "outputs": [], @@ -193,7 +185,7 @@ }, { "cell_type": "code", - "execution_count": 47, + "execution_count": 6, "id": "7db18d0f-bdb7-4f08-a8cf-ac07a49e7d2c", "metadata": {}, "outputs": [], @@ -203,7 +195,7 @@ }, { "cell_type": "code", - "execution_count": 48, + "execution_count": 7, "id": "2a240e3b-5acc-4f82-8f4d-29391f5692b7", "metadata": {}, "outputs": [], @@ -213,7 +205,7 @@ }, { "cell_type": "code", - "execution_count": 49, + "execution_count": 8, "id": "84ebe067-f51e-4038-ae00-06bafa7ca014", "metadata": {}, "outputs": [], @@ -231,7 +223,7 @@ }, { "cell_type": "code", - "execution_count": 50, + "execution_count": 9, "id": "da815ec8", "metadata": {}, "outputs": [], @@ -312,9 +304,9 @@ " \n", " __doc__ = BaseWeightsBasedEstimator.predict.__doc__\n", " \n", - " return super(MetaEstimatorMixin, self).predict(X = X,\n", - " probs = probs, \n", - " scalingList = scalingList)\n", + " return super(LGBMModel, self).predict(X = X,\n", + " probs = probs, \n", + " scalingList = scalingList)\n", " \n", " #---\n", " \n", @@ -337,7 +329,7 @@ }, { "cell_type": "code", - "execution_count": 51, + "execution_count": 10, "id": "952b21e7-4c15-4c6d-8ebd-236740ec71e5", "metadata": {}, "outputs": [], @@ -473,7 +465,7 @@ }, { "cell_type": "code", - "execution_count": 52, + "execution_count": 11, "id": "6dc67de5-0fcb-47b3-82dd-908cbedaae31", "metadata": {}, "outputs": [], @@ -483,7 +475,7 @@ }, { "cell_type": "code", - "execution_count": 53, + "execution_count": 12, "id": "a9520933-6480-4e96-bace-8b9f164cd922", "metadata": {}, "outputs": [], @@ -493,7 +485,7 @@ }, { "cell_type": "code", - "execution_count": 54, + "execution_count": 13, "id": "c5e77e0d-5cb8-4c29-b356-0f0e61bccde0", "metadata": {}, "outputs": [], @@ -503,7 +495,7 @@ }, { "cell_type": "code", - "execution_count": 55, + "execution_count": 14, "id": "9e79762a-1427-49d7-b8b2-42ecde48e16c", "metadata": {}, "outputs": [], @@ -530,7 +522,7 @@ }, { "cell_type": "code", - "execution_count": 56, + "execution_count": 15, "id": "c5f055de-89ce-4943-8242-8f434ee8a3f1", "metadata": {}, "outputs": [], @@ -549,7 +541,7 @@ }, { "cell_type": "code", - "execution_count": 114, + "execution_count": 16, "id": "bbcd2880-1b9e-4d07-ab84-4ba8a2bef226", "metadata": {}, "outputs": [], @@ -560,18 +552,16 @@ "# n_estimators = 10,\n", "# n_jobs = 1,\n", "# boosting_type = 'rf',\n", - "# subsample_freq = 0,\n", - "# subsample = 1)\n", - "\n", - " " + "# subsample_freq = 1,\n", + "# subsample = 0.9) " ] } ], "metadata": { "kernelspec": { - "display_name": "Python 3 (ipykernel)", + "display_name": "dddex", "language": "python", - "name": "python3" + "name": "dddex" }, "language_info": { "codemirror_mode": { @@ -583,7 +573,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.6" + "version": "3.8.15" } }, "nbformat": 4, diff --git a/nbs/03_wSAA.ipynb b/nbs/03_wSAA.ipynb index 9ebc0cc..12aa2ec 100644 --- a/nbs/03_wSAA.ipynb +++ b/nbs/03_wSAA.ipynb @@ -5,16 +5,7 @@ "execution_count": null, "id": "6a9df2e7-fdc8-44e7-b16c-d8b15ed01db9", "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "The autoreload extension is already loaded. To reload it, use:\n", - " %reload_ext autoreload\n" - ] - } - ], + "outputs": [], "source": [ "%load_ext autoreload\n", "%autoreload 2" @@ -81,6 +72,7 @@ "from sklearn.ensemble import RandomForestRegressor\n", "from lightgbm import LGBMRegressor\n", "from sklearn.base import MetaEstimatorMixin\n", + "from lightgbm.sklearn import LGBMModel\n", "from dddex.baseClasses import BaseWeightsBasedEstimator\n", "from dddex.utils import restructureWeightsDataList" ] @@ -312,9 +304,9 @@ " \n", " __doc__ = BaseWeightsBasedEstimator.predict.__doc__\n", " \n", - " return super(MetaEstimatorMixin, self).predict(X = X,\n", - " probs = probs, \n", - " scalingList = scalingList)\n", + " return super(LGBMModel, self).predict(X = X,\n", + " probs = probs, \n", + " scalingList = scalingList)\n", " \n", " #---\n", " \n", @@ -560,18 +552,16 @@ "# n_estimators = 10,\n", "# n_jobs = 1,\n", "# boosting_type = 'rf',\n", - "# subsample_freq = 0,\n", - "# subsample = 1)\n", - "\n", - " " + "# subsample_freq = 1,\n", + "# subsample = 0.9) " ] } ], "metadata": { "kernelspec": { - "display_name": "python3", + "display_name": "dddex", "language": "python", - "name": "python3" + "name": "dddex" } }, "nbformat": 4, diff --git a/settings.ini b/settings.ini index 9b6c8fc..2135227 100644 --- a/settings.ini +++ b/settings.ini @@ -5,7 +5,7 @@ ### Python library ### repo = dddex lib_name = %(repo)s -version = 0.0.20 +version = 0.0.22 min_python = 3.7 license = apache2