diff options
| author | aje <leo_g_autheron@hotmail.fr> | 2017-08-29 15:38:11 +0200 |
|---|---|---|
| committer | Nicolas Courty <Nico@MacBook-Pro-de-Nicolas.local> | 2017-09-01 11:09:13 +0200 |
| commit | 6ae3ad7bb48b1fa8964cfd2791bdb86267776495 (patch) | |
| tree | cb412b0e9a21b6a7c1d0622d84ce8550aaaee60f /ot/lp/EMD.h | |
| parent | 5a9795f08341458bd9e3befe0c2c6ea6fa891323 (diff) | |
Changes to LP solver:
- Allow to modify the maximal number of iterations
- Display an error message in the python console if the solver encountered an issue
Diffstat (limited to 'ot/lp/EMD.h')
| -rw-r--r-- | ot/lp/EMD.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ot/lp/EMD.h b/ot/lp/EMD.h index 40d7192..956830c 100644 --- a/ot/lp/EMD.h +++ b/ot/lp/EMD.h @@ -23,7 +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 *cost); +int EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, double *cost, int numItermax); #endif |