generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Macro removal

Browse Source
This commit is contained in:
Juan Manuel Perez 2013-09-25 14:13:42 +02:00 committed by Vadim Pisarevsky
parent aa73dafbbb
commit 1bf4298251
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/shape/src/emdL1.cpp
View File

@ -51,7 +51,7 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "emdL1_def.hpp" #include "emdL1_def.hpp"
#include <limits>
/****************************************************************************************\ /****************************************************************************************\
* EMDL1 Class * * EMDL1 Class *
@ -286,7 +286,7 @@ bool EmdL1::greedySolution2()
for(r=0; r<binsDim1; r++) for(r=0; r<binsDim1; r++)
{ {
dFlow = D[r][c]; dFlow = D[r][c];
bUpward = (r<binsDim1-1) && (std::abs(dFlow+d2s[c+1]) > std::abs(dFlow+d1s[r+1])); // Move upward or right bUpward = (r<binsDim1-1) && (fabs(dFlow+d2s[c+1]) > fabs(dFlow+d1s[r+1])); // Move upward or right
// modify basic variables, record BV and related values // modify basic variables, record BV and related values
if(bUpward) if(bUpward)
@ -308,7 +308,7 @@ bool EmdL1::greedySolution2()
d2s[c+1] += dFlow; // auxilary matrix maintanence d2s[c+1] += dFlow; // auxilary matrix maintanence
} }
pBV->pParent->pChild = pBV; pBV->pParent->pChild = pBV;
pBV->flow = std::abs(dFlow); pBV->flow = fabs(dFlow);
pBV->iDir = dFlow>0; // 1:outward, 0:inward pBV->iDir = dFlow>0; // 1:outward, 0:inward
} }
@ -320,7 +320,7 @@ bool EmdL1::greedySolution2()
pBV = &(m_EdgesUp[r][c]); pBV = &(m_EdgesUp[r][c]);
D[r+1][c] += dFlow; // auxilary matrix maintanence D[r+1][c] += dFlow; // auxilary matrix maintanence
pBV->pParent->pChild= pBV; pBV->pParent->pChild= pBV;
pBV->flow = std::abs(dFlow); pBV->flow = fabs(dFlow);
pBV->iDir = dFlow>0; // 1:outward, 0:inward pBV->iDir = dFlow>0; // 1:outward, 0:inward
} }
return true; return true;
@ -393,9 +393,9 @@ bool EmdL1::greedySolution3()
//- determine which direction to move, either right or upward //- determine which direction to move, either right or upward
dFlow = D[i1][i2][i3]; dFlow = D[i1][i2][i3];
f1 = (i1<(binsDim1-1))?std::abs(dFlow+d1s[i1+1]):VHIGH; f1 = (i1<(binsDim1-1))?fabs(dFlow+d1s[i1+1]):std::numeric_limits<float>::max();
f2 = (i2<(binsDim2-1))?std::abs(dFlow+d2s[i2+1]):VHIGH; f2 = (i2<(binsDim2-1))?fabs(dFlow+d2s[i2+1]):std::numeric_limits<float>::max();
f3 = (i3<(binsDim3-1))?std::abs(dFlow+d3s[i3+1]):VHIGH; f3 = (i3<(binsDim3-1))?fabs(dFlow+d3s[i3+1]):std::numeric_limits<float>::max();
if(f1<f2 && f1<f3) if(f1<f2 && f1<f3)
{ {
@ -422,7 +422,7 @@ bool EmdL1::greedySolution3()
d3s[i3+1] += dFlow; d3s[i3+1] += dFlow;
} }
pBV->flow = std::abs(dFlow); pBV->flow = fabs(dFlow);
pBV->iDir = dFlow>0; // 1:outward, 0:inward pBV->iDir = dFlow>0; // 1:outward, 0:inward
pBV->pParent->pChild= pBV; pBV->pParent->pChild= pBV;
} }
@ -679,7 +679,7 @@ void EmdL1::findNewSolution()
void EmdL1::findLoopFromEnterBV() void EmdL1::findLoopFromEnterBV()
{ {
// Initialize Leaving-BV edge // Initialize Leaving-BV edge
float minFlow = VHIGH; float minFlow = std::numeric_limits<float>::max();
cvPEmdEdge pE = NULL; cvPEmdEdge pE = NULL;
int iLFlag = 0; // 0: in the FROM list, 1: in the TO list int iLFlag = 0; // 0: in the FROM list, 1: in the TO list

1
modules/shape/src/emdL1_def.hpp
View File

@ -44,7 +44,6 @@
#include <math.h> #include <math.h>
#include <vector> #include <vector>
#define VHIGH 1e10;
/****************************************************************************************\ /****************************************************************************************\
* For EMDL1 Framework * * For EMDL1 Framework *
\****************************************************************************************/ \****************************************************************************************/