Changeset 17424 for trunk/ppMerge/src/ppMergeLoop.c

Timestamp:

Apr 9, 2008, 8:31:42 PM (18 years ago)

Author:

bills

Message:

added pmConceptsAverageChips. This is needed to get valid files from
ppMerge for gpc1

File:

• trunk/ppMerge/src/ppMergeLoop.c (modified) (1 diff)

trunk/ppMerge/src/ppMergeLoop.c

@@ -306 +306 @@
             }
         }
+        psList *inChips = psListAlloc(NULL);
+        for (int i=0; i < numFiles; i++) {
+            pmChip *chip = pmFPAviewThisChip(view, ((pmFPAfile *)inputs->data[i])->fpa);
+            psListAdd(inChips, PS_LIST_TAIL, chip);
+        }
+        if (!pmConceptsAverageChips(outChip, inChips, true)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to average Chip concepts.");
+            psFree(inChips);
+            goto ERROR;
+        }
+        psFree(inChips);
         if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
             goto ERROR;