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

Merge dynamic dimension values #1103

Merged
merged 2 commits into from Feb 6, 2017
Merged

Merge dynamic dimension values #1103

merged 2 commits into from Feb 6, 2017

Conversation

@philippjfr
Copy link
Member

@philippjfr philippjfr commented Feb 5, 2017

Merges the values from multiple composed DynamicMaps addressing #920.

"""
Merges lists of fully or partially overlapping dimensions by
combining their values.
"""

This comment has been minimized.

@jlstevens

jlstevens Feb 5, 2017
Contributor

The code is clear enough, but it might be nice to add a doctest example here (if we are using doctests).

@jlstevens
Copy link
Contributor

@jlstevens jlstevens commented Feb 5, 2017

Looks like my comment in the issue regarding a KeyError was confused. Anyway, merging dimensions with merge_dimensions makes sense - my only question, is there anywhere else we should be using it?

@philippjfr
Copy link
Member Author

@philippjfr philippjfr commented Feb 6, 2017

my only question, is there anywhere else we should be using it?

I think this uses it everywhere it matters, i.e. when merging HoloMaps/DynamicMaps in an Overlay and when computing the dimensions during plotting to handle Layouts/GridSpaces of multiple HoloMaps/DynamicMaps

@jlstevens
Copy link
Contributor

@jlstevens jlstevens commented Feb 6, 2017

Thanks for adding the doctest!

Happy to merge once the tests pass.

@philippjfr
Copy link
Member Author

@philippjfr philippjfr commented Feb 6, 2017

Some syntax error due to the test being multi-line.

@philippjfr philippjfr force-pushed the merge_dimension_values branch from 03fb900 to f66ec43 Feb 6, 2017
@philippjfr
Copy link
Member Author

@philippjfr philippjfr commented Feb 6, 2017

Ready to merge when it passes.

@philippjfr philippjfr added this to the v1.7.0 milestone Feb 6, 2017
@jlstevens
Copy link
Contributor

@jlstevens jlstevens commented Feb 6, 2017

Tests have passed. Merging.

@jlstevens jlstevens merged commit b38c518 into master Feb 6, 2017
4 checks passed
4 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.01%) to 77.99%
Details
@philippjfr
s3-reference-data-cache Test data is cached.
Details
@philippjfr philippjfr deleted the merge_dimension_values branch Feb 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants