diff --git a/00_GT.obj b/00_GT.obj deleted file mode 100644 index 669cdff..0000000 --- a/00_GT.obj +++ /dev/null @@ -1,29 +0,0 @@ -v 99 677 -v 229 510 -v 57 347 -v 344 724 -v 581 361 -v 341 199 -v 757 377 -v 981 152 -v 793 508 -v 941 600 -v 647 738 -v 88 563 -v 181 372 -v 316 596 -v 385 425 -v 481 165 -v 574 223 -v 818 229 -v 679 601 -l 1 12 2 -l 3 13 2 -l 2 14 4 -l 2 15 5 -l 6 16 17 5 -l 5 7 -l 8 18 7 -l 7 9 -l 9 10 -l 9 19 11 diff --git a/00_T.obj b/00_T.obj deleted file mode 100644 index 3eee399..0000000 --- a/00_T.obj +++ /dev/null @@ -1,50 +0,0 @@ -v 119 675 0 -v 343 730 0 -v 59 346 0 -v 577 361 0 -v 347 199 0 -v 756 375 0 -v 588 483 0 -v 789 514 0 -v 676 603 0 -v 652 744 0 -v 933 598 0 -v 105 611 0 -v 126 537 0 -v 227 519 0 -v 294 580 0 -v 319 677 0 -v 165 366 0 -v 192 438 0 -v 234 473 0 -v 294 463 0 -v 375 428 0 -v 441 404 0 -v 510 388 0 -v 419 188 0 -v 492 174 0 -v 551 205 0 -v 567 273 0 -v 572 334 0 -v 645 365 0 -v 695 410 0 -v 633 438 0 -v 776 424 0 -v 788 467 0 -v 742 552 0 -v 702 584 0 -v 663 659 0 -v 649 720 0 -v 839 539 0 -v 882 557 0 -v 804 606 0 -l 1 12 13 14 15 16 2 -l 3 17 18 19 20 21 22 23 4 -l 5 24 25 26 27 28 4 -l 4 29 6 -l 6 30 31 7 -l 6 32 33 8 -l 8 34 35 9 -l 9 36 37 10 -l 8 38 39 11 -l 9 40 11 diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ede322..1583687 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,9 +7,6 @@ project(netMets) #set the module directory set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}") -#set up CUDA -find_package(CUDA REQUIRED) - #find the STIM library find_package(STIM REQUIRED) @@ -22,36 +19,46 @@ find_package(Threads) #find the X11 package find_package(X11) - #find the Approximate Nearest Neighbor Library find_package(ANN REQUIRED) +if ( MSVC ) + SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${OUTPUT_DIRECTORY}") + SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${OUTPUT_DIRECTORY}") +endif ( MSVC ) + include_directories( ${STIM_INCLUDE_DIRS} - ${ANN_INCLUDE_DIR} + ${ANN_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ) #Assign source files to the appropriate variables file(GLOB SRC_CPP "*.cpp") file(GLOB SRC_H "*.h") -file(GLOB SRC_CU "*.cu") -file(GLOB SRC_CUH "*.cuh") #create an executable file -cuda_add_executable(netmets - ${SRC_H} - ${SRC_CPP} - ${SRC_CU} - ${SRC_CUH} +add_executable(netmets + ${SRC_H} + ${SRC_CPP} ) #set the link libraries target_link_libraries(netmets - #${CUDA_cufft_LIBRARY} - #${CUDA_cublas_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} - ${ANN_LIBRARY} + ${ANN_LIBRARY} ${X11_LIBRARIES} ) +#set up copying data files +configure_file(data/00_GT.obj ${CMAKE_CURRENT_BINARY_DIR}/00_GT.obj @ONLY) +configure_file(data/00_T.obj ${CMAKE_CURRENT_BINARY_DIR}/00_T.obj @ONLY) +configure_file(data/01_GT.obj ${CMAKE_CURRENT_BINARY_DIR}/01_GT.obj @ONLY) +configure_file(data/01_T.obj ${CMAKE_CURRENT_BINARY_DIR}/01_T.obj @ONLY) +configure_file(data/02_GT.obj ${CMAKE_CURRENT_BINARY_DIR}/02_GT.obj @ONLY) +configure_file(data/02_T.obj ${CMAKE_CURRENT_BINARY_DIR}/02_T.obj @ONLY) +configure_file(data/03_GT.obj ${CMAKE_CURRENT_BINARY_DIR}/03_GT.obj @ONLY) +configure_file(data/03_T.obj ${CMAKE_CURRENT_BINARY_DIR}/03_T.obj @ONLY) +configure_file(data/04_GT.obj ${CMAKE_CURRENT_BINARY_DIR}/04_GT.obj @ONLY) +configure_file(data/04_Ta.obj ${CMAKE_CURRENT_BINARY_DIR}/04_Ta.obj @ONLY) +configure_file(data/04_Tb.obj ${CMAKE_CURRENT_BINARY_DIR}/04_Tb.obj @ONLY) diff --git a/data/00_GT.obj b/data/00_GT.obj new file mode 100644 index 0000000..0e66fe5 --- /dev/null +++ b/data/00_GT.obj @@ -0,0 +1,29 @@ +v 99 677 0 +v 229 510 0 +v 57 347 0 +v 344 724 0 +v 581 361 0 +v 341 199 0 +v 757 377 0 +v 981 152 0 +v 793 508 0 +v 941 600 0 +v 647 738 0 +v 88 563 0 +v 181 372 0 +v 316 596 0 +v 385 425 0 +v 481 165 0 +v 574 223 0 +v 818 229 0 +v 679 601 0 +l 1 12 2 +l 3 13 2 +l 2 14 4 +l 2 15 5 +l 6 16 17 5 +l 5 7 +l 8 18 7 +l 7 9 +l 9 10 +l 9 19 11 diff --git a/data/00_T.obj b/data/00_T.obj new file mode 100644 index 0000000..3eee399 --- /dev/null +++ b/data/00_T.obj @@ -0,0 +1,50 @@ +v 119 675 0 +v 343 730 0 +v 59 346 0 +v 577 361 0 +v 347 199 0 +v 756 375 0 +v 588 483 0 +v 789 514 0 +v 676 603 0 +v 652 744 0 +v 933 598 0 +v 105 611 0 +v 126 537 0 +v 227 519 0 +v 294 580 0 +v 319 677 0 +v 165 366 0 +v 192 438 0 +v 234 473 0 +v 294 463 0 +v 375 428 0 +v 441 404 0 +v 510 388 0 +v 419 188 0 +v 492 174 0 +v 551 205 0 +v 567 273 0 +v 572 334 0 +v 645 365 0 +v 695 410 0 +v 633 438 0 +v 776 424 0 +v 788 467 0 +v 742 552 0 +v 702 584 0 +v 663 659 0 +v 649 720 0 +v 839 539 0 +v 882 557 0 +v 804 606 0 +l 1 12 13 14 15 16 2 +l 3 17 18 19 20 21 22 23 4 +l 5 24 25 26 27 28 4 +l 4 29 6 +l 6 30 31 7 +l 6 32 33 8 +l 8 34 35 9 +l 9 36 37 10 +l 8 38 39 11 +l 9 40 11 diff --git a/data/01_GT.obj b/data/01_GT.obj new file mode 100644 index 0000000..6499cd4 --- /dev/null +++ b/data/01_GT.obj @@ -0,0 +1,9 @@ +v 291 412 0 +v 464 251 0 +v 635 405 0 +v 463 602 0 +v 635 405 0 +l 1 2 +l 2 3 +l 3 5 1 +l 3 4 diff --git a/data/01_T.obj b/data/01_T.obj new file mode 100644 index 0000000..10cc8a2 --- /dev/null +++ b/data/01_T.obj @@ -0,0 +1,18 @@ +v 292 411 0 +v 464 252 0 +v 531 312 0 +v 637 404 0 +v 537 405 0 +v 442 408 0 +v 368 409 0 +v 464 603 0 +v 531 312 0 +v 442 408 0 +l 1 2 +l 2 3 +l 3 4 +l 4 5 +l 3 9 5 +l 6 10 5 +l 1 7 +l 4 8 diff --git a/data/02_GT.obj b/data/02_GT.obj new file mode 100644 index 0000000..182e8d3 --- /dev/null +++ b/data/02_GT.obj @@ -0,0 +1,21 @@ +v 485 172 0 +v 681 360 0 +v 548 544 0 +v 300 356 0 +v 372 545 0 +v 481 378 0 +v 372 545 0 +v 481 378 0 +v 481 378 0 +v 481 378 0 +v 481 378 0 +l 1 2 +l 2 3 +l 1 4 +l 4 5 +l 5 7 3 +l 1 6 +l 6 8 3 +l 6 9 2 +l 6 10 5 +l 6 11 4 diff --git a/data/02_T.obj b/data/02_T.obj new file mode 100644 index 0000000..4b51745 --- /dev/null +++ b/data/02_T.obj @@ -0,0 +1,22 @@ +v 334 445 0 +v 370 544 0 +v 549 545 0 +v 681 360 0 +v 484 172 0 +v 469 477 0 +v 484 172 0 +v 469 477 0 +v 370 544 0 +v 549 545 0 +v 469 477 0 +v 484 172 0 +l 1 2 +l 2 3 +l 3 4 +l 4 5 +l 5 7 1 +l 6 8 1 +l 2 9 6 +l 3 10 6 +l 6 11 4 +l 5 12 6 diff --git a/data/03_GT.obj b/data/03_GT.obj new file mode 100644 index 0000000..3b968ba --- /dev/null +++ b/data/03_GT.obj @@ -0,0 +1,40 @@ +v 212 603 0 +v 365 427 0 +v 125 308 0 +v 457 253 0 +v 654 335 0 +v 578 630 0 +v 565 118 0 +v 813 145 0 +v 801 451 0 +v 949 54 0 +v 276 494 0 +v 208 348 0 +v 284 382 0 +v 404 352 0 +v 381 408 0 +v 414 444 0 +v 492 452 0 +v 554 451 0 +v 602 403 0 +v 662 429 0 +v 648 487 0 +v 617 570 0 +v 633 266 0 +v 614 219 0 +v 594 172 0 +v 705 322 0 +v 747 299 0 +v 796 243 0 +v 855 233 0 +v 825 359 0 +v 884 89 0 +l 1 11 2 +l 3 12 13 2 +l 4 14 15 2 +l 2 16 17 18 19 5 +l 5 20 21 22 6 +l 5 23 24 25 7 +l 5 26 27 28 8 +l 8 29 30 9 +l 8 31 10 diff --git a/data/03_T.obj b/data/03_T.obj new file mode 100644 index 0000000..981eaf3 --- /dev/null +++ b/data/03_T.obj @@ -0,0 +1,16 @@ +v 212 604 0 +v 123 310 0 +v 365 427 0 +v 576 631 0 +v 457 253 0 +v 563 116 0 +v 813 144 0 +v 800 450 0 +v 951 57 0 +v 800 450 0 +l 1 2 +l 3 4 +l 5 6 +l 6 7 +l 8 10 4 +l 8 9 diff --git a/data/04_GT.obj b/data/04_GT.obj new file mode 100644 index 0000000..4004b04 --- /dev/null +++ b/data/04_GT.obj @@ -0,0 +1,6 @@ +v -1 1 0 +v 1 1 0 +v -1 -1 0 +v 1 -1 0 +l 1 4 +l 2 3 diff --git a/data/04_Ta.obj b/data/04_Ta.obj new file mode 100644 index 0000000..05136e4 --- /dev/null +++ b/data/04_Ta.obj @@ -0,0 +1,3 @@ +v -1 1 0 +v 1 -1 0 +l 1 2 diff --git a/data/04_Tb.obj b/data/04_Tb.obj new file mode 100644 index 0000000..dee6951 --- /dev/null +++ b/data/04_Tb.obj @@ -0,0 +1,6 @@ +v -1 1 0 +v 0 0 0 +v 1 -1 0 +v 1 1 0 +l 1 2 3 +l 4 2 diff --git a/main.cpp b/main.cpp index 6c74f60..7858134 100644 --- a/main.cpp +++ b/main.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include @@ -13,15 +13,29 @@ network* network1; int main(int argc, char* argv[]) { - std::string groundTruth = argv[1]; + if(argc < 4){ + std::cout<<"Please specify a ground truth and test case"< GT; + GT.load_obj(argv[1]); + + std::cout< network; boost::tuple< ANNkd_tree*, ANNkd_tree*, stim::network, stim::network > networkKdtree; networkKdtree = network1->LoadNetworks(groundTruth, truthCase); - //std::cout<().edges_to_str()<().edges_to_str()<().to_obj(); //networkKdtree.get< 2>() - boost::tuple< float, float > metrics = network1->compareSkeletons(networkKdtree); + boost::tuple< float, float > metrics = network1->compareSkeletons(networkKdtree, sigma); std::cout << "False postive rate is " << metrics.get< 0>() << std::endl; std::cout << "False negative rate is " << metrics.get< 1>() << std::endl; + */ } -- libgit2 0.21.4