You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2009/07/10 21:13:20 UTC
svn commit: r793078 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima:
analysis_engine/impl/ cas/impl/ internal/util/
Author: schor
Date: Fri Jul 10 19:13:20 2009
New Revision: 793078
URL: http://svn.apache.org/viewvc?rev=793078&view=rev
Log:
[UIMA-1431] Fix int computation of average to work with values approaching 2 gb (the largest positive int), without overflowing. Also add comment to ResultSpecification_impl on why string == test is OK.
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSVectorIndex.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntArrayUtils.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java?rev=793078&r1=793077&r2=793078&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java Fri Jul 10 19:13:20 2009
@@ -732,7 +732,8 @@
return true;
}
String baseLanguage = getBaseLanguage(language);
- return baseLanguage != language &&
+ return baseLanguage != language && // the != means the base language is different from the language
+ // != is OK here
languages.get(getLanguageIndex(baseLanguage));
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java?rev=793078&r1=793077&r2=793078&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java Fri Jul 10 19:13:20 2009
@@ -247,7 +247,7 @@
int i; // Current position
int comp; // Compare value
while (start <= end) {
- i = (start + end) / 2;
+ i = (int)(((long)start + end) / 2);
comp = compare(ele, array[i]);
if (comp == 0) {
return i;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSVectorIndex.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSVectorIndex.java?rev=793078&r1=793077&r2=793078&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSVectorIndex.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSVectorIndex.java Fri Jul 10 19:13:20 2009
@@ -191,7 +191,7 @@
int i; // Current position
int comp; // Compare value
while (start <= end) {
- i = (start + end) / 2;
+ i = (int)(((long)start + end) / 2);
comp = compare(ele, array[i]);
if (comp == 0) {
return i;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java?rev=793078&r1=793077&r2=793078&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java Fri Jul 10 19:13:20 2009
@@ -129,7 +129,7 @@
int i; // Current position
int comp; // Compare value
while (start <= end) {
- i = (start + end) / 2;
+ i = (int)(((long)start + end) / 2);
comp = this.ll_getIndex().ll_compare(ele, array[i]);
if (comp == 0) {
return i;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntArrayUtils.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntArrayUtils.java?rev=793078&r1=793077&r2=793078&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntArrayUtils.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntArrayUtils.java Fri Jul 10 19:13:20 2009
@@ -129,7 +129,7 @@
int i; // Current position
int current; // Current value
while (start <= end) {
- i = (start + end) / 2;
+ i = (int)(((long)start + end) / 2);
current = array[i];
if (ele == current) {
return i;