Author: cwiklik
Date: Fri Nov 4 20:23:36 2011
New Revision: 1197746
URL: http://svn.apache.org/viewvc?rev=1197746&view=rev
Log:
UIMA-2180 When generating per CAS stats skip the top level aggregate stats, and
only include primitives
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java?rev=1197746&r1=1197745&r2=1197746&view=diff
==============================================================================
---
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
(original)
+++
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
Fri Nov 4 20:23:36 2011
@@ -538,9 +538,10 @@ public class PrimitiveAnalysisEngineCont
AnalysisEngineManagement rootAem = ae.getManagementInterface();
- beforeAnalysisManagementObjects.add(deepCopy(rootAem));
if ( rootAem.getComponents().size() > 0 ) {
getLeafManagementObjects(rootAem, beforeAnalysisManagementObjects,
true);
+ } else {
+ beforeAnalysisManagementObjects.add(deepCopy(rootAem));
}
CasIterator casIterator = ae.processAndOutputNewCASes(aCAS);
@@ -795,13 +796,14 @@ public class PrimitiveAnalysisEngineCont
// These stats are internally maintained in a Map. If the AE is an
aggregate
// the Map will contain AnalysisEngineManagement instance for each AE.
AnalysisEngineManagement aem = ae.getManagementInterface();
- // Add the top level AnalysisEngineManagement instance.
- afterAnalysisManagementObjects.add(aem);
if ( aem.getComponents().size() > 0) {
// Flatten the hierarchy by recursively (if this AE is an
aggregate) extracting
// primitive AE's AnalysisEngineManagement instance and placing it
in
// afterAnalysisManagementObjects List.
getLeafManagementObjects(aem, afterAnalysisManagementObjects, false);
+ } else {
+ // Add the top level AnalysisEngineManagement instance.
+ afterAnalysisManagementObjects.add(aem);
}
// Create a List to hold per CAS analysisTime and total number of CASes
processed
