X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=images%2Fsig-cmp-gen.h;h=d316cb2f43c1c49e4c48b30bdd868acfdb84fc5b;hb=c8c688e0b06fdacb20b28b66b9b0608dae8ca0dc;hp=e95d94229f7e6df6f085a8d90ffa6f86927ff1af;hpb=50502db00a2a2f38a0cf8c0a18d733575da4e0a6;p=libucw.git

diff --git a/images/sig-cmp-gen.h b/images/sig-cmp-gen.h
index e95d9422..d316cb2f 100644
--- a/images/sig-cmp-gen.h
+++ b/images/sig-cmp-gen.h
@@ -65,26 +65,68 @@ image_signatures_dist_integrated_explain(struct image_signature *sig1, struct im
     for (j = 0, reg2 = sig2->reg; j < sig2->len; j++, reg2++)
       for (i = 0, reg1 = sig1->reg; i < sig1->len; i++, reg1++)
         {
-	  uns ds =
-	    image_sig_cmp_features_weights[6] * isqr((int)reg1->h[0] - (int)reg2->h[0]) +
-	    image_sig_cmp_features_weights[7] * isqr((int)reg1->h[1] - (int)reg2->h[1]) +
-	    image_sig_cmp_features_weights[8] * isqr((int)reg1->h[2] - (int)reg2->h[2]);
-	  uns dt =
-	    image_sig_cmp_features_weights[0] * isqr((int)reg1->f[0] - (int)reg2->f[0]) +
-	    image_sig_cmp_features_weights[1] * isqr((int)reg1->f[1] - (int)reg2->f[1]) +
-	    image_sig_cmp_features_weights[2] * isqr((int)reg1->f[2] - (int)reg2->f[2]) +
-	    image_sig_cmp_features_weights[3] * isqr((int)reg1->f[3] - (int)reg2->f[3]) +
-	    image_sig_cmp_features_weights[4] * isqr((int)reg1->f[4] - (int)reg2->f[4]) +
-	    image_sig_cmp_features_weights[5] * isqr((int)reg1->f[5] - (int)reg2->f[5]);
+	  uns dt = 0, ds = 0, dp = 0, d;
+	  for (uns i = 0; i < IMAGE_VEC_F; i++)
+	    dt += image_sig_cmp_features_weights[i] * isqr((int)reg1->f[i] - (int)reg2->f[i]);
+	  for (uns i = 0; i < 3; i++)
+	    ds += image_sig_cmp_features_weights[IMAGE_VEC_F + i] * isqr((int)reg1->h[i] - (int)reg2->h[i]);
+	  for (uns i = 3; i < 5; i++)
+	    dp += image_sig_cmp_features_weights[IMAGE_VEC_F + i] * isqr((int)reg1->h[i] - (int)reg2->h[i]);
+#if 0
+	  int x1, y1, x2, y2;
+	  if (sig1->cols > sig1->rows)
+	    {
+	      x1 = reg1->h[3];
+	      y1 = ((int)reg1->h[4] - 64) * (int)sig1->rows / (int)sig1->cols + 64;
+	    }
+	  else
+	    {
+	      y1 = reg1->h[4];
+	      x1 = ((int)reg1->h[3] - 64) * (int)sig1->cols / (int)sig1->rows + 64;
+	    }
+	  if (sig2->cols > sig2->rows)
+	    {
+	      x2 = reg2->h[3];
+	      y2 = ((int)reg2->h[4] - 64) * (int)sig2->rows / (int)sig2->cols + 64;
+	    }
+	  else
+	    {
+	      y2 = reg2->h[4];
+	      x2 = ((int)reg2->h[3] - 64) * (int)sig2->cols / (int)sig2->rows + 64;
+	    }
+	  MSGL("%d %d %d %d", x1, y1, x2, y2);
+	  dp = image_sig_cmp_features_weights[IMAGE_VEC_F + 3] * isqr(x1 - x2) +
+    	       image_sig_cmp_features_weights[IMAGE_VEC_F + 4] * isqr(y1 - y2);
+#endif
+#if 0
+	  d = dt * (4 + MIN(8, (ds >> 12))) * (4 + MIN(8, (dp >> 10))) + (ds >> 11) + (dp >> 10);
+	  MSG("[%u, %u] d=%u=(%u * %u * %u + %u + %u) dt=%u ds=%u dp=%u df=(%d", i, j, d,
+	      dt, 4 + MIN(8, (ds >> 12)), 4 + MIN(8, dp >> 10), ds >> 11, dp >> 10, dt, ds, dp, (int)reg1->f[0] - (int)reg2->f[0]);
+#endif
+#if 1
+	  d = dt;
 	  if (ds < 1000)
-	    dt *= 8;
+	    d = d * 4;
+	  else if (ds < 4000)
+	    d = d * 6 + 8;
 	  else if (ds < 10000)
-	    dt *= 12;
+	    d = d * 8 + 20;
+	  else if (ds < 50000)
+	    d = d * 10 + 50;
+	  else
+	    d = d * 12 + 100;
+	  if (dp < 1000)
+	    d = d * 2;
+	  else if (dp < 4000)
+	    d = d * 3 + 100;
+	  else if (dp < 10000)
+	    d = d * 4 + 800;
 	  else
-	    dt *= 16;
-	  dist[n++] = (dt << 8) + i + (j << 4);
-#ifdef CONFIG_EXPLAIN
-	  MSG("[%u, %u] dt=%u ds=%u df=(%d", i, j, dt, ds, (int)reg1->f[0] - (int)reg2->f[0]);
+	    d = d * 5 + 3000;
+#endif
+	  dist[n++] = (d << 8) + i + (j << 4);
+	  MSG("[%u, %u] d=%u dt=%u ds=%u dp=%u df=(%d", i, j, d, dt, ds, dp, (int)reg1->f[0] - (int)reg2->f[0]);
+#ifdef EXPLAIN
 	  for (uns i = 1; i < IMAGE_VEC_F; i++)
 	    MSG(" %d", (int)reg1->f[i] - (int)reg2->f[i]);
 	  MSG(") dh=(%d", (int)reg1->h[0] - (int)reg2->h[0]);
@@ -98,15 +140,11 @@ image_signatures_dist_integrated_explain(struct image_signature *sig1, struct im
     for (j = 0, reg2 = sig2->reg; j < sig2->len; j++, reg2++)
       for (i = 0, reg1 = sig1->reg; i < sig1->len; i++, reg1++)
         {
-	  uns dt =
-	    image_sig_cmp_features_weights[0] * isqr((int)reg1->f[0] - (int)reg2->f[0]) +
-	    image_sig_cmp_features_weights[1] * isqr((int)reg1->f[1] - (int)reg2->f[1]) +
-	    image_sig_cmp_features_weights[2] * isqr((int)reg1->f[2] - (int)reg2->f[2]) +
-	    image_sig_cmp_features_weights[3] * isqr((int)reg1->f[3] - (int)reg2->f[3]) +
-	    image_sig_cmp_features_weights[4] * isqr((int)reg1->f[4] - (int)reg2->f[4]) +
-	    image_sig_cmp_features_weights[5] * isqr((int)reg1->f[5] - (int)reg2->f[5]);
+	  uns dt = 0;
+	  for (uns i = 0; i < IMAGE_VEC_F; i++)
+	    dt += image_sig_cmp_features_weights[i] * isqr((int)reg1->f[i] - (int)reg2->f[i]);
 	  dist[n++] = (dt << 12) + i + (j << 4);
-#ifdef CONFIG_EXPLAIN
+#ifdef EXPLAIN
 	  MSG("[%u, %u] dt=%u df=(%d", i, j, dt, (int)reg1->f[0] - (int)reg2->f[0]);
 	  for (uns i = 1; i < IMAGE_VEC_F; i++)
 	    MSG(" %d", (int)reg1->f[i] - (int)reg2->f[i]);
@@ -125,7 +163,7 @@ image_signatures_dist_integrated_explain(struct image_signature *sig1, struct im
     q[i] = reg2->wb;
 
   /* Sort entries in distance matrix */
-  image_signatures_dist_integrated_sort(n, dist);
+  image_signatures_dist_integrated_sort(dist, n);
 
   /* Compute significance matrix and resulting distance */
   uns sum = 0;
@@ -149,8 +187,10 @@ image_signatures_dist_integrated_explain(struct image_signature *sig1, struct im
 	}
       l -= s;
       sum += s * d;
-#ifdef CONFIG_EXPLAIN
-      MSG("[%u, %u] d=%u d=%u df=(%d", i, j, s, d, (int)reg1->f[0] - (int)reg2->f[0]);
+#ifdef EXPLAIN
+      reg1 = sig1->reg + i;
+      reg2 = sig2->reg + j;
+      MSG("[%u, %u] s=%u d=%u df=(%d", i, j, s, d, (int)reg1->f[0] - (int)reg2->f[0]);
       for (uns i = 1; i < IMAGE_VEC_F; i++)
         MSG(" %d", (int)reg1->f[i] - (int)reg2->f[i]);
       if (!((sig1->flags | sig2->flags) & IMAGE_SIG_TEXTURED))
@@ -163,7 +203,26 @@ image_signatures_dist_integrated_explain(struct image_signature *sig1, struct im
 #endif
     }
 
-  return sum;
+  d = sum / 32;
+
+  uns a = sig1->cols * sig2->rows;
+  uns b = sig1->rows * sig2->cols;
+  if (a < 2 * b && b < 2 * a)
+    d = d * 2;
+  else if (a < 4 * b && b < 4 * a)
+    d = d * 3;
+  else
+    d = d * 5;
+
+  a = sig1->cols * sig1->rows;
+  b = sig2->cols * sig2->rows;
+
+  if ((a < 1000 && b > 5000) || (b < 1000 && a > 5000))
+    d = d * 2;
+  else if ((a < 5000 && b > 20000) || (b < 5000 && a > 20000))
+    d = d * 3 / 2;
+
+  return d;
 }
 
 #ifndef EXPLAIN
@@ -201,17 +260,17 @@ image_signatures_dist_fuzzy_explain(struct image_signature *sig1, struct image_s
     for (uns j = 0; j < cnt2; j++)
       {
 	uns d = 0;
-	for (uns k = 0; k < IMAGE_REG_F; k++)
+	for (uns k = 0; k < IMAGE_VEC_F; k++)
 	  {
 	    int dif = reg1[i].f[k] - reg2[j].f[k];
-	    d += dif * dif;
+	    d += image_sig_cmp_features_weights[k] * 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;
+	    d += image_sig_cmp_features_weights[k + IMAGE_VEC_F] * dif * dif;
 	  }
 	mh[i][j] = d;
       }
@@ -246,7 +305,7 @@ image_signatures_dist_fuzzy_explain(struct image_signature *sig1, struct image_s
 
   uns measure = lfs * 6 + lhs * 2 * 8;
 
-#ifdef CONFIG_EXPLAIN
+#ifdef EXPLAIN
   /* Display similarity vectors */
   MSG("Lf=(");
   for (uns i = 0; i < cnt1 + cnt2; i++)
@@ -276,6 +335,58 @@ image_signatures_dist_fuzzy_explain(struct image_signature *sig1, struct image_s
   return (1 << (3 + 3 + 8 + 16)) - measure;
 }
 
+#ifndef EXPLAIN
+static uns
+image_signatures_dist_average(struct image_signature *sig1, struct image_signature *sig2)
+#else
+static uns
+image_signatures_dist_average_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
+#endif
+{
+#ifdef EXPLAIN
+  byte buf[1024], *line = buf;
+  MSGL("Average matching");
+#endif
+
+  uns dist = 0;
+  for (uns i = 0; i < IMAGE_VEC_F; i++)
+    {
+      uns d = image_sig_cmp_features_weights[0] * isqr((int)sig1->vec.f[i] - (int)sig2->vec.f[i]);
+      MSGL("feature %u: d=%u (%u %u)", i, d, sig1->vec.f[i], sig2->vec.f[i]);
+      dist += d;
+    }
+
+  MSGL("dist=%u", dist);
+  return dist;
+}
+
+#ifndef EXPLAIN
+#define CALL(x) image_signatures_dist_##x(sig1, sig2)
+uns
+image_signatures_dist(struct image_signature *sig1, struct image_signature *sig2)
+#else
+#define CALL(x) image_signatures_dist_##x##_explain(sig1, sig2, msg, param)
+uns
+image_signatures_dist_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
+#endif
+{
+  if (!sig1->len)
+    return CALL(average);
+  else
+    switch (image_sig_compare_method)
+      {
+        case 0:
+	  return CALL(integrated);
+	case 1:
+	  return CALL(fuzzy);
+	case 2:
+	  return CALL(average);
+	default:
+	  ASSERT(0);
+      }
+}
+#undef CALL
+
 #undef EXPLAIN
 #undef MSG
 #undef LINE