segmentation / netmets

Commit 35c77a3e8d506f6348b97ae965c3c124c05413cf

Authored by David Mayerich
1 parent df7df5b0

updated netmets to work with the new cylinder class

Showing 3 changed files with 2 additions and 50 deletions   Show diff stats
Inline Side-by-side
FindANN.cmake deleted
View file @df7df5b
1 -# - Try to find ANN  
2 -# Once done this will define  
3 -#  
4 -# ANN_FOUND - system has ANN  
5 -# ANN_INCLUDE_DIR - the ANN include directory  
6 -# ANN_LIBRARY - Link these to use ANN  
7 -#  
8 -  
9 -IF (ANN_INCLUDE_DIRS)  
10 - # Already in cache, be silent  
11 - SET(ANN_FIND_QUIETLY TRUE)  
12 -ENDIF (ANN_INCLUDE_DIRS)  
13 -  
14 -FIND_PATH( ANN_INCLUDE_DIR ANN/ANN.h  
15 - PATHS "/usr/include" "C:/libs/ANN/include")  
16 -  
17 -if( WIN32 )  
18 -  
19 - set(ANN_LIBRARY $ENV{ANN_PATH}\\ANN.lib)  
20 - set(ANN_INCLUDE_DIR $ENV{ANN_PATH})  
21 -  
22 -  
23 -  
24 -  
25 - # Store the library dir. May be used for linking to dll!  
26 - # GET_FILENAME_COMPONENT( ANN_LIBRARY_DIR ${ANN_LIBRARY} PATH )  
27 -  
28 - find_package_handle_standard_args(ANN DEFAULT_MSG ANN_INCLUDE_DIR)  
29 -  
30 -else (WIN32)  
31 -  
32 - FIND_LIBRARY( ANN_LIBRARY  
33 - NAMES ann ANN  
34 - PATHS /lib /usr/lib /usr/lib64 /usr/local/lib )  
35 -  
36 -endif( WIN32)  
37 -  
38 -  
39 -IF (ANN_INCLUDE_DIR AND ANN_LIBRARY)  
40 - SET(ANN_FOUND TRUE)  
41 -ELSE (ANN_INCLUDE_DIR AND ANN_LIBRARY)  
42 - SET( ANN_FOUND FALSE )  
43 -ENDIF (ANN_INCLUDE_DIR AND ANN_LIBRARY)  
44 -  
@@ -55,16 +55,12 @@ if (WIN32) @@ -55,16 +55,12 @@ if (WIN32)
55 55
56 NO_DEFAULT_PATH 56 NO_DEFAULT_PATH
57 ) 57 )
58 - message("GLUT 64-bit detected:")  
59 - message(${GLUT_glut_LIBRARY})  
60 else( CMAKE_SIZEOF_VOID_P EQUAL 8 ) 58 else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
61 find_library( GLUT_glut_LIBRARY NAMES glut glut32 freeglut 59 find_library( GLUT_glut_LIBRARY NAMES glut glut32 freeglut
62 PATHS 60 PATHS
63 ${OPENGL_LIBRARY_DIR} 61 ${OPENGL_LIBRARY_DIR}
64 $ENV{GLUT_ROOT_PATH}/lib 62 $ENV{GLUT_ROOT_PATH}/lib
65 ) 63 )
66 - message("GLUT 32-bit detected")  
67 -  
68 endif( CMAKE_SIZEOF_VOID_P EQUAL 8 ) 64 endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
69 65
70 else () 66 else ()
@@ -222,8 +222,8 @@ void compare(float sigma, int device){ @@ -222,8 +222,8 @@ void compare(float sigma, int device){
222 T = T.compare(GT, sigma, device); //compare the test case to the ground truth - store errors in T 222 T = T.compare(GT, sigma, device); //compare the test case to the ground truth - store errors in T
223 223
224 //calculate the metrics 224 //calculate the metrics
225 - float FPR = GT.average(1); //calculate the metrics  
226 - float FNR = T.average(1); 225 + float FPR = GT.average(0); //calculate the metrics
  226 + float FNR = T.average(0);
227 227
228 std::cout << "FNR: " << FPR << std::endl; //print false alarms and misses 228 std::cout << "FNR: " << FPR << std::endl; //print false alarms and misses
229 std::cout << "FPR: " << FNR << std::endl; 229 std::cout << "FPR: " << FNR << std::endl;