You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2020/11/15 20:55:48 UTC
[uima-uimaj] branch
UIMA-6151-Containment-and-overlap-predicates-for-AnnotationFS updated
(5b8774c -> 816a15e)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch UIMA-6151-Containment-and-overlap-predicates-for-AnnotationFS
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.
from 5b8774c Merge branch 'master' into UIMA-6151-Containment-and-overlap-predicates-for-AnnotationFS
add 4007121 [UIMA-6276] Potential memory leak in FSClassRegistry
add 5c75217 [UIMA-6283] Annotation relation predicates
add a3280e0 Merge branch 'master' into feature/UIMA-6283-Annotation-relation-predicates
add 40fccf8 [UIMA-6283] Annotation relation predicates
add bab3643 Merge branch 'bugfix/UIMA-6284-select.following-fails-to-find-adjacent-annotations' into feature/UIMA-6283-Annotation-relation-predicates
add 1a80f18 Merge branch 'bugfix/UIMA-6285-select.following-on-a-zero-width-annotation-returns-other-zero-width-annotation-at-same-location' into feature/UIMA-6283-Annotation-relation-predicates
add d0efd2d [UIMA-6283] Annotation relation predicates
add 2c0819d Merge branch 'bugfix/UIMA-6286-select-following-finds-zero-width-annotation-at-reference-end-position' into feature/UIMA-6283-Annotation-relation-predicates
add 5de803d [UIMA-6283] Annotation relation predicates
add 0dc73ec Merge branch 'bugfix/UIMA-6286-select-following-finds-zero-width-annotation-at-reference-end-position' into feature/UIMA-6283-Annotation-relation-predicates
add 3060d15 Merge branch 'bugfix/UIMA-6286-select-following-finds-zero-width-annotation-at-reference-end-position' into feature/UIMA-6283-Annotation-relation-predicates
add c69ba87 Merge branch 'master' into feature/UIMA-6283-Annotation-relation-predicates
add bbd20f4 [UIMA-6283] Annotation relation predicates
add eb800df [UIMA-6283] Annotation relation predicates
add 240f45f [UIMA-6283] Annotation relation predicates
add c78a62d [UIMA-6283] Annotation relation predicates
add edece98 [UIMA-6283] Annotation relation predicates
add 951cf10 [UIMA-6283] Annotation relation predicates
add b1a286b [UIMA-6283] Annotation relation predicates
add edabffd Merge branch 'master' into feature/UIMA-6283-Annotation-relation-predicates
add 35ce8bb [UIMA-6283] Annotation relation predicates
add bc4d317 Merge pull request #73 from apache/feature/UIMA-6283-Annotation-relation-predicates
add 3ca5530 [UIMA-6290] Clean up AnnotationIteratorTest
add 5016382 [UIMA-6290] Clean up AnnotationIteratorTest
add 8071a49 [UIMA-6290] Clean up AnnotationIteratorTest
add 2916509 [UIMA-6290] Clean up AnnotationIteratorTest
add fff5c8e [UIMA-6289] SelectFS.coveredBy not selecting annotations with exact same bounds as annotation argument
add 506f2ca [UIMA-6289] SelectFS.coveredBy not selecting annotations with exact same bounds as annotation argument
add bd66474 [UIMA-6289] SelectFS.coveredBy not selecting annotations with exact same bounds as annotation argument
add 53e48c2 [UIMA-6289] SelectFS.coveredBy not selecting annotations with exact same bounds as annotation argument
add 6cd24ed [UIMA-6289] SelectFS.coveredBy not selecting annotations with exact same bounds as annotation argument
add 173f110 Merge pull request #81 from apache/bugfix/UIMA-6289-SelectFS-coveredBy-not-selecting-annotations-with-exact-same-bounds-as-annotation-argument
add 7267181 Merge branch 'master' into feature/UIMA-6290-Clean-up-AnnotationIteratorTest
add 099a2e0 Merge pull request #80 from apache/feature/UIMA-6290-Clean-up-AnnotationIteratorTest
add a175491 [UIMA-6290] Clean up AnnotationIteratorTest
add 99e9168 Merge pull request #82 from apache/feature/UIMA-6290-Clean-up-AnnotationIteratorTest
add 7c71ef1 [NO JIRA] Refactoring SelectFS tests
add cf73cf3 Merge pull request #83 from apache/feature/no-jira-refactoring-select-fs-tests
add d8ae851 [NO JIRA] Remove warning about two SLF4J backends when running tests.
add d031cce [UIMA-6294] SelectFS.at(annotation) does not return the correct result
add 6790428 [UIMA-6294] SelectFS.at(annotation) does not return the correct result
add 3e102f7 [UIMA-6294] SelectFS.at(annotation) does not return the correct result
add f239f41 Merge pull request #84 from apache/bugfix/UIMA-6294-SelectFS-at-annotation-does-not-return-the-correct-result
add c5238ae [NO JIRA] Remove Eclipse Maven Repo
add 6b08e58 Merge pull request #86 from apache/refactoring/NO-JIRA-Remove-Eclipse-Maven-Repo
add 18ebf33 Merge branch 'master' into bugfix/UIMA-6276-Potential-memory-leak-in-FSClassRegistry
add 1364eec Merge pull request #71 from apache/bugfix/UIMA-6276-Potential-memory-leak-in-FSClassRegistry
add f2075fc [UIMA-6254] Move API report post-analysis script into the build resources
add 53cb225 [UIMA-6254] Move API report post-analysis script into the build resources
add 6ae4f4c [UIMA-6254] Move API report post-analysis script into the build resources
add bf5518c [UIMA-6254] Move API report post-analysis script into the build resources
add c783560 Merge pull request #87 from apache/feature/UIMA-6254-Move-API-report-post-analysis-script-into-the-build-resources
add 816a15e Merge branch 'master' into UIMA-6151-Containment-and-overlap-predicates-for-AnnotationFS
No new revisions were added by this update.
Summary of changes:
NOTICE | 8 +-
.../annotation_predicates/annotation-relations.ods | Bin 0 -> 67477 bytes
.../annotation_predicates/annotation-relations.png | Bin 0 -> 328700 bytes
.../src/docbook/uv3.annotation_predicates.xml | 56 ++
.../src/docbook/version_3_users_guide.xml | 1 +
uimaj-core/pom.xml | 5 -
.../org/apache/uima/cas/impl/FSClassRegistry.java | 24 +-
.../apache/uima/cas/impl/FsIndex_annotation.java | 9 +-
.../uima/cas/impl/FsIterator_set_sorted2.java | 9 +-
.../org/apache/uima/cas/impl/SelectFSs_impl.java | 3 +-
.../java/org/apache/uima/cas/impl/Subiterator.java | 254 ++++---
.../org/apache/uima/cas/text/AnnotationFS.java | 60 +-
.../apache/uima/cas/text/AnnotationPredicates.java | 136 ++--
.../apache/uima/internal/util/WeakIdentityMap.java | 318 +++++++++
.../org/apache/uima/cas/impl/SelectFsAssert.java | 283 ++++++++
.../cas/impl/SelectFsPredicateAlignmentTest.java | 338 +++++++++
.../org/apache/uima/cas/impl/SelectFsTest.java | 795 +++++++++++++--------
.../uima/cas/test/AnnotationIteratorTest.java | 636 +++++++++--------
.../java/org/apache/uima/cas/test/SelectTest.java | 66 --
.../uima/cas/text/AnnotationPredicateAssert.java | 115 +++
.../uima/cas/text/AnnotationPredicateTestData.java | 134 ++++
.../uima/cas/text/AnnotationPredicatesTest.java | 453 +++---------
.../uima/internal/util/WeakIdentityMapTest.java | 261 +++++++
uimaj-parent/pom.xml | 114 +--
uimaj-parent/src/main/groovy/api-report.groovy | 30 -
25 files changed, 2800 insertions(+), 1308 deletions(-)
create mode 100644 uima-docbook-v3-users-guide/src/docbook/images/version_3_users_guide/annotation_predicates/annotation-relations.ods
create mode 100644 uima-docbook-v3-users-guide/src/docbook/images/version_3_users_guide/annotation_predicates/annotation-relations.png
create mode 100644 uima-docbook-v3-users-guide/src/docbook/uv3.annotation_predicates.xml
create mode 100644 uimaj-core/src/main/java/org/apache/uima/internal/util/WeakIdentityMap.java
create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/SelectFsAssert.java
create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/SelectFsPredicateAlignmentTest.java
delete mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/test/SelectTest.java
create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/text/AnnotationPredicateAssert.java
create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/text/AnnotationPredicateTestData.java
create mode 100644 uimaj-core/src/test/java/org/apache/uima/internal/util/WeakIdentityMapTest.java
delete mode 100644 uimaj-parent/src/main/groovy/api-report.groovy