Re: gift-write-feature-descs segfaults... (is the GIFT broken?)

--- ../../anoncvs/gift/ChangeLog	2006-08-28 17:18:09.000000000 +0000
+++ ChangeLog	2006-08-28 21:06:40.000000000 +0000
@@ -1,3 +1,10 @@
+2006-08-28    <[email protected]>
+
+	* FeatureExtraction/extract_block_features.c
+	handle gabor_ranges() better, fix gabor_ranges to 100000 instead of 10000
+	* FeatureExtraction/write_feature_descs.c
+	update initialization function call, provide variables to be 'initialized'.
+
 2006-08-02    <[email protected]>
 	* FeatureExtraction/extract_block_features.c
 	define the kernals here, pass to gabor.c for init, use

--- ../../anoncvs/gift/FeatureExtraction/extract_block_features.c	2006-08-28 17:18:09.000000000 +0000
+++ FeatureExtraction/extract_block_features.c	2006-08-28 21:02:04.000000000 +0000
@@ -94,8 +94,8 @@
 double gabor_ranges_var[num_gabor_ranges] = {0.0625, 0.125, 0.25, 0.5, 1, 1.5, 2, 3, 4, 5, 6, 7, 8, 9, 10, 100000};
 #else
 #if num_gabor_ranges==10
-/* this is magic, as far as i'm concerned. [2..10,10000] */
-#define gabor_ranges(i) (i+2+9989*(((i>>3)&1)&(i&1)))
+/* this is magic, as far as i'm concerned. [2..10,100000] */
+#define gabor_ranges(i) (i+2+99989*(((i>>3)&1)&(i&1)))
 #else
 #error invalid setting for num_gabor_ranges
 #endif
@@ -649,7 +649,13 @@
 			/* blocks */
 			for (i = 0; i < square((image_size/gabor_block_size)); i++) {
 				for (j = 0; j < num_gabor_ranges; j++) {
+#if num_gabor_ranges==16 /* technically, we should be checking the type.. */
 					fprintf(out_file, "%d %d GABOR_POS block size = %dx%d position = %d SCALE, ORIENTATION, ENERGY = %d, %d, %f\n", feature_index, GABOR_POS, gabor_block_size, gabor_block_size, i, scale, orientation, gabor_ranges(j));
+#else
+#if num_gabor_ranges==10
+					fprintf(out_file, "%d %d GABOR_POS block size = %dx%d position = %d SCALE, ORIENTATION, ENERGY = %d, %d, %d.000000\n", feature_index, GABOR_POS, gabor_block_size, gabor_block_size, i, scale, orientation, gabor_ranges(j));
+#endif
+#endif
 				feature_index++;
 				}
 			}

--- ../../dev3/gift/FeatureExtraction/write_feature_descs.c	2004-02-25 06:47:12.000000000 +0000
+++ FeatureExtraction/write_feature_descs.c	2006-08-28 20:11:19.000000000 +0000
@@ -8,6 +8,17 @@
 
 //#include "extract_features.proto"
 
+/* for c99 uint32_t */
+
+#include <stdint.h>
+
+/* this is common between extract_features and this file. -ENEEDHEADER? */
+
+/* the number of scales to recognise features at */
+#define num_gabor_scales 3
+/* the number of color blocks we're going to break the image into (overlapping) */
+#define num_total_colour_blocks (256+64+16+4)
+
 int main(int argc, char *argv[]) {
 
 	FILE *ppm_file;
@@ -16,6 +27,12 @@
 	enum file_types ppm_type;
 	enum ppm_error the_error;
 	int numH, numS, numV, numGrey;
+	/* the following variables are here just to be initialized. */
+	/* the colour count of each block. for quantizing the image */
+	uint32_t * col_counts[num_total_colour_blocks];
+	uint32_t ** gabor_histogram[num_gabor_scales];
+	uint32_t ** block_gabor_class[num_gabor_scales];
+
  
 	switch(argc) {
 	case 5:
@@ -60,7 +77,7 @@
 	}
 
 	/* initialise the variables required for the feature extraction */
-	init_feature_variables(colmap_size);
+        init_feature_variables(colmap_size, col_counts, block_gabor_class, gabor_histogram);
 
 	/* write them to the file */
 	if ((the_error = write_feature_descriptions(stdout, colmap, colmap_size)) != PPM_OK) {

#!/bin/bash

blah=""
runs=25

target=tempsized

#trusted is concidered the reference copy
trusted_ext=gift-extract-features
trusted_wri=gift-write-feature-descs

#untrusted is the version we're testing
untrusted_ext=/disk1/gift/src/merge/dev/gift/FeatureExtraction/gift-extract-features
#untrusted_wri=gift-write-feature-descs
untrusted_wri=/disk1/gift/src/merge/dev/gift/FeatureExtraction/gift-write-feature-descs


#first, generate "origional trusted" versions of our two data files ($target.fts, InvertedFileFeatureDescription.db)
time $trusted_ext $target.ppm
mv $target.fts orig_$target.fts

$trusted_wri 18 3 3 4 < $target.ppm > orig_InvertedFileFeatureDescription.db

#now, timing test our feature extractor, doing a diff for comparison each iteration

for ((i=0;i<runs;i++)); do 
    {
	/usr/bin/time -o blah.out $untrusted_ext $target.ppm
	blah="$blah`cat blah.out | sed -n \"/^[0-9.]*user/p\" | sed \"s/^0*\([0-9.]*\).*/\1+/\" | tr -d \"\n\"`"
	diff -a $target.fts orig_$target.fts
	echo $blah
    } 
done

#report our result

echo -n $blah=" "
echo "scale=5; $blah" | sed "s/.$//" | bc	
bleh=`echo "scale=5; $blah" | sed "s/.$//" | bc`	
echo -n "magic number: "

echo "scale=5; $bleh / $runs " | bc

blah=""
bleh=""
runs=""

#next, test our write-feature-descs
$untrusted_wri 18 3 3 4 < $target.ppm > untrusted_InvertedFileFeatureDescription.db
diff -a untrusted_InvertedFileFeatureDescription.db orig_InvertedFileFeatureDescription.db