Peter M. Groen / openbr

Commit 9b4e841b76e7b897d8bc065f93b458ef8d983e3f

Authored by Josh Klontz
1 parent 6be32da3

cleaned up br -help

Inline Side-by-side
Showing 1 changed file with 9 additions and 9 deletions
app/br/br.cpp
  View file @9b4e841
@@ -100,9 +100,6 @@ public: @@ -100,9 +100,6 @@ public:
100 } else if (!strcmp(fun, "compare")) { 100 } else if (!strcmp(fun, "compare")) {
101 check((parc >= 2) && (parc <= 3), "Incorrect parameter count for 'compare'."); 101 check((parc >= 2) && (parc <= 3), "Incorrect parameter count for 'compare'.");
102 br_compare(parv[0], parv[1], parc == 3 ? parv[2] : ""); 102 br_compare(parv[0], parv[1], parc == 3 ? parv[2] : "");
103 - } else if (!strcmp(fun, "pairwiseCompare")) {  
104 - check((parc >= 2) && (parc <= 3), "Incorrect parameter count for 'pairwiseCompare'.");  
105 - br_pairwise_compare(parv[0], parv[1], parc == 3 ? parv[2] : "");  
106 } else if (!strcmp(fun, "eval")) { 103 } else if (!strcmp(fun, "eval")) {
107 check((parc >= 1) && (parc <= 4), "Incorrect parameter count for 'eval'."); 104 check((parc >= 1) && (parc <= 4), "Incorrect parameter count for 'eval'.");
108 if (parc == 1) { 105 if (parc == 1) {
@@ -126,9 +123,6 @@ public: @@ -126,9 +123,6 @@ public:
126 } else { 123 } else {
127 br_eval(parv[0], parv[1], parv[2], atoi(parv[3])); 124 br_eval(parv[0], parv[1], parv[2], atoi(parv[3]));
128 } 125 }
129 - } else if (!strcmp(fun, "inplaceEval")) {  
130 - check((parc >= 3) && (parc <= 4), "Incorrect parameter count for 'inplaceEval'.");  
131 - br_inplace_eval(parv[0], parv[1], parv[2], parc == 4 ? parv[3] : "");  
132 } else if (!strcmp(fun, "plot")) { 126 } else if (!strcmp(fun, "plot")) {
133 check(parc >= 2, "Incorrect parameter count for 'plot'."); 127 check(parc >= 2, "Incorrect parameter count for 'plot'.");
134 br_plot(parc-1, parv, parv[parc-1], true); 128 br_plot(parc-1, parv, parv[parc-1], true);
@@ -174,6 +168,12 @@ public: @@ -174,6 +168,12 @@ public:
174 } else if (!strcmp(fun, "evalRegression")) { 168 } else if (!strcmp(fun, "evalRegression")) {
175 check(parc >= 2 && parc <= 4, "Incorrect parameter count for 'evalRegression'."); 169 check(parc >= 2 && parc <= 4, "Incorrect parameter count for 'evalRegression'.");
176 br_eval_regression(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc >= 4 ? parv[3] : ""); 170 br_eval_regression(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc >= 4 ? parv[3] : "");
  171 + } else if (!strcmp(fun, "pairwiseCompare")) {
  172 + check((parc >= 2) && (parc <= 3), "Incorrect parameter count for 'pairwiseCompare'.");
  173 + br_pairwise_compare(parv[0], parv[1], parc == 3 ? parv[2] : "");
  174 + } else if (!strcmp(fun, "inplaceEval")) {
  175 + check((parc >= 3) && (parc <= 4), "Incorrect parameter count for 'inplaceEval'.");
  176 + br_inplace_eval(parv[0], parv[1], parv[2], parc == 4 ? parv[3] : "");
177 } else if (!strcmp(fun, "plotDetection")) { 177 } else if (!strcmp(fun, "plotDetection")) {
178 check(parc >= 2, "Incorrect parameter count for 'plotDetection'."); 178 check(parc >= 2, "Incorrect parameter count for 'plotDetection'.");
179 br_plot_detection(parc-1, parv, parv[parc-1], true); 179 br_plot_detection(parc-1, parv, parv[parc-1], true);
@@ -257,10 +257,8 @@ private: @@ -257,10 +257,8 @@ private:
257 "-train <gallery> ... <gallery> [{model}]\n" 257 "-train <gallery> ... <gallery> [{model}]\n"
258 "-enroll <input_gallery> ... <input_gallery> {output_gallery}\n" 258 "-enroll <input_gallery> ... <input_gallery> {output_gallery}\n"
259 "-compare <target_gallery> <query_gallery> [{output}]\n" 259 "-compare <target_gallery> <query_gallery> [{output}]\n"
260 - "-pairwiseCompare <target_gallery> <query_gallery> [{output}]\n"  
261 "-eval <simmat> [<mask>] [{csv}] [{matches}]\n" 260 "-eval <simmat> [<mask>] [{csv}] [{matches}]\n"
262 - "-inplaceEval <simmat> <target> <query> [{csv}]\n"  
263 - "-plot <file> ... <file> {destination}\n" 261 + "-plot <csv> ... <csv> {destination}\n"
264 "\n" 262 "\n"
265 "==== Other Commands ====\n" 263 "==== Other Commands ====\n"
266 "-fuse <simmat> ... <simmat> (None|MinMax|ZScore|WScore) (Min|Max|Sum[W1:W2:...:Wn]|Replace|Difference|None) {simmat}\n" 264 "-fuse <simmat> ... <simmat> (None|MinMax|ZScore|WScore) (Min|Max|Sum[W1:W2:...:Wn]|Replace|Difference|None) {simmat}\n"
@@ -275,6 +273,8 @@ private: @@ -275,6 +273,8 @@ private:
275 "-evalDetection <predicted_gallery> <truth_gallery> [{csv}] [{normalize}] [{minSize}] [{maxSize}]\n" 273 "-evalDetection <predicted_gallery> <truth_gallery> [{csv}] [{normalize}] [{minSize}] [{maxSize}]\n"
276 "-evalLandmarking <predicted_gallery> <truth_gallery> [{csv} [<normalization_index_a> <normalization_index_b>] [sample_index] [total_examples]]\n" 274 "-evalLandmarking <predicted_gallery> <truth_gallery> [{csv} [<normalization_index_a> <normalization_index_b>] [sample_index] [total_examples]]\n"
277 "-evalRegression <predicted_gallery> <truth_gallery> <predicted property name> <ground truth property name>\n" 275 "-evalRegression <predicted_gallery> <truth_gallery> <predicted property name> <ground truth property name>\n"
  276 + "-pairwiseCompare <target_gallery> <query_gallery> [{output}]\n"
  277 + "-inplaceEval <simmat> <target> <query> [{csv}]\n"
278 "-assertEval <simmat> <mask> <accuracy>\n" 278 "-assertEval <simmat> <mask> <accuracy>\n"
279 "-plotDetection <file> ... <file> {destination}\n" 279 "-plotDetection <file> ... <file> {destination}\n"
280 "-plotLandmarking <file> ... <file> {destination}\n" 280 "-plotLandmarking <file> ... <file> {destination}\n"