Changeset 17169 for branches/pap_branch_080320/ppMerge/src/ppMergeLoop.c

Timestamp:

Mar 28, 2008, 9:39:53 AM (18 years ago)

Author:

Paul Price

Message:

Need to average concepts for output.

File:

• branches/pap_branch_080320/ppMerge/src/ppMergeLoop.c (modified) (2 diffs)

branches/pap_branch_080320/ppMerge/src/ppMergeLoop.c

@@ -219 +219 @@
                 }
             }
+
+            // Get list of cells for concepts averaging
+            psList *inCells = psListAlloc(NULL); // List of cells
+            for (int i = 0; i < numFiles; i++) {
+                psListAdd(inCells, PS_LIST_TAIL, readouts->data[i]);
+            }
+            if (!pmConceptsAverageCells(outCell, inCells, NULL, NULL, true)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to average cell concepts.");
+                psFree(inCells);
+                psFree(outRO);
+                goto ERROR;
+            }
+            psFree(inCells);
+
             psFree(readouts);
 
@@ -283 +297 @@
         }
     }
+
+    // Get list of FPAs for concepts averaging
+    psList *inFPAs = psListAlloc(NULL); // List of FPAs
+    for (int i = 0; i < numFiles; i++) {
+        pmFPAfile *input = inputs->data[i]; // Input file
+        psListAdd(inFPAs, PS_LIST_TAIL, input->fpa);
+    }
+    if (!pmConceptsAverageFPAs(output->fpa, inFPAs)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to average FPA concepts.");
+        psFree(inFPAs);
+        goto ERROR;
+    }
+    psFree(inFPAs);
+
+
     if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
         goto ERROR;