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

LatLong type #57

Merged
merged 21 commits into from Jan 18, 2018
Merged

LatLong type #57

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
cef72b7
Add LatLong variable type, Lat and Long trans prims
Dec 13, 2017
3cbfa31
Modify get_function
Dec 13, 2017
645a7eb
Add latlong to test es
Dec 13, 2017
42e3379
latlong_string workaround
Dec 14, 2017
3ff65c2
linting
Dec 14, 2017
8a7bbcd
Write primitives with latlong as tuple
Jan 2, 2018
f9a2819
es.entity_from_csv -> pd.read_csv
Jan 2, 2018
90238bf
Comment out breaking tests. 3 glob/gzip 1 unicode to fix
Jan 2, 2018
9810bd7
Add encoding='utf-8'
Jan 3, 2018
5067022
Add warnings about from_csv, add desc to latlong
Jan 12, 2018
bee50ed
Add haversine primitive and test
Jan 12, 2018
a290740
Remove entity_from_csv from notebook
Jan 12, 2018
3b7707a
Merge branch 'master' into latlong-type
Jan 17, 2018
c108211
Add Haversine, NumWords and NumCharacters to default primitives
Jan 17, 2018
3091ba7
lint
Jan 17, 2018
4654c70
isort
Jan 17, 2018
856d8e8
list(map() in mock_ds
Jan 18, 2018
b6a5069
map -> apply
Jan 18, 2018
051d27a
Merge branch 'master' into latlong-type
Jan 18, 2018
1dd7501
Update API reference
Jan 18, 2018
737dae8
Add LatLong, Drop from_csv to API ref
Jan 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions featuretools/tests/testing_utils/mock_ds.py
View file
Open in desktop
Expand Up @@ -301,8 +301,10 @@ def make_ecommerce_entityset(with_integer_time_index=False, base_path=None, save

df = pd.read_csv(filenames[entity], encoding='utf-8')
if entity is 'log':
df['latlong'] = map(lambda x: latlong_unstringify(x), df['latlong'])
df['latlong2'] = map(lambda x: latlong_unstringify(x), df['latlong2'])
df['latlong'] = list(map(
lambda x: latlong_unstringify(x), df['latlong']))
Copy link
Contributor

Choose a reason for hiding this comment

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

i think this line can actually be

df['latlong'] = df['latlong'].apply(latlong_unstringify)

df['latlong2'] = list(map(
lambda x: latlong_unstringify(x), df['latlong2']))

es.entity_from_dataframe(entity,
df,
Expand Down