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 2012/11/12 21:29:46 UTC
svn commit: r1408443 - in /uima/uimaj/trunk/uimaj-core/src:
main/java/org/apache/uima/cas/impl/ main/java/org/apache/uima/util/
main/java/org/apache/uima/util/impl/ test/java/org/apache/uima/cas/impl/
Author: schor
Date: Mon Nov 12 20:29:45 2012
New Revision: 1408443
URL: http://svn.apache.org/viewvc?rev=1408443&view=rev
Log:
no Jira - move SerializationMeasures to an "impl" package - this is not stuff for normal users.
Added:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SerializationMeasures.java
- copied, changed from r1406261, uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/SerializationMeasures.java
Removed:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/SerializationMeasures.java
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest.java
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java?rev=1408443&r1=1408442&r2=1408443&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java Mon Nov 12 20:29:45 2012
@@ -79,9 +79,9 @@ import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Marker;
import org.apache.uima.internal.util.IntVector;
import org.apache.uima.jcas.JCas;
-import org.apache.uima.util.SerializationMeasures;
import org.apache.uima.util.impl.DataIO;
import org.apache.uima.util.impl.OptimizeStrings;
+import org.apache.uima.util.impl.SerializationMeasures;
/**
* User callable serialization and deserialization of the CAS in a compressed Binary Format
@@ -2686,10 +2686,6 @@ public class BinaryCasSerDes4 {
private IntVector itemIndexToAddr = new IntVector(); // item is feature structure or string segment
private Map<Integer, Integer> itemAddrToIndex = new HashMap<Integer, Integer>();
-// private float avgWdsPerFs;
-// private int midValue;
-// private int smallFudge;
-// private boolean isSetup = false;
public ComprItemRefs() {
addItemAddr(0);
@@ -2717,59 +2713,8 @@ public class BinaryCasSerDes4 {
return itemIndexToAddr.get(index);
}
- /**
- * search in table for matching fsAddr;
- * if found, return relative position
- * to current fsAddr
- * otherwise is an error
- *
- * Modified binary search - mid point calc closer than middle
- *
- * @param itemAddr
- * @return
- */
public int getItemIndex(int itemAddr) {
- return itemAddrToIndex.get(itemAddr);
-
-// // special case 0 and 1 which occur frequently
-// // 0 is "null" fs
-// // 1 usually is the sofa fs - in every annotation
-// if (itemAddr == 0) {
-// return 0;
-// }
-// if (itemAddr == 1) {
-// return 1;
-// }
-// if (!isSetup) {
-// throw new RuntimeException();
-// }
-//
-// int lowIndex = 0;
-// int highIndex = itemIndexToAddr.size() - 1;
-//
-// // the initial split point is made as close as possible to the value
-// // but tries to fudge to be on the right side so a smaller number of
-// // iterations are needed
-// int smallDelta = (itemAddr > midValue) ? - smallFudge : smallFudge;
-// float fudge = (itemAddr > midValue) ? .99F : 1.01F;
-// int testIndex = (int)(fudge * itemAddr / avgWdsPerFs) + smallDelta;
-// int testValue = itemIndexToAddr.get(testIndex);
-//
-// while (testValue != itemAddr) {
-//
-// if (testValue > itemAddr) {
-// highIndex = testIndex - 1;
-// } else {
-// lowIndex = testIndex + 1;
-// }
-// if (lowIndex > highIndex) {
-// throw new RuntimeException("not found - should never happen");
-// }
-// // next trick lets the int addition overflow, and then recovers
-// testIndex = (highIndex + lowIndex) >>> 1;
-// testValue = itemIndexToAddr.get(testIndex);
-// }
-// return testIndex;
+ return itemAddrToIndex.get(itemAddr);
}
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java?rev=1408443&r1=1408442&r2=1408443&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java Mon Nov 12 20:29:45 2012
@@ -85,7 +85,7 @@ import org.apache.uima.cas.text.Language
import org.apache.uima.internal.util.IntVector;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.impl.JCasImpl;
-import org.apache.uima.util.SerializationMeasures;
+import org.apache.uima.util.impl.SerializationMeasures;
/**
* Implements the CAS interfaces. This class must be public because we need to
Copied: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SerializationMeasures.java (from r1406261, uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/SerializationMeasures.java)
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SerializationMeasures.java?p2=uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SerializationMeasures.java&p1=uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/SerializationMeasures.java&r1=1406261&r2=1408443&rev=1408443&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/SerializationMeasures.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SerializationMeasures.java Mon Nov 12 20:29:45 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.util;
+package org.apache.uima.util.impl;
import static org.apache.uima.cas.impl.BinaryCasSerDes4.CAN_BE_NEGATIVE;
import static org.apache.uima.cas.impl.BinaryCasSerDes4.IN_MAIN_HEAP;
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest.java?rev=1408443&r1=1408442&r2=1408443&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest.java Mon Nov 12 20:29:45 2012
@@ -48,7 +48,7 @@ import org.apache.uima.cas.admin.TypeSys
import org.apache.uima.cas.test.AnnotatorInitializer;
import org.apache.uima.cas.test.CASInitializer;
import org.apache.uima.util.CasCreationUtils;
-import org.apache.uima.util.SerializationMeasures;
+import org.apache.uima.util.impl.SerializationMeasures;
/**
* Serializer and Deserializer testing