You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2013/12/13 16:33:22 UTC

svn commit: r1550750 - /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java

Author: degenaro
Date: Fri Dec 13 15:33:21 2013
New Revision: 1550750

URL: http://svn.apache.org/r1550750
Log:
UIMA-2626 DUCC webserver (WS) Job Performance tab shows meaningless total for min/max

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1550750&r1=1550749&r2=1550750&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Fri Dec 13 15:33:21 2013
@@ -1330,6 +1330,8 @@ public class DuccHandler extends DuccAbs
 		if(job != null) {
 			try {
 				String userId = duccWebSessionManager.getUserId(request);
+				WorkItemStateManager workItemStateManager = new WorkItemStateManager(job.getLogDirectory()+jobNo);
+				workItemStateManager.importData(userId);
 				PerformanceSummary performanceSummary = new PerformanceSummary(job.getLogDirectory()+jobNo);
 			    PerformanceMetricsSummaryMap performanceMetricsSummaryMap = performanceSummary.readSummary(userId);
 			    if( (performanceMetricsSummaryMap == null) || (performanceMetricsSummaryMap.size() == 0) ) {
@@ -1392,25 +1394,9 @@ public class DuccHandler extends DuccAbs
 				    DecimalFormat formatter = new DecimalFormat("##0.0");
 				    // pass 1
 				    double time_total = 0;
-				    double time_avg = 0;
-				    double time_min = 0;
-				    double time_max = 0;
-				    if(numstats > 0) {
-				    	time_min = uimaStats.get(0).getAnalysisMinTime();
-				    	time_max = uimaStats.get(0).getAnalysisMaxTime();
-				    }
 				    for (int i = 0; i < numstats; ++i) {
 						time_total += (uimaStats.get(i).getAnalysisTime());
-						long itime_min = uimaStats.get(i).getAnalysisMinTime();
-						if(itime_min < time_min) {
-							time_min = itime_min;
-						}
-						long itime_max = uimaStats.get(i).getAnalysisMinTime();
-						if(itime_max > time_max) {
-							time_max = itime_max;
-						}
 					}
-				    time_avg = time_total/casCount;
 				    int counter = 0;
 				    sb.append(trGet(counter++));
 				    // Totals
@@ -1426,16 +1412,22 @@ public class DuccHandler extends DuccAbs
 					sb.append(formatter.format(100));
 					// Avg
 					sb.append("<td align=\"right\">");
-					ltime = (long)time_avg;
+					sb.append("<span class=\"health_purple\" title=\"average processing time per completed work item\">");
+					ltime = (long)workItemStateManager.getAvg();
 					sb.append(FormatHelper.duration(ltime));
+					sb.append("</span>");
 					// Min
 					sb.append("<td align=\"right\">");
-					ltime = (long)time_min;
+					sb.append("<span class=\"health_purple\" title=\"minimum processing time for any completed work item\">");
+					ltime = (long)workItemStateManager.getMin();
 					sb.append(FormatHelper.duration(ltime));
+					sb.append("</span>");
 					// Max
 					sb.append("<td align=\"right\">");
-					ltime = (long)time_max;
+					sb.append("<span class=\"health_purple\" title=\"maximum processing time for any completed work item\">");
+					ltime = (long)workItemStateManager.getMax();
 					sb.append(FormatHelper.duration(ltime));
+					sb.append("</span>");
 				    // pass 2
 				    for (int i = 0; i < numstats; ++i) {
 				    	sb.append(trGet(counter++));