Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes 502 Add feature_groups parameter to SequentialFeatureSelection #965

Merged
merged 93 commits into from Sep 14, 2022
Merged
Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
4165b89
replace None with empty tuple to clean code
NimaSarajpoor Aug 27, 2022
2029d60
Remove unnecessary if statement
NimaSarajpoor Aug 27, 2022
641a6c3
Remove else to clean code
NimaSarajpoor Aug 27, 2022
e580173
Factor out a block to clean code
NimaSarajpoor Aug 27, 2022
d81e50f
combine two if block, all tests passing
NimaSarajpoor Aug 27, 2022
7ba3733
minor change
NimaSarajpoor Aug 27, 2022
50a6b78
revise if statement to improve readability
NimaSarajpoor Aug 27, 2022
7f2285b
major clean up of while loop
NimaSarajpoor Aug 27, 2022
72f3f0c
Gives error message its own if block
NimaSarajpoor Aug 27, 2022
eac3ee4
Remove redundant line
NimaSarajpoor Aug 27, 2022
d78eeae
Merge two nested if
NimaSarajpoor Aug 27, 2022
4509305
replace float(-inf) with np.NINF
NimaSarajpoor Aug 27, 2022
df31812
convert k_features int into tuple
NimaSarajpoor Aug 27, 2022
1b067a0
Improve readability of private functions
NimaSarajpoor Aug 27, 2022
2227d46
change if condition to make two private functions similar
NimaSarajpoor Aug 27, 2022
0cece9d
Add fixed features seperately in backward
NimaSarajpoor Aug 27, 2022
fe747a8
Replace while with for loop to increase safety
NimaSarajpoor Aug 27, 2022
37b00df
Replace set with generator
NimaSarajpoor Aug 27, 2022
8b255ab
Factor out feature selection_phase1_ok
NimaSarajpoor Aug 27, 2022
6f5be4e
Factor out feature selection_phase2_ok
NimaSarajpoor Aug 27, 2022
8806f0b
Remove unnecessary comments
NimaSarajpoor Aug 27, 2022
8e81321
Remove old functions
NimaSarajpoor Aug 27, 2022
58db2ca
Remove unncessary condition
NimaSarajpoor Aug 27, 2022
c3e6212
Rename variable
NimaSarajpoor Aug 27, 2022
200beaf
factor out code in if-else block
NimaSarajpoor Aug 28, 2022
d901214
restructure the code
NimaSarajpoor Aug 28, 2022
5574383
Use number of fixed features as minimum number of features
NimaSarajpoor Aug 28, 2022
eb4cf68
Avoid changing orig_set variable
NimaSarajpoor Aug 28, 2022
725c567
Add a few if checks
NimaSarajpoor Aug 28, 2022
42259b5
minor changes
NimaSarajpoor Aug 28, 2022
40fdb0c
Remove redundant variable
NimaSarajpoor Aug 28, 2022
11addd7
Remove redundant line
NimaSarajpoor Aug 28, 2022
88b59a3
Reformat the lines
NimaSarajpoor Aug 28, 2022
d23a7dd
Remove unncessary if check
NimaSarajpoor Aug 28, 2022
0e4954b
Add comment to inform reader of a bug
NimaSarajpoor Aug 29, 2022
c99e0c6
fix continual condition bug in float mode
NimaSarajpoor Aug 29, 2022
2610549
Update best-so-far subsets in each float iteration
NimaSarajpoor Aug 29, 2022
6a70b79
all tests passing
NimaSarajpoor Aug 29, 2022
d4f7565
Improve readability
NimaSarajpoor Aug 29, 2022
c62ed9b
change func name and add docstring
NimaSarajpoor Aug 29, 2022
38391a7
Remove unnecessary condition in if statement
NimaSarajpoor Aug 29, 2022
6781551
minor correction
NimaSarajpoor Aug 29, 2022
8758803
Improve readability
NimaSarajpoor Aug 29, 2022
f8d22b5
End function after exception block
NimaSarajpoor Aug 31, 2022
fa9262b
Change the outer for-loop back to while loop
NimaSarajpoor Aug 31, 2022
34e0392
Add early return when keyboardinterrupted is raised
NimaSarajpoor Aug 31, 2022
0f2eeec
add support for feature group selection
NimaSarajpoor Sep 2, 2022
7bda3d3
fix minor bug
NimaSarajpoor Sep 2, 2022
20ab0bc
improve test coverage
rasbt Sep 4, 2022
18a579d
codecov action
rasbt Sep 4, 2022
6ddde7c
codecov badge and reformatting
rasbt Sep 4, 2022
2fe6735
merge remote branch to local
NimaSarajpoor Sep 4, 2022
99a8c00
fix minor bug
NimaSarajpoor Sep 4, 2022
2de0483
improve docstrings
NimaSarajpoor Sep 4, 2022
77ef6b1
Add unit tests for param feature_groups
NimaSarajpoor Sep 4, 2022
2064738
replace id var
rasbt Sep 4, 2022
464b85e
update docstrings
rasbt Sep 4, 2022
eef36c1
Modify dict before return when KeyboardInterrupt is raised
NimaSarajpoor Sep 5, 2022
661bb02
style cleanup
rasbt Sep 5, 2022
a240df0
add coverage note, remove redundant func
rasbt Sep 5, 2022
49f99f1
test with fixed features
rasbt Sep 5, 2022
6970881
update docs
rasbt Sep 5, 2022
e3453d3
bypass two test functions for now
NimaSarajpoor Sep 6, 2022
23de3b1
Create utilities file to refactor modules
NimaSarajpoor Sep 6, 2022
3843b13
refactor _calc_score
NimaSarajpoor Sep 6, 2022
bebd7eb
Add preprocess function for input X
NimaSarajpoor Sep 6, 2022
f5d9373
refactor preprocessing step
NimaSarajpoor Sep 6, 2022
001999b
add docstring, not completed yet
NimaSarajpoor Sep 6, 2022
fdf67b4
Complete docstrings
NimaSarajpoor Sep 6, 2022
8c39462
Returns None for features_name when X is numpy array
NimaSarajpoor Sep 6, 2022
1e5eb10
clean code
NimaSarajpoor Sep 6, 2022
547d5e4
Remove support for custom feature names
NimaSarajpoor Sep 6, 2022
801848a
Refactor get_feature_names
NimaSarajpoor Sep 6, 2022
f51829f
use utilities function to clean up code
NimaSarajpoor Sep 6, 2022
8e36d0e
minor changes
NimaSarajpoor Sep 6, 2022
19090a6
Check validity of several params
NimaSarajpoor Sep 6, 2022
31d58d3
udpate example 8 to recommend best practices
rasbt Sep 7, 2022
a311a6b
increase the consistency between featre selection modules
NimaSarajpoor Sep 7, 2022
8cd28f5
Handle KeyboardInterrupt
NimaSarajpoor Sep 8, 2022
0a21907
minor changes
NimaSarajpoor Sep 8, 2022
26d62b4
Rename variables to improve readability
NimaSarajpoor Sep 9, 2022
104d9a0
Add check for k_features
NimaSarajpoor Sep 9, 2022
580801a
minor changes
NimaSarajpoor Sep 9, 2022
09ba017
Remove some checks from __init__
NimaSarajpoor Sep 10, 2022
b4acac5
Add note on using finalize_fit
NimaSarajpoor Sep 10, 2022
c4e07cb
feature group tests (fail)
rasbt Sep 11, 2022
634b93b
upate unit tests
rasbt Sep 11, 2022
d45e71d
Modify k_feature
NimaSarajpoor Sep 12, 2022
9cdbd3b
Correct actual value
NimaSarajpoor Sep 12, 2022
b445050
Change actual value in test function
NimaSarajpoor Sep 12, 2022
d7253e0
Change test function
NimaSarajpoor Sep 12, 2022
4b86cbd
Change decimal precision from 3 to 2
NimaSarajpoor Sep 12, 2022
89f9ba3
add keyboardinterrupt notes
rasbt Sep 14, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 0 additions & 9 deletions .coveragerc

This file was deleted.

6 changes: 5 additions & 1 deletion .github/workflows/python-package-conda.yml
Expand Up @@ -33,9 +33,13 @@ jobs:
conda install imageio scikit-image -y -q
conda install dlib -y -q
pip install markdown
pip install coverage
pip install -e .
python -c "import numpy; print('NumPy:', numpy.__version__)"
python -c "import scipy; print('SciPy:', scipy.__version__)"
python -c "import sklearn; print('Scikit-learn:', sklearn.__version__)"
python -c "import pandas; print('Pandas:', pandas.__version__)"
pytest -sv
coverage run --source=mlxtend --branch -m pytest mlxtend
coverage xml
- name: Upload Coverage to Codecov
uses: codecov/codecov-action@v2
4 changes: 2 additions & 2 deletions README.md
@@ -1,8 +1,8 @@
[![DOI](https://joss.theoj.org/papers/10.21105/joss.00638/status.svg)](https://doi.org/10.21105/joss.00638)
[![PyPI version](https://badge.fury.io/py/mlxtend.svg)](http://badge.fury.io/py/mlxtend)
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/mlxtend/badges/version.svg)](https://anaconda.org/conda-forge/mlxtend)
[![Build statu s](https://ci.appveyor.com/api/projects/status/7vx20e0h5dxcyla2/branch/master?svg=true)](https://ci.appveyor.com/project/rasbt/mlxtend/branch/master)
[![Coverage Status](https://coveralls.io/repos/rasbt/mlxtend/badge.svg?branch=master&service=github)](https://coveralls.io/github/rasbt/mlxtend?branch=master)
[![Build status](https://ci.appveyor.com/api/projects/status/7vx20e0h5dxcyla2/branch/master?svg=true)](https://ci.appveyor.com/project/rasbt/mlxtend/branch/master)
[![codecov](https://codecov.io/gh/rasbt/mlxtend/branch/master/graph/badge.svg)](https://codecov.io/gh/rasbt/mlxtend)
![Python 3](https://img.shields.io/badge/python-3-blue.svg)
![License](https://img.shields.io/badge/license-BSD-blue.svg)
[![Discuss](https://img.shields.io/badge/discuss-github-blue.svg)](https://github.com/rasbt/mlxtend/discussions)
Expand Down