diff options
| author | Rémi Flamary <remi.flamary@gmail.com> | 2017-09-13 08:11:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 08:11:00 +0200 |
| commit | a53ede95f916a11e2150ab7917820d813c0034bc (patch) | |
| tree | 24304d83267d51b962e18722553973bbc75509f2 /ot/lp/EMD.h | |
| parent | 62dcfbfb78a2be24379cd5cdb4aec70d8c4befaa (diff) | |
| parent | e52b6eb41228a7f8e381cf73c06e0dffba5773be (diff) | |
Merge pull request #29 from arolet/ot_dual_variables
Dual variables in EMD_wrapper
Diffstat (limited to 'ot/lp/EMD.h')
| -rw-r--r-- | ot/lp/EMD.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ot/lp/EMD.h b/ot/lp/EMD.h index aa92441..f42e222 100644 --- a/ot/lp/EMD.h +++ b/ot/lp/EMD.h @@ -26,9 +26,10 @@ typedef unsigned int node_id_type; enum ProblemType { INFEASIBLE, OPTIMAL, - UNBOUNDED + UNBOUNDED, + MAX_ITER_REACHED }; -int EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, 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 maxIter); #endif |