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 23c98cb..c33989d 100644 Binary files a/dddex/__pycache__/__init__.cpython-38.pyc and b/dddex/__pycache__/__init__.cpython-38.pyc differ diff --git a/dddex/__pycache__/_modidx.cpython-38.pyc b/dddex/__pycache__/_modidx.cpython-38.pyc index 384307b..36f1a8c 100644 Binary files a/dddex/__pycache__/_modidx.cpython-38.pyc and b/dddex/__pycache__/_modidx.cpython-38.pyc differ diff --git a/dddex/__pycache__/baseClasses.cpython-38.pyc b/dddex/__pycache__/baseClasses.cpython-38.pyc index e5e67d6..f09dc08 100644 Binary files a/dddex/__pycache__/baseClasses.cpython-38.pyc and b/dddex/__pycache__/baseClasses.cpython-38.pyc differ diff --git a/dddex/__pycache__/crossValidation.cpython-38.pyc b/dddex/__pycache__/crossValidation.cpython-38.pyc index 235b0fa..cbc679b 100644 Binary files a/dddex/__pycache__/crossValidation.cpython-38.pyc and b/dddex/__pycache__/crossValidation.cpython-38.pyc differ diff --git a/dddex/__pycache__/levelSetKDEx_multivariate.cpython-38.pyc b/dddex/__pycache__/levelSetKDEx_multivariate.cpython-38.pyc index 86f9349..09107cc 100644 Binary files a/dddex/__pycache__/levelSetKDEx_multivariate.cpython-38.pyc and b/dddex/__pycache__/levelSetKDEx_multivariate.cpython-38.pyc differ diff --git a/dddex/__pycache__/levelSetKDEx_univariate.cpython-38.pyc b/dddex/__pycache__/levelSetKDEx_univariate.cpython-38.pyc index 2dc1dae..eed482d 100644 Binary files a/dddex/__pycache__/levelSetKDEx_univariate.cpython-38.pyc and b/dddex/__pycache__/levelSetKDEx_univariate.cpython-38.pyc differ diff --git a/dddex/__pycache__/loadData.cpython-38.pyc b/dddex/__pycache__/loadData.cpython-38.pyc index bf246b9..9bf6a63 100644 Binary files a/dddex/__pycache__/loadData.cpython-38.pyc and b/dddex/__pycache__/loadData.cpython-38.pyc differ diff --git a/dddex/__pycache__/utils.cpython-38.pyc b/dddex/__pycache__/utils.cpython-38.pyc index 9511af7..21e3103 100644 Binary files a/dddex/__pycache__/utils.cpython-38.pyc and b/dddex/__pycache__/utils.cpython-38.pyc differ diff --git a/dddex/__pycache__/wSAA.cpython-38.pyc b/dddex/__pycache__/wSAA.cpython-38.pyc index 860ead3..4749563 100644 Binary files a/dddex/__pycache__/wSAA.cpython-38.pyc and b/dddex/__pycache__/wSAA.cpython-38.pyc differ 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