diff options
| author | Gard Spreemann <gspr@nonempty.org> | 2020-07-09 08:50:11 +0200 |
|---|---|---|
| committer | Gard Spreemann <gspr@nonempty.org> | 2020-07-09 08:50:11 +0200 |
| commit | 616c6039614e96b6cfd88eb7db25ce11c7302c30 (patch) | |
| tree | a745ec24604f660b256dbaee214affa497c9c21e /ot/lp/EMD_wrapper.cpp | |
| parent | d62f05daf348b4e554056f298c66cbd64f5e3c6e (diff) | |
| parent | a16b9471d7114ec08977479b7249efe747702b97 (diff) | |
Merge branch 'dfsg/latest' into debian/sid
Diffstat (limited to 'ot/lp/EMD_wrapper.cpp')
| -rw-r--r-- | ot/lp/EMD_wrapper.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ot/lp/EMD_wrapper.cpp b/ot/lp/EMD_wrapper.cpp index fc7ca63..bc873ed 100644 --- a/ot/lp/EMD_wrapper.cpp +++ b/ot/lp/EMD_wrapper.cpp @@ -17,13 +17,13 @@ int EMD_wrap(int n1, int n2, double *X, double *Y, double *D, double *G, double* alpha, double* beta, double *cost, int maxIter) { -// beware M and C anre strored in row major C style!!! - int n, m, i, cur; + // beware M and C anre strored in row major C style!!! + int n, m, i, cur; typedef FullBipartiteDigraph Digraph; - DIGRAPH_TYPEDEFS(FullBipartiteDigraph); + DIGRAPH_TYPEDEFS(FullBipartiteDigraph); - // Get the number of non zero coordinates for r and c + // Get the number of non zero coordinates for r and c n=0; for (int i=0; i<n1; i++) { double val=*(X+i); @@ -105,3 +105,4 @@ int EMD_wrap(int n1, int n2, double *X, double *Y, double *D, double *G, return ret; } + |