[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-serv23069

Modified Files:
	ktcalculation.cpp 
Log Message:
- Don't use normalization by default
- Normalize between -1 and 1


Index: ktcalculation.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktcalculation.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ktcalculation.cpp	7 Jul 2005 14:54:34 -0000	1.13
+++ ktcalculation.cpp	8 Jul 2005 20:03:19 -0000	1.14
@@ -43,6 +43,8 @@
     m_window_size.width = 5;
     m_window_size.height = 5;
     m_iterations = 0;
+
+    m_normalize = false;
 }
 
 KTCalculation::~KTCalculation()
@@ -237,7 +239,6 @@
         }
         m_first = false;
     }
-    else
     {
         for (int j=0; j < m_inputs; ++j)
         {
@@ -269,8 +270,9 @@
 void KTCalculation::normalize()
 {
     //the upper limit
-    float uplimit = 1000.;
-    
+    float uplimit = 1.;
+    float lowlimit = -1.;
+
     QValueList<dataEntry>::iterator end = m_data.end();
     float dif[m_inputs];
     for (int i=0; i < m_inputs; ++i)
@@ -279,7 +281,7 @@
     for (QValueList<dataEntry>::iterator it = m_data.begin(); it != end; ++it)
     {
         for ( int i=0; i < m_inputs; ++i )
-            (*it).inputs[i] = ( ((*it).inputs[i] - m_min[i]) * uplimit ) / dif[i];
+            (*it).inputs[i] = ( ((*it).inputs[i] - m_min[i]) * (uplimit-lowlimit) ) / dif[i] + lowlimit;
 
     }
 }