zhangyiss/EMD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned code

Browse Source
This commit is contained in:
William DURAND 2012-01-09 22:14:39 +01:00
parent 28b2481ac2
commit 48adfdc542
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main.cpp
View File

@ -21,9 +21,9 @@ int SIZE = 3;
double sum(CImg<float> img, int startedX, int startedY, int w) { double sum(CImg<float> img, int startedX, int startedY, int w) {
double res = 0; double res = 0;
for(int i = startedX - ((w - 1) / 2); i < startedX + ((w + 1) / 2); i++) { for (int i = startedX - ((w - 1) / 2); i < startedX + ((w + 1) / 2); i++) {
for(int j = startedY - ((w - 1) / 2) ; j < startedY + ((w + 1) / 2); j++) { for (int j = startedY - ((w - 1) / 2) ; j < startedY + ((w + 1) / 2); j++) {
if((i >= 0 && i < img.width()) && (j >= 0 && j < img.height())) { if ((i >= 0 && i < img.width()) && (j >= 0 && j < img.height())) {
res += img(i,j); res += img(i,j);
} }
} }
@ -31,17 +31,6 @@ double sum(CImg<float> img, int startedX, int startedY, int w) {
return res; return res;
} }
void showMatrix(CImg<float> img) {
std::cout << std::endl;
for (int i = 0; i < 9 ; i++) {
for (int j = 0; j < 9; j++) {
std::cout << (double) img(i, j) << " ";
}
std::cout << std::endl;
}
std::cout << std::endl;
}
/******************************************************************************* /*******************************************************************************
Main Main
*******************************************************************************/ *******************************************************************************/
@ -196,12 +185,9 @@ int main()
printf(" Calculate the window size..\n"); printf(" Calculate the window size..\n");
// Calculate the window size // Calculate the window size
for(unsigned int i = 0; i < vectEMin.size(); i++) { for(unsigned int i = 0; i < vectEMin.size(); i++) {
//double d1 = MIN(Euclidean::min(vectEMax), Euclidean::min(vectEMin)); double d = MAX(Euclidean::max(vectEMax), Euclidean::max(vectEMin));
//double d2 = MAX(Euclidean::min(vectEMax), Euclidean::min(vectEMin));
//double d3 = MIN(Euclidean::max(vectEMax), Euclidean::max(vectEMin));
double d4 = MAX(Euclidean::max(vectEMax), Euclidean::max(vectEMin));
wmax = (int)ceil(d4); wmax = (int)ceil(d);
if(wmax % 2 == 0) { if(wmax % 2 == 0) {
wmax++; wmax++;
} }
@ -248,7 +234,7 @@ int main()
for(int unsigned i = 0; i < vectEMax.size(); i++) { for(int unsigned i = 0; i < vectEMax.size(); i++) {
for (int k = vectEMax[i].getX() - ((wmax - 1) / 2); k < vectEMax[i].getX() + ((wmax + 1) / 2); k++) { for (int k = vectEMax[i].getX() - ((wmax - 1) / 2); k < vectEMax[i].getX() + ((wmax + 1) / 2); k++) {
for (int l = vectEMax[i].getY() - ((wmax - 1) / 2); l < vectEMax[i].getY() + ((wmax + 1) / 2); l++) { for (int l = vectEMax[i].getY() - ((wmax - 1) / 2); l < vectEMax[i].getY() + ((wmax + 1) / 2); l++) {
if( (k >= 0 && k < imgSource.width()) && (l >= 0 && l < imgSource.height()) ) { if ((k >= 0 && k < imgSource.width()) && (l >= 0 && l < imgSource.height())) {
if( imgMax(k, l) == 0 ) { if( imgMax(k, l) == 0 ) {
imgMax(k, l) = vectFilterMax[i]; imgMax(k, l) = vectFilterMax[i];
} }