From 7aacb90f511280bcb1982d2994c0e701b178869c Mon Sep 17 00:00:00 2001 From: David Mayerich Date: Wed, 19 Aug 2015 09:30:34 -0500 Subject: [PATCH] updated examples, added the correct repo location --- CMakeLists.txt | 4 ++++ data/blue_gt.txt | 418 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- main.cpp | 40 ++++++++++++++++++++-------------------- 3 files changed, 233 insertions(+), 229 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eabe14b..e389c37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,9 @@ find_package(ANN REQUIRED) #find the pthreads package find_package(Threads) +#find the X11 package +find_package(X11) + include_directories( ${STIM_INCLUDE_DIRS} ${ANN_INCLUDE_DIR} @@ -35,6 +38,7 @@ add_executable(pointmets target_link_libraries(pointmets ${CMAKE_THREAD_LIBS_INIT} ${ANN_LIBRARY} + ${X11_LIBRARIES} ) #copy an OBJ test case diff --git a/data/blue_gt.txt b/data/blue_gt.txt index 7d0c82e..a9697b8 100644 --- a/data/blue_gt.txt +++ b/data/blue_gt.txt @@ -1,210 +1,210 @@ -3 686 -19 537 -46 587 -57 785 -73 465 -99 367 -103 657 -109 1038 -115 304 -149 665 -175 984 -187 324 -191 1069 -200 628 -205 566 -218 388 -242 494 -242 633 -249 288 -249 745 -259 442 -270 193 -292 984 -297 539 -297 688 -313 463 -322 342 -329 842 -337 304 -342 407 -380 517 -382 1003 -394 306 -398 372 -400 1071 -401 658 -410 236 -419 585 -421 421 -433 101 -433 182 -433 793 -435 492 -471 341 -474 515 -479 244 -480 1012 -484 310 -485 873 -489 95 -498 174 -501 443 -501 772 -504 388 -524 338 -529 239 -531 488 -544 556 -558 411 -561 99 -562 276 -566 728 -574 624 -574 1044 -578 220 -580 146 -586 44 -605 326 -606 385 -611 536 -620 95 -625 692 -636 458 -642 213 -645 578 -650 37 -653 283 -656 735 -659 387 -669 106 -698 528 -700 460 -703 10 -708 1073 -711 382 -713 884 -715 292 -715 667 -721 197 -724 735 -731 233 -736 57 -737 582 -746 638 -748 158 -763 483 -775 706 -777 202 -779 531 -779 950 -787 599 -793 102 -793 322 -794 1074 -797 368 -816 278 -829 478 -831 648 -836 191 -840 730 -847 106 -847 938 -849 559 -850 377 -854 814 -874 676 -875 215 -877 329 -879 174 -896 438 -897 22 -904 868 -906 733 -909 217 -910 265 -918 589 -930 645 -931 143 -937 492 -937 690 -945 824 -947 234 -949 408 -965 310 -970 88 -979 135 -979 450 -979 539 -981 290 -999 213 -999 937 -1003 1007 -1004 380 -1019 832 -1029 183 -1029 312 -1035 744 -1036 68 -1063 556 -1083 165 -1083 423 -1092 729 -1099 11 -1099 344 -1104 241 -1117 106 -1118 827 -1129 666 -1133 485 -1149 19 -1157 152 -1159 570 -1160 410 -1176 325 -1179 244 -1185 702 -1189 778 -1192 472 -1217 559 -1222 202 -1244 95 -1245 310 -1251 255 -1252 142 -1253 422 -1278 474 -1280 567 -1304 177 -1309 710 -1338 329 -1339 255 -1339 413 -1363 555 -1363 678 -1364 489 -1367 180 -1369 107 -1384 774 -1405 339 -1447 624 -1453 426 -1461 133 -1462 357 -1473 853 -1488 500 -1488 766 -1516 642 -1551 484 -1578 837 -1588 331 -1603 741 -1632 628 -1635 367 -1641 472 -1654 566 -1686 924 -1704 819 -1754 694 -1777 785 +3 686 +19 537 +46 587 +57 785 +73 465 +99 367 +103 657 +109 1038 +115 304 +149 665 +175 984 +187 324 +191 1069 +200 628 +205 566 +218 388 +242 494 +242 633 +249 288 +249 745 +259 442 +270 193 +292 984 +297 539 +297 688 +313 463 +322 342 +329 842 +337 304 +342 407 +380 517 +382 1003 +394 306 +398 372 +400 1071 +401 658 +410 236 +419 585 +421 421 +433 101 +433 182 +433 793 +435 492 +471 341 +474 515 +479 244 +480 1012 +484 310 +485 873 +489 95 +498 174 +501 443 +501 772 +504 388 +524 338 +529 239 +531 488 +544 556 +558 411 +561 99 +562 276 +566 728 +574 624 +574 1044 +578 220 +580 146 +586 44 +605 326 +606 385 +611 536 +620 95 +625 692 +636 458 +642 213 +645 578 +650 37 +653 283 +656 735 +659 387 +669 106 +698 528 +700 460 +703 10 +708 1073 +711 382 +713 884 +715 292 +715 667 +721 197 +724 735 +731 233 +736 57 +737 582 +746 638 +748 158 +763 483 +775 706 +777 202 +779 531 +779 950 +787 599 +793 102 +793 322 +794 1074 +797 368 +816 278 +829 478 +831 648 +836 191 +840 730 +847 106 +847 938 +849 559 +850 377 +854 814 +874 676 +875 215 +877 329 +879 174 +896 438 +897 22 +904 868 +906 733 +909 217 +910 265 +918 589 +930 645 +931 143 +937 492 +937 690 +945 824 +947 234 +949 408 +965 310 +970 88 +979 135 +979 450 +979 539 +981 290 +999 213 +999 937 +1003 1007 +1004 380 +1019 832 +1029 183 +1029 312 +1035 744 +1036 68 +1063 556 +1083 165 +1083 423 +1092 729 +1099 11 +1099 344 +1104 241 +1117 106 +1118 827 +1129 666 +1133 485 +1149 19 +1157 152 +1159 570 +1160 410 +1176 325 +1179 244 +1185 702 +1189 778 +1192 472 +1217 559 +1222 202 +1244 95 +1245 310 +1251 255 +1252 142 +1253 422 +1278 474 +1280 567 +1304 177 +1309 710 +1338 329 +1339 255 +1339 413 +1363 555 +1363 678 +1364 489 +1367 180 +1369 107 +1384 774 +1405 339 +1447 624 +1453 426 +1461 133 +1462 357 +1473 853 +1488 500 +1488 766 +1516 642 +1551 484 +1578 837 +1588 331 +1603 741 +1632 628 +1635 367 +1641 472 +1654 566 +1686 924 +1704 819 +1754 694 +1777 785 1852 381 \ No newline at end of file diff --git a/main.cpp b/main.cpp index 1fffda0..569607c 100644 --- a/main.cpp +++ b/main.cpp @@ -107,14 +107,14 @@ void calc_hitlist(std::vector< unsigned int >& hits, int main(int argc, char** argv){ - //output advertisement - std::cout<