Skip to content

Commit

Permalink
Merge pull request #756 from rasbt/v0.18.0
Browse files Browse the repository at this point in the history 
Readying the pkg for the 0.18.0 release
  • Loading branch information
@rasbt
rasbt committed Nov 26, 2020
2 parents 276fdd3 + 1bd5df4 commit e5c906f
Show file tree
Hide file tree
Showing 17 changed files with 97 additions and 102 deletions.
2 changes: 1 addition & 1 deletion docs/sources/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The CHANGELOG for the current development version is available at
---


### Version 0.18.0 (TBD)
### Version 0.18.0 (11/25/2020)

##### Downloads

Expand Down
9 changes: 6 additions & 3 deletions docs/sources/user_guide/classifier/Adaline.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"cell_type": "code",
"execution_count": 1,
"metadata": {
"collapsed": true
"collapsed": true,
"jupyter": {
"outputs_hidden": true
}
},
"outputs": [],
"source": [
Expand Down Expand Up @@ -659,7 +662,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.1"
"version": "3.8.2"
},
"toc": {
"nav_menu": {},
Expand All @@ -675,5 +678,5 @@
}
},
"nbformat": 4,
"nbformat_minor": 2
"nbformat_minor": 4
}
20 changes: 4 additions & 16 deletions docs/sources/user_guide/classifier/EnsembleVoteClassifier.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -649,13 +649,7 @@
" https://scikit-learn.org/stable/modules/preprocessing.html\n",
"Please also refer to the documentation for alternative solver options:\n",
" https://scikit-learn.org/stable/modules/linear_model.html#logistic-regression\n",
" extra_warning_msg=_LOGISTIC_SOLVER_CONVERGENCE_MSG)\n"
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
" extra_warning_msg=_LOGISTIC_SOLVER_CONVERGENCE_MSG)\n",
"/Users/kani/Documents/KatrinaLand/mlxtend/venv/lib/python3.7/site-packages/sklearn/linear_model/_logistic.py:940: ConvergenceWarning: lbfgs failed to converge (status=1):\n",
"STOP: TOTAL NO. of ITERATIONS REACHED LIMIT.\n",
"\n",
Expand Down Expand Up @@ -815,13 +809,7 @@
" https://scikit-learn.org/stable/modules/preprocessing.html\n",
"Please also refer to the documentation for alternative solver options:\n",
" https://scikit-learn.org/stable/modules/linear_model.html#logistic-regression\n",
" extra_warning_msg=_LOGISTIC_SOLVER_CONVERGENCE_MSG)\n"
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
" extra_warning_msg=_LOGISTIC_SOLVER_CONVERGENCE_MSG)\n",
"/Users/kani/Documents/KatrinaLand/mlxtend/venv/lib/python3.7/site-packages/sklearn/linear_model/_logistic.py:940: ConvergenceWarning: lbfgs failed to converge (status=1):\n",
"STOP: TOTAL NO. of ITERATIONS REACHED LIMIT.\n",
"\n",
Expand Down Expand Up @@ -1579,7 +1567,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.4"
"version": "3.8.2"
},
"toc": {
"base_numbering": 1,
Expand All @@ -1596,5 +1584,5 @@
}
},
"nbformat": 4,
"nbformat_minor": 1
"nbformat_minor": 4
}
17 changes: 8 additions & 9 deletions docs/sources/user_guide/classifier/LogisticRegression.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"cell_type": "code",
"execution_count": 1,
"metadata": {
"collapsed": true
"collapsed": true,
"jupyter": {
"outputs_hidden": true
}
},
"outputs": [],
"source": [
Expand Down Expand Up @@ -74,9 +77,7 @@
},
{
"cell_type": "markdown",
"metadata": {
"collapsed": true
},
"metadata": {},
"source": [
"After model fitting, the conditional probability $p(y=1 \\mid \\mathbf{x})$ is converted to a binary class label via a threshold function $g(\\cdot)$:\n",
"\n",
Expand Down Expand Up @@ -476,9 +477,7 @@
},
{
"cell_type": "markdown",
"metadata": {
"collapsed": true
},
"metadata": {},
"source": [
"### Predicting Class Labels"
]
Expand Down Expand Up @@ -882,7 +881,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.4"
"version": "3.8.2"
},
"toc": {
"nav_menu": {},
Expand All @@ -898,5 +897,5 @@
}
},
"nbformat": 4,
"nbformat_minor": 1
"nbformat_minor": 4
}
14 changes: 10 additions & 4 deletions docs/sources/user_guide/classifier/MultiLayerPerceptron.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"cell_type": "code",
"execution_count": 1,
"metadata": {
"collapsed": true
"collapsed": true,
"jupyter": {
"outputs_hidden": true
}
},
"outputs": [],
"source": [
Expand Down Expand Up @@ -777,7 +780,10 @@
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
"collapsed": true,
"jupyter": {
"outputs_hidden": true
}
},
"outputs": [],
"source": []
Expand All @@ -800,7 +806,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.4"
"version": "3.8.2"
},
"toc": {
"nav_menu": {},
Expand All @@ -816,5 +822,5 @@
}
},
"nbformat": 4,
"nbformat_minor": 1
"nbformat_minor": 4
}
2 changes: 1 addition & 1 deletion docs/sources/user_guide/classifier/OneRClassifier.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.1"
"version": "3.8.2"
},
"toc": {
"nav_menu": {},
Expand Down
14 changes: 10 additions & 4 deletions docs/sources/user_guide/classifier/Perceptron.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"cell_type": "code",
"execution_count": 1,
"metadata": {
"collapsed": true
"collapsed": true,
"jupyter": {
"outputs_hidden": true
}
},
"outputs": [],
"source": [
Expand Down Expand Up @@ -454,7 +457,10 @@
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
"collapsed": true,
"jupyter": {
"outputs_hidden": true
}
},
"outputs": [],
"source": []
Expand All @@ -477,7 +483,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.4"
"version": "3.8.2"
},
"toc": {
"nav_menu": {},
Expand All @@ -493,5 +499,5 @@
}
},
"nbformat": 4,
"nbformat_minor": 1
"nbformat_minor": 4
}
23 changes: 15 additions & 8 deletions docs/sources/user_guide/classifier/SoftmaxRegression.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"cell_type": "code",
"execution_count": 1,
"metadata": {
"collapsed": true
"collapsed": true,
"jupyter": {
"outputs_hidden": true
}
},
"outputs": [],
"source": [
Expand Down Expand Up @@ -99,7 +102,10 @@
"cell_type": "code",
"execution_count": 2,
"metadata": {
"collapsed": true
"collapsed": true,
"jupyter": {
"outputs_hidden": true
}
},
"outputs": [],
"source": [
Expand Down Expand Up @@ -521,9 +527,7 @@
},
{
"cell_type": "markdown",
"metadata": {
"collapsed": true
},
"metadata": {},
"source": [
"#### Predicting Class Labels"
]
Expand Down Expand Up @@ -822,7 +826,10 @@
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
"collapsed": true,
"jupyter": {
"outputs_hidden": true
}
},
"outputs": [],
"source": []
Expand All @@ -845,7 +852,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.4"
"version": "3.8.2"
},
"toc": {
"nav_menu": {},
Expand All @@ -861,5 +868,5 @@
}
},
"nbformat": 4,
"nbformat_minor": 1
"nbformat_minor": 4
}
4 changes: 2 additions & 2 deletions docs/sources/user_guide/classifier/StackingCVClassifier.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1080,7 +1080,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.1"
"version": "3.8.2"
},
"toc": {
"nav_menu": {},
Expand All @@ -1097,4 +1097,4 @@
},
"nbformat": 4,
"nbformat_minor": 4
}
}
4 changes: 2 additions & 2 deletions docs/sources/user_guide/classifier/StackingClassifier.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.4"
"version": "3.8.2"
},
"toc": {
"base_numbering": 1,
Expand All @@ -819,4 +819,4 @@
},
"nbformat": 4,
"nbformat_minor": 4
}
}
58 changes: 22 additions & 36 deletions docs/sources/user_guide/feature_selection/ExhaustiveFeatureSelector.ipynb
View file

Large diffs are not rendered by default.

Binary file modified ...re_selection/ExhaustiveFeatureSelector_files/ExhaustiveFeatureSelector_19_0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...re_selection/SequentialFeatureSelector_files/SequentialFeatureSelector_44_1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...re_selection/SequentialFeatureSelector_files/SequentialFeatureSelector_47_0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...re_selection/SequentialFeatureSelector_files/SequentialFeatureSelector_81_1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e5c906f

Please sign in to comment.