Changeset 34277

Timestamp:

Aug 2, 2012, 9:38:03 AM (14 years ago)

Author:

eugene

Message:

only report a missing image once, not once per detection

Location:

trunk/Ohana/src/dvomerge

Files:

• include/dvomerge.h (modified) (2 diffs)
• src/IDmapIO.c (modified) (1 diff)
• src/dvo_image_merge_dbs.c (modified) (4 diffs)

trunk/Ohana/src/dvomerge/include/dvomerge.h

@@ -42 +42 @@
   unsigned int *old;
   unsigned int *new;
+  char *notFound;
 } IDmapType;
 
@@ -128 +129 @@
 int        IDmapSave               PROTO((char *filename, IDmapType *IDmap));
 IDmapType *IDmapLoad               PROTO((char *filename));
+int        create_IDmap_lookup     PROTO((IDmapType *IDmap));

trunk/Ohana/src/dvomerge/src/IDmapIO.c

@@ -133 +133 @@
   fprintf (stderr, "loaded data for %lld images\n", (long long) Nrow);
 
+  create_IDmap_lookup (IDmap);
+
   return IDmap;
 }

trunk/Ohana/src/dvomerge/src/dvo_image_merge_dbs.c

@@ -54 +54 @@
   }
 
+  create_IDmap_lookup (IDmap);
+
   FREE(TgtIndex);
   FREE(TgtTimes);
@@ -105 +107 @@
   }
 
+
   // sort IDmap->old,new on the basis of IDmap->old:
   sort_IDmap (IDmap);
+
+  create_IDmap_lookup (IDmap);
 
   if (!out[0].swapped) {
@@ -172 +177 @@
     newID = dvo_map_image_ID (IDmap, oldID);
     if (newID == 0) {
-      fprintf (stderr, "cannot find image ID "OFF_T_FMT"\n",  oldID);
+      if (!IDmap->notFound[oldID]) {
+        fprintf (stderr, "cannot find image ID "OFF_T_FMT"\n",  oldID);
+        IDmap->notFound[oldID] = TRUE;
+        // once we discover an imageID is not found, record that fact so we do not complain for every detection
+      }
+      // optionally exit here? or wait until end to report an error?
       // exit (2);
     }
@@ -242 +252 @@
 }
 
+// we need a lookup table of length (oldIDmax + 1) to record if a given oldIDmax has not been found in Tgt
+int create_IDmap_lookup (IDmapType *IDmap) {
+  
+  off_t i;
+  unsigned int oldIDmax = 0;
+
+  for (i = 0; i < IDmap->Nmap; i++) {
+    if (oldIDmax > IDmap->old[i]) continue;
+    oldIDmax = IDmap->old[i];
+  }
+  ALLOCATE (IDmap->notFound, char, oldIDmax + 1);
+  memset (IDmap->notFound, 0, sizeof(char) * (oldIDmax + 1));
+  return TRUE;
+}