Skip to content
Snippets Groups Projects
Commit 9b4b7cfa authored by Tanguy Raufflet's avatar Tanguy Raufflet
Browse files

Quantification sur les doubles : Lloyd-Max OK

parent 527efd1b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/Operations/Quantification.cpp
+ 37
− 37
View file @ 9b4b7cfa
...@@ -103,11 +103,11 @@ Quantification Quantification::linearQuant(int size, int threshold_a, int thresh ...@@ -103,11 +103,11 @@ Quantification Quantification::linearQuant(int size, int threshold_a, int thresh
Quantification quant(size, threshold_a, threshold_b); Quantification quant(size, threshold_a, threshold_b);
for(int i = 0; i < size - 1; ++i) { for(int i = 0; i < size - 1; ++i) {
quant._threshold[i] = (int) round((float)((threshold_b-threshold_a)*(i+1))/(float)size)+threshold_a; quant._threshold[i] = (int) floor((float)((threshold_b-threshold_a+1)*(i+1))/(float)size + 0.5)+threshold_a;
} }
if(size > 0) { if(size > 0) {
quant._values[0] = floor( (threshold_a + quant._threshold[0])/ 2.); quant._values[0] = floor( (threshold_a + quant._threshold[0])/ 2.);
quant._values[size - 1] = floor( ((float)threshold_b + (float)quant._threshold[size - 2]) / 2. ); quant._values[size - 1] = floor( ((float)threshold_b + 1 + (float)quant._threshold[size - 2]) / 2.);
} }
for(int i = 1; i < size - 1; ++i) { for(int i = 1; i < size - 1; ++i) {
quant._values[i] = floor( (double)(quant._threshold[i] + quant._threshold[i-1]) / 2.); quant._values[i] = floor( (double)(quant._threshold[i] + quant._threshold[i-1]) / 2.);
...@@ -160,7 +160,7 @@ Quantification Quantification::nonLinearQuant(int size, int threshold_a, int thr ...@@ -160,7 +160,7 @@ Quantification Quantification::nonLinearQuant(int size, int threshold_a, int thr
if(size > 0) { if(size > 0) {
quant._values[0] = floor((threshold_a + quant._threshold[0]) / 2.); quant._values[0] = floor((threshold_a + quant._threshold[0]) / 2.);
quant._values[size - 1] = floor(((float) threshold_b + (float) quant._threshold[size - 2]) / 2.); quant._values[size - 1] = round(((float) threshold_b + (float) quant._threshold[size - 2]) / 2.);
} }
for(int i = 1; i < size - 1; ++i) { for(int i = 1; i < size - 1; ++i) {
quant._values[i] = floor( (double)(quant._threshold[i] + quant._threshold[i-1]) / 2.); quant._values[i] = floor( (double)(quant._threshold[i] + quant._threshold[i-1]) / 2.);
...@@ -193,35 +193,35 @@ Quantification Quantification::nonLinearQuantOptimized(int size, int threshold_a ...@@ -193,35 +193,35 @@ Quantification Quantification::nonLinearQuantOptimized(int size, int threshold_a
double som_lum = 0; double som_lum = 0;
int nb_points = 0; int nb_points = 0;
for (int j = 0; j < quant._threshold[0]; j++) { for (int j = threshold_a; j < quant._threshold[0]; j++) {
som_lum += histogram[j] * j; som_lum += histogram[j] * (j-threshold_a);
nb_points += histogram[j]; nb_points += histogram[j];
} }
if (nb_points > 0) quant._values[0] = (int) (som_lum / nb_points); if (nb_points > 0) quant._values[0] = (int) (som_lum / nb_points)+threshold_a;
else quant._values[0] = quant._threshold[0] / 2; else quant._values[0] = (quant._threshold[0]+threshold_a) / 2;
for (int j = 1; j < size - 1; j++) { for (int j = 1; j < size - 1; j++) {
som_lum = 0; som_lum = 0;
nb_points = 0; nb_points = 0;
//Calcul des baricentres entre deux seuils //Calcul des baricentres entre deux seuils
for (int i = ((quant._threshold)[j - 1]); i <= ((quant._threshold)[j]); i++) { for (int i = ((quant._threshold)[j - 1]); i <= ((quant._threshold)[j]); i++) {
som_lum += histogram[i] * i; som_lum += histogram[i] * (i-threshold_a);
nb_points += histogram[i]; nb_points += histogram[i];
} }
//Evite les divisions par 0. On estime que s'il n'y a pas d'élements le baricentre est le milieu du segment //Evite les divisions par 0. On estime que s'il n'y a pas d'élements le baricentre est le milieu du segment
if (nb_points > 0) quant._values[j] = (int) (som_lum / nb_points); if (nb_points > 0) quant._values[j] = (int) (som_lum / nb_points)+threshold_a;
else quant._values[j] = (quant._threshold[j] + quant._threshold[j + 1]) / 2; else quant._values[j] = (quant._threshold[j] + quant._threshold[j + 1]) / 2;
} }
som_lum = 0; som_lum = 0;
nb_points = 0; nb_points = 0;
for (int j = quant._threshold[size - 2]; j < N_MAX_THRESHOLD; ++j) { for (int j = quant._threshold[size - 2]; j < threshold_b+1; ++j) {
som_lum += histogram[j] * j; som_lum += histogram[j] * (j-threshold_a);
nb_points += histogram[j]; nb_points += histogram[j];
} }
if (nb_points > 0) quant._values[size - 1] = (som_lum / nb_points); if (nb_points > 0) quant._values[size - 1] = (som_lum / nb_points)+threshold_a;
else quant._values[size - 1] = (quant._threshold[size - 2] + N_MAX_THRESHOLD) / 2; else quant._values[size - 1] = (quant._threshold[size - 2] + threshold_b+1) / 2;
} }
else if(currentWnd->isDouble()){ else if(currentWnd->isDouble()){
...@@ -267,12 +267,12 @@ Quantification Quantification::nonLinearQuantOptimized(int size, int threshold_a ...@@ -267,12 +267,12 @@ Quantification Quantification::nonLinearQuantOptimized(int size, int threshold_a
som_lum = 0; som_lum = 0;
nb_points = 0; nb_points = 0;
for (int j = quant._threshold[size - 2]; j < threshold_b; ++j) { for (int j = quant._threshold[size - 2]; j < threshold_b+1; ++j) {
som_lum += histogram[j] * (j-threshold_a); som_lum += histogram[j] * (j-threshold_a);
nb_points += histogram[j]; nb_points += histogram[j];
} }
if (nb_points > 0) quant._values[size - 1] = (som_lum / nb_points)+threshold_a; if (nb_points > 0) quant._values[size - 1] = (som_lum / nb_points)+threshold_a;
else quant._values[size - 1] = (quant._threshold[size - 2] + threshold_b) / 2; else quant._values[size - 1] = (quant._threshold[size - 2] + threshold_b+1) / 2;
} }
...@@ -282,7 +282,7 @@ Quantification Quantification::nonLinearQuantOptimized(int size, int threshold_a ...@@ -282,7 +282,7 @@ Quantification Quantification::nonLinearQuantOptimized(int size, int threshold_a
Quantification Quantification::lloydMaxQuant(int size, int threshold_a, int threshold_b, const genericinterface::ImageWindow *currentWnd, unsigned int c) { Quantification Quantification::lloydMaxQuant(int size, int threshold_a, int threshold_b, const genericinterface::ImageWindow *currentWnd, unsigned int c) {
if(currentWnd->isStandard()) { if(currentWnd->isStandard()) {
const auto *wnd = dynamic_cast<const genericinterface::DoubleImageWindow *>(currentWnd); const auto *wnd = dynamic_cast<const genericinterface::StandardImageWindow *>(currentWnd);
Histogram histogram = wnd->getImage()->getHistogram(c); Histogram histogram = wnd->getImage()->getHistogram(c);
int som_lum = 0; int som_lum = 0;
...@@ -292,7 +292,7 @@ Quantification Quantification::lloydMaxQuant(int size, int threshold_a, int thre ...@@ -292,7 +292,7 @@ Quantification Quantification::lloydMaxQuant(int size, int threshold_a, int thre
int diff_mean = 100; int diff_mean = 100;
// initialisation : repartion lineaire des niveaux de quantification // initialisation : repartion lineaire des niveaux de quantification
Quantification quant = linearQuant(size, threshold_a, threshold_b); Quantification quant = linearQuant(size, threshold_a, threshold_b);
printf("\n%d\n",quant._values[size-1]);
while (cpt > 0 && diff_mean >= 1) { while (cpt > 0 && diff_mean >= 1) {
// calcul des nouveaux seuils de quantification // calcul des nouveaux seuils de quantification
for (int i = 0; i < size - 1; i++) { for (int i = 0; i < size - 1; i++) {
...@@ -308,24 +308,24 @@ Quantification Quantification::lloydMaxQuant(int size, int threshold_a, int thre ...@@ -308,24 +308,24 @@ Quantification Quantification::lloydMaxQuant(int size, int threshold_a, int thre
// Premier niveau baricentre entre 0 et le premier seuil // Premier niveau baricentre entre 0 et le premier seuil
som_lum = 0; som_lum = 0;
nb_points = 0; nb_points = 0;
for (int j = 0; j < quant._threshold[0]; j++) { for (int j = threshold_a; j < quant._threshold[0]; j++) {
som_lum += histogram[j] * j; som_lum += histogram[j] * (j-threshold_a);
nb_points += histogram[j]; nb_points += histogram[j];
} }
if (nb_points > 0) quant._values[0] = (int) (som_lum / nb_points); if (nb_points > 0) quant._values[0] = (int) (som_lum / nb_points) + threshold_a;
else quant._values[0] = quant._threshold[0] / 2; else quant._values[0] = (quant._threshold[0]+threshold_a) / 2;
for (int j = 1; j < size - 1; j++) { for (int j = 1; j < size - 1; j++) {
som_lum = 0; som_lum = 0;
nb_points = 0; nb_points = 0;
//Calcul des baricentres entre deux seuils //Calcul des baricentres entre deux seuils
for (int i = ((quant._threshold)[j - 1]); i <= ((quant._threshold)[j]); i++) { for (int i = ((quant._threshold)[j - 1]); i <= ((quant._threshold)[j]); i++) {
som_lum += histogram[i] * i; som_lum += histogram[i] * (i-threshold_a);
nb_points += histogram[i]; nb_points += histogram[i];
} }
//Evite les divisions par 0. On estime que s'il n'y a pas d'élements le baricentre est le milieu du segment //Evite les divisions par 0. On estime que s'il n'y a pas d'élements le baricentre est le milieu du segment
if (nb_points > 0) quant._values[j] = (int) (som_lum / nb_points); if (nb_points > 0) quant._values[j] = (int) (som_lum / nb_points)+threshold_a;
else quant._values[j] = (quant._threshold[j] + quant._threshold[j + 1]) / 2; else quant._values[j] = (quant._threshold[j] + quant._threshold[j + 1]) / 2;
} }
...@@ -333,13 +333,13 @@ Quantification Quantification::lloydMaxQuant(int size, int threshold_a, int thre ...@@ -333,13 +333,13 @@ Quantification Quantification::lloydMaxQuant(int size, int threshold_a, int thre
// Dernier niveau baricentre entre le max et le dernier seuil // Dernier niveau baricentre entre le max et le dernier seuil
som_lum = 0; som_lum = 0;
nb_points = 0; nb_points = 0;
for (int j = quant._threshold[size - 2]; j < N_MAX_THRESHOLD; j++) { for (int j = quant._threshold[size - 2]; j < threshold_b+1; j++) {
som_lum += histogram[j] * j; som_lum += histogram[j] * (j-threshold_a);
nb_points += histogram[j]; nb_points += histogram[j];
} }
if (nb_points > 0) quant._values[size - 1] = (som_lum / nb_points); if (nb_points > 0) quant._values[size - 1] = (int)(som_lum / nb_points)+threshold_a;
else quant._values[size - 1] = (quant._threshold[size - 2] + N_MAX_THRESHOLD) / 2; else quant._values[size - 1] = (quant._threshold[size - 2] + threshold_b + 1) / 2;
//calcul de la condition d'arret (moyenne des écarts < 1 ) //calcul de la condition d'arret (moyenne des écarts < 1 )
for (int i = 0; i < size - 1; i++) { for (int i = 0; i < size - 1; i++) {
...@@ -378,24 +378,24 @@ Quantification Quantification::lloydMaxQuant(int size, int threshold_a, int thre ...@@ -378,24 +378,24 @@ Quantification Quantification::lloydMaxQuant(int size, int threshold_a, int thre
// Premier niveau baricentre entre 0 et le premier seuil // Premier niveau baricentre entre 0 et le premier seuil
som_lum = 0; som_lum = 0;
nb_points = 0; nb_points = 0;
for (int j = 0; j < quant._threshold[0]; j++) { for (int j = threshold_a; j < quant._threshold[0]; j++) {
som_lum += histogram[j] * j; som_lum += histogram[j] * (j-threshold_a);
nb_points += histogram[j]; nb_points += histogram[j];
} }
if (nb_points > 0) quant._values[0] = (int) (som_lum / nb_points); if (nb_points > 0) quant._values[0] = (int) (som_lum / nb_points) + threshold_a;
else quant._values[0] = quant._threshold[0] / 2; else quant._values[0] = (quant._threshold[0]+threshold_a) / 2;
for (int j = 1; j < size - 1; j++) { for (int j = 1; j < size - 1; j++) {
som_lum = 0; som_lum = 0;
nb_points = 0; nb_points = 0;
//Calcul des baricentres entre deux seuils //Calcul des baricentres entre deux seuils
for (int i = ((quant._threshold)[j - 1]); i <= ((quant._threshold)[j]); i++) { for (int i = ((quant._threshold)[j - 1]); i <= ((quant._threshold)[j]); i++) {
som_lum += histogram[i] * i; som_lum += histogram[i] * (i-threshold_a);
nb_points += histogram[i]; nb_points += histogram[i];
} }
//Evite les divisions par 0. On estime que s'il n'y a pas d'élements le baricentre est le milieu du segment //Evite les divisions par 0. On estime que s'il n'y a pas d'élements le baricentre est le milieu du segment
if (nb_points > 0) quant._values[j] = (int) (som_lum / nb_points); if (nb_points > 0) quant._values[j] = (int) (som_lum / nb_points)+threshold_a;
else quant._values[j] = (quant._threshold[j] + quant._threshold[j + 1]) / 2; else quant._values[j] = (quant._threshold[j] + quant._threshold[j + 1]) / 2;
} }
...@@ -403,13 +403,13 @@ Quantification Quantification::lloydMaxQuant(int size, int threshold_a, int thre ...@@ -403,13 +403,13 @@ Quantification Quantification::lloydMaxQuant(int size, int threshold_a, int thre
// Dernier niveau baricentre entre le max et le dernier seuil // Dernier niveau baricentre entre le max et le dernier seuil
som_lum = 0; som_lum = 0;
nb_points = 0; nb_points = 0;
for (int j = quant._threshold[size - 2]; j < N_MAX_THRESHOLD; j++) { for (int j = quant._threshold[size - 2]; j < threshold_b+1; j++) {
som_lum += histogram[j] * j; som_lum += histogram[j] * (j-threshold_a);
nb_points += histogram[j]; nb_points += histogram[j];
} }
if (nb_points > 0) quant._values[size - 1] = (som_lum / nb_points); if (nb_points > 0) quant._values[size - 1] = (som_lum / nb_points)+threshold_a;
else quant._values[size - 1] = (quant._threshold[size - 2] + N_MAX_THRESHOLD) / 2; else quant._values[size - 1] = (quant._threshold[size - 2] + threshold_b+1) / 2;
//calcul de la condition d'arret (moyenne des écarts < 1 ) //calcul de la condition d'arret (moyenne des écarts < 1 )
for (int i = 0; i < size - 1; i++) { for (int i = 0; i < size - 1; i++) {
......
app/Operations/Quantification.h
+ 1
− 0
View file @ 9b4b7cfa
...@@ -47,6 +47,7 @@ public: ...@@ -47,6 +47,7 @@ public:
inline void setQuantificationInterval(int a, int b){threshold_a = a; threshold_b = b;} inline void setQuantificationInterval(int a, int b){threshold_a = a; threshold_b = b;}
inline int QuantificationIntervalThreshold_a() const {return threshold_a;} inline int QuantificationIntervalThreshold_a() const {return threshold_a;}
inline int QuantificationIntervalThreshold_b() const {return threshold_b;}
inline int threshold(int i) const {return _threshold[i];} inline int threshold(int i) const {return _threshold[i];}
inline void setThreshold(int i, int v) {_threshold[i] = v;} inline void setThreshold(int i, int v) {_threshold[i] = v;}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment