[kimageprocess-devel] kimageprocess/src/libkimageprocess ktcalculation.cpp

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

Update of /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25599/src/libkimageprocess

Modified Files:
	ktcalculation.cpp 
Log Message:
- normalize values between 0 and 1
- invert calculation order
- fix image iterator


Index: ktcalculation.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktcalculation.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ktcalculation.cpp	23 Jun 2005 23:19:41 -0000	1.3
+++ ktcalculation.cpp	25 Jun 2005 21:12:32 -0000	1.4
@@ -78,7 +78,8 @@
     
     int imgClass = 1;
     KTImage *it;
-    for ( it = KTImageManager::self()->sampleImages().first(); it; it = KTImageManager::self()->sampleImages().next())
+    KTImageList list = KTImageManager::self()->sampleImages();
+    for ( it = list.first(); it; it = list.next())
         generateWindowResults(it, imgClass++);
    
     //normalize
@@ -92,7 +93,7 @@
     {
         for ( int i=0; i < m_inputs; ++i )
         {
-            (*it).inputs[i] = ((*it).inputs[i] - m_min[i]) * 100 / dif[i];
+            (*it).inputs[i] = ((*it).inputs[i] - m_min[i]) * 1/*100*/ / dif[i];
         }
     }
 
@@ -140,7 +141,7 @@
     {
         for ( int i=0; i < m_inputs; ++i )
         {
-            (*it).inputs[i] = ((*it).inputs[i] - m_min[i]) * 100 / dif[i];
+            (*it).inputs[i] = ((*it).inputs[i] - m_min[i]) * 1/*100*/ / dif[i];
         }
     }
     
@@ -243,9 +244,9 @@
                 // Generate the pattern for Testing Image
                 int width = img->width();
                 int height = img->height();
-                for (y = 0; y < height; y++)
+                for (x = 0; x < width; x++)
                 {
-                    for (x = 0; x < width; x++)
+                    for (y = 0; y < height; y++)
                     {
                         int startx, starty;