Changeset 16633 for branches/eam_branch_20080223/Ohana/src/addstar/src/build_links.c

Timestamp:

Feb 23, 2008, 3:16:39 PM (18 years ago)

Author:

eugene

Message:

rename of average elements Nm,Nn,offset,missing to Nmeasure, Nmissing, measureOffset, missingOffset

File:

• branches/eam_branch_20080223/Ohana/src/addstar/src/build_links.c (modified) (11 diffs)

branches/eam_branch_20080223/Ohana/src/addstar/src/build_links.c

@@ -2 +2 @@
 
 /* build the initial links assuming the table is sorted, 
-   not partial, and has a correct set of average[].offset,Nm values */
+   not partial, and has a correct set of average[].measureOffset,Nm values */
 int *init_measure_links (Average *average, int Naverage, Measure *measure, int Nmeasure) {
 
@@ -12 +12 @@
   ALLOCATE (next, int, Nmeasure);
   for (i = 0; i < Naverage; i++, N++) {
-    for (j = 0; j < average[i].Nm - 1; j++, N++) {
+    for (j = 0; j < average[i].Nmeasure - 1; j++, N++) {
       next[N] = N + 1;
       if (N >= Nmeasure) {
@@ -41 +41 @@
   ALLOCATE (next, int, Nmissing);
   for (i = 0; i < Naverage; i++) {
-    for (j = 0; j < average[i].Nn - 1; j++, N++) {
+    for (j = 0; j < average[i].Nmissing - 1; j++, N++) {
       next[N] = N + 1;
     }
-    if (average[i].Nn > 0) {
+    if (average[i].Nmissing > 0) {
       next[N] = -1;
       if (N >= Nmissing) {
@@ -57 +57 @@
 }
 
-/* average[].offset, average[].Nm are valid within an addstar run */
+/* average[].measureOffset, average[].Nmeasure are valid within an addstar run */
 int add_meas_link (Average *average, int *next, int Nmeasure, int NMEASURE) {
 
@@ -63 +63 @@
 
   /* if we have trouble, check validity of next[m] : m < Nmeasure */
-  m = average[0].offset;  
-
-  for (k = 0; k < average[0].Nm - 1; k++)  {
+  m = average[0].measureOffset;  
+
+  for (k = 0; k < average[0].Nmeasure - 1; k++)  {
     m = next[m];
     if (m >= NMEASURE) {
@@ -79 +79 @@
 
   if (m == -1) {
-    average[0].offset = Nmeasure;
+    average[0].measureOffset = Nmeasure;
   } else {
     next[m] = Nmeasure;
@@ -95 +95 @@
 
   /* there may be 0 Nmiss; this is not true for Nmeas */
-  if (average[0].Nn < 1) {
-    average[0].missing = Nmissing;
+  if (average[0].Nmissing < 1) {
+    average[0].missingOffset = Nmissing;
     next[Nmissing] = -1;
     return (TRUE);
   }
 
-  m = average[0].missing;  
-  for (k = 0; k < average[0].Nn - 1; k++) m = next[m];
+  m = average[0].missingOffset;  
+  for (k = 0; k < average[0].Nmissing - 1; k++) m = next[m];
   /* set up references */
   next[Nmissing] = -1;
@@ -125 +125 @@
   /* reset the Nm, offset values for average */
   for (i = 0; i < Naverage; i++) {
-    average[i].offset = -1;
-    average[i].Nm     =  0;
+    average[i].measureOffset = -1;
+    average[i].Nmeasure     =  0;
   }
 
   for (Nm = 0; Nm < Nmeasure; Nm++) {
     averef = measure[Nm].averef;
-    m = average[averef].offset;  
+    m = average[averef].measureOffset;  
     next[Nm] = -1;
 
     if (m == -1) { /* no links yet for source */
-      average[averef].offset = Nm;
-      average[averef].Nm     = 1;
+      average[averef].measureOffset = Nm;
+      average[averef].Nmeasure     = 1;
       continue;
     }
@@ -147 +147 @@
     }
 
-    average[averef].Nm = k + 2;
+    average[averef].Nmeasure = k + 2;
     next[m] = Nm;
     if (m >= Nmeasure) {
@@ -168 +168 @@
   ALLOCATE (tmpmeasure, Measure, Nmeasure);
   for (i = 0; i < Naverage; i++) {
-    n = average[i].offset;
-    average[i].offset = N;
-    for (k = 0; k < average[i].Nm; k++, N++) {
+    n = average[i].measureOffset;
+    average[i].measureOffset = N;
+    for (k = 0; k < average[i].Nmeasure; k++, N++) {
       tmpmeasure[N] = measure[n]; 
       tmpmeasure[N].averef = i;
@@ -189 +189 @@
   ALLOCATE (tmpmissing, Missing, Nmissing);
   for (i = 0; i < Naverage; i++) {
-    n = average[i].missing;
-    average[i].missing = N;
-    for (k = 0; k < average[i].Nn; k++, N++) {
+    n = average[i].missingOffset;
+    average[i].missingOffset = N;
+    for (k = 0; k < average[i].Nmissing; k++, N++) {
       tmpmissing[N] = missing[n]; 
       n = next[n];