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

Rename SimpleAverage in decider.py #130

Merged
merged 6 commits into from
Sep 16, 2020
Merged

Rename SimpleAverage in decider.py #130

merged 6 commits into from
Sep 16, 2020

Conversation

chenyugoal
Copy link
Contributor

What is the issue?

Rename SimpleAverage in decider.py to SimpleArgmaxAverage and propagate changes #115
The issue was put up by @levinwil

What changes?

I've done the search and replaced all 'SimpleAverage' with 'SimpleArgmaxAverage'.
There are two types:

  • One is 'from deciders import SimpleAverage',
  • the other is 'from proglearn import SimpleAverage'. I replaced them all.

@jdey4
Copy link
Collaborator

jdey4 commented Sep 14, 2020

@chenyugoal please solve the merge conflicts.

…te changes #115

I've done the search and replaced all 'SimpleAverage' with 'SimpleArgmaxAverage'. There are two types. One is 'from deciders import SimpleAverage', the other is 'from proglearn import SimpleAverage'. I replaced them all.
…te changes #115

I've done the search and replaced all 'SimpleAverage' with 'SimpleArgmaxAverage'. There are two types. One is 'from deciders import SimpleAverage', the other is 'from proglearn import SimpleAverage'. I replaced them all.
2 places to SimpleArgmaxAverage
@chenyugoal
Copy link
Contributor Author

chenyugoal commented Sep 14, 2020

Finally, it passed the Travis CI build!
So the problem might be:
I was doing 'Pull' from my repo, rather than from neurodata's repo. Therefore, it caused no changes to the file on my PC. So I could not get the correct version, thus failing the Travis again and again.
@jdey4
Sorry for the trouble!

@hhelm10
Copy link
Collaborator

hhelm10 commented Sep 16, 2020

@levinwil @jovo can i suggest a(nother) change to ArgmaxSimpleAverage..?

@levinwil
Copy link
Collaborator

Sure!

@jdey4 jdey4 merged commit 3c14f96 into neurodata:master Sep 16, 2020
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.

5 participants