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

Added some improvements

Browse Source
This commit is contained in:
William DURAND 2011-12-12 12:01:38 +01:00
parent b3497eac20
commit f3b20c5f0b
2 changed files with 61 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -19,7 +19,7 @@ debug: CFLAGS += -DDEBUG
debug: LFLAGS += -DDEBUG debug: LFLAGS += -DDEBUG
debug: $(EXEC) debug: $(EXEC)
clean: clean: clear
rm -f $(OBJETS) rm -f $(OBJETS)
clear: clear:
rm -f $(EXEC) rm -f $(EXEC)

86
main.cpp
View File

@ -17,17 +17,29 @@
using namespace cimg_library; 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 - ((w - 1) / 2); i < startedX + ((w + 1) / 2); i++) {
for(int j = startedY; j < startedY + w; j++) { for(int j = startedY - ((w - 1) / 2) ; j < startedY + ((w + 1) / 2); j++) {
res = img(i,j); if( (i >= 0 && i < img.width()) && (j >= 0 && j < img.height()) ) {
res += img(i,j);
}
} }
} }
return res; return res;
} }
void ShowMatrix(CImg<unsigned char> 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
*******************************************************************************/ *******************************************************************************/
@ -60,11 +72,11 @@ int main()
#endif #endif
std::vector<Euclidean> vectEMax, vectEMin; std::vector<Euclidean> vectEMax, vectEMin;
std::vector<int> w;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Part 1: Finding minimas and maximas // // Part 1: Finding minimas and maximas //
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
CImg<unsigned char> imgMax(inputImg.channel(0)); CImg<unsigned char> imgMax(inputImg.channel(0));
CImg<unsigned char> imgMin(inputImg.channel(0)); CImg<unsigned char> imgMin(inputImg.channel(0));
@ -89,9 +101,9 @@ int main()
for (int l = j; l<j+3 ; l++) { for (int l = j; l<j+3 ; l++) {
// Max // Max
if ((imgMax(k,l) <= max)&&(l!=ymax &&k!=xmax)) { if ((imgMax(k,l) <= max) && (l!=ymax || k!=xmax)) {
imgMax(k,l) = 0; imgMax(k,l) = 0;
} else { } else if (l!=ymax || k!=xmax) {
max = imgMax(k,l); max = imgMax(k,l);
imgMax(xmax,ymax) = 0; imgMax(xmax,ymax) = 0;
xmax = k; xmax = k;
@ -102,9 +114,9 @@ int main()
} }
// Min // Min
if ((imgMin(k,l) >= min)&&(l!=ymin &&k!=xmin)) { if ((imgMin(k,l) >= min) && (l!=ymin || k!=xmin)) {
imgMin(k,l) = 0; imgMin(k,l) = 0;
} else { } else if (l!=ymax || k!=xmax) {
min = imgMin(k,l); min = imgMin(k,l);
imgMin(xmin,ymin) = 0; imgMin(xmin,ymin) = 0;
xmin = k; xmin = k;
@ -176,6 +188,9 @@ int main()
} }
} }
int wmax = 0;
std::vector<int> w;
// Calculate the windows sizes // Calculate the windows sizes
for(unsigned int i = 0; i < vectEMin.size(); i++) { for(unsigned int i = 0; i < vectEMin.size(); i++) {
double d1 = MIN(vectEMax[i].getDistance(), vectEMin[i].getDistance()); double d1 = MIN(vectEMax[i].getDistance(), vectEMin[i].getDistance());
@ -184,7 +199,13 @@ int main()
double d4 = MAX(vectEMax[i].getDistance(), vectEMin[i].getDistance()); double d4 = MAX(vectEMax[i].getDistance(), vectEMin[i].getDistance());
int wi = (int)ceil(MIN(MIN(d1, d2), MIN(d3, d4))); int wi = (int)ceil(MIN(MIN(d1, d2), MIN(d3, d4)));
wi = wi % 2 ? wi + 1 : wi; if(wi%2 == 0)
{
wi++;
}
if(wi > wmax) {
wmax=wi;
}
w.push_back(wi); w.push_back(wi);
} }
@ -193,52 +214,52 @@ int main()
// Order filters with source image // Order filters with source image
std::vector<unsigned char> vectFilterMax, vectFilterMin; std::vector<unsigned char> vectFilterMax, vectFilterMin;
for(unsigned int i = 0; i < vectEMax.size(); i++) { for(int unsigned i = 0; i < vectEMax.size(); i++) {
unsigned char max = 0; unsigned char max = 0;
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++) {
if( (k>=0 && k<imgSource.width()) && (l>=0 && l<imgSource.height()) ) {
if (imgSource(k, l) > max) { if (imgSource(k, l) > max) {
max = imgSource(k, l); max = imgSource(k, l);
} }
} }
} }
}
vectFilterMax.push_back(max); vectFilterMax.push_back(max);
} }
for(unsigned int i = 0; i < vectEMin.size(); i++) { for(int unsigned i = 0; i < vectEMin.size(); i++) {
unsigned char min = 199; unsigned char min = 255;
for (int k = vectEMin[i].getX() - ((w[i] - 1) / 2); k < vectEMin[i].getX() + ((w[i] + 1) / 2); k++) { 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++) { for (int l = vectEMin[i].getY() - ((w[i] - 1) / 2); l < vectEMin[i].getY() + ((w[i] + 1) / 2); l++) {
if( (k>=0 && k<imgSource.width()) && (l>=0 && l<imgSource.height()) ) {
if (imgSource(k, l) < min) { if (imgSource(k, l) < min) {
min = imgSource(k, l); min = imgSource(k, l);
} }
} }
} }
}
vectFilterMin.push_back(min); vectFilterMin.push_back(min);
} }
CImg<unsigned char> newImgMax(imgMax.width(), imgMax.height()); CImg<unsigned char> newImgMax(imgMax.width(), imgMax.height());
// Calculate the upper envelope // Calculate the upper envelope
for(unsigned int i = 0; i < vectEMax.size(); i++) { for(int unsigned i = 0; i < vectEMax.size(); 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++) {
if( (k == vectEMax[i].getX() && l == vectEMax[i].getY()) || imgMax(k, l) == 0 ) { if( (k>=0 && k<imgSource.width()) && (l>=0 && l<imgSource.height()) ) {
imgMax(k, l) = vectFilterMax[i]; imgMax(k, l) = vectFilterMax[i];
} }
else {
imgMax(k, l) = (imgMax(k, l) + vectFilterMax[i]) / 2;
}
} }
} }
} }
// Smooth of the upper envelope // Smooth of the upper envelope
for(unsigned int i = 0; i < vectEMax.size(); i++) { for (int k = 0; k < imgSource.width(); k++) {
double sum = Sum(imgMax, vectEMax[i].getX() - ((w[i] + 1) / 2), vectEMax[i].getY() - ((w[i] + 1) / 2), w[i]); for (int l = 0; l < imgSource.height(); l++) {
for (int k = vectEMax[i].getX() - ((w[i] - 1) / 2); k < vectEMax[i].getX() + ((w[i] + 1) / 2); k++) { if( (k>=0 && k<imgSource.width()) && (l>=0 && l<imgSource.height()) ) {
for (int l = vectEMax[i].getY() - ((w[i] - 1) / 2); l < vectEMax[i].getY() + ((w[i] + 1) / 2); l++) { newImgMax(k, l) = (int)Sum(imgMax, k, l,wmax)/(wmax*wmax);
newImgMax(k, l) = (1./(w[i]*w[i])) * sum;
} }
} }
} }
@ -246,25 +267,21 @@ int main()
CImg<unsigned char> newImgMin(imgMin.width(), imgMin.height()); CImg<unsigned char> newImgMin(imgMin.width(), imgMin.height());
// Calculate the lower envelope // Calculate the lower envelope
for(unsigned int i = 0; i < vectEMin.size(); i++) { for(int unsigned i = 0; i < vectEMin.size(); i++) {
for (int k = vectEMin[i].getX() - ((w[i] - 1) / 2); k < vectEMin[i].getX() + ((w[i] + 1) / 2); k++) { 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++) { for (int l = vectEMin[i].getY() - ((w[i] - 1) / 2); l < vectEMin[i].getY() + ((w[i] + 1) / 2); l++) {
if( (k == vectEMin[i].getX() && l == vectEMin[i].getY()) || imgMin(k, l) == 0 ) { if( (k>=0 && k<imgSource.width()) && (l>=0 && l<imgSource.height()) ) {
imgMin(k, l) = vectFilterMin[i]; imgMin(k, l) = vectFilterMin[i];
} }
else {
imgMin(k, l) = (imgMin(k, l) + vectFilterMin[i]) / 2;
}
} }
} }
} }
// Smooth of the lower envelope // Smooth of the lower envelope
for(unsigned int i = 0; i < vectEMax.size(); i++) { for (int k = 0; k < imgSource.width(); k++) {
double sum = Sum(imgMin, vectEMin[i].getX() - ((w[i] + 1) / 2), vectEMin[i].getY() - ((w[i] + 1) / 2), w[i]); for (int l = 0; l < imgSource.height(); l++) {
for (int k = vectEMin[i].getX() - ((w[i] - 1) / 2); k < vectEMin[i].getX() + ((w[i] + 1) / 2); k++) { if( (k>=0 && k<imgSource.width()) && (l>=0 && l<imgSource.height()) ) {
for (int l = vectEMin[i].getY() - ((w[i] - 1) / 2); l < vectEMin[i].getY() + ((w[i] + 1) / 2); l++) { newImgMin(k, l) = (int)Sum(imgMin, k, l,wmax)/(wmax*wmax);
newImgMin(k, l) = (1./(w[i]*w[i])) * sum;
} }
} }
} }
@ -325,6 +342,7 @@ int main()
// Partie 3: Deletion // // Partie 3: Deletion //
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#ifndef DEBUG #ifndef DEBUG
CImg<unsigned char> imgFin(inputImg - imgMoyenne); CImg<unsigned char> imgFin(inputImg - imgMoyenne);
CImgDisplay dispFin(imgFin,"Image Finale"); CImgDisplay dispFin(imgFin,"Image Finale");