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

Added holidays parameter to date encoder #3822

Merged
merged 16 commits into from
Mar 26, 2018
Merged

Conversation

JonnoFTW
Copy link
Contributor

Fixes #3821

Also fixed up some typos.

JonnoFTW added 14 commits March 10, 2017 15:18
Conflicts:
	src/nupic/encoders/__init__.py
	src/nupic/encoders/multi.py
	tests/unit/nupic/encoders/pass_through_encoder_test.py
	tests/unit/nupic/encoders/sparse_pass_through_encoder_test.py
Added WARNING message when permutations runner job fails
Added nupic-site.xml to .gitignore
Added holidays parameter to date encoder and added extra unit test
Fixed a typo in unit tests and comments in date.py
@rhyolight rhyolight requested a review from lscheinkman March 23, 2018 17:31
@rhyolight
Copy link
Member

@JonnoFTW Please investigate test failures in CI.

@lscheinkman
Copy link
Contributor

@JonnoFTW Could separate the holiday feature from the other changes related to swarming?

@JonnoFTW
Copy link
Contributor Author

@lscheinkman my bad, I forgot to merge with upstream. It should be good now. Do you know how I can get it to stop listing those really old commits in every pull request?

Copy link
Contributor

@lscheinkman lscheinkman left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@lscheinkman
Copy link
Contributor

@JonnoFTW You can try using git rebase --interactive and squash the old commits

@rhyolight
Copy link
Member

I can squash and merge from the UI.

@rhyolight rhyolight merged commit 54e1ffe into numenta:master Mar 26, 2018
@rhyolight
Copy link
Member

Nice @JonnoFTW thanks!

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.

DateEncoder only has 1 holiday
3 participants