Merged
Conversation
complexity builtins
in setup.py
nltk fixes
nltk troubles
mgasvoda
approved these changes
Apr 12, 2018
OliverSherouse
suggested changes
Apr 13, 2018
Contributor
OliverSherouse
left a comment
OliverSherouse
left a comment
There was a problem hiding this comment.
Small changes needed.
quantgov/__main__.py
Outdated
| '--probability', action='store_true', | ||
| help='output probabilities instead of predictions') | ||
| estimate.add_argument( | ||
| '--precision', default=4, |
Contributor
There was a problem hiding this comment.
Set type to int here rather than cast in the function itself.
quantgov/estimator/estimation.py
Outdated
| texts = (doc.text for doc in streamer) | ||
| yield from zip(streamer.index, pipeline.predict_proba(texts)) | ||
| yield from zip(streamer.index, (i.round(int(precision)) | ||
| for i in pipeline.predict_proba(texts))) |
Contributor
There was a problem hiding this comment.
Round at the array level, not the obvservation level. So:
yield from zip(streamer.index, pipeline.predict_proba(texts).round(precision))
quantgov/estimator/estimation.py
Outdated
| predicted = pipeline.predict_proba(texts) | ||
| for i, docidx in enumerate(streamer.index): | ||
| yield docidx, tuple(label_predictions[i] | ||
| yield docidx, tuple(label_predictions[i].round(int(precision)) |
Member
Author
|
@OliverSherouse fixed those changes |
quantgov/estimator/estimation.py
Outdated
| texts = (doc.text for doc in streamer) | ||
| truecol = list(int(i) for i in model.model.classes_).index(1) | ||
| predicted = ((round(i[truecol], int(precision)) | ||
| predicted = ((round(i[truecol], precision) |
Contributor
There was a problem hiding this comment.
Why aren't we selecting the whole column and rounding at once? I think that would be pipeline.predict_proba[:,truecol].round(precision).
OliverSherouse
approved these changes
Apr 13, 2018
OliverSherouse
added a commit
that referenced
this pull request
Apr 17, 2018
* Inaugurated 0.4.0 dev series * Sentiment analysis (#33) Closes #11 #12 #13 and adds Sentiment analysis! * complexity * complexity builtins * complexity builtins with tests * code review updates * option tests * added nltk requirement in setup.py * add pip install to .travis.yml * nltk fixes * another nltk fix * last nltk fix? * you know the drill * Update .travis.yml * nltk troubles * some final cleanup * if it aint broke... * textblob sentiment * tests and error raising * fixed install req * pep8 fixes * code review updates * fix travis file * import fixes * small fix * Test corpora (#35) * complexity * complexity builtins * complexity builtins with tests * code review updates * option tests * added nltk requirement in setup.py * add pip install to .travis.yml * nltk fixes * another nltk fix * last nltk fix? * you know the drill * Update .travis.yml * nltk troubles * some final cleanup * new corpora in English!! * hotfix to add timestamp as corpus identifier * Skl compatibility (#41) * Add sklearn 0.17 compatibility Paper over library reorganization. * renamed corpora to corpus, added deprecation warning (#42) * renamed corpora to corpus, added deprecation warning * moved load_driver and set up for future forcing of full imports of submodules Closes #31 * S3 drivers (#44) * initial working commit for s3 driver and database driver * removing 3.6 formatting * adding extra requirements list * adding basic s3 driver test * Removing unnecessary function * This ain't 2007 * test updates * adding s3driver to new corpus structure * Rounding (#45) * bumped version
OliverSherouse
added a commit
that referenced
this pull request
Apr 17, 2018
* Inaugurated 0.4.0 dev series * Sentiment analysis (#33) Closes #11 #12 #13 and adds Sentiment analysis! * complexity * complexity builtins * complexity builtins with tests * code review updates * option tests * added nltk requirement in setup.py * add pip install to .travis.yml * nltk fixes * another nltk fix * last nltk fix? * you know the drill * Update .travis.yml * nltk troubles * some final cleanup * if it aint broke... * textblob sentiment * tests and error raising * fixed install req * pep8 fixes * code review updates * fix travis file * import fixes * small fix * Test corpora (#35) * complexity * complexity builtins * complexity builtins with tests * code review updates * option tests * added nltk requirement in setup.py * add pip install to .travis.yml * nltk fixes * another nltk fix * last nltk fix? * you know the drill * Update .travis.yml * nltk troubles * some final cleanup * if it aint broke... * new corpora in English!! * hotfix to add timestamp as corpus identifier * Skl compatibility (#41) * Add sklearn 0.17 compatibility Paper over library reorganization. * renamed corpora to corpus, added deprecation warning (#42) * renamed corpora to corpus, added deprecation warning * moved load_driver and set up for future forcing of full imports of submodules Closes #31 * S3 drivers (#44) * initial working commit for s3 driver and database driver * removing 3.6 formatting * adding extra requirements list * adding basic s3 driver test * Removing unnecessary function * This ain't 2007 * test updates * adding s3driver to new corpus structure * Rounding (#45) * bumped version * Fix NLTK loading bug Fix evaluation order when NLTK is not present
OliverSherouse
added a commit
that referenced
this pull request
May 21, 2018
* hotfix to add timestamp as corpus identifier (#39) * bumped version * Release 0.4 (#47) * Inaugurated 0.4.0 dev series * Sentiment analysis (#33) Closes #11 #12 #13 and adds Sentiment analysis! * complexity * complexity builtins * complexity builtins with tests * code review updates * option tests * added nltk requirement in setup.py * add pip install to .travis.yml * nltk fixes * another nltk fix * last nltk fix? * you know the drill * Update .travis.yml * nltk troubles * some final cleanup * if it aint broke... * textblob sentiment * tests and error raising * fixed install req * pep8 fixes * code review updates * fix travis file * import fixes * small fix * Test corpora (#35) * complexity * complexity builtins * complexity builtins with tests * code review updates * option tests * added nltk requirement in setup.py * add pip install to .travis.yml * nltk fixes * another nltk fix * last nltk fix? * you know the drill * Update .travis.yml * nltk troubles * some final cleanup * new corpora in English!! * hotfix to add timestamp as corpus identifier * Skl compatibility (#41) * Add sklearn 0.17 compatibility Paper over library reorganization. * renamed corpora to corpus, added deprecation warning (#42) * renamed corpora to corpus, added deprecation warning * moved load_driver and set up for future forcing of full imports of submodules Closes #31 * S3 drivers (#44) * initial working commit for s3 driver and database driver * removing 3.6 formatting * adding extra requirements list * adding basic s3 driver test * Removing unnecessary function * This ain't 2007 * test updates * adding s3driver to new corpus structure * Rounding (#45) * bumped version * Fix NLTK loading bug Fix evaluation order when NLTK is not present
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.