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

added debug

Browse Source
This commit is contained in:
William DURAND 2011-12-09 11:46:59 +01:00
parent 7acb222e09
commit 7865217d0e
2 changed files with 117 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -15,6 +15,10 @@ $(EXEC):$(OBJETS) Makefile
.cpp.o: .cpp.o:
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
debug: CFLAGS += -DDEBUG
debug: LFLAGS += -DDEBUG
debug: $(EXEC)
clean: clean:
rm -f $(OBJETS) rm -f $(OBJETS)
clear: clear:

154
main.cpp
View File

@ -19,13 +19,13 @@ using namespace cimg_library;
double Sum(CImg<unsigned char> img, int startedX, int startedY, int w) double Sum(CImg<unsigned char> img, int startedX, int startedY, int w)
{ {
double res = 0; double res = 0;
for(int i = startedX; i < startedX + w; i++) { for(int i = startedX; i < startedX + w; i++) {
for(int j = startedY; j < startedY + w; j++) { for(int j = startedY; j < startedY + w; j++) {
res = img(i,j); res = img(i,j);
}
} }
} return res;
return res;
} }
/******************************************************************************* /*******************************************************************************
@ -33,9 +33,32 @@ double Sum(CImg<unsigned char> img, int startedX, int startedY, int w)
*******************************************************************************/ *******************************************************************************/
int main() int main()
{ {
CImg<unsigned char> imgLena("lena.bmp"); #ifdef DEBUG
CImg<unsigned char> inputImg(8, 8, 1, 3);
int tab[][8] = {
{ 8, 8, 4, 1, 5, 2, 6, 3 },
{ 6, 3, 2, 3, 7, 3, 9, 3 },
{ 7, 8, 3, 2, 1, 4, 3, 7 },
{ 4, 1, 2, 4, 3, 5, 7, 8 },
{ 6, 4, 2, 1, 2, 5, 3, 4 },
{ 1, 3, 7, 9, 9, 8, 7, 8 },
{ 9, 2, 6, 7, 6, 8, 7, 7 },
{ 8, 2, 1, 9, 7, 9, 1, 1 }
};
CImgDisplay dispBase(imgLena,"Image de base"); printf("Base:\n");
for (int i = 0; i < inputImg.width(); i++) {
for (int j = 0; j < inputImg.height(); j++) {
inputImg(i, j) = tab[i][j];
printf("%d ", inputImg(i, j));
}
printf("\n");
}
#else
CImg<unsigned char> inputImg("lena.bmp");
#endif
CImgDisplay dispBase(inputImg,"Image de base");
std::vector<Euclidean> vectEMax, vectEMin; std::vector<Euclidean> vectEMax, vectEMin;
std::vector<int> w; std::vector<int> w;
@ -43,11 +66,11 @@ int main()
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Part 1: Finding minimas and maximas // // Part 1: Finding minimas and maximas //
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
CImg<unsigned char> imgMax = imgLena.channel(0); CImg<unsigned char> imgMax(inputImg.channel(0));
CImg<unsigned char> imgMin = imgLena.channel(0); CImg<unsigned char> imgMin(inputImg.channel(0));
for (int i = 0; i<imgLena.width() ; i+=3) { for (int i = 0; i < inputImg.width(); i += 3) {
for (int j = 0; j<imgLena.height() ; j+=3) { for (int j = 0; j < inputImg.height(); j += 3) {
// Save max and min locations // Save max and min locations
int xmax = i; int xmax = i;
@ -99,6 +122,26 @@ int main()
} }
} }
#ifdef DEBUG
printf("- Extremas\n");
printf("Max\n");
for (int i = 0; i < imgMax.width(); i++) {
for (int j = 0; j < imgMax.height(); j++) {
printf("%d ", imgMax(i, j));
}
printf("\n");
}
printf("Min\n");
for (int i = 0; i < imgMin.width(); i++) {
for (int j = 0; j < imgMin.height(); j++) {
printf("%d ", imgMin(i, j));
}
printf("\n");
}
#endif
// Array of Euclidean distance to the nearest non zero element // Array of Euclidean distance to the nearest non zero element
std::vector<Euclidean>::iterator it1, it2; std::vector<Euclidean>::iterator it1, it2;
@ -146,7 +189,7 @@ int main()
w.push_back(wi); w.push_back(wi);
} }
CImg<unsigned char> imgSource = imgLena.channel(0); CImg<unsigned char> imgSource(inputImg.channel(0));
// Order filters with source image // Order filters with source image
std::vector<unsigned char> vectFilterMax, vectFilterMin; std::vector<unsigned char> vectFilterMax, vectFilterMin;
@ -191,16 +234,15 @@ int main()
} }
} }
// Smooth of the upper envelope // Smooth of the upper envelope
for(unsigned int i = 0; i < vectEMax.size(); i++) { for(unsigned int i = 0; i < vectEMax.size(); i++) {
double sum = Sum(imgMax, vectEMax[i].getX() - ((w[i] + 1) / 2), vectEMax[i].getY() - ((w[i] + 1) / 2), w[i]); double sum = Sum(imgMax, vectEMax[i].getX() - ((w[i] + 1) / 2), vectEMax[i].getY() - ((w[i] + 1) / 2), w[i]);
for (int k = vectEMax[i].getX() - ((w[i] - 1) / 2); k < vectEMax[i].getX() + ((w[i] + 1) / 2); k++) { for (int k = vectEMax[i].getX() - ((w[i] - 1) / 2); k < vectEMax[i].getX() + ((w[i] + 1) / 2); k++) {
for (int l = vectEMax[i].getY() - ((w[i] - 1) / 2); l < vectEMax[i].getY() + ((w[i] + 1) / 2); l++) { for (int l = vectEMax[i].getY() - ((w[i] - 1) / 2); l < vectEMax[i].getY() + ((w[i] + 1) / 2); l++) {
newImgMax(k, l) = (1./(w[i]*w[i])) * sum; newImgMax(k, l) = (1./(w[i]*w[i])) * sum;
std::cout << ((1./(w[i]*w[i])) * sum) << std::endl; }
} }
} }
}
CImg<unsigned char> newImgMin(imgMin.width(), imgMin.height()); CImg<unsigned char> newImgMin(imgMin.width(), imgMin.height());
@ -218,43 +260,73 @@ int main()
} }
} }
// Smooth of the lower envelope #ifdef DEBUG
for(unsigned int i = 0; i < vectEMax.size(); i++) { printf("- Envelopes\n");
double sum = Sum(imgMin, vectEMin[i].getX() - ((w[i] + 1) / 2), vectEMin[i].getY() - ((w[i] + 1) / 2), w[i]);
for (int k = vectEMin[i].getX() - ((w[i] - 1) / 2); k < vectEMin[i].getX() + ((w[i] + 1) / 2); k++) { printf("Max\n");
for (int l = vectEMin[i].getY() - ((w[i] - 1) / 2); l < vectEMin[i].getY() + ((w[i] + 1) / 2); l++) { for (int i = 0; i < newImgMax.width(); i++) {
newImgMin(k, l) = (1./(w[i]*w[i])) * sum; for (int j = 0; j < newImgMax.height(); j++) {
std::cout << ((1./(w[i]*w[i])) * sum) << std::endl; printf("%d ", newImgMax(i, j));
} }
} printf("\n");
} }
printf("Min\n");
for (int i = 0; i < newImgMin.width(); i++) {
for (int j = 0; j < newImgMin.height(); j++) {
printf("%d ", newImgMin(i, j));
}
printf("\n");
}
#endif
// Smooth of the lower envelope
for(unsigned int i = 0; i < vectEMax.size(); i++) {
double sum = Sum(imgMin, vectEMin[i].getX() - ((w[i] + 1) / 2), vectEMin[i].getY() - ((w[i] + 1) / 2), w[i]);
for (int k = vectEMin[i].getX() - ((w[i] - 1) / 2); k < vectEMin[i].getX() + ((w[i] + 1) / 2); k++) {
for (int l = vectEMin[i].getY() - ((w[i] - 1) / 2); l < vectEMin[i].getY() + ((w[i] + 1) / 2); l++) {
newImgMin(k, l) = (1./(w[i]*w[i])) * sum;
}
}
}
// Display images for max and min // Display images for max and min
CImgDisplay dispMax(imgMax,"Image de Max"); CImgDisplay dispMax(imgMax,"Image de Max");
CImgDisplay dispMin(imgMin,"Image de Min"); CImgDisplay dispMin(imgMin,"Image de Min");
CImgDisplay dispEMax(newImgMax,"Image de enveloppe Max"); CImgDisplay dispEMax(newImgMax,"Image de enveloppe Max");
CImgDisplay dispEMin(newImgMin,"Image de enveloppe Min"); CImgDisplay dispEMin(newImgMin,"Image de enveloppe Min");
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Part 2: Average // // Part 2: Average //
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Calculate the Average // Calculate the Average
CImg<unsigned char> imgMoyenne(imgLena.width(), imgLena.height()); CImg<unsigned char> imgMoyenne(inputImg.width(), inputImg.height());
for (int i = 0; i<imgLena.width() ; i++) { for (int i = 0; i < inputImg.width(); i++) {
for (int j = 0; j<imgLena.height() ; j++) { for (int j = 0; j < inputImg.height(); j++) {
imgMoyenne(i,j) = (newImgMin(i,j) + newImgMax(i,j)) /2; imgMoyenne(i, j) = (newImgMin(i, j) + newImgMax(i, j)) /2;
} }
} }
#ifdef DEBUG
printf("- Average\n");
for (int i = 0; i < imgMoyenne.width(); i++) {
for (int j = 0; j < imgMoyenne.height(); j++) {
printf("%d ", imgMoyenne(i, j));
}
printf("\n");
}
#endif
CImgDisplay dispMoyenne(imgMoyenne,"Image Moyenne"); CImgDisplay dispMoyenne(imgMoyenne,"Image Moyenne");
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Partie 3: Deletion // // Partie 3: Deletion //
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
CImg<unsigned char> imgFin = imgLena - imgMoyenne; CImg<unsigned char> imgFin(inputImg - imgMoyenne);
CImgDisplay dispFin(imgFin,"Image Finale"); CImgDisplay dispFin(imgFin,"Image Finale");
while (!dispBase.is_closed()) { while (!dispBase.is_closed()) {
@ -262,4 +334,4 @@ int main()
} }
return 0; return 0;
} }