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

Primitive refactor updates #365

Merged
merged 7 commits into from Jan 8, 2019
Merged

Conversation

rwedge
Copy link
Contributor

@rwedge rwedge commented Jan 8, 2019

No description provided.

@rwedge rwedge requested a review from kmax12 January 8, 2019 19:07
@@ -225,8 +225,7 @@ def __sub__(self, other):
return self._handle_binary_comparision(other, primitives.SubtractNumeric, primitives.SubtractNumericScalar)

def __rsub__(self, other):
# TODO
pass
return self._handle_binary_comparision(other, primitives.SubtractNumeric, primitives.ScalarSubtractNumeric)
Copy link
Contributor

Choose a reason for hiding this comment

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

let's rename to SubtractNumericFeature and Scalar SubtractNumericFeature

@kmax12
Copy link
Contributor

kmax12 commented Jan 8, 2019

good to merge after the one comment

@rwedge rwedge merged commit 8378b0b into primitive-refactor Jan 8, 2019
@rwedge rwedge deleted the primitive-refactor-updates branch January 8, 2019 19:48
rwedge pushed a commit that referenced this pull request Jan 18, 2019
* initial support

* cfm tests passing

* linting

* progress

* progress

* add lint-fix and autopep

* more passing

* progress

* progress

* progress

* don't require initialization

* separate override tests

* lint

* cleanup

* more tests passing

* one more test passing

* all but one test passing

* all test pass

* linting

* add to lint-fix

* all tests pass!

* cleanup

* fix tests

* fix test

* fix linting

* docs building

* actually fix docs

* updates

* Primitive refactor updates (#365)

* remove incorrect commutative attributes

* handle rsub override and test reverse overrides

* rename weekend primitive is_weekend

* updated weekend to is_weekend in docs

* test values for scalar_subtract_numeric

* rename subtract_numeric and scalar_subtract_numeric to subtract_numeric_feature and scalar_subtract_numeric_feature

* revert subtract_numeric_feature to subtract_numeric

* update rsub

* fix test

* cleanup

* remove unecessary primitive initializations

* addressed review comments
rwedge added a commit that referenced this pull request Jan 19, 2019
* initial support

* cfm tests passing

* linting

* progress

* progress

* add lint-fix and autopep

* more passing

* progress

* progress

* progress

* don't require initialization

* separate override tests

* lint

* cleanup

* more tests passing

* one more test passing

* all but one test passing

* all test pass

* linting

* add to lint-fix

* all tests pass!

* cleanup

* fix tests

* fix test

* fix linting

* docs building

* actually fix docs

* updates

* Primitive refactor updates (#365)

* remove incorrect commutative attributes

* handle rsub override and test reverse overrides

* rename weekend primitive is_weekend

* updated weekend to is_weekend in docs

* test values for scalar_subtract_numeric

* rename subtract_numeric and scalar_subtract_numeric to subtract_numeric_feature and scalar_subtract_numeric_feature

* revert subtract_numeric_feature to subtract_numeric

* update rsub

* fix test

* replace expanding with number_output_features

* remove old line from encode features

* have dfs intialized un-initialized primitives

* fix feature name assertion

* remove get_feature_names on primitive

* cleanup

* test direct features of multi output features

* linting

* remove unecessary primitive initializations

* rename NMostCommon primitive function

* remove unecessary default value from NMostCommon

* allow NMostCommon to stack

* don't set primitive for DirectFeature

* make number_output_features a property of FeatureBase

* change parameter name in check_stacking

* rename ready_primitive to handle_primitive and add check that input is a primitive

* update variable name in where primitive check

* switch to using feature.number_output_features in logic

* add warning in encode_features for multi output features

* make helper function for adding feature values to existing data

* clean up direct feature tests on multi-output features

* addressed review comments

* remove logic to do direct features of grandparents
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