Changeset 14289

Timestamp:

Jul 18, 2007, 8:48:29 AM (19 years ago)

Author:

eugene

Message:

do not allow duplicate regions in SkyListFromBounds

File:

• trunk/Ohana/src/libdvo/src/skyregion_ops.c (modified) (2 diffs)

trunk/Ohana/src/libdvo/src/skyregion_ops.c

@@ -200 +200 @@
 SkyList *SkyListByBounds (SkyTable *table, int depth, double Rmin, double Rmax, double Dmin, double Dmax) {
 
-  int i, Ns;
+  int i, j, Ns;
   SkyList *list, *extra;
 
@@ -219 +219 @@
     Ns = list[0].Nregions;
     for (i = 0; i < extra[0].Nregions; i++) {
-      list[0].regions[i + Ns] = extra[0].regions[i];
-      list[0].filename[i + Ns] = extra[0].filename[i];
-    }
-    list[0].Nregions += extra[0].Nregions;
+      // search for pre-existing match
+      for (j = 0; j < list[0].Nregions; j++) {
+        if (list[0].regions[j] == extra[0].regions[i]) {
+          goto skip;
+        }
+      }
+      list[0].regions[Ns] = extra[0].regions[i];
+      list[0].filename[Ns] = extra[0].filename[i];
+      Ns ++;
+    skip:
+      continue;
+    }
+    list[0].Nregions = Ns;
     SkyListFree (extra, FALSE);
   } else {