X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=svrt.git;a=blobdiff_plain;f=vision_test.cc;h=524a6e17996659c6e49eab4943584a995678018b;hp=94591f19b3bf2d9cbaef322a26a92aeb2f2c1cac;hb=HEAD;hpb=194e1b60502426108c6f6c3cf2e08e95e7a2811d
diff --git a/vision_test.cc b/vision_test.cc
index 94591f1..524a6e1 100644
--- a/vision_test.cc
+++ b/vision_test.cc
@@ -1,4 +1,4 @@
-c/*
+/*
* svrt is the ``Synthetic Visual Reasoning Test'', an image
* generator for evaluating classification performance of machine
* learning systems, humans and primates.
@@ -18,7 +18,7 @@ c/*
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with selector. If not, see .
+ * along with svrt. If not, see .
*
*/
@@ -27,6 +27,7 @@ c/*
#include
#include
#include
+#include
using namespace std;
@@ -45,16 +46,26 @@ using namespace std;
#include "vision_problem_1.h"
#include "vision_problem_2.h"
#include "vision_problem_3.h"
+#include "vision_problem_4.h"
#include "vision_problem_5.h"
#include "vision_problem_6.h"
+#include "vision_problem_7.h"
#include "vision_problem_8.h"
+#include "vision_problem_9.h"
+#include "vision_problem_10.h"
#include "vision_problem_11.h"
#include "vision_problem_12.h"
#include "vision_problem_13.h"
+#include "vision_problem_14.h"
+#include "vision_problem_15.h"
+#include "vision_problem_16.h"
#include "vision_problem_17.h"
#include "vision_problem_18.h"
+#include "vision_problem_19.h"
#include "vision_problem_20.h"
#include "vision_problem_21.h"
+#include "vision_problem_22.h"
+#include "vision_problem_23.h"
//////////////////////////////////////////////////////////////////////
@@ -102,27 +113,27 @@ int main(int argc, char **argv) {
case 3:
generator = new VisionProblem_3();
break;
- // case 4:
- // generator = new VisionProblem_4();
- // break;
+ case 4:
+ generator = new VisionProblem_4();
+ break;
case 5:
generator = new VisionProblem_5();
break;
case 6:
generator = new VisionProblem_6();
break;
- // case 7:
- // generator = new VisionProblem_7();
- // break;
+ case 7:
+ generator = new VisionProblem_7();
+ break;
case 8:
generator = new VisionProblem_8();
break;
- // case 9:
- // generator = new VisionProblem_9();
- // break;
- // case 10:
- // generator = new VisionProblem_10();
- // break;
+ case 9:
+ generator = new VisionProblem_9();
+ break;
+ case 10:
+ generator = new VisionProblem_10();
+ break;
case 11:
generator = new VisionProblem_11();
break;
@@ -132,36 +143,36 @@ int main(int argc, char **argv) {
case 13:
generator = new VisionProblem_13();
break;
- // case 14:
- // generator = new VisionProblem_14();
- // break;
- // case 15:
- // generator = new VisionProblem_15();
- // break;
- // case 16:
- // generator = new VisionProblem_16();
- // break;
+ case 14:
+ generator = new VisionProblem_14();
+ break;
+ case 15:
+ generator = new VisionProblem_15();
+ break;
+ case 16:
+ generator = new VisionProblem_16();
+ break;
case 17:
generator = new VisionProblem_17();
break;
case 18:
generator = new VisionProblem_18();
break;
- // case 19:
- // generator = new VisionProblem_19();
- // break;
+ case 19:
+ generator = new VisionProblem_19();
+ break;
case 20:
generator = new VisionProblem_20();
break;
case 21:
generator = new VisionProblem_21();
break;
- // case 22:
- // generator = new VisionProblem_22();
- // break;
- // case 23:
- // generator = new VisionProblem_23();
- // break;
+ case 22:
+ generator = new VisionProblem_22();
+ break;
+ case 23:
+ generator = new VisionProblem_23();
+ break;
default:
cerr << "Can not find problem "
<< global.problem_number
@@ -188,13 +199,11 @@ int main(int argc, char **argv) {
for(int c = 1; c < new_argc; c++) {
if(strcmp(new_argv[c], "randomize-train") == 0) {
+ cout << "Generating the training set." << endl;
for(int n = 0; n < global.nb_train_samples; n++) {
- if(n > 0 && n%100 == 0) cout << "*"; cout.flush();
- // cout << "n = " << n << endl;
train_labels[n] = int(drand48() * 2);
generator->generate(train_labels[n], &train_samples[n]);
}
- cout << endl;
}
else if(strcmp(new_argv[c], "adaboost") == 0) {