Changeset 18025

Timestamp:

Jun 9, 2008, 12:10:17 PM (18 years ago)

Author:

Paul Price

Message:

Only average concepts for chip if they exist!

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.");
+
+        if (outChip->data_exists) {
+            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);
-            goto ERROR;
-        }
-        psFree(inChips);
+        }
         if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
             goto ERROR;