Changeset 35512 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpOverlaps.c

Timestamp:

May 5, 2013, 2:20:46 PM (13 years ago)

Author:

eugene

Message:

stats is basically working now

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpOverlaps.c (modified) (4 diffs)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpOverlaps.c

@@ -45 +45 @@
         if (!chip->process || !chip->file_exists) { 
             // this ensures one entry per chip (regardless of existence)
-            // XXX maybe not? pswarpBoundsAppend (bounds, NAN, NAN, NAN, NAN);
+            pswarpBoundsAppend (bounds, NAN, NAN, NAN, NAN);
             continue; 
         }
@@ -83 +83 @@
             }
         }
-        fprintf (stderr, "bounds %d : %f - %f, %f - %f\n", view->chip, Pmin, Pmax, Qmin, Qmax);
+        // fprintf (stderr, "bounds %d : %f - %f, %f - %f\n", view->chip, Pmin, Pmax, Qmin, Qmax);
         pswarpBoundsAppend (bounds, Pmin, Pmax, Qmin, Qmax);
     }
@@ -164 +164 @@
 }
 
-bool pswarpFindOverlap (pmFPA *fpa, pswarpBounds *src, pswarpBounds *tgt) {
+bool pswarpFindOverlap (pmFPA *input, pmFPA *output, pswarpBounds *src, pswarpBounds *tgt) {
 
     // we have the source and target bounds.  loop over all output elements and check if any of the source
     // elements overlap it.
 
-    assert (fpa->chips->n == tgt->Pmin->n);
-
-    for (int j = 0; j < fpa->chips->n; j++) {
-        pmChip *chip = fpa->chips->data[j];
+    // also add the list if input (src) cells which land on each output (tgt) chip we do this
+    // by only identifying the input and output chips and adding all input chip cells to each
+    // output cell
+
+    assert (output->chips->n == tgt->Pmin->n);
+    assert (input->chips->n == src->Pmin->n);
+
+    for (int j = 0; j < output->chips->n; j++) {
+        pmChip *chip = output->chips->data[j];
 
         // we have src bounds
@@ -180 +185 @@
         float Qmax = tgt->Qmax->data.F32[j];
 
-        bool valid = false;
-        for (int i = 0; !valid && (i < src->Pmin->n); i++) {
+        psArray *inputChips = psArrayAllocEmpty(8);
+
+        bool hasOverlap = false;
+        for (int i = 0; i < src->Pmin->n; i++) {
             // overlaps in P?
-            bool Pvalid = (Pmin < src->Pmax->data.F32[i]) && (Pmax > src->Pmin->data.F32[i]);
-            bool Qvalid = (Qmin < src->Qmax->data.F32[i]) && (Qmax > src->Qmin->data.F32[i]);
-            valid = Pvalid && Qvalid;
-        }
-        // if (valid) {
-        //     fprintf (stderr, "chip %d is valid\n", j);
-        // } else {
-        //     fprintf (stderr, "chip %d is NOT valid\n", j);
-        // }
-        chip->process = valid;
+            if (!isfinite(src->Pmin->data.F32[i])) continue;
+            if (!isfinite(src->Pmax->data.F32[i])) continue;
+            if (!isfinite(src->Qmin->data.F32[i])) continue;
+            if (!isfinite(src->Qmax->data.F32[i])) continue;
+
+            if (Pmin > src->Pmax->data.F32[i]) continue;
+            if (Pmax < src->Pmin->data.F32[i]) continue;
+
+            if (Qmin > src->Qmax->data.F32[i]) continue;
+            if (Qmax < src->Qmin->data.F32[i]) continue;
+
+            hasOverlap = true;
+            psArrayAdd (inputChips, 1, input->chips->data[i]);
+        }
+        chip->process = hasOverlap;
+        if (hasOverlap) {
+            // get the complete list of input cells for this set of input chips
+            // pmConceptsAverageCells needs a psList (not a psArray)
+            psList *inputCells = psListAlloc(NULL);
+            for (int nChip = 0; nChip < inputChips->n; nChip++) {
+                pmChip *inputChip = inputChips->data[nChip];
+                for (int nCell = 0; nCell < inputChip->cells->n; nCell++) {
+                    fprintf (stderr, "input %d, %d : output %d\n", nChip, nCell, j);
+                    psListAdd (inputCells, PS_LIST_TAIL, inputChip->cells->data[nCell]);
+                }
+            }
+            
+            // place the inputCells on each of the output cells 
+            for (int nCell = 0; nCell < chip->cells->n; nCell++) {
+                pmCell *outputCell = chip->cells->data[nCell];
+                psMetadataAddPtr(outputCell->analysis, PS_LIST_TAIL, "INPUT.CELLS", PS_DATA_LIST , "input cells touching this output cell", inputCells);
+            }
+            psFree (inputCells);
+        }
+        psFree (inputChips);
     }
     return true;