Commit 7aacb90f511280bcb1982d2994c0e701b178869c
1 parent
f51866f3
updated examples, added the correct repo location
Showing
3 changed files
with
233 additions
and
229 deletions
Show diff stats
CMakeLists.txt
@@ -16,6 +16,9 @@ find_package(ANN REQUIRED) | @@ -16,6 +16,9 @@ find_package(ANN REQUIRED) | ||
16 | #find the pthreads package | 16 | #find the pthreads package |
17 | find_package(Threads) | 17 | find_package(Threads) |
18 | 18 | ||
19 | +#find the X11 package | ||
20 | +find_package(X11) | ||
21 | + | ||
19 | include_directories( | 22 | include_directories( |
20 | ${STIM_INCLUDE_DIRS} | 23 | ${STIM_INCLUDE_DIRS} |
21 | ${ANN_INCLUDE_DIR} | 24 | ${ANN_INCLUDE_DIR} |
@@ -35,6 +38,7 @@ add_executable(pointmets | @@ -35,6 +38,7 @@ add_executable(pointmets | ||
35 | target_link_libraries(pointmets | 38 | target_link_libraries(pointmets |
36 | ${CMAKE_THREAD_LIBS_INIT} | 39 | ${CMAKE_THREAD_LIBS_INIT} |
37 | ${ANN_LIBRARY} | 40 | ${ANN_LIBRARY} |
41 | + ${X11_LIBRARIES} | ||
38 | ) | 42 | ) |
39 | 43 | ||
40 | #copy an OBJ test case | 44 | #copy an OBJ test case |
data/blue_gt.txt
1 | -3 686 | ||
2 | -19 537 | ||
3 | -46 587 | ||
4 | -57 785 | ||
5 | -73 465 | ||
6 | -99 367 | ||
7 | -103 657 | ||
8 | -109 1038 | ||
9 | -115 304 | ||
10 | -149 665 | ||
11 | -175 984 | ||
12 | -187 324 | ||
13 | -191 1069 | ||
14 | -200 628 | ||
15 | -205 566 | ||
16 | -218 388 | ||
17 | -242 494 | ||
18 | -242 633 | ||
19 | -249 288 | ||
20 | -249 745 | ||
21 | -259 442 | ||
22 | -270 193 | ||
23 | -292 984 | ||
24 | -297 539 | ||
25 | -297 688 | ||
26 | -313 463 | ||
27 | -322 342 | ||
28 | -329 842 | ||
29 | -337 304 | ||
30 | -342 407 | ||
31 | -380 517 | ||
32 | -382 1003 | ||
33 | -394 306 | ||
34 | -398 372 | ||
35 | -400 1071 | ||
36 | -401 658 | ||
37 | -410 236 | ||
38 | -419 585 | ||
39 | -421 421 | ||
40 | -433 101 | ||
41 | -433 182 | ||
42 | -433 793 | ||
43 | -435 492 | ||
44 | -471 341 | ||
45 | -474 515 | ||
46 | -479 244 | ||
47 | -480 1012 | ||
48 | -484 310 | ||
49 | -485 873 | ||
50 | -489 95 | ||
51 | -498 174 | ||
52 | -501 443 | ||
53 | -501 772 | ||
54 | -504 388 | ||
55 | -524 338 | ||
56 | -529 239 | ||
57 | -531 488 | ||
58 | -544 556 | ||
59 | -558 411 | ||
60 | -561 99 | ||
61 | -562 276 | ||
62 | -566 728 | ||
63 | -574 624 | ||
64 | -574 1044 | ||
65 | -578 220 | ||
66 | -580 146 | ||
67 | -586 44 | ||
68 | -605 326 | ||
69 | -606 385 | ||
70 | -611 536 | ||
71 | -620 95 | ||
72 | -625 692 | ||
73 | -636 458 | ||
74 | -642 213 | ||
75 | -645 578 | ||
76 | -650 37 | ||
77 | -653 283 | ||
78 | -656 735 | ||
79 | -659 387 | ||
80 | -669 106 | ||
81 | -698 528 | ||
82 | -700 460 | ||
83 | -703 10 | ||
84 | -708 1073 | ||
85 | -711 382 | ||
86 | -713 884 | ||
87 | -715 292 | ||
88 | -715 667 | ||
89 | -721 197 | ||
90 | -724 735 | ||
91 | -731 233 | ||
92 | -736 57 | ||
93 | -737 582 | ||
94 | -746 638 | ||
95 | -748 158 | ||
96 | -763 483 | ||
97 | -775 706 | ||
98 | -777 202 | ||
99 | -779 531 | ||
100 | -779 950 | ||
101 | -787 599 | ||
102 | -793 102 | ||
103 | -793 322 | ||
104 | -794 1074 | ||
105 | -797 368 | ||
106 | -816 278 | ||
107 | -829 478 | ||
108 | -831 648 | ||
109 | -836 191 | ||
110 | -840 730 | ||
111 | -847 106 | ||
112 | -847 938 | ||
113 | -849 559 | ||
114 | -850 377 | ||
115 | -854 814 | ||
116 | -874 676 | ||
117 | -875 215 | ||
118 | -877 329 | ||
119 | -879 174 | ||
120 | -896 438 | ||
121 | -897 22 | ||
122 | -904 868 | ||
123 | -906 733 | ||
124 | -909 217 | ||
125 | -910 265 | ||
126 | -918 589 | ||
127 | -930 645 | ||
128 | -931 143 | ||
129 | -937 492 | ||
130 | -937 690 | ||
131 | -945 824 | ||
132 | -947 234 | ||
133 | -949 408 | ||
134 | -965 310 | ||
135 | -970 88 | ||
136 | -979 135 | ||
137 | -979 450 | ||
138 | -979 539 | ||
139 | -981 290 | ||
140 | -999 213 | ||
141 | -999 937 | ||
142 | -1003 1007 | ||
143 | -1004 380 | ||
144 | -1019 832 | ||
145 | -1029 183 | ||
146 | -1029 312 | ||
147 | -1035 744 | ||
148 | -1036 68 | ||
149 | -1063 556 | ||
150 | -1083 165 | ||
151 | -1083 423 | ||
152 | -1092 729 | ||
153 | -1099 11 | ||
154 | -1099 344 | ||
155 | -1104 241 | ||
156 | -1117 106 | ||
157 | -1118 827 | ||
158 | -1129 666 | ||
159 | -1133 485 | ||
160 | -1149 19 | ||
161 | -1157 152 | ||
162 | -1159 570 | ||
163 | -1160 410 | ||
164 | -1176 325 | ||
165 | -1179 244 | ||
166 | -1185 702 | ||
167 | -1189 778 | ||
168 | -1192 472 | ||
169 | -1217 559 | ||
170 | -1222 202 | ||
171 | -1244 95 | ||
172 | -1245 310 | ||
173 | -1251 255 | ||
174 | -1252 142 | ||
175 | -1253 422 | ||
176 | -1278 474 | ||
177 | -1280 567 | ||
178 | -1304 177 | ||
179 | -1309 710 | ||
180 | -1338 329 | ||
181 | -1339 255 | ||
182 | -1339 413 | ||
183 | -1363 555 | ||
184 | -1363 678 | ||
185 | -1364 489 | ||
186 | -1367 180 | ||
187 | -1369 107 | ||
188 | -1384 774 | ||
189 | -1405 339 | ||
190 | -1447 624 | ||
191 | -1453 426 | ||
192 | -1461 133 | ||
193 | -1462 357 | ||
194 | -1473 853 | ||
195 | -1488 500 | ||
196 | -1488 766 | ||
197 | -1516 642 | ||
198 | -1551 484 | ||
199 | -1578 837 | ||
200 | -1588 331 | ||
201 | -1603 741 | ||
202 | -1632 628 | ||
203 | -1635 367 | ||
204 | -1641 472 | ||
205 | -1654 566 | ||
206 | -1686 924 | ||
207 | -1704 819 | ||
208 | -1754 694 | ||
209 | -1777 785 | 1 | +3 686 |
2 | +19 537 | ||
3 | +46 587 | ||
4 | +57 785 | ||
5 | +73 465 | ||
6 | +99 367 | ||
7 | +103 657 | ||
8 | +109 1038 | ||
9 | +115 304 | ||
10 | +149 665 | ||
11 | +175 984 | ||
12 | +187 324 | ||
13 | +191 1069 | ||
14 | +200 628 | ||
15 | +205 566 | ||
16 | +218 388 | ||
17 | +242 494 | ||
18 | +242 633 | ||
19 | +249 288 | ||
20 | +249 745 | ||
21 | +259 442 | ||
22 | +270 193 | ||
23 | +292 984 | ||
24 | +297 539 | ||
25 | +297 688 | ||
26 | +313 463 | ||
27 | +322 342 | ||
28 | +329 842 | ||
29 | +337 304 | ||
30 | +342 407 | ||
31 | +380 517 | ||
32 | +382 1003 | ||
33 | +394 306 | ||
34 | +398 372 | ||
35 | +400 1071 | ||
36 | +401 658 | ||
37 | +410 236 | ||
38 | +419 585 | ||
39 | +421 421 | ||
40 | +433 101 | ||
41 | +433 182 | ||
42 | +433 793 | ||
43 | +435 492 | ||
44 | +471 341 | ||
45 | +474 515 | ||
46 | +479 244 | ||
47 | +480 1012 | ||
48 | +484 310 | ||
49 | +485 873 | ||
50 | +489 95 | ||
51 | +498 174 | ||
52 | +501 443 | ||
53 | +501 772 | ||
54 | +504 388 | ||
55 | +524 338 | ||
56 | +529 239 | ||
57 | +531 488 | ||
58 | +544 556 | ||
59 | +558 411 | ||
60 | +561 99 | ||
61 | +562 276 | ||
62 | +566 728 | ||
63 | +574 624 | ||
64 | +574 1044 | ||
65 | +578 220 | ||
66 | +580 146 | ||
67 | +586 44 | ||
68 | +605 326 | ||
69 | +606 385 | ||
70 | +611 536 | ||
71 | +620 95 | ||
72 | +625 692 | ||
73 | +636 458 | ||
74 | +642 213 | ||
75 | +645 578 | ||
76 | +650 37 | ||
77 | +653 283 | ||
78 | +656 735 | ||
79 | +659 387 | ||
80 | +669 106 | ||
81 | +698 528 | ||
82 | +700 460 | ||
83 | +703 10 | ||
84 | +708 1073 | ||
85 | +711 382 | ||
86 | +713 884 | ||
87 | +715 292 | ||
88 | +715 667 | ||
89 | +721 197 | ||
90 | +724 735 | ||
91 | +731 233 | ||
92 | +736 57 | ||
93 | +737 582 | ||
94 | +746 638 | ||
95 | +748 158 | ||
96 | +763 483 | ||
97 | +775 706 | ||
98 | +777 202 | ||
99 | +779 531 | ||
100 | +779 950 | ||
101 | +787 599 | ||
102 | +793 102 | ||
103 | +793 322 | ||
104 | +794 1074 | ||
105 | +797 368 | ||
106 | +816 278 | ||
107 | +829 478 | ||
108 | +831 648 | ||
109 | +836 191 | ||
110 | +840 730 | ||
111 | +847 106 | ||
112 | +847 938 | ||
113 | +849 559 | ||
114 | +850 377 | ||
115 | +854 814 | ||
116 | +874 676 | ||
117 | +875 215 | ||
118 | +877 329 | ||
119 | +879 174 | ||
120 | +896 438 | ||
121 | +897 22 | ||
122 | +904 868 | ||
123 | +906 733 | ||
124 | +909 217 | ||
125 | +910 265 | ||
126 | +918 589 | ||
127 | +930 645 | ||
128 | +931 143 | ||
129 | +937 492 | ||
130 | +937 690 | ||
131 | +945 824 | ||
132 | +947 234 | ||
133 | +949 408 | ||
134 | +965 310 | ||
135 | +970 88 | ||
136 | +979 135 | ||
137 | +979 450 | ||
138 | +979 539 | ||
139 | +981 290 | ||
140 | +999 213 | ||
141 | +999 937 | ||
142 | +1003 1007 | ||
143 | +1004 380 | ||
144 | +1019 832 | ||
145 | +1029 183 | ||
146 | +1029 312 | ||
147 | +1035 744 | ||
148 | +1036 68 | ||
149 | +1063 556 | ||
150 | +1083 165 | ||
151 | +1083 423 | ||
152 | +1092 729 | ||
153 | +1099 11 | ||
154 | +1099 344 | ||
155 | +1104 241 | ||
156 | +1117 106 | ||
157 | +1118 827 | ||
158 | +1129 666 | ||
159 | +1133 485 | ||
160 | +1149 19 | ||
161 | +1157 152 | ||
162 | +1159 570 | ||
163 | +1160 410 | ||
164 | +1176 325 | ||
165 | +1179 244 | ||
166 | +1185 702 | ||
167 | +1189 778 | ||
168 | +1192 472 | ||
169 | +1217 559 | ||
170 | +1222 202 | ||
171 | +1244 95 | ||
172 | +1245 310 | ||
173 | +1251 255 | ||
174 | +1252 142 | ||
175 | +1253 422 | ||
176 | +1278 474 | ||
177 | +1280 567 | ||
178 | +1304 177 | ||
179 | +1309 710 | ||
180 | +1338 329 | ||
181 | +1339 255 | ||
182 | +1339 413 | ||
183 | +1363 555 | ||
184 | +1363 678 | ||
185 | +1364 489 | ||
186 | +1367 180 | ||
187 | +1369 107 | ||
188 | +1384 774 | ||
189 | +1405 339 | ||
190 | +1447 624 | ||
191 | +1453 426 | ||
192 | +1461 133 | ||
193 | +1462 357 | ||
194 | +1473 853 | ||
195 | +1488 500 | ||
196 | +1488 766 | ||
197 | +1516 642 | ||
198 | +1551 484 | ||
199 | +1578 837 | ||
200 | +1588 331 | ||
201 | +1603 741 | ||
202 | +1632 628 | ||
203 | +1635 367 | ||
204 | +1641 472 | ||
205 | +1654 566 | ||
206 | +1686 924 | ||
207 | +1704 819 | ||
208 | +1754 694 | ||
209 | +1777 785 | ||
210 | 1852 381 | 210 | 1852 381 |
211 | \ No newline at end of file | 211 | \ No newline at end of file |
main.cpp
@@ -107,14 +107,14 @@ void calc_hitlist(std::vector< unsigned int >& hits, | @@ -107,14 +107,14 @@ void calc_hitlist(std::vector< unsigned int >& hits, | ||
107 | 107 | ||
108 | int main(int argc, char** argv){ | 108 | int main(int argc, char** argv){ |
109 | 109 | ||
110 | - //output advertisement | ||
111 | - std::cout<<std::endl<<std::endl; | ||
112 | - std::cout<<"========================================================================="<<std::endl; | ||
113 | - std::cout<<"Thank you for using the PointMets validation tool!"<<std::endl; | ||
114 | - std::cout<<"Scalable Tissue Imaging and Modeling (STIM) Lab, University of Houston"<<std::endl; | ||
115 | - std::cout<<"Developers: David Mayerich"<<std::endl; | ||
116 | - std::cout<<"Source: https://github.com/stimlab/hsiproc.git"<<std::endl; | ||
117 | - std::cout<<"========================================================================="<<std::endl<<std::endl; | 110 | + //output advertisement |
111 | + std::cout<<std::endl<<std::endl; | ||
112 | + std::cout<<"========================================================================="<<std::endl; | ||
113 | + std::cout<<"Thank you for using the PointMets validation tool!"<<std::endl; | ||
114 | + std::cout<<"Scalable Tissue Imaging and Modeling (STIM) Lab, University of Houston"<<std::endl; | ||
115 | + std::cout<<"Developers: David Mayerich"<<std::endl; | ||
116 | + std::cout<<"Source: https://git.stim.ee.uh.edu/validation/pointmets"<<std::endl; | ||
117 | + std::cout<<"========================================================================="<<std::endl<<std::endl; | ||
118 | 118 | ||
119 | 119 | ||
120 | stim::arglist args; | 120 | stim::arglist args; |
@@ -131,20 +131,20 @@ int main(int argc, char** argv){ | @@ -131,20 +131,20 @@ int main(int argc, char** argv){ | ||
131 | args.parse(argc, argv); | 131 | args.parse(argc, argv); |
132 | 132 | ||
133 | //display the help text if requested | 133 | //display the help text if requested |
134 | - if(args["help"].is_set()){ | ||
135 | - std::cout<<std::endl<<"usage: pointmets ground_truth test_case --option [A B C ...]"<<std::endl; | ||
136 | - std::cout<<std::endl<<std::endl | ||
137 | - << "examples: pointmets blue_gt.txt blue_t.txt"<<std::endl; | ||
138 | - std::cout << " pointmets blue_gt.bmp blue_t.bmp" << std::endl; | ||
139 | - std::cout<<std::endl<<std::endl; | ||
140 | - std::cout<<args.str()<<std::endl; | ||
141 | - exit(1); | 134 | + if(args["help"].is_set()){ |
135 | + std::cout<<std::endl<<"usage: pointmets ground_truth test_case --option [A B C ...]"<<std::endl; | ||
136 | + std::cout<<std::endl<<std::endl | ||
137 | + << "examples: pointmets blue_gt.txt blue_t.txt"<<std::endl; | ||
138 | + std::cout << " pointmets blue_gt.bmp blue_t.bmp" << std::endl; | ||
139 | + std::cout<<std::endl<<std::endl; | ||
140 | + std::cout<<args.str()<<std::endl; | ||
141 | + exit(1); | ||
142 | } | 142 | } |
143 | 143 | ||
144 | - //if the input and output files aren't specified, throw an error and exit | ||
145 | - if(args.nargs() < 2){ | ||
146 | - std::cout<<"ERROR: Two files must be specified for comparison, enter pointmets --help for options."<<std::endl<<std::endl; | ||
147 | - exit(1); | 144 | + //if the input and output files aren't specified, throw an error and exit |
145 | + if(args.nargs() < 2){ | ||
146 | + std::cout<<"ERROR: Two files must be specified for comparison, enter pointmets --help for options."<<std::endl<<std::endl; | ||
147 | + exit(1); | ||
148 | } | 148 | } |
149 | 149 | ||
150 | //get the ground truth and test file | 150 | //get the ground truth and test file |