diff options
| author | Gard Spreemann <gspr@nonempty.org> | 2021-11-09 17:06:47 +0100 |
|---|---|---|
| committer | Gard Spreemann <gspr@nonempty.org> | 2021-11-09 17:06:47 +0100 |
| commit | 3d10287c776e95427ace867b302cff02488694ca (patch) | |
| tree | 5735b6434fe7a14b775d266e1a5d7720b56912e4 /ot/lp/EMD.h | |
| parent | cc703fc5e204a4b1c03fc29e59687e6b97aa7f67 (diff) | |
| parent | 1a283cb0c77f79d6f36de7c01fa61dc8d9696bca (diff) | |
Merge branch 'dfsg/latest' into debian/sid
Diffstat (limited to 'ot/lp/EMD.h')
| -rw-r--r-- | ot/lp/EMD.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ot/lp/EMD.h b/ot/lp/EMD.h index c0fe7a3..8a1f9ac 100644 --- a/ot/lp/EMD.h +++ b/ot/lp/EMD.h @@ -18,19 +18,18 @@ #include <iostream> #include <vector> -#include "network_simplex_simple.h" -using namespace lemon; typedef unsigned int node_id_type; enum ProblemType { INFEASIBLE, OPTIMAL, UNBOUNDED, - MAX_ITER_REACHED + MAX_ITER_REACHED }; int EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, double* alpha, double* beta, double *cost, int maxIter); +int EMD_wrap_omp(int n1,int n2, double *X, double *Y,double *D, double *G, double* alpha, double* beta, double *cost, int maxIter, int numThreads); |