[MRG] Jcpot : Multi source DA with target shift #137
Conversation
README.md
Outdated
| @@ -29,6 +29,7 @@ It provides the following solvers: | |||
| * Non regularized free support Wasserstein barycenters [20]. | |||
| * Unbalanced OT with KL relaxation distance and barycenter [10, 25]. | |||
| * Screening Sinkhorn Algorithm for OT [26]. | |||
| * JCPOT algorithm for multi-source target shift [27]. | |||
There was a problem hiding this comment.
Multi source domain adaptation with target shift
ot/bregman.py
Outdated
|
|
||
| # build the cost matrix and the Gibbs kernel | ||
| M = dist(Xs[d], Xt, metric=metric) | ||
| M = M / np.median(M) |
There was a problem hiding this comment.
normalization by median should be optional.
There was a problem hiding this comment.
removed median and adjusted parameters in the tests accordingly
| @@ -549,3 +547,57 @@ def test_linear_mapping_class(): | |||
| Cst = np.cov(Xst.T) | |||
|
|
|||
| np.testing.assert_allclose(Ct, Cst, rtol=1e-2, atol=1e-2) | |||
|
|
|||
|
|
|||
| def test_jcpot_transport_class(): | |||
There was a problem hiding this comment.
could you also write a test for the jcpot function in addition to the class?
It's nice to chgeck both since the interface is available for both. you can also use it on another test dataset with obvious solutions (repeating samples and known proportions for instance).
| class JCPOTTransport(BaseTransport): | ||
|
|
||
| """Domain Adapatation OT method for multi-source target shift based on Wasserstein barycenter algorithm. | ||
|
|
There was a problem hiding this comment.
Could you add to the documentation what kind of mzpping is used? barycentric it seems but you could also so label prop by keeping the target position and providong non binary one hot encoding no? This couls be a parameter to give to the method.
There was a problem hiding this comment.
added label prop for base class and jcpot + tests for all otda methods
ot/bregman.py
Outdated
| The problem consist in solving a Wasserstein barycenter problem to estimate the proportions :math:`\mathbf{h}` in the target domain. | ||
|
|
||
| The algorithm used for solving the problem is the Iterative Bregman projections algorithm | ||
| with two sets of marginal constraints related to the unknown vector :math:`\mathbf{h}` and uniform tarhet distribution. |
|
|
||
| bary = bary / np.sum(bary) | ||
|
|
||
| if log: |
There was a problem hiding this comment.
Hum, do we really need to return the gammas by default?
The name of the function is barycenter which is the weights h in this case.
I would put the gammas in the log or at least second position.
There was a problem hiding this comment.
as far as I understand we have to return gamma as in documentation of the BaseTransport of da.py it is said that: "fit method should estimate a coupling matrix and store it in a coupling_ attribute"
ot/da.py
Outdated
| # compute transported samples | ||
| transp_ys = np.dot(D1, transp) | ||
|
|
||
| return np.argmax(transp_ys, axis=0) |
There was a problem hiding this comment.
why return argmax? I woul return the smooth label estimations and let the user do the argmax if he really wants one label.
There was a problem hiding this comment.
Done, changed documentation to "soft labels"
ot/da.py
Outdated
| # compute transported samples | ||
| transp_ys = np.dot(D1, transp.T) | ||
|
|
||
| return np.argmax(transp_ys, axis=0) |
There was a problem hiding this comment.
Done, changed documentation to "soft labels"
ot/da.py
Outdated
| transp[~ np.isfinite(transp)] = 0 | ||
|
|
||
| # compute transported labels | ||
| transp_ys.append(np.argmax(np.dot(D1, transp.T), axis=0)) |
There was a problem hiding this comment.
Done, changed documentation to "soft labels"
rflamary
changed the title
Added jcpot class in the da.py, jcpot_barycenter with the optimization routine, an example and a test