X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fsig-cmp.c;h=028e1b6ac56288cfeb7b3d2e06548e1381094a6e;hb=27a14fc4257c0d8ae2618bd0238b6987c65ae50d;hp=6367643be36aeaa96646989dee076ecc7aefffce;hpb=731cb9f2c5a321a96bf36e3278382bb9ca26c72e;p=libucw.git

diff --git a/images/sig-cmp.c b/images/sig-cmp.c
index 6367643b..028e1b6a 100644
--- a/images/sig-cmp.c
+++ b/images/sig-cmp.c
@@ -1,5 +1,5 @@
 /*
- *	Image Library -- Comparitions of image signatures
+ *	Image Library -- Comparisions of image signatures
  *
  *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
  *
@@ -7,105 +7,21 @@
  *	of the GNU Lesser General Public License.
  */
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/math.h"
+#include "ucw/lib.h"
+#include "images/math.h"
 #include "images/images.h"
 #include "images/signature.h"
-#include <stdio.h>
-
-uns
-image_signatures_dist(struct image_signature *sig1, struct image_signature *sig2)
-{
-  DBG("image_signatures_dist()");
-
-  uns cnt1 = sig1->len;
-  uns cnt2 = sig2->len;
-  struct image_region *reg1 = sig1->reg;
-  struct image_region *reg2 = sig2->reg;
-  uns mf[IMAGE_REG_MAX][IMAGE_REG_MAX], mh[IMAGE_REG_MAX][IMAGE_REG_MAX];
-  uns lf[IMAGE_REG_MAX * 2], lh[IMAGE_REG_MAX * 2];
-  uns df = sig1->df + sig2->df, dh = sig1->dh + sig2->dh;
 
-  /* Compute distance matrix */
-  for (uns i = 0; i < cnt1; i++)
-    for (uns j = 0; j < cnt2; j++)
-      {
-	uns d = 0;
-	for (uns k = 0; k < IMAGE_REG_F; k++)
-	  {
-	    int dif = reg1[i].f[k] - reg2[j].f[k];
-	    d += dif * dif;
-	  }
-	mf[i][j] = d;
-	d = 0;
-	for (uns k = 0; k < IMAGE_REG_H; k++)
-	  {
-	    int dif = reg1[i].h[k] - reg2[j].h[k];
-	    d += dif * dif;
-	  }
-	mh[i][j] = d;
-      }
-
-  uns lfs = 0, lhs = 0;
-  for (uns i = 0; i < cnt1; i++)
-    {
-      uns f = mf[i][0], h = mh[i][0];
-      for (uns j = 1; j < cnt2; j++)
-        {
-	  f = MIN(f, mf[i][j]);
-	  h = MIN(h, mh[i][j]);
-	}
-      lf[i] = (df * 0x10000) / (df + (int)sqrt(f));
-      lh[i] = (dh * 0x10000) / (dh + (int)sqrt(h));
-      lfs += lf[i] * (6 * reg1[i].wa + 2 * reg1[i].wb);
-      lhs += lh[i] * reg1[i].wa;
-    }
-  for (uns i = 0; i < cnt2; i++)
-    {
-      uns f = mf[0][i], h = mh[0][i];
-      for (uns j = 1; j < cnt1; j++)
-        {
-	  f = MIN(f, mf[j][i]);
-	  h = MIN(h, mh[j][i]);
-	}
-      lf[i + cnt1] = (df * 0x10000) / (df + (int)sqrt(f));
-      lh[i + cnt1] = (dh * 0x10000) / (dh + (int)sqrt(h));
-      lfs += lf[i] * (6 * reg2[i].wa + 2 * reg2[i].wb);
-      lhs += lh[i] * reg2[i].wa;
-    }
-
-  uns measure = lfs * 6 + lhs * 2 * 8;
+#include <stdio.h>
 
-#ifdef LOCAL_DEBUG
-  /* Display similarity vectors */
-  byte buf[2 * IMAGE_REG_MAX * 16 + 3], *b = buf;
-  for (uns i = 0; i < cnt1 + cnt2; i++)
-    {
-      if (i)
-	*b++ = ' ';
-      if (i == cnt1)
-	*b++ = '~', *b++ = ' ';
-      b += sprintf(b, "%.4f", (double)lf[i] / 0x10000);
-    }
-  *b = 0;
-  DBG("Lf=(%s)", buf);
-  b = buf;
-  for (uns i = 0; i < cnt1 + cnt2; i++)
-    {
-      if (i)
-	*b++ = ' ';
-      if (i == cnt1)
-	*b++ = '~', *b++ = ' ';
-      b += sprintf(b, "%.4f", (double)lh[i] / 0x10000);
-    }
-  *b = 0;
-  DBG("Lh=(%s)", buf);
-  DBG("Lfm=%.4f", lfs / (double)(1 << (3 + 8 + 16)));
-  DBG("Lhm=%.4f", lhs / (double)(1 << (8 + 16)));
-  DBG("measure=%.4f", measure / (double)(1 << (3 + 3 + 8 + 16)));
-#endif
+#define ASORT_PREFIX(x) image_signatures_dist_integrated_##x
+#define ASORT_KEY_TYPE uns
+#define ASORT_ELT(i) items[i]
+#define ASORT_EXTRA_ARGS , uns *items
+#include "ucw/arraysort.h"
 
-  return (1 << (3 + 3 + 8 + 16)) - measure;
-}
+#define EXPLAIN
+#include "images/sig-cmp-gen.h"
+#include "images/sig-cmp-gen.h"