segmentation / ivote3

Commit 305d252c1b6cbbb59822c19a71d258019da832b3

Authored by David Mayerich
1 parent 1f55a874

Win32 fixes, results aren't correct

Showing 2 changed files with 11 additions and 5 deletions   Show diff stats
Inline Side-by-side
Matlab_3D/validation.m
  Show/Hide comments   View file @305d252
@@ -14,9 +14,9 @@ vote=7; @@ -14,9 +14,9 @@ vote=7;
14 std = [5 5]; 14 std = [5 5];
15 gt_filename = 'gt-128.vol'; 15 gt_filename = 'gt-128.vol';
16 % out_filename = sprintf('128-128-128/0-nissl-std%d.%d-t0%d-r%d.%d-t%d-out%d.%d.vol',std(1), std(2),t0,r1,r2,t,itr,vote); 16 % out_filename = sprintf('128-128-128/0-nissl-std%d.%d-t0%d-r%d.%d-t%d-out%d.%d.vol',std(1), std(2),t0,r1,r2,t,itr,vote);
17 -out_filename = sprintf('D:/build/ivote3-bld/0-out.%d.vol',t); 17 +out_filename = sprintf('E:/build/ivote3-bld/0-out.%d.vol',t);
18 % txt_filename = sprintf('128-128-128/0-validation-nissl-std%d.%d-r%d.%d-t%d-out%d.%d-D%d.txt',std(1), std(2),r1,r2,t,itr,vote,D); 18 % txt_filename = sprintf('128-128-128/0-validation-nissl-std%d.%d-r%d.%d-t%d-out%d.%d-D%d.txt',std(1), std(2),r1,r2,t,itr,vote,D);
19 -txt_filename = sprintf('D:/build/ivote3-bld/0-t%d-atomic-aabb.txt',t); 19 +txt_filename = sprintf('E:/build/ivote3-bld/0-t%d-atomic-aabb.txt',t);
20 spec = sprintf('Nissl-std%d.%d-r%d.%d-t%d-out%d.%d',std(1), std(2),r1,r2,t,itr,vote); 20 spec = sprintf('Nissl-std%d.%d-r%d.%d-t%d-out%d.%d',std(1), std(2),r1,r2,t,itr,vote);
21 fid0 = fopen(gt_filename); 21 fid0 = fopen(gt_filename);
22 gt = fread(fid0,[X Y*Z], 'single'); 22 gt = fread(fid0,[X Y*Z], 'single');
cpp/CMakeLists.txt
  Show/Hide comments   View file @305d252
@@ -22,6 +22,12 @@ find_package(Threads) @@ -22,6 +22,12 @@ find_package(Threads)
22 #find the X11 package 22 #find the X11 package
23 find_package(X11) 23 find_package(X11)
24 24
  25 +#build the executable in the binary directory on MS Visual Studio
  26 +if ( MSVC )
  27 + SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${OUTPUT_DIRECTORY}")
  28 + SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${OUTPUT_DIRECTORY}")
  29 +endif ( MSVC )
  30 +
25 include_directories( 31 include_directories(
26 ${STIM_INCLUDE_DIRS} 32 ${STIM_INCLUDE_DIRS}
27 ) 33 )
@@ -49,6 +55,6 @@ target_link_libraries(ivote3 @@ -49,6 +55,6 @@ target_link_libraries(ivote3
49 ) 55 )
50 56
51 #copy an image test case 57 #copy an image test case
52 -configure_file(nissl-raw-data/nissl-float-256.256.256.vol nissl-float-256.256.256.vol COPYONLY)  
53 -configure_file(nissl-raw-data/nissl-float-128.128.128.vol nissl-float-128.128.128.vol COPYONLY)  
54 -configure_file(nissl-raw-data/nissl-float-64.64.64.vol nissl-float-64.64.64.vol COPYONLY) 58 +configure_file(nissl-raw-data/nissl-float-256.256.256.vol ${CMAKE_CURRENT_BINARY_DIR}/nissl-float-256.256.256.vol @ONLY)
  59 +configure_file(nissl-raw-data/nissl-float-128.128.128.vol ${CMAKE_CURRENT_BINARY_DIR}/nissl-float-128.128.128.vol @ONLY)
  60 +configure_file(nissl-raw-data/nissl-float-64.64.64.vol ${CMAKE_CURRENT_BINARY_DIR}/nissl-float-64.64.64.vol @ONLY)