diff options
| author | Antoine Rolet <antoine.rolet@gmail.com> | 2017-09-05 15:30:50 +0900 |
|---|---|---|
| committer | Antoine Rolet <antoine.rolet@gmail.com> | 2017-09-05 15:30:50 +0900 |
| commit | 13dfb3ddbbd8926b4751b82dd41c5570253b1f07 (patch) | |
| tree | b28098e98640c64483a599103e2fdb5df46d2c79 /ot/lp/EMD.h | |
| parent | 185eb3e2ef34b5ce6b8f90a28a5bcc78432b7fd3 (diff) | |
| parent | 16697047eff9326a0ecb483317c13a854a3d3a71 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'ot/lp/EMD.h')
| -rw-r--r-- | ot/lp/EMD.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ot/lp/EMD.h b/ot/lp/EMD.h index fb7feca..15e9115 100644 --- a/ot/lp/EMD.h +++ b/ot/lp/EMD.h @@ -23,8 +23,12 @@ using namespace lemon; typedef unsigned int node_id_type; +enum ProblemType { + INFEASIBLE, + OPTIMAL, + UNBOUNDED +}; -void EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, - double* alpha, double* beta, double *cost, int max_iter); +int EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, double* alpha, double* beta, double *cost, int max_iter); #endif |