[Wavelet-commit] Wavelet/WTools ImageComparison.hh,1.7,1.8

[Herbert M. D. <he...@us...>]

Update of /cvsroot/wavelet/Wavelet/WTools
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4434/WTools

Modified Files:
	ImageComparison.hh 
Log Message:
added additional CLI tool ppmlq, added some more static methods to ImageComparison

Index: ImageComparison.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WTools/ImageComparison.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ImageComparison.hh	13 Apr 2009 19:29:38 -0000	1.7
--- ImageComparison.hh	19 Jun 2009 13:46:04 -0000	1.8
***************
*** 92,95 ****
--- 92,98 ----
     * Idea and basic algorithm from Jacobs, Finkelstein, Salesin: "Fast
     * multiresolution image querying", Proc. of SIGGRAPH, 95.
+    * Note that this method is deprecated as it does not strictly conform to
+    * the original algorithm. I propose using the static methods truncateForLq
+    * and calcLqAverageAcore, calcLqDetailScore instead.
     * @exception invalid_argument
     * image is not square
***************
*** 132,135 ****
--- 135,170 ----
  			       double percent, FilterSet &flt);
    /**
+    * Calculate an $L^q$ detail score for a greyscale image / single color
+    * channel.
+    * @param truncated1
+    * the first image already truncated (see truncateForLq)
+    * @param truncated2
+    * the second image already truncated (see truncateForLq)
+    * @param colorChannel
+    * the number of the color channel to which the two images correspond, this
+    * is important as it has an effect on the weights chosen when calculating
+    * the score
+    * @result the detail score
+    */
+   static double calcLqDetailScore (const Image &truncated1,
+ 				   const Image &truncated2,
+ 				   int colorChannel = 0);
+   /**
+    * Calculate an $L^q$ average score for a greyscale image / single color
+    * channel.
+    * @param truncated1
+    * the first image already truncated (see truncateForLq)
+    * @param truncated2
+    * the second image already truncated (see truncateForLq)
+    * @param colorChannel
+    * the number of the color channel to which the two images correspond, this
+    * is important as it has an effect on the weights chosen when calculating
+    * the score
+    * @result the average score
+    */
+   static double calcLqAverageScore (const Image &truncated1,
+ 				    const Image &truncated2,
+ 				    int colorChannel = 0);
+   /**
     * Calculates a feature vector for the $L^q$ and $L^qd$ metrics.
     * @param image