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

Tpot mdr#2 #222

Merged
merged 14 commits into from
Aug 26, 2016
Merged

Tpot mdr#2 #222

merged 14 commits into from
Aug 26, 2016

Conversation

sohnam
Copy link
Contributor

@sohnam sohnam commented Aug 19, 2016

[please review the contribution guidelines prior to submitting your pull request. go ahead and delete this line if you've already reviewed said guidelines.]

What does this PR do?

Where should the reviewer start?

How should this PR be tested?

Any background context you want to provide?

What are the relevant issues?

[you can link directly to issues by entering # then the number of the issue, for example, #3 links to issue 3]

Screenshots (if appropriate)

Questions:

  • Do the docs need to be updated?
  • Does this PR add new (Python) dependencies?

@@ -73,7 +72,8 @@ class TPOT(object):
def __init__(self, population_size=100, generations=100,
mutation_rate=0.9, crossover_rate=0.05,
random_state=0, verbosity=0, scoring_function=None,
disable_update_check=False):
disable_update_check=False, expert_source=None,
ekf_index=0, k_best=5):
Copy link
Contributor

Choose a reason for hiding this comment

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

No need to set ekf_index and k_best in the TPOT init method.

@rhiever
Copy link
Contributor

rhiever commented Aug 21, 2016

Please let me know when you think this is ready for review.

@sohnam
Copy link
Contributor Author

sohnam commented Aug 21, 2016

Uploaded the latest changes (checks).

@rhiever
Copy link
Contributor

rhiever commented Aug 21, 2016

Looks like we have some merge conflicts -- can you pull from this tpot-mdr branch and sort out the conflict?

@sohnam
Copy link
Contributor Author

sohnam commented Aug 21, 2016

I pulled from the main tpot-mdr branch, added the ekf changes and re-uploaded the file.

@rhiever rhiever merged commit eacf81d into EpistasisLab:tpot-mdr Aug 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants