[Robotflow-cvs] RobotFlow/Vision/src CvBiModalTest.cc,1.2,1.3

[Dominic L. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Vision/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18651

Modified Files:
	CvBiModalTest.cc 
Log Message:
looking at stddev

Index: CvBiModalTest.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/CvBiModalTest.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CvBiModalTest.cc	17 May 2005 14:54:29 -0000	1.2
--- CvBiModalTest.cc	17 May 2005 18:18:28 -0000	1.3
***************
*** 6,16 ****
  #include "Image.h"
  #include "highgui.h"
! 
! #include <cstdio>
! #include <cstdlib>
! #include <image.h>
! #include <misc.h>
! #include <pnmfile.h>
! #include "segment-image.h"
  #include <math.h>
  #include <sys/timeb.h>
--- 6,11 ----
  #include "Image.h"
  #include "highgui.h"
! #include <stdio.h>
! #include <stdlib.h>
  #include <math.h>
  #include <sys/timeb.h>
***************
*** 247,253 ****
        }
  
!       if (mean_dist > min_dist /*&&
! 	  std1sum < std_max &&
! 	  std2sum < std_max */ ) {
  	bimodal = true;
        }
--- 242,255 ----
        }
  
!       
! 
!       //TEST CONDITIONS
!       if (mean_dist > min_dist &&
! 	  (stddev1.val[0] < mean_dist / std_max) &&
! 	  (stddev1.val[1] < mean_dist / std_max) &&
! 	  (stddev1.val[2] < mean_dist / std_max) &&
! 	  (stddev2.val[0] < mean_dist / std_max) &&
! 	  (stddev2.val[1] < mean_dist / std_max) &&
! 	  (stddev2.val[2] < mean_dist / std_max)) {
  	bimodal = true;
        }
***************
*** 340,343 ****
--- 342,346 ----
  
  	cvReleaseMemStorage(&storage);
+ 	
  
  	ftime(&t2);