diff options
| author | aje <leo_g_autheron@hotmail.fr> | 2017-08-30 09:56:37 +0200 |
|---|---|---|
| committer | aje <leo_g_autheron@hotmail.fr> | 2017-08-30 09:56:37 +0200 |
| commit | 982f36cb0a5f3a6a14454238a26053de7251b0f0 (patch) | |
| tree | e7ad62954515430a418b9825829f7d563bf469ff /ot/lp/EMD_wrapper.cpp | |
| parent | 308ce24b705dfad9d058138d058da8b18002e081 (diff) | |
Changes:
- Rename numItermax to max_iter
- Default value to 100000 instead of 10000
- Add max_iter to class SinkhornTransport(BaseTransport)
- Add norm to all BaseTransport
Diffstat (limited to 'ot/lp/EMD_wrapper.cpp')
| -rw-r--r-- | ot/lp/EMD_wrapper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ot/lp/EMD_wrapper.cpp b/ot/lp/EMD_wrapper.cpp index 83ed56c..c8c2eb3 100644 --- a/ot/lp/EMD_wrapper.cpp +++ b/ot/lp/EMD_wrapper.cpp @@ -15,7 +15,7 @@ #include "EMD.h" -int EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, double *cost, int numItermax) { +int EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, double *cost, int max_iter) { // beware M and C anre strored in row major C style!!! int n, m, i,cur; double max; @@ -45,7 +45,7 @@ int EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, double *c std::vector<int> indI(n), indJ(m); std::vector<double> weights1(n), weights2(m); Digraph di(n, m); - NetworkSimplexSimple<Digraph,double,double, node_id_type> net(di, true, n+m, n*m, numItermax); + NetworkSimplexSimple<Digraph,double,double, node_id_type> net(di, true, n+m, n*m, max_iter); // Set supply and demand, don't account for 0 values (faster) |