ImProc ass3: Fixed some stuff.

improc/ass3/intersect.py

@@ -10,11 +10,11 @@ def domainIterator(image):
             yield x, y
 
 def colHist(image, bins, model):
-    h = zeros(bins)
-    image *= bins
+    h = zeros(tuple(bins))
+    image *= list(bins)
 
     if model == 'rgb':
-        image /= 255
+        image /= 255.
     elif model == 'rgba':
         pass
 
@@ -37,20 +37,15 @@ def histogramIntersect(h1, h2):
     return match / h2.sum()
 
 # Create table of intersections
-if __name__ == '__main':
+if __name__ == '__main__':
     bins = [8] * 3
-    print 'Reading images...'
     db = map(lambda x: imread('database/%d.jpg' % x), range(1, 3))
-    print 'done'
     table = zeros((len(db), len(db)))
 
-    for i, im1 in enumerate(db):
-        print i
-        for j, im2 in enumerate(db):
-            print j
-            if i != j:
-                print i, j
-                table[i, j] = histogramIntersect(colHist(im1, bins, 'rgb'),
-                                                 colHist(im2, bins, 'rgb'))
+    for i, im in enumerate(db):
+        for j in xrange(i + 1, len(db)):
+            print 'comparing', i, j
+            table[i, j] = histogramIntersect(colHist(im, bins, 'rgb'),
+                                                 colHist(db[j], bins, 'rgb'))
 
     print table