From 0faef7fde7e64705b4f0ed6618a0cfd25319bdc7 Mon Sep 17 00:00:00 2001 From: arolet Date: Fri, 14 Jul 2017 15:19:55 +0900 Subject: Removed unused variable max Probably a legacy normalization variable --- ot/lp/EMD_wrapper.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'ot/lp') diff --git a/ot/lp/EMD_wrapper.cpp b/ot/lp/EMD_wrapper.cpp index 2d448a0..d97ba46 100644 --- a/ot/lp/EMD_wrapper.cpp +++ b/ot/lp/EMD_wrapper.cpp @@ -15,10 +15,10 @@ #include "EMD.h" -void EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, double *cost, int max_iter) { +void 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; typedef FullBipartiteDigraph Digraph; DIGRAPH_TYPEDEFS(FullBipartiteDigraph); @@ -39,7 +39,6 @@ void EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, double * } } - // Define the graph std::vector indI(n), indJ(m); @@ -49,28 +48,23 @@ void EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, double * // Set supply and demand, don't account for 0 values (faster) - max=0; cur=0; for (node_id_type i=0; i0) { weights1[ di.nodeFromId(cur) ] = val; - max+=val; indI[cur++]=i; } } // Demand is actually negative supply... - max=0; cur=0; for (node_id_type i=0; i0) { weights2[ di.nodeFromId(cur) ] = -val; indJ[cur++]=i; - - max-=val; } } @@ -78,14 +72,10 @@ void EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, double * net.supplyMap(&weights1[0], n, &weights2[0], m); // Set the cost of each edge - max=0; for (node_id_type i=0; imax) { - max=val; - } } } -- cgit v1.2.3