Changeset 33037 for branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.astro/spex1dgas.c

Timestamp:

Dec 30, 2011, 8:05:04 AM (15 years ago)

Author:

eugene

Message:

avoid double counting the pairs

File:

• branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.astro/spex1dgas.c (modified) (2 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.astro/spex1dgas.c

@@ -172 +172 @@
     }
 
-    N = index2->elements.Int[i];
-    if (N >= Nobject) abort();
-    m = object[N].Nindex;
-    object[N].index[m] = index1->elements.Int[i];
-    object[N].Dtgt[m] = distance->elements.Flt[i];
-    object[N].Dcur[m] = 0.0;
-    object[N].Nindex ++;
-    if (object[N].Nindex == object[N].NINDEX) {
-      object[N].NINDEX += 100;
-      REALLOCATE (object[N].Dtgt, float, object[N].NINDEX);
-      REALLOCATE (object[N].Dcur, float, object[N].NINDEX);
-      REALLOCATE (object[N].index, int, object[N].NINDEX);
-    }
+    // Above we used the set (N,M,D_N,M) to assigned the distance of obj M to obj N.
+    // Below we use that set to assign the distance of obj N to obj M.  IF we supply all
+    // pairwise distances, then this duplicates all entries, so we need to skip that step
+    // in such a case.
+
+    // XX N = index2->elements.Int[i];
+    // XX if (N >= Nobject) abort();
+    // XX m = object[N].Nindex;
+    // XX object[N].index[m] = index1->elements.Int[i];
+    // XX object[N].Dtgt[m] = distance->elements.Flt[i];
+    // XX object[N].Dcur[m] = 0.0;
+    // XX object[N].Nindex ++;
+    // XX if (object[N].Nindex == object[N].NINDEX) {
+    // XX   object[N].NINDEX += 100;
+    // XX   REALLOCATE (object[N].Dtgt, float, object[N].NINDEX);
+    // XX   REALLOCATE (object[N].Dcur, float, object[N].NINDEX);
+    // XX   REALLOCATE (object[N].index, int, object[N].NINDEX);
+    // XX }
   }
 
@@ -221 +226 @@
   // int idx2 = object[idx1].index[(int)(0.75*object[idx1].Nindex)];
   float A = NAN;
-  for (i = 0; isnan (A) && (i < object[idx1].Nindex); i++) {
-      if (object[idx1].index[i] == idx2) {
-          A = object[idx1].Dtgt[i];
+  for (i = 0; isnan (A) && (i < object[idx2].Nindex); i++) {
+      if (object[idx2].index[i] == idx1) {
+          A = object[idx2].Dtgt[i];
       }
   }