[kimageprocess-devel] kimageprocess/src/methods/hsvcm/features/correlation correlation.cpp

[Gustavo P. B. <gb...@us...>]

Update of /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/correlation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16273/methods/hsvcm/features/correlation

Modified Files:
	correlation.cpp 
Log Message:

- Fixed progressbar stuff
- added (testing) code for progressbar


Index: correlation.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/methods/hsvcm/features/correlation/correlation.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- correlation.cpp	23 Jun 2005 18:34:06 -0000	1.8
+++ correlation.cpp	23 Jun 2005 19:39:00 -0000	1.9
@@ -82,7 +82,6 @@
                 ps[k] += value;
             }
             
-    float mult;
     // ----- V component -------------
     for (i=0; i < cmSizeV; ++i)
         meanv += pv[i]*i;
@@ -104,17 +103,18 @@
         sum_sqrs += value * (k-means) * (k-means);
     }
     
-    stddevv = sqrt(sum_sqrv);
-    stddevh = sqrt(sum_sqrh);
-    stddevs = sqrt(sum_sqrs);
+    stddevv = sum_sqrv;
+    stddevh = sum_sqrh;
+    stddevs = sum_sqrs;
     
+    float mult;
     //and now (finally) the correlation itself:
     tmp = 0;
     for (i = 0; i < cmSizeV; ++i)
         for (j = 0; j < cmSizeH; ++j)
             for (k = 0; k < cmSizeS; ++k)
             {
-                float mult = stddevv * stddevh * stddevs;
+                mult = stddevv * stddevh * stddevs;
                 if (mult == 0)
                     mult = 0.000000000001;
                 tmp += (i * j * k * cm[i][j][k] - meanv * meanh * means) / mult;