Changeset 30348

Timestamp:

Jan 24, 2011, 1:36:36 PM (15 years ago)

Author:

eugene

Message:

add consistency tests; fix last measure count

File:

• branches/eam_branches/ipp-20101205/Ohana/src/addstar/src/resort_catalog.c (modified) (4 diffs)

branches/eam_branches/ipp-20101205/Ohana/src/addstar/src/resort_catalog.c

@@ -39 +39 @@
     tmp_ave  = AVE[A];  AVE[A]  = AVE[B];  AVE[B]  = tmp_ave;           \
   }
-# define COMPARE(A,B)(MEAS[A] < MEAS[B])
+# define COMPARE(A,B)(AVE[A] < AVE[B])
   OHANA_SORT (N, COMPARE, SWAPFUNC);
 # undef SWAPFUNC
@@ -96 +96 @@
   }
   
+  // check that averageSeq is now in order
+  // for (i = 1; i < Nmeasure; i++) {
+  //   if (averageSeq[i] < averageSeq[i-1]) {
+  //     fprintf (stderr, "%d ", (int) i);
+  //   }
+  // }
+  // fprintf (stderr, "\n");
+
   SortAveMeasMatch(measureSeq, averageSeq, Nmeasure);
   // MARKTIME("sort : %f sec\n", dtime);
+
+  // check that averageSeq is now in order
+  // for (i = 1; i < Nmeasure; i++) {
+  //   if (averageSeq[i] < averageSeq[i-1]) {
+  //     fprintf (stderr, "%d ", (int) i);
+  //   }
+  // }
+  // fprintf (stderr, "\n");
 
   // copy the measurements in the sorted order
@@ -116 +132 @@
   for (i = 0; i < Nmeasure; i++) {
     if (averageSeq[i] != currentAve) {
+      // we have hit the next entry in the list
       average[currentAve].Nmeasure = N;
       N = 0;
@@ -123 +140 @@
     N++;
   }
-  N++;
+  // N++;
   average[currentAve].Nmeasure = N;
   // MARKTIME("update Nmeasure : %f sec\n", dtime);
 
+  int NmeasureTotal = 0;
+  int measureOffsetOK = TRUE;
+  for (i = 0; i < catalog[0].Naverage; i++) {
+    NmeasureTotal += catalog[0].average[i].Nmeasure;
+    if (VERBOSE && !(NmeasureTotal <= catalog[0].Nmeasure)) {
+      fprintf (stderr, "too few measurements: %d %d %d\n", (int) i, NmeasureTotal, (int) catalog[0].Nmeasure);
+    }
+    measureOffsetOK &= (catalog[0].average[i].measureOffset < catalog[0].Nmeasure);
+    if (VERBOSE && !(catalog[0].average[i].measureOffset < catalog[0].Nmeasure)) {
+      fprintf (stderr, "offset too large: %d %d %d\n", (int) i, catalog[0].average[i].Nmeasure, (int) catalog[0].Nmeasure);
+    }
+    measureOffsetOK &= (catalog[0].average[i].measureOffset + catalog[0].average[i].Nmeasure <= catalog[0].Nmeasure);
+    if (VERBOSE && !(catalog[0].average[i].measureOffset + catalog[0].average[i].Nmeasure <= catalog[0].Nmeasure)) {
+      fprintf (stderr, "orrset + Nmeasure too large: %d + %d > %d %d\n", (int) i, catalog[0].average[i].measureOffset, catalog[0].average[i].Nmeasure, (int) catalog[0].Nmeasure);
+    }
+  }
+
+  if (!measureOffsetOK) {
+    fprintf (stderr, "ERROR: catalog %s has an invalid measureOffset\n", catalog[0].filename);
+  }
+
+  if (NmeasureTotal != catalog[0].Nmeasure) {
+    fprintf (stderr, "ERROR: catalog %s has an invalid Nmeasure\n", catalog[0].filename);
+  }
+
   // MARKTIME("  match time %9.4f sec for %7lld measures, %6lld average\n", dtime, (long long) Nmeasure, (long long) Naverage);
+
+  catalog[0].sorted = TRUE;
 
   FREE (measureSeq);