Changeset 100 for liacs/MIR2010

Timestamp:

Apr 6, 2010, 12:11:36 PM (15 years ago)

Author:

Rick van der Zwet

Message:

Special feature to be handed in.

Location:

liacs/MIR2010

Files:

• README.txt (modified) (2 diffs)
• SourceCode/main.cpp (modified) (6 diffs)

liacs/MIR2010/README.txt

@@ +1 @@
+Rick van der Zwet <info@rickvanderzwet.nl>
+
+= Properties =
 [crowd] - face colour
 [skijump] - green olympics logo, straight line of leaves
@@ -11 +14 @@
   - Licenses for pictures is restricted by owner (not me).
   - License for cximage is by http://www.xdp.it/cximage.htm
+  - Other code: BSDLike - http://rickvanderzwet.nl/LICENSE
+
+= Usage =
+ 1. Make sure your folders are organised in the following way
+ - trainingSet/<category>/1.jpg
+ ...
+ - trainingSet/<category>/50.jpg
+ - testSet/<category>/1.jpg
+ ...
+ - testSet/<category>/XX.jpg
+ 
+ 2. Start aplication and select the folders
+
+ 3. To-do a regular run 
+  - Select 1
+  - Select 2
+  - Select 4

liacs/MIR2010/SourceCode/main.cpp

@@ -20 +20 @@
 bool ShowAverages(const char *basedir);
 
-#define TRAINING_DIR_DEBUG "C:\\Documents and Settings\\rvdzwet\\Desktop\\liacs\\MIR2010\\trainingSet"
-#define TESTSET_DIR_DEBUG "C:\\Documents and Settings\\rvdzwet\\Desktop\\liacs\\MIR2010\\testSet"
+//#define TRAINING_DIR_DEBUG "C:\\Documents and Settings\\rvdzwet\\Desktop\\liacs\\MIR2010\\trainingSet"
+//#define TESTSET_DIR_DEBUG "C:\\Documents and Settings\\rvdzwet\\Desktop\\liacs\\MIR2010\\testSet"
 #define DEBUG 0
 
@@ -49 +49 @@
 
 
-// Find common coloured shapes as characteristics
+// Find common coloured block shapes as characteristics
 // Walk over image with opt_spread steps, if pixel -within opt_tolerance- matches previous pixel 
-// make the size of the specific block bigger.
+// make the size of the specific block bigger. Blocks can be horizontally and vertically attached
 // Block '0' is used an non-matcher. Not taken into account for the time beeing.
 int opt_tolerance = 10;
@@ -57 +57 @@
 #define MAX_BLOCKSIZE 500
 float average_block[CATEGORY_SIZE][MAX_BLOCKSIZE];
+
+// ===========Block Interesting Results ===========================
+// opt_spread  | opt_tolerance | total | (almost correct)
+// ------------|---------------|-------|---------------------------
+//     10      |      10       | 20/41 | crowd, downhill, icehockey                          
+//     10      |      20       | 15/41 | crowd, downhill                          
+//     10      |      50       | 13/41 | crowd, downhill                         
+//     20      |      10       | 17/41 | crowd, icehockey, downhill                         
+//     20      |      20       | 17/41 | crowd, downhill, icehockey
+//     50      |      10       | 13/41 | 
+//     50      |      20       | 14/41 | crowd, downhill
+//     50      |      50       | 12/41 | crowd, downhill
+//    100      |     100       | 10/41 | icehockey
+
+
 
 
@@ -431 +446 @@
                                 goto failure;
 
+                        if (opt_verbose) {
+                                for (int u = 0; u < MAX_BLOCKSIZE; u++) {
+                                        if (block[u])
+                                                cout << "Blocksize " << u << " : " << block[u] << endl;
+                                }
+                        }
+                                
+
                         // save the descriptor,block to disk
                         SAFE_SPRINTF(path, sizeof(path), "%s%i.dat", catdir, i);
@@ -476 +499 @@
                 sprintf(catdir,"%s\\%s\\", basedir, catname);
 
+                // Make sure initial values are 0
+                memset(average, 0, BIN_COUNT*BIN_COUNT*BIN_COUNT * sizeof(float));
+                memset(average_block, 0, MAX_BLOCKSIZE * sizeof(float));
+
                 // average all descriptors
-                memset(average, 0, BIN_COUNT*BIN_COUNT*BIN_COUNT * sizeof(float));
                 for (int i = 1; i <= 50; i++)
                 {
@@ -514 +540 @@
                         average[b] /= c_size;
 
-                for (int b = 0; b < MAX_BLOCKSIZE; b++)
+                for (int b = 0; b < MAX_BLOCKSIZE; b++) {
                         average_block[b] /= c_size;
+                }
 
                 // save the average to disk