Changeset 38731

Timestamp:

Sep 15, 2015, 9:49:05 AM (11 years ago)

Author:

eugene

Message:

it is not an error to have 0 entries for various dvo tables

File:

• branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvoverify_utils.c (modified) (2 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvoverify_utils.c

@@ -224 +224 @@
   
 # define CHECK_TABLE(NAME) {                                            \
-    int Ntotal = 0; int offsetOK = TRUE;                                \
+    int Ntotal = 0; int offsetOK = TRUE; int isOK = FALSE;              \
     for (i = 0; i < catalog.Naverage; i++) {                            \
       Ntotal += catalog.average[i].N##NAME;                             \
@@ -230 +230 @@
         fprintf (stderr, "Ntotal (%s) > catalog.N##NAME: %d %d %d\n", #NAME, i, catalog.average[i].N##NAME, (int) catalog.N##NAME); \
       }                                                                 \
-      offsetOK &= (catalog.average[i].NAME##Offset < catalog.N##NAME); \
-      if (VERBOSE && !(catalog.average[i].NAME##Offset < catalog.N##NAME)) { \
+      isOK = (catalog.average[i].N##NAME == 0) || (catalog.average[i].NAME##Offset < catalog.N##NAME); \
+      offsetOK &= isOK;                                                 \
+      if (VERBOSE && !isOK) {                                           \
         fprintf (stderr, "%sOffset >= catalog.N%s: %d %d %d\n", #NAME, #NAME, i, catalog.average[i].NAME##Offset, (int) catalog.N##NAME); \
       }                                                                 \
-      offsetOK &= (catalog.average[i].NAME##Offset + catalog.average[i].N##NAME <= catalog.N##NAME); \
-      if (VERBOSE && !(catalog.average[i].NAME##Offset + catalog.average[i].N##NAME <= catalog.N##NAME)) { \
+      isOK = (catalog.average[i].N##NAME == 0) || (catalog.average[i].NAME##Offset + catalog.average[i].N##NAME < catalog.N##NAME); \
+      offsetOK &= isOK;                                                 \
+      if (VERBOSE && !isOK) {                                           \
         fprintf (stderr, "%sOffset + N%s > catalog.N%s : %d %d %d\n", #NAME, #NAME, #NAME, i, catalog.average[i].N##NAME, (int) catalog.N##NAME); \
       } }                                                               \