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

SelectFwe added issue #56 #68

Merged
merged 9 commits into from
Jan 6, 2016
Merged

SelectFwe added issue #56 #68

merged 9 commits into from
Jan 6, 2016

Conversation

kadarakos
Copy link
Contributor

Solving issue: Add SelectFwe to feature selection operators #56.
Code is based on the SelectKBest operator.

@@ -0,0 +1 @@
tpot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove all of these files listed in the .idea directory.

@rhiever
Copy link
Contributor

rhiever commented Dec 31, 2015

Thank you for this PR @kadarakos. This looks great! I commented on some of the lines of code to request some fixes before we merge it.

@kadarakos
Copy link
Contributor Author

Thanks for the suggestions! I apologize for the messy PR, but I'm not very experienced in contributing to projects on github :-).

@@ -113,7 +113,8 @@ def __init__(self, population_size=100, generations=100,
self.pset.addPrimitive(self.gradient_boosting, [pd.DataFrame, float, int, int], pd.DataFrame)
self.pset.addPrimitive(self._combine_dfs, [pd.DataFrame, pd.DataFrame], pd.DataFrame)
self.pset.addPrimitive(self._variance_threshold, [pd.DataFrame, float], pd.DataFrame)
self.pset.addPrimitive(self._select_kbest, [pd.DataFrame, int], pd.DataFrame)
self.pset.addPrimitive(self._select_kbest, [pd.DataFrame, int], pd.DataFrame)
self.pset.addPrimitive(self._select_fwe, [pd.DataFrame, int], pd.DataFrame)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noticed -- this should be

 self.pset.addPrimitive(self._select_fwe, [pd.DataFrame, float], pd.DataFrame)

since the second parameter that select_fwe() takes is the alpha value in the range [0.001, 0.05].

@rhiever
Copy link
Contributor

rhiever commented Jan 1, 2016

No worries -- I appreciate that you took the time to contribute! :-) I just noted one more minor error, which when fixed, I believe will make this PR ready to merge.

@kadarakos
Copy link
Contributor Author

Should I add anything else?

rhiever pushed a commit that referenced this pull request Jan 6, 2016
@rhiever rhiever merged commit 088c625 into EpistasisLab:master Jan 6, 2016
@rhiever
Copy link
Contributor

rhiever commented Jan 6, 2016

Thank you for pinging me on this again! It's now merged. :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants