[MRG] Use the weights w in ot.dist for the cityblock metric - #859
Merged
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #859 +/- ##
==========================================
- Coverage 96.86% 96.85% -0.01%
==========================================
Files 128 128
Lines 26181 26197 +16
==========================================
+ Hits 25359 25373 +14
- Misses 822 824 +2 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Types of changes
Description
ot.distdocuments thatwis used by thecityblockandminkowskimetrics, but thecityblockbranch never read it and returned the unweighted distance:The weighted
minkowskibranch already handled this.cityblocknow applieswthe same way, in both theuse_tensor=Trueand loop implementations.How has this been tested
Added
test_dist_weighted_cityblock, which compares againstscipy.spatial.distance.cdistfor both implementations. It fails on master and passes with this change.test/test_utils.pypasses.Checklist