updated netmets to work with the new cylinder class

David Mayerich
1 parent df7df5b0
Showing 3 changed files with 2 additions and 50 deletions Show diff stats
FindANN.cmake
FindGLUT.cmake
main.cu
-# - Try to find ANN
-# Once done this will define
-#  
-#  ANN_FOUND        - system has ANN
-#  ANN_INCLUDE_DIR  - the ANN include directory
-#  ANN_LIBRARY      - Link these to use ANN
-#   
-
-IF (ANN_INCLUDE_DIRS)
-  # Already in cache, be silent
-  SET(ANN_FIND_QUIETLY TRUE)
-ENDIF (ANN_INCLUDE_DIRS)
-
-FIND_PATH( ANN_INCLUDE_DIR ANN/ANN.h
-           PATHS "/usr/include" "C:/libs/ANN/include")
-
-if( WIN32 )
-
-	set(ANN_LIBRARY $ENV{ANN_PATH}\\ANN.lib)
-	set(ANN_INCLUDE_DIR $ENV{ANN_PATH})
-
-	
-
-               
-	 # Store the library dir. May be used for linking to dll!
-	 # GET_FILENAME_COMPONENT( ANN_LIBRARY_DIR ${ANN_LIBRARY} PATH )
-
-	 find_package_handle_standard_args(ANN DEFAULT_MSG ANN_INCLUDE_DIR)
- 
-else (WIN32)
-
- FIND_LIBRARY( ANN_LIBRARY
-               NAMES ann ANN
-               PATHS /lib /usr/lib /usr/lib64 /usr/local/lib )
-
-endif( WIN32)
-
-
-IF (ANN_INCLUDE_DIR AND ANN_LIBRARY)
-  SET(ANN_FOUND TRUE)
-ELSE (ANN_INCLUDE_DIR AND ANN_LIBRARY)
-  SET( ANN_FOUND FALSE )
-ENDIF (ANN_INCLUDE_DIR AND ANN_LIBRARY)
-
@@ -55,16 +55,12 @@ if (WIN32)
  
       NO_DEFAULT_PATH
     )
-    message("GLUT 64-bit detected:")
-    message(${GLUT_glut_LIBRARY})
   else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
     find_library( GLUT_glut_LIBRARY NAMES glut glut32 freeglut
       PATHS
       ${OPENGL_LIBRARY_DIR}
       $ENV{GLUT_ROOT_PATH}/lib
     )
-    message("GLUT 32-bit detected")
-
   endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
  
 else ()
@@ -222,8 +222,8 @@ void compare(float sigma, int device){
     T = T.compare(GT, sigma, device);						//compare the test case to the ground truth - store errors in T
  
 	//calculate the metrics
-	float FPR = GT.average(1);						//calculate the metrics
-	float FNR = T.average(1);
+	float FPR = GT.average(0);						//calculate the metrics
+	float FNR = T.average(0);
  
 	std::cout << "FNR: " << FPR << std::endl;		//print false alarms and misses
 	std::cout << "FPR: " << FNR << std::endl;