-
Notifications
You must be signed in to change notification settings - Fork 9
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
Finite Discrete Measure #95
Finite Discrete Measure #95
Conversation
…imalTransport.jl into sinkhorndivergence
- Created the struct FiniteDiscreteMeasure, - Implemented two versions of sinkhorn_divergence, - Disabled the use of regularization on sinkhorn_divergence, - Fixed docstring with suggestions.
Pull Request Test Coverage Report for Build 914791279
💛 - Coveralls |
Codecov Report
@@ Coverage Diff @@
## master #95 +/- ##
==========================================
- Coverage 94.88% 94.67% -0.22%
==========================================
Files 6 7 +1
Lines 430 488 +58
==========================================
+ Hits 408 462 +54
- Misses 22 26 +4
Continue to review full report at Codecov.
|
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
There is some compatibility issue, but I cannot reproduce in my machine. It seems to be related to |
KernelFunctions requires Julia >= 1.3 (this is one reason for why we want to extract ColVecs and RowVecs to a separate package). It seems ArraysOfArrays also supports Julia 1.0, so it would be better to use it in the tests until ColVecs and RowVecs are compatible with Julia 1.0. |
If there are no more proposed changes, I think this is ready to be merged :D |
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, let's merge this and see how we can make use of it. Since it's not exported we can iterate freely until we reach a good design 🙂
@devmotion would you know if the ColVecs and RowVecs have been moved to another package? I'm writing some extra documentation on the 1D case, and I remembered this. |
Pull Request Test Coverage Report for Build 911924330Warning: This coverage report may be inaccurate.This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.
Details
💛 - Coveralls |
This PR has the implementation of the
FiniteDiscreteMesure
struct which I talked about in #92. It is similar to theDiscreteNonParametric
type inDistributions.jl
. It contains asupport
and ap
(for probability), allowing the user to store the empirical distributions. This would allow use to write functions such assinkhorn2(c, mu::FiniteDiscreteMeasure, nu::FiniteDiscreteMeasure)
, without having to pass both support and probabilities separately.p.s: I don't feel strongly about the
FiniteDiscreteMeasure
naming. Feel free to give better suggestions. I just don't thinkDiscreteMeasure
is a good name, because our variable cannot have infinite support, like a Poisson distribution.SimpleMeasure
is another option and would be theoretically correct.EmpiricalMeasure
andSampleMeasure
are another option, but they are kind of ambiguous, since the measure does not need necessarily to be either empirical or from a sampling process.