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

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

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

Modified Files:
	ktcalculation.cpp ktcalculation.h 
Log Message:
- Now it is possible to choose wheter to use normalization


Index: ktcalculation.h
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktcalculation.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ktcalculation.h	2 Jul 2005 23:42:52 -0000	1.7
+++ ktcalculation.h	7 Jul 2005 14:54:34 -0000	1.8
@@ -73,7 +73,9 @@
     void parseResults(const QValueList<float> &results, int sampleClass);
 
     void normalize();
-    
+    bool useNormalization() { return m_normalize; }
+    void setUseNormalization(bool use) { m_normalize = use; }
+   
 public slots:
     void calculateSampleData();
 
@@ -82,7 +84,7 @@
 signals:
     void updateProgress();
     void finished();
-    
+
 private:
     /**
      * generate and write results for the current window settings
@@ -95,6 +97,7 @@
     int m_outputs;
     bool m_first;
     bool m_testing;
+    bool m_normalize;
     QValueList<dataEntry> m_data;
     QValueVector<float> m_min;
     QValueVector<float> m_max;

Index: ktcalculation.cpp
===================================================================
RCS file: /cvsroot/kimageprocess/kimageprocess/src/libkimageprocess/ktcalculation.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ktcalculation.cpp	6 Jul 2005 01:34:43 -0000	1.12
+++ ktcalculation.cpp	7 Jul 2005 14:54:34 -0000	1.13
@@ -86,7 +86,8 @@
         generateWindowResults((*it), imgClass++);
    
     //normalize the values
-    normalize();
+    if (m_normalize)
+        normalize();
     
     KTPluginManager::self()->classifier()->doTraining(m_data, m_inputs, m_outputs);
     emit finished();
@@ -120,7 +121,8 @@
     m_window_type = winType;
      
     //normalize the values
-    normalize();
+    if (m_normalize)
+        normalize();
     
     KTPluginManager::self()->classifier()->doClassify(m_data, m_inputs, m_outputs);