You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2015/09/24 23:38:28 UTC
svn commit: r1705164 - in /uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1:
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/
uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/
uima-ducc-web/src/main/java/org/apache/uima/ducc/ws...
Author: burn
Date: Thu Sep 24 21:38:28 2015
New Revision: 1705164
URL: http://svn.apache.org/viewvc?rev=1705164&view=rev
Log:
Merge in Performance tab changes from UIMA-4586 & UIMA-4574 & UIMA-4598
Modified:
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Version.java
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Modified: uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Version.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Version.java?rev=1705164&r1=1705163&r2=1705164&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Version.java (original)
+++ uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Version.java Thu Sep 24 21:38:28 2015
@@ -43,7 +43,7 @@ public class Version
{
private static final int major = 2; // Major version
private static final int minor = 0; // Minor - may be API changes, or new function
- private static final int ptf = 0; // Fix level, fully compatible with previous, no relevent new function
+ private static final int ptf = 1; // Fix level, fully compatible with previous, no relevent new function
private static final String id = null; // A short decoration, optional
public final static String version()
Modified: uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java?rev=1705164&r1=1705163&r2=1705164&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java (original)
+++ uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java Thu Sep 24 21:38:28 2015
@@ -297,6 +297,8 @@ public class UimaProcessContainer extend
// Components,p2=ThirdLevelAggregateCM
// Components,name=Multiplier1
if (aem.getUniqueMBeanName().indexOf("p0=") > -1) {
+ uimaFullyQualifiedAEContext = "";
+/*
// check id the parent aggregate has been scaled up by
// looking at the last char in its name. If it is a number
// strip it from the name
@@ -324,6 +326,7 @@ public class UimaProcessContainer extend
}
}
}
+ */
}
result.add(deepCopyMetrics(aem, uimaFullyQualifiedAEContext));
}
@@ -417,10 +420,12 @@ public class UimaProcessContainer extend
}
// Primitive AE will not have "X Components" prefix, but it is required
// by the DUCC JD to be there. Prepend it to the unique name.
+ /*
if (uimaFullyQualifiedAEContext.indexOf(" Components ") == -1) {
uimaFullyQualifiedAEContext = index + " Components "
+ uimaFullyQualifiedAEContext;
}
+ */
return new AnalysisEnginePerformanceMetrics(aem.getName(),
uimaFullyQualifiedAEContext, aem.getAnalysisTime(),
aem.getNumberOfCASesProcessed());
Modified: uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1705164&r1=1705163&r2=1705164&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Thu Sep 24 21:38:28 2015
@@ -1912,7 +1912,8 @@ public class DuccHandler extends DuccAbs
// pass 2
for (int i = 0; i < numstats; ++i) {
sb.append(trGet(counter++));
- sb.append("<td>");
+ String title = "title="+"\""+uimaStats.get(i).getLongName()+"\"";
+ sb.append("<td "+title+">");
sb.append(uimaStats.get(i).getShortName());
double time;
// Total