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.

Sign up for GitHub

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

Jump to bottom

Removed Variable dtype #416

Merged
merged 5 commits into from
Feb 8, 2019
Merged

Removed Variable dtype #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5460c31
removed dtype
gsheni Feb 7, 2019
78e9bb8
use repr
gsheni Feb 7, 2019
cbe0326
fix test
gsheni Feb 7, 2019
204c600
delete varaible dtype
gsheni Feb 7, 2019
0ab6863
Merge branch 'master' into remove_v_dtype
gsheni Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion featuretools/entityset/entity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def __repr__(self):
repr_out = u"Entity: {}\n".format(self.id)
repr_out += u" Variables:"
for v in self.variables:
repr_out += u"\n {} (dtype: {})".format(v.id, v.dtype)
repr_out += u"\n {} (dtype: {})".format(v.id, v._dtype_repr)

shape = self.shape
repr_out += u"\n Shape:\n (Rows: {}, Columns: {})".format(
Expand Down
9 changes: 2 additions & 7 deletions featuretools/variable_types/variable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def __eq__(self, other):
self.entity_id == other.entity_id

def __repr__(self):
ret = u"<Variable: {} (dtype = {})>".format(self.name, self.dtype)
ret = u"<Variable: {} (dtype = {})>".format(self.name, self._dtype_repr)

# encode for python 2
if type(ret) != str:
Expand All @@ -70,11 +70,6 @@ def create_from(cls, variable):
def name(self):
return self._name if self._name is not None else self.id

@property
def dtype(self):
return self._dtype_repr \
if self._dtype_repr is not None else "generic_type"

@name.setter
def name(self, name):
self._name = name
Expand Down Expand Up @@ -181,7 +176,7 @@ def __init__(self, id, entity, format=None, name=None):
super(Datetime, self).__init__(id, entity, name)

def __repr__(self):
ret = u"<Variable: {} (dtype: {}, format: {})>".format(self.name, self.dtype, self.format)
ret = u"<Variable: {} (dtype: {}, format: {})>".format(self.name, self._dtype_repr, self.format)

# encode for python 2
if type(ret) != str:
Expand Down