(uima-ruta) 01/01: Merge pull request #164 from apache/no-issue-fix-pom-3.4.x
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch maintenance/3.4.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit b7b877dcc67ee89c6a7a350f29ffb62e1e502b60 Merge: d7772d07 2478bd54 Author: pkluegl AuthorDate: Thu Feb 1 17:27:42 2024 +0100 Merge pull request #164 from apache/no-issue-fix-pom-3.4.x no issue: cleanup example-projects/ruta-maven-example/pom.xml | 2 +- pom.xml | 2 +- ruta-core-ext/pom.xml | 2 +- ruta-core/pom.xml | 2 +- ruta-eclipse-update-site/pom.xml| 2 +- ruta-ep-addons/pom.xml | 2 +- ruta-ep-caseditor/pom.xml | 2 +- ruta-ep-core-ext/pom.xml| 2 +- ruta-ep-engine/pom.xml | 2 +- ruta-ep-ide-ui/pom.xml | 2 +- ruta-ep-ide/pom.xml | 2 +- ruta-ep-parent/pom.xml | 2 +- ruta-ep-textruler/pom.xml | 2 +- ruta-maven-archetype/pom.xml| 2 +- ruta-maven-plugin/pom.xml | 2 +- ruta-parent/pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-)
(uima-ruta) branch maintenance/3.4.x updated (d7772d07 -> b7b877dc)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.4.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from d7772d07 Merge pull request #162 from apache/bugfix/161-Right-to-left-wildcard-matches-too-much add 2478bd54 no issue: cleanup new b7b877dc Merge pull request #164 from apache/no-issue-fix-pom-3.4.x The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: example-projects/ruta-maven-example/pom.xml | 2 +- pom.xml | 2 +- ruta-core-ext/pom.xml | 2 +- ruta-core/pom.xml | 2 +- ruta-eclipse-update-site/pom.xml| 2 +- ruta-ep-addons/pom.xml | 2 +- ruta-ep-caseditor/pom.xml | 2 +- ruta-ep-core-ext/pom.xml| 2 +- ruta-ep-engine/pom.xml | 2 +- ruta-ep-ide-ui/pom.xml | 2 +- ruta-ep-ide/pom.xml | 2 +- ruta-ep-parent/pom.xml | 2 +- ruta-ep-textruler/pom.xml | 2 +- ruta-maven-archetype/pom.xml| 2 +- ruta-maven-plugin/pom.xml | 2 +- ruta-parent/pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-)
(uima-ruta) branch no-issue-fix-pom-3.4.x deleted (was 2478bd54)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch no-issue-fix-pom-3.4.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git was 2478bd54 no issue: cleanup The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(uima-ruta) 01/01: no issue: cleanup
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch no-issue-fix-pom-3.4.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 2478bd547593a24d92580de11131fa4cb8017eaa Author: kluegl AuthorDate: Thu Feb 1 16:59:02 2024 +0100 no issue: cleanup --- example-projects/ruta-maven-example/pom.xml | 2 +- pom.xml | 2 +- ruta-core-ext/pom.xml | 2 +- ruta-core/pom.xml | 2 +- ruta-eclipse-update-site/pom.xml| 2 +- ruta-ep-addons/pom.xml | 2 +- ruta-ep-caseditor/pom.xml | 2 +- ruta-ep-core-ext/pom.xml| 2 +- ruta-ep-engine/pom.xml | 2 +- ruta-ep-ide-ui/pom.xml | 2 +- ruta-ep-ide/pom.xml | 2 +- ruta-ep-parent/pom.xml | 2 +- ruta-ep-textruler/pom.xml | 2 +- ruta-maven-archetype/pom.xml| 2 +- ruta-maven-plugin/pom.xml | 2 +- ruta-parent/pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/example-projects/ruta-maven-example/pom.xml b/example-projects/ruta-maven-example/pom.xml index d241ca62..345d37ab 100644 --- a/example-projects/ruta-maven-example/pom.xml +++ b/example-projects/ruta-maven-example/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/apache/uima-ruta/ scm:git:https://github.com/apache/uima-ruta/ https://github.com/apache/uima-ruta/ -ruta-3.4.0 +HEAD diff --git a/pom.xml b/pom.xml index 762a3276..2954f339 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ scm:git:https://github.com/apache/uima-ruta/ scm:git:https://github.com/apache/uima-ruta/ https://github.com/apache/uima-ruta/ -ruta-3.4.0 +HEAD diff --git a/ruta-core-ext/pom.xml b/ruta-core-ext/pom.xml index 9eb7be78..44e16aed 100644 --- a/ruta-core-ext/pom.xml +++ b/ruta-core-ext/pom.xml @@ -43,7 +43,7 @@ scm:git:https://github.com/apache/uima-ruta/ scm:git:https://github.com/apache/uima-ruta/ https://github.com/apache/uima-ruta/ -ruta-3.4.0 +HEAD diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml index cbea8efb..4342d684 100644 --- a/ruta-core/pom.xml +++ b/ruta-core/pom.xml @@ -43,7 +43,7 @@ scm:git:https://github.com/apache/uima-ruta/ scm:git:https://github.com/apache/uima-ruta/ https://github.com/apache/uima-ruta/ -ruta-3.4.0 +HEAD diff --git a/ruta-eclipse-update-site/pom.xml b/ruta-eclipse-update-site/pom.xml index 61bfa2e9..3c2bee1e 100644 --- a/ruta-eclipse-update-site/pom.xml +++ b/ruta-eclipse-update-site/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/apache/uima-ruta/ scm:git:https://github.com/apache/uima-ruta/ https://github.com/apache/uima-ruta/ -ruta-3.4.0 +HEAD diff --git a/ruta-ep-addons/pom.xml b/ruta-ep-addons/pom.xml index 185cc2e2..f2fdb100 100644 --- a/ruta-ep-addons/pom.xml +++ b/ruta-ep-addons/pom.xml @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/uima-ruta/ scm:git:https://github.com/apache/uima-ruta/ https://github.com/apache/uima-ruta/ -ruta-3.4.0 +HEAD diff --git a/ruta-ep-caseditor/pom.xml b/ruta-ep-caseditor/pom.xml index a33cfeb1..b329313e 100644 --- a/ruta-ep-caseditor/pom.xml +++ b/ruta-ep-caseditor/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/apache/uima-ruta/ scm:git:https://github.com/apache/uima-ruta/ https://github.com/apache/uima-ruta/ -ruta-3.4.0 +HEAD diff --git a/ruta-ep-core-ext/pom.xml b/ruta-ep-core-ext/pom.xml index 5157d4d0..64bd656f 100644 --- a/ruta-ep-core-ext/pom.xml +++ b/ruta-ep-core-ext/pom.xml @@ -41,7 +41,7 @@ scm:git:https://github.com/apache/uima-ruta/ scm:git:https://github.com/apache/uima-ruta/ https://github.com/apache/uima-ruta/ -ruta-3.4.0 +HEAD diff --git a/ruta-ep-engine/pom.xml b/ruta-ep-engine/pom.xml index f53069d2..dc0e7a24 100644 --- a/ruta-ep-engine/pom.xml +++ b/ruta-ep-engine/pom.xml @@ -45,7 +45,7 @@ scm:git:https://github.com/apache/uima-ruta/ scm:git:https://github.com/apache/uima-ruta/ https://github.com/apache/uima-ruta/ -ruta-3.4.0 +HEAD diff --git a/ruta-ep-ide-ui/pom.xml b/ruta-ep-ide-ui/pom.xml index 0cec2524..c78be2ec 100644 --- a/ruta-ep-ide-ui/pom.xml +++ b/ruta-ep-ide-ui/pom.xml @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/uima-ruta/ scm:git:https://github.com/apache/uima-ruta/ https://github.com/apache/uima-ruta/ -ruta-3.4.0 +HEAD diff --git a/ruta-ep-ide/pom.xml b/ruta-ep-ide/pom.xml index 34093238..edba8f56 100644 --- a/ruta-ep-ide/pom.xml +++ b/ruta-ep-ide/pom.xml @@ -41,7 +41,7 @@ scm:git:https://github.com/apache/uima-ruta/ scm:git:https://github.com
(uima-ruta) branch no-issue-fix-pom-3.4.x created (now 2478bd54)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch no-issue-fix-pom-3.4.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at 2478bd54 no issue: cleanup This branch includes the following new commits: new 2478bd54 no issue: cleanup The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(uima-ruta) branch main updated (d7772d07 -> 932b5e72)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from d7772d07 Merge pull request #162 from apache/bugfix/161-Right-to-left-wildcard-matches-too-much add 628cf7e7 no issue: cleanup versions add 6ec99b53 no issue: cleanup versions add 9fd1c123 no issue: cleanup versions new 932b5e72 Merge pull request #163 from apache/no-issue-fix-versions The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: example-projects/ruta-ep-example-extensions/pom.xml | 2 +- example-projects/ruta-maven-example/pom.xml | 4 ++-- pom.xml | 4 ++-- ruta-core-ext/pom.xml | 4 ++-- ruta-core/pom.xml | 4 ++-- ruta-documentation/pom.xml | 2 +- ruta-eclipse-feature/feature.xml| 2 +- ruta-eclipse-feature/pom.xml| 16 ruta-eclipse-update-site/category.xml | 2 +- ruta-eclipse-update-site/pom.xml| 6 +++--- ruta-ep-addons/pom.xml | 4 ++-- ruta-ep-caseditor/pom.xml | 4 ++-- ruta-ep-core-ext/pom.xml| 4 ++-- ruta-ep-engine/pom.xml | 4 ++-- ruta-ep-ide-ui/pom.xml | 4 ++-- ruta-ep-ide/pom.xml | 4 ++-- ruta-ep-parent/pom.xml | 4 ++-- ruta-ep-textruler/pom.xml | 4 ++-- ruta-maven-archetype/pom.xml| 4 ++-- ruta-maven-plugin/pom.xml | 4 ++-- ruta-parent/pom.xml | 4 ++-- 21 files changed, 45 insertions(+), 45 deletions(-)
(uima-ruta) branch no-issue-fix-versions deleted (was 9fd1c123)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch no-issue-fix-versions in repository https://gitbox.apache.org/repos/asf/uima-ruta.git was 9fd1c123 no issue: cleanup versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(uima-ruta) 01/01: Merge pull request #163 from apache/no-issue-fix-versions
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 932b5e72e3a91c6f223b60f540fad9e3aea648ec Merge: d7772d07 9fd1c123 Author: pkluegl AuthorDate: Thu Feb 1 16:50:18 2024 +0100 Merge pull request #163 from apache/no-issue-fix-versions no issue: cleanup versions example-projects/ruta-ep-example-extensions/pom.xml | 2 +- example-projects/ruta-maven-example/pom.xml | 4 ++-- pom.xml | 4 ++-- ruta-core-ext/pom.xml | 4 ++-- ruta-core/pom.xml | 4 ++-- ruta-documentation/pom.xml | 2 +- ruta-eclipse-feature/feature.xml| 2 +- ruta-eclipse-feature/pom.xml| 16 ruta-eclipse-update-site/category.xml | 2 +- ruta-eclipse-update-site/pom.xml| 6 +++--- ruta-ep-addons/pom.xml | 4 ++-- ruta-ep-caseditor/pom.xml | 4 ++-- ruta-ep-core-ext/pom.xml| 4 ++-- ruta-ep-engine/pom.xml | 4 ++-- ruta-ep-ide-ui/pom.xml | 4 ++-- ruta-ep-ide/pom.xml | 4 ++-- ruta-ep-parent/pom.xml | 4 ++-- ruta-ep-textruler/pom.xml | 4 ++-- ruta-maven-archetype/pom.xml| 4 ++-- ruta-maven-plugin/pom.xml | 4 ++-- ruta-parent/pom.xml | 4 ++-- 21 files changed, 45 insertions(+), 45 deletions(-)
(uima-ruta) branch no-issue-fix-versions updated (6ec99b53 -> 9fd1c123)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch no-issue-fix-versions in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 6ec99b53 no issue: cleanup versions add 9fd1c123 no issue: cleanup versions No new revisions were added by this update. Summary of changes: ruta-eclipse-update-site/category.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(uima-ruta) branch no-issue-fix-versions updated (628cf7e7 -> 6ec99b53)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch no-issue-fix-versions in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 628cf7e7 no issue: cleanup versions add 6ec99b53 no issue: cleanup versions No new revisions were added by this update. Summary of changes: ruta-eclipse-feature/feature.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(uima-ruta) branch no-issue-fix-versions created (now 628cf7e7)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch no-issue-fix-versions in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at 628cf7e7 no issue: cleanup versions This branch includes the following new commits: new 628cf7e7 no issue: cleanup versions The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(uima-ruta) 01/01: no issue: cleanup versions
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch no-issue-fix-versions
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 628cf7e7b4a6c711c5bf0658b70ef7dd4cf8b292
Author: kluegl
AuthorDate: Thu Feb 1 15:07:56 2024 +0100
no issue: cleanup versions
(cherry picked from commit dadb14d8177d27ac9d3cf814628168bcbe41e088)
---
example-projects/ruta-ep-example-extensions/pom.xml | 2 +-
example-projects/ruta-maven-example/pom.xml | 4 ++--
pom.xml | 4 ++--
ruta-core-ext/pom.xml | 4 ++--
ruta-core/pom.xml | 4 ++--
ruta-documentation/pom.xml | 2 +-
ruta-eclipse-feature/pom.xml| 16
ruta-eclipse-update-site/pom.xml| 6 +++---
ruta-ep-addons/pom.xml | 4 ++--
ruta-ep-caseditor/pom.xml | 4 ++--
ruta-ep-core-ext/pom.xml| 4 ++--
ruta-ep-engine/pom.xml | 4 ++--
ruta-ep-ide-ui/pom.xml | 4 ++--
ruta-ep-ide/pom.xml | 4 ++--
ruta-ep-parent/pom.xml | 4 ++--
ruta-ep-textruler/pom.xml | 4 ++--
ruta-maven-archetype/pom.xml| 4 ++--
ruta-maven-plugin/pom.xml | 4 ++--
ruta-parent/pom.xml | 4 ++--
19 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/example-projects/ruta-ep-example-extensions/pom.xml
b/example-projects/ruta-ep-example-extensions/pom.xml
index 8952c185..9da05a47 100644
--- a/example-projects/ruta-ep-example-extensions/pom.xml
+++ b/example-projects/ruta-ep-example-extensions/pom.xml
@@ -23,7 +23,7 @@
org.apache.uima
ruta-ep-parent
-3.4.1-SNAPSHOT
+3.5.0-SNAPSHOT
../../ruta-ep-parent/pom.xml
diff --git a/example-projects/ruta-maven-example/pom.xml
b/example-projects/ruta-maven-example/pom.xml
index d241ca62..c60f5bcc 100644
--- a/example-projects/ruta-maven-example/pom.xml
+++ b/example-projects/ruta-maven-example/pom.xml
@@ -23,7 +23,7 @@
org.apache.uima
ruta-parent
-3.4.1-SNAPSHOT
+3.5.0-SNAPSHOT
../../ruta-parent/pom.xml
${uimaWebsiteUrl}
@@ -37,7 +37,7 @@
scm:git:https://github.com/apache/uima-ruta/
scm:git:https://github.com/apache/uima-ruta/
https://github.com/apache/uima-ruta/
-ruta-3.4.0
+HEAD
diff --git a/pom.xml b/pom.xml
index 762a3276..ce4d77ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache.uima
ruta-parent
-3.4.1-SNAPSHOT
+3.5.0-SNAPSHOT
ruta-parent/pom.xml
@@ -41,7 +41,7 @@
scm:git:https://github.com/apache/uima-ruta/
scm:git:https://github.com/apache/uima-ruta/
https://github.com/apache/uima-ruta/
-ruta-3.4.0
+HEAD
diff --git a/ruta-core-ext/pom.xml b/ruta-core-ext/pom.xml
index 9eb7be78..d5bcce3e 100644
--- a/ruta-core-ext/pom.xml
+++ b/ruta-core-ext/pom.xml
@@ -23,7 +23,7 @@
org.apache.uima
ruta-parent
-3.4.1-SNAPSHOT
+3.5.0-SNAPSHOT
../ruta-parent/pom.xml
@@ -43,7 +43,7 @@
scm:git:https://github.com/apache/uima-ruta/
scm:git:https://github.com/apache/uima-ruta/
https://github.com/apache/uima-ruta/
-ruta-3.4.0
+HEAD
diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml
index cbea8efb..8f2a3aef 100644
--- a/ruta-core/pom.xml
+++ b/ruta-core/pom.xml
@@ -23,7 +23,7 @@
org.apache.uima
ruta-parent
-3.4.1-SNAPSHOT
+3.5.0-SNAPSHOT
../ruta-parent/pom.xml
@@ -43,7 +43,7 @@
scm:git:https://github.com/apache/uima-ruta/
scm:git:https://github.com/apache/uima-ruta/
https://github.com/apache/uima-ruta/
-ruta-3.4.0
+HEAD
diff --git a/ruta-documentation/pom.xml b/ruta-documentation/pom.xml
index 749727d8..bf9ca8e1 100644
--- a/ruta-documentation/pom.xml
+++ b/ruta-documentation/pom.xml
@@ -23,7 +23,7 @@
org.apache.uima
ruta-parent
-3.4.1-SNAPSHOT
+3.5.0-SNAPSHOT
../ruta-parent/pom.xml
diff --git a/ruta-eclipse-feature/pom.xml b/ruta-eclipse-feature/pom.xml
index eefa00e6..e887f173 100644
--- a/ruta-eclipse-feature/pom.xml
+++ b/ruta-eclipse-feature/pom.xml
@@ -23,7 +23,7 @@
org.apache.uima
ruta-parent
-3.4.1-SNAPSHOT
+3.5.0-SNAPSHOT
../ruta-parent/pom.xml
@@ -90,37 +90,37 @@
org.apache.uima
ruta-ep-addons
- 3.4.1-SNAPSHOT
+ 3.5.0-SNAPSHOT
org.apache.uima
ruta-ep-caseditor
- 3.4.1-SNAPSHOT
+ 3.5.0-SNAPSHOT
org.apache.uima
ruta-ep-core-ext
- 3.4.1-SNAPSHOT
+ 3.5.0-SNAPSHOT
org.apache.uima
(uima-ruta) branch maintenance/3.4.x updated (cd8ee4b4 -> d7772d07)
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a change to branch maintenance/3.4.x
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
from cd8ee4b4 Merge pull request #150 from
apache/release/146-Apache-UIMA-Ruta-3.4.0
add 1c44f121 Issue #161: Right to left wildcard matches too much
add 39d5a8d4 Issue #161: Right to left wildcard matches too much
add 2343d2ea Issue #159: Assignment of composed number expression is broken
add 302688ce Merge pull request #160 from
apache/bugfix/159-Assignment-of-composed-number-expression-is-broken
add a380a668 Merge branch 'main' into
bugfix/161-Right-to-left-wildcard-matches-too-much
add d7772d07 Merge pull request #162 from
apache/bugfix/161-Right-to-left-wildcard-matches-too-much
No new revisions were added by this update.
Summary of changes:
.../org/apache/uima/ruta/parser/RutaParser.g | 14 +++-
.../uima/ruta/condition/ConditionFactory.java | 4 +-
.../uima/ruta/expression/ExpressionFactory.java| 6 +-
.../ruta/expression/GenericComposedExpression.java | 83 ++
.../java/org/apache/uima/ruta/utils/UIMAUtils.java | 8 +--
.../uima/ruta/verbalize/ExpressionVerbalizer.java | 14 +++-
.../number/ComposedNumberExpressionTest.java | 6 +-
.../number/NumberExpressionTest.java} | 34 ++---
.../org/apache/uima/ruta/rule/WildCard2Test.java | 20 ++
.../ruta/verbalizer/ExpressionVerbalizerTest.java | 73 ---
10 files changed, 192 insertions(+), 70 deletions(-)
create mode 100644
ruta-core/src/main/java/org/apache/uima/ruta/expression/GenericComposedExpression.java
copy
ruta-core/src/test/java/org/apache/uima/ruta/{rule/InvisibleWildcardMatchTest.java
=> expression/number/NumberExpressionTest.java} (51%)
(uima-ruta) branch bugfix/161-Right-to-left-wildcard-matches-too-much deleted (was d7772d07)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/161-Right-to-left-wildcard-matches-too-much in repository https://gitbox.apache.org/repos/asf/uima-ruta.git was d7772d07 Merge pull request #162 from apache/bugfix/161-Right-to-left-wildcard-matches-too-much The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(uima-ruta) branch bugfix/161-Right-to-left-wildcard-matches-too-much created (now d7772d07)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/161-Right-to-left-wildcard-matches-too-much in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at d7772d07 Merge pull request #162 from apache/bugfix/161-Right-to-left-wildcard-matches-too-much No new revisions were added by this update.
(uima-ruta) branch bugfix/161-Right-to-left-wildcard-matches-too-much deleted (was a380a668)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/161-Right-to-left-wildcard-matches-too-much in repository https://gitbox.apache.org/repos/asf/uima-ruta.git was a380a668 Merge branch 'main' into bugfix/161-Right-to-left-wildcard-matches-too-much The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(uima-ruta) branch main updated (302688ce -> d7772d07)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 302688ce Merge pull request #160 from apache/bugfix/159-Assignment-of-composed-number-expression-is-broken add 1c44f121 Issue #161: Right to left wildcard matches too much add 39d5a8d4 Issue #161: Right to left wildcard matches too much add a380a668 Merge branch 'main' into bugfix/161-Right-to-left-wildcard-matches-too-much new d7772d07 Merge pull request #162 from apache/bugfix/161-Right-to-left-wildcard-matches-too-much The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/uima/ruta/rule/WildCard2Test.java | 20 1 file changed, 20 insertions(+)
(uima-ruta) 01/01: Merge pull request #162 from apache/bugfix/161-Right-to-left-wildcard-matches-too-much
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit d7772d07e10e58c70b8854ee295aebb445e03fc4 Merge: 302688ce a380a668 Author: pkluegl AuthorDate: Wed Jan 31 15:15:39 2024 +0100 Merge pull request #162 from apache/bugfix/161-Right-to-left-wildcard-matches-too-much Issue #161: Right to left wildcard matches too much .../org/apache/uima/ruta/rule/WildCard2Test.java | 20 1 file changed, 20 insertions(+)
(uima-ruta) branch bugfix/161-Right-to-left-wildcard-matches-too-much updated (39d5a8d4 -> a380a668)
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a change to branch
bugfix/161-Right-to-left-wildcard-matches-too-much
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
from 39d5a8d4 Issue #161: Right to left wildcard matches too much
add 2343d2ea Issue #159: Assignment of composed number expression is broken
add 302688ce Merge pull request #160 from
apache/bugfix/159-Assignment-of-composed-number-expression-is-broken
add a380a668 Merge branch 'main' into
bugfix/161-Right-to-left-wildcard-matches-too-much
No new revisions were added by this update.
Summary of changes:
.../org/apache/uima/ruta/parser/RutaParser.g | 14 +++-
.../uima/ruta/condition/ConditionFactory.java | 4 +-
.../uima/ruta/expression/ExpressionFactory.java| 6 +-
.../ruta/expression/GenericComposedExpression.java | 83 ++
.../java/org/apache/uima/ruta/utils/UIMAUtils.java | 8 +--
.../uima/ruta/verbalize/ExpressionVerbalizer.java | 14 +++-
.../number/ComposedNumberExpressionTest.java | 6 +-
.../number/NumberExpressionTest.java} | 34 ++---
.../ruta/verbalizer/ExpressionVerbalizerTest.java | 73 ---
9 files changed, 172 insertions(+), 70 deletions(-)
create mode 100644
ruta-core/src/main/java/org/apache/uima/ruta/expression/GenericComposedExpression.java
copy
ruta-core/src/test/java/org/apache/uima/ruta/{rule/InvisibleWildcardMatchTest.java
=> expression/number/NumberExpressionTest.java} (51%)
(uima-ruta) branch main updated (cd8ee4b4 -> 302688ce)
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
from cd8ee4b4 Merge pull request #150 from
apache/release/146-Apache-UIMA-Ruta-3.4.0
add 2343d2ea Issue #159: Assignment of composed number expression is broken
add 302688ce Merge pull request #160 from
apache/bugfix/159-Assignment-of-composed-number-expression-is-broken
No new revisions were added by this update.
Summary of changes:
.../org/apache/uima/ruta/parser/RutaParser.g | 14 +++-
.../uima/ruta/condition/ConditionFactory.java | 4 +-
.../uima/ruta/expression/ExpressionFactory.java| 6 +-
.../ruta/expression/GenericComposedExpression.java | 83 ++
.../java/org/apache/uima/ruta/utils/UIMAUtils.java | 8 +--
.../uima/ruta/verbalize/ExpressionVerbalizer.java | 14 +++-
.../number/ComposedNumberExpressionTest.java | 6 +-
.../number/NumberExpressionTest.java} | 34 ++---
.../ruta/verbalizer/ExpressionVerbalizerTest.java | 73 ---
9 files changed, 172 insertions(+), 70 deletions(-)
create mode 100644
ruta-core/src/main/java/org/apache/uima/ruta/expression/GenericComposedExpression.java
copy
ruta-core/src/test/java/org/apache/uima/ruta/{rule/InvisibleWildcardMatchTest.java
=> expression/number/NumberExpressionTest.java} (51%)
(uima-ruta) branch bugfix/159-Assignment-of-composed-number-expression-is-broken deleted (was 2343d2ea)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/159-Assignment-of-composed-number-expression-is-broken in repository https://gitbox.apache.org/repos/asf/uima-ruta.git was 2343d2ea Issue #159: Assignment of composed number expression is broken The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(uima-ruta) branch bugfix/161-Right-to-left-wildcard-matches-too-much updated (1c44f121 -> 39d5a8d4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/161-Right-to-left-wildcard-matches-too-much in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 1c44f121 Issue #161: Right to left wildcard matches too much add 39d5a8d4 Issue #161: Right to left wildcard matches too much No new revisions were added by this update. Summary of changes: ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(uima-ruta) branch bugfix/161-Right-to-left-wildcard-matches-too-much updated: Issue #161: Right to left wildcard matches too much
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
bugfix/161-Right-to-left-wildcard-matches-too-much
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to
refs/heads/bugfix/161-Right-to-left-wildcard-matches-too-much by this push:
new 1c44f121 Issue #161: Right to left wildcard matches too much
1c44f121 is described below
commit 1c44f1213f7a79d71bcbc3765077fa37de971cf4
Author: kluegl
AuthorDate: Fri Jan 26 16:23:53 2024 +0100
Issue #161: Right to left wildcard matches too much
- added test
---
.../org/apache/uima/ruta/rule/WildCard2Test.java | 20
1 file changed, 20 insertions(+)
diff --git
a/ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java
b/ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java
index 4d81cb6c..a3ce7726 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java
@@ -344,4 +344,24 @@ public class WildCard2Test {
RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "Is");
}
+ @Test
+ public void testRightToLeft() throws Exception {
+String document = "some Text with CAP";
+String script = "";
+script += "(ANY{-PARTOF(SW)-> T1} # CAP){->T2};\n";
+script += "(ANY{-PARTOF(CW)-> T3} # CAP){->T4};\n";
+
+CAS cas = RutaTestUtils.getCAS(document);
+Ruta.apply(cas, script);
+
+if (RutaTestUtils.DEBUG_MODE) {
+ RutaTestUtils.storeCas(cas, "testRightToLeft");
+}
+
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Text");
+RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "Text with CAP");
+RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "with");
+RutaTestUtils.assertAnnotationsEquals(cas, 4, 1, "with CAP");
+ }
+
}
(uima-ruta) branch bugfix/161-Right-to-left-wildcard-matches-too-much created (now cd8ee4b4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/161-Right-to-left-wildcard-matches-too-much in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at cd8ee4b4 Merge pull request #150 from apache/release/146-Apache-UIMA-Ruta-3.4.0 No new revisions were added by this update.
(uima-ruta) branch bugfix/159-Assignment-of-composed-number-expression-is-broken updated: Issue #159: Assignment of composed number expression is broken
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
bugfix/159-Assignment-of-composed-number-expression-is-broken
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to
refs/heads/bugfix/159-Assignment-of-composed-number-expression-is-broken by
this push:
new 2343d2ea Issue #159: Assignment of composed number expression is broken
2343d2ea is described below
commit 2343d2ea4bd2cc600887b67104d3b4999aa7bd88
Author: kluegl
AuthorDate: Fri Jan 26 15:24:22 2024 +0100
Issue #159: Assignment of composed number expression is broken
- avoid disambiguation problems with generic expression
---
.../org/apache/uima/ruta/parser/RutaParser.g | 14 +++-
.../uima/ruta/condition/ConditionFactory.java | 4 +-
.../uima/ruta/expression/ExpressionFactory.java| 6 +-
.../ruta/expression/GenericComposedExpression.java | 83 ++
.../java/org/apache/uima/ruta/utils/UIMAUtils.java | 8 +--
.../uima/ruta/verbalize/ExpressionVerbalizer.java | 14 +++-
.../number/ComposedNumberExpressionTest.java | 6 +-
.../expression/number/NumberExpressionTest.java| 51 +
.../ruta/verbalizer/ExpressionVerbalizerTest.java | 73 ---
9 files changed, 200 insertions(+), 59 deletions(-)
diff --git a/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
b/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
index 4627ba17..9bc7782f 100644
--- a/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
+++ b/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
@@ -2431,7 +2431,7 @@ options {
| match = dottedIdWithIndex2 (comp = LESS | comp = GREATER | comp =
GREATEREQUAL | comp = LESSEQUAL |comp = EQUAL | comp = NOTEQUAL) arg = argument
{MatchReference mr = expressionFactory.createMatchReference(match,
comp, arg);
expr = expressionFactory.createAnnotationTypeExpression(mr);}
-| (complexStringExpression) => cse = complexStringExpression {expr =
cse;}
+| (genericComposedExpression) => gce = genericComposedExpression {expr
= gce;}
| (featureExpression)=> fe = featureExpression {expr =
expressionFactory.createGenericFeatureExpression(fe);}
| a2 = booleanExpression {expr = a2;}
| a3 = numberExpression {expr = a3;}
@@ -2720,6 +2720,14 @@ numberVariable returns [Token ref = null]
;
+complexNumberExpression returns [INumberExpression expr = null]
+@init{List exprs = new ArrayList();
+ List ops = new ArrayList();}
+ :
+ e = multiplicativeExpression{exprs.add(e);} ((PLUS | MINUS)=> op =
(PLUS | MINUS){ops.add(op);} e = multiplicativeExpression{exprs.add(e);} )+
+ {expr = expressionFactory.createComposedNumberExpression(exprs,ops);}
+ ;
+
additiveExpression returns [INumberExpression expr = null]
@init{List exprs = new ArrayList();
List ops = new ArrayList();}
@@ -2778,7 +2786,7 @@ List exprs = new
ArrayList();
|(e = stringFunction)=> e = stringFunction{expr = e;}
;
-complexStringExpression returns [IStringExpression expr = null]
+genericComposedExpression returns [IRutaExpression expr = null]
options {
backtrack = true;
}
@@ -2786,7 +2794,7 @@ options {
:
a1 = simpleArgument {list.add(a1);}
((PLUS)=>PLUS an = simpleArgument {list.add(an);})+
- {expr = expressionFactory.createGenericComposedStringExpression(list);}
+ {expr = expressionFactory.createGenericComposedExpression(list);}
;
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java
b/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java
index 3cde11fe..e61c2473 100644
---
a/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java
+++
b/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
b/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
index cf752cfc..e990b754 100644
---
a/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
+++
b/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
@@ -181,13 +181,15 @@ public class ExpressionFactory {
for (IRutaExpression each : expressions) {
(uima-ruta) branch bugfix/159-Assignment-of-composed-number-expression-is-broken created (now cd8ee4b4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/159-Assignment-of-composed-number-expression-is-broken in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at cd8ee4b4 Merge pull request #150 from apache/release/146-Apache-UIMA-Ruta-3.4.0 No new revisions were added by this update.
(uima-ruta) branch maintenance/3.4.x created (now cd8ee4b4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.4.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at cd8ee4b4 Merge pull request #150 from apache/release/146-Apache-UIMA-Ruta-3.4.0 No new revisions were added by this update.
(uima-ruta) branch maintenance/3.4.x deleted (was a0ae6d7a)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.4.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git was a0ae6d7a [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(uima-ruta) branch maintenance/3.4.x created (now a0ae6d7a)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.4.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at a0ae6d7a [maven-release-plugin] prepare for next development iteration No new revisions were added by this update.
[uima-ruta] branch main updated (1598bb28 -> e34f1865)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 1598bb28 Merge pull request #142 from apache/bugfix/139-Unexpected-behavior-of-plus-operator add 46eb0951 Issue #130: Improve support for feature assignments add c29e23c4 Merge branch 'main' into feature/130-Improve-support-for-feature-assignments add dab039ab Issue #130: Improve support for feature assignments add bbcff9fd Issue #117: Improve initial expansion of tree in applied rules view add 9105ce03 Issue #131: Rule applied without all elements matched add 11e24917 Issue #130: Improve support for feature assignments new e34f1865 Merge pull request #141 from apache/feature/130-Improve-support-for-feature-assignments The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/uima/ruta/parser/RutaParser.g | 18 +- .../org/apache/uima/ruta/RutaScriptFactory.java| 22 +-- .../main/java/org/apache/uima/ruta/RutaStream.java | 21 ++- .../uima/ruta/action/AbstractMarkAction.java | 8 +- .../org/apache/uima/ruta/action/ColorAction.java | 4 +- .../uima/ruta/action/MarkFastReloadAction.java | 192 +++-- .../ruta/descriptor/RutaDescriptorBuilder.java | 30 ++-- .../java/org/apache/uima/ruta/engine/Ruta.java | 14 +- .../org/apache/uima/ruta/engine/RutaTestUtils.java | 19 +- .../org/apache/uima/ruta/engine/ViewWriter.java| 6 +- .../org/apache/uima/ruta/engine/XMIWriter.java | 8 +- .../uima/ruta/expression/ExpressionFactory.java| 36 ++-- .../annotation/AbstractAnnotationExpression.java | 16 +- .../expression/bool/BooleanFeatureExpression.java | 18 +- .../expression/string/StringFeatureExpression.java | 15 +- .../uima/ruta/visitor/StatisticsVisitor.java | 36 ++-- .../expression/bool/BooleanExpressionTest.java | 77 + .../expression/string/StringExpressionTest.java| 174 +++ .../ruta/expression/string/StringFeatureTest.java | 71 .../org/apache/uima/ruta/rule/WildCard2Test.java | 22 ++- .../uima/ruta/explain/apply/ApplyViewPage.java | 18 +- .../ruta/ide/validator/LanguageCheckerVisitor.java | 99 +-- .../apache/uima/ruta/ide/core/parser/RutaParser.g | 24 ++- ruta-parent/pom.xml| 2 +- 24 files changed, 609 insertions(+), 341 deletions(-) create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/expression/bool/BooleanExpressionTest.java create mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/expression/string/StringExpressionTest.java delete mode 100644 ruta-core/src/test/java/org/apache/uima/ruta/expression/string/StringFeatureTest.java
[uima-ruta] 01/01: Merge pull request #141 from apache/feature/130-Improve-support-for-feature-assignments
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit e34f18655923b9f9913ed602442d15c189e6b351 Merge: 1598bb28 11e24917 Author: pkluegl AuthorDate: Mon Oct 16 16:05:45 2023 +0200 Merge pull request #141 from apache/feature/130-Improve-support-for-feature-assignments Issue #130: Improve support for feature assignments .../org/apache/uima/ruta/parser/RutaParser.g | 18 +- .../org/apache/uima/ruta/RutaScriptFactory.java| 22 +-- .../main/java/org/apache/uima/ruta/RutaStream.java | 21 ++- .../uima/ruta/action/AbstractMarkAction.java | 8 +- .../org/apache/uima/ruta/action/ColorAction.java | 4 +- .../uima/ruta/action/MarkFastReloadAction.java | 192 +++-- .../ruta/descriptor/RutaDescriptorBuilder.java | 30 ++-- .../java/org/apache/uima/ruta/engine/Ruta.java | 14 +- .../org/apache/uima/ruta/engine/RutaTestUtils.java | 19 +- .../org/apache/uima/ruta/engine/ViewWriter.java| 6 +- .../org/apache/uima/ruta/engine/XMIWriter.java | 8 +- .../uima/ruta/expression/ExpressionFactory.java| 36 ++-- .../annotation/AbstractAnnotationExpression.java | 16 +- .../expression/bool/BooleanFeatureExpression.java | 18 +- .../expression/string/StringFeatureExpression.java | 15 +- .../uima/ruta/visitor/StatisticsVisitor.java | 36 ++-- .../expression/bool/BooleanExpressionTest.java | 77 + .../expression/string/StringExpressionTest.java| 174 +++ .../ruta/expression/string/StringFeatureTest.java | 71 .../org/apache/uima/ruta/rule/WildCard2Test.java | 22 ++- .../uima/ruta/explain/apply/ApplyViewPage.java | 18 +- .../ruta/ide/validator/LanguageCheckerVisitor.java | 99 +-- .../apache/uima/ruta/ide/core/parser/RutaParser.g | 24 ++- ruta-parent/pom.xml| 2 +- 24 files changed, 609 insertions(+), 341 deletions(-)
[uima-ruta] branch feature/130-Improve-support-for-feature-assignments deleted (was 11e24917)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch feature/130-Improve-support-for-feature-assignments in repository https://gitbox.apache.org/repos/asf/uima-ruta.git was 11e24917 Issue #130: Improve support for feature assignments The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[uima-ruta] branch feature/130-Improve-support-for-feature-assignments updated (9105ce03 -> 11e24917)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch feature/130-Improve-support-for-feature-assignments in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 9105ce03 Issue #131: Rule applied without all elements matched add 11e24917 Issue #130: Improve support for feature assignments No new revisions were added by this update. Summary of changes: ruta-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[uima-ruta] branch feature/130-Improve-support-for-feature-assignments updated (bbcff9fd -> 9105ce03)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch feature/130-Improve-support-for-feature-assignments in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from bbcff9fd Issue #117: Improve initial expansion of tree in applied rules view add 9105ce03 Issue #131: Rule applied without all elements matched No new revisions were added by this update. Summary of changes: .../org/apache/uima/ruta/rule/WildCard2Test.java | 22 -- .../uima/ruta/explain/apply/ApplyViewPage.java | 4 +--- 2 files changed, 21 insertions(+), 5 deletions(-)
[uima-ruta] branch feature/130-Improve-support-for-feature-assignments updated (dab039ab -> bbcff9fd)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch feature/130-Improve-support-for-feature-assignments in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from dab039ab Issue #130: Improve support for feature assignments add bbcff9fd Issue #117: Improve initial expansion of tree in applied rules view No new revisions were added by this update. Summary of changes: .../apache/uima/ruta/explain/apply/ApplyViewPage.java | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-)
[uima-ruta] branch feature/130-Improve-support-for-feature-assignments updated (c29e23c4 -> dab039ab)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch feature/130-Improve-support-for-feature-assignments in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from c29e23c4 Merge branch 'main' into feature/130-Improve-support-for-feature-assignments add dab039ab Issue #130: Improve support for feature assignments No new revisions were added by this update. Summary of changes: .../ruta/ide/validator/LanguageCheckerVisitor.java | 99 +++--- .../apache/uima/ruta/ide/core/parser/RutaParser.g | 8 +- 2 files changed, 55 insertions(+), 52 deletions(-)
[uima-ruta] branch feature/130-Improve-support-for-feature-assignments updated (46eb0951 -> c29e23c4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch feature/130-Improve-support-for-feature-assignments in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 46eb0951 Issue #130: Improve support for feature assignments add 2fef068e Issue #139: Unexpected behavior of plus operator add 1598bb28 Merge pull request #142 from apache/bugfix/139-Unexpected-behavior-of-plus-operator add c29e23c4 Merge branch 'main' into feature/130-Improve-support-for-feature-assignments No new revisions were added by this update. Summary of changes: .../apache/uima/ruta/rule/ComposedRuleElement.java | 37 .../ComposedRuleElementWithQuantifierTest.java | 65 +++--- ruta-ep-engine/pom.xml | 2 + .../textruler/learner/kep/KEPPreferencePage.java | 18 +++--- .../learner/lp2/NaiveLP2PreferencePage.java| 18 +++--- .../learner/lp2/OptimizedLP2PreferencePage.java| 18 +++--- .../learner/rapier/RapierPreferencePage.java | 23 +--- .../whisk/generic/WhiskGenericPreferencePage.java | 18 +++--- .../whisk/token/WhiskTokenPreferencePage.java | 18 +++--- 9 files changed, 141 insertions(+), 76 deletions(-)
[uima-ruta] branch main updated (0133fec2 -> 1598bb28)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 0133fec2 Merge pull request #140 from apache/refactoring/133-Update-dependencies add 2fef068e Issue #139: Unexpected behavior of plus operator new 1598bb28 Merge pull request #142 from apache/bugfix/139-Unexpected-behavior-of-plus-operator The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/uima/ruta/rule/ComposedRuleElement.java | 37 .../ComposedRuleElementWithQuantifierTest.java | 65 +++--- ruta-ep-engine/pom.xml | 2 + .../textruler/learner/kep/KEPPreferencePage.java | 18 +++--- .../learner/lp2/NaiveLP2PreferencePage.java| 18 +++--- .../learner/lp2/OptimizedLP2PreferencePage.java| 18 +++--- .../learner/rapier/RapierPreferencePage.java | 23 +--- .../whisk/generic/WhiskGenericPreferencePage.java | 18 +++--- .../whisk/token/WhiskTokenPreferencePage.java | 18 +++--- 9 files changed, 141 insertions(+), 76 deletions(-)
[uima-ruta] 01/01: Merge pull request #142 from apache/bugfix/139-Unexpected-behavior-of-plus-operator
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 1598bb2800bc2652259dfd551a902b9be131baba Merge: 0133fec2 2fef068e Author: pkluegl AuthorDate: Fri Oct 13 13:46:31 2023 +0200 Merge pull request #142 from apache/bugfix/139-Unexpected-behavior-of-plus-operator Issue #139: Unexpected behavior of plus operator .../apache/uima/ruta/rule/ComposedRuleElement.java | 37 .../ComposedRuleElementWithQuantifierTest.java | 65 +++--- ruta-ep-engine/pom.xml | 2 + .../textruler/learner/kep/KEPPreferencePage.java | 18 +++--- .../learner/lp2/NaiveLP2PreferencePage.java| 18 +++--- .../learner/lp2/OptimizedLP2PreferencePage.java| 18 +++--- .../learner/rapier/RapierPreferencePage.java | 23 +--- .../whisk/generic/WhiskGenericPreferencePage.java | 18 +++--- .../whisk/token/WhiskTokenPreferencePage.java | 18 +++--- 9 files changed, 141 insertions(+), 76 deletions(-)
[uima-ruta] branch bugfix/139-Unexpected-behavior-of-plus-operator deleted (was 2fef068e)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/139-Unexpected-behavior-of-plus-operator in repository https://gitbox.apache.org/repos/asf/uima-ruta.git was 2fef068e Issue #139: Unexpected behavior of plus operator The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[uima-ruta] branch bugfix/139-Unexpected-behavior-of-plus-operator updated: Issue #139: Unexpected behavior of plus operator
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
bugfix/139-Unexpected-behavior-of-plus-operator
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to
refs/heads/bugfix/139-Unexpected-behavior-of-plus-operator by this push:
new 2fef068e Issue #139: Unexpected behavior of plus operator
2fef068e is described below
commit 2fef068e19a4a73b82d420b0ef6f17fd6bf7e96a
Author: kluegl
AuthorDate: Fri Oct 13 12:04:28 2023 +0200
Issue #139: Unexpected behavior of plus operator
- fixed rule inference
- some cleanup
---
.../apache/uima/ruta/rule/ComposedRuleElement.java | 37
.../ComposedRuleElementWithQuantifierTest.java | 65 +++---
ruta-ep-engine/pom.xml | 2 +
.../textruler/learner/kep/KEPPreferencePage.java | 18 +++---
.../learner/lp2/NaiveLP2PreferencePage.java| 18 +++---
.../learner/lp2/OptimizedLP2PreferencePage.java| 18 +++---
.../learner/rapier/RapierPreferencePage.java | 23 +---
.../whisk/generic/WhiskGenericPreferencePage.java | 18 +++---
.../whisk/token/WhiskTokenPreferencePage.java | 18 +++---
9 files changed, 141 insertions(+), 76 deletions(-)
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
b/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
index ade9153b..7663fd8a 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
@@ -23,6 +23,7 @@ import static java.util.Arrays.asList;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -498,6 +499,42 @@ public class ComposedRuleElement extends
AbstractRuleElement implements RuleElem
if (evaluateMatches.isEmpty()) {
return annotation;
}
+
+// ensure correct ordering
+Collections.sort(evaluateMatches, new Comparator() {
+
+ @Override
+ public int compare(RuleElementMatch rem1, RuleElementMatch rem2) {
+List textsMatched1 = rem1.getTextsMatched();
+List textsMatched2 = rem2.getTextsMatched();
+if ((textsMatched1 == null || textsMatched1.isEmpty())
+&& (textsMatched2 == null || textsMatched2.isEmpty())) {
+ return 0;
+}
+if (textsMatched1 == null
+|| textsMatched1.isEmpty() && !(textsMatched2 == null ||
textsMatched2.isEmpty())) {
+ return -1;
+}
+if (!(textsMatched1 == null || textsMatched1.isEmpty())
+&& (textsMatched2 == null || textsMatched2.isEmpty())) {
+ return 1;
+}
+if (textsMatched1.equals(textsMatched2)) {
+ return 0;
+}
+AnnotationFS first1 = textsMatched1.get(0);
+AnnotationFS last1 = textsMatched1.get(textsMatched1.size() - 1);
+AnnotationFS first2 = textsMatched2.get(0);
+AnnotationFS last2 = textsMatched2.get(textsMatched2.size() - 1);
+int compareBegin = Integer.compare(first1.getBegin(),
first2.getBegin());
+if (compareBegin != 0) {
+ return compareBegin;
+}
+int compareEnd = Integer.compare(last1.getEnd(), last2.getEnd());
+return compareEnd;
+ }
+});
+
if (after) {
List textsMatched =
evaluateMatches.get(evaluateMatches.size() - 1)
.getTextsMatched();
diff --git
a/ruta-core/src/test/java/org/apache/uima/ruta/rule/ComposedRuleElementWithQuantifierTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/rule/ComposedRuleElementWithQuantifierTest.java
index fa749a69..03450c32 100644
---
a/ruta-core/src/test/java/org/apache/uima/ruta/rule/ComposedRuleElementWithQuantifierTest.java
+++
b/ruta-core/src/test/java/org/apache/uima/ruta/rule/ComposedRuleElementWithQuantifierTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,51 +27,52 @@ import org.junit.jupiter.api.Test;
public class ComposedRuleElementWithQuantifierTest {
@Test
- public void test() {
+ public void test() throws Exception {
String document = "Bla DDD, Bla, DDD,DDD, Bla, DDD,DDD Bla.";
String script = "";
script += "\"DDD\" -> T1;\n";
script += "(T1 COMMA)+? (T1 W){->MARKONCE(T2,1,2)};\n";
-C
[uima-ruta] branch bugfix/139-Unexpected-behavior-of-plus-operator created (now 0133fec2)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/139-Unexpected-behavior-of-plus-operator in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at 0133fec2 Merge pull request #140 from apache/refactoring/133-Update-dependencies No new revisions were added by this update.
[uima-ruta] branch feature/130-Improve-support-for-feature-assignments updated: Issue #130: Improve support for feature assignments
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
feature/130-Improve-support-for-feature-assignments
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to
refs/heads/feature/130-Improve-support-for-feature-assignments by this push:
new 46eb0951 Issue #130: Improve support for feature assignments
46eb0951 is described below
commit 46eb0951644c4d5b9a76b2d93fe26fb2f009e479
Author: kluegl
AuthorDate: Wed Oct 11 09:40:38 2023 +0200
Issue #130: Improve support for feature assignments
- support more generic string assignments
- improved boolean assignment
---
.../org/apache/uima/ruta/parser/RutaParser.g | 18 +-
.../org/apache/uima/ruta/RutaScriptFactory.java| 22 +--
.../main/java/org/apache/uima/ruta/RutaStream.java | 21 ++-
.../uima/ruta/action/AbstractMarkAction.java | 8 +-
.../org/apache/uima/ruta/action/ColorAction.java | 4 +-
.../uima/ruta/action/MarkFastReloadAction.java | 192 +++--
.../ruta/descriptor/RutaDescriptorBuilder.java | 30 ++--
.../java/org/apache/uima/ruta/engine/Ruta.java | 14 +-
.../org/apache/uima/ruta/engine/RutaTestUtils.java | 19 +-
.../org/apache/uima/ruta/engine/ViewWriter.java| 6 +-
.../org/apache/uima/ruta/engine/XMIWriter.java | 8 +-
.../uima/ruta/expression/ExpressionFactory.java| 36 ++--
.../annotation/AbstractAnnotationExpression.java | 16 +-
.../expression/bool/BooleanFeatureExpression.java | 18 +-
.../expression/string/StringFeatureExpression.java | 15 +-
.../uima/ruta/visitor/StatisticsVisitor.java | 36 ++--
.../expression/bool/BooleanExpressionTest.java | 77 +
.../expression/string/StringExpressionTest.java| 174 +++
.../ruta/expression/string/StringFeatureTest.java | 71
.../apache/uima/ruta/ide/core/parser/RutaParser.g | 18 +-
20 files changed, 523 insertions(+), 280 deletions(-)
diff --git a/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
b/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
index 4e5f7fb7..4627ba17 100644
--- a/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
+++ b/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
@@ -2431,7 +2431,7 @@ options {
| match = dottedIdWithIndex2 (comp = LESS | comp = GREATER | comp =
GREATEREQUAL | comp = LESSEQUAL |comp = EQUAL | comp = NOTEQUAL) arg = argument
{MatchReference mr = expressionFactory.createMatchReference(match,
comp, arg);
expr = expressionFactory.createAnnotationTypeExpression(mr);}
-
+| (complexStringExpression) => cse = complexStringExpression {expr =
cse;}
| (featureExpression)=> fe = featureExpression {expr =
expressionFactory.createGenericFeatureExpression(fe);}
| a2 = booleanExpression {expr = a2;}
| a3 = numberExpression {expr = a3;}
@@ -2455,8 +2455,8 @@ options {
}
:
(featureExpression)=> fe = featureExpression {expr =
expressionFactory.createGenericFeatureExpression(fe);}
- | a2 = booleanExpression {expr = a2;}
- | a3 = numberExpression {expr = a3;}
+ | a2 = simpleBooleanExpression {expr = a2;}
+ | a3 = simpleNumberExpression {expr = a3;}
| a4 = stringExpression {expr = a4;}
| (listExpression)=> l = listExpression {expr = l;}
| a5 = nullExpression {expr = a5;}
@@ -2778,6 +2778,18 @@ List exprs = new
ArrayList();
|(e = stringFunction)=> e = stringFunction{expr = e;}
;
+complexStringExpression returns [IStringExpression expr = null]
+options {
+ backtrack = true;
+}
+@init {List list = new ArrayList();}
+ :
+ a1 = simpleArgument {list.add(a1);}
+ ((PLUS)=>PLUS an = simpleArgument {list.add(an);})+
+ {expr = expressionFactory.createGenericComposedStringExpression(list);}
+ ;
+
+
// not checked
stringFunction returns [IStringExpression expr = null]
@init {List list = new ArrayList();}
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java
b/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java
index 8f56d83d..0a731087 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -106,7 +106,7 @@ public class RutaScriptFactory {
if (ruleElement != null)
[uima-ruta] branch feature/130-Improve-support-for-feature-assignments created (now 0133fec2)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch feature/130-Improve-support-for-feature-assignments in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at 0133fec2 Merge pull request #140 from apache/refactoring/133-Update-dependencies No new revisions were added by this update.
[uima-ruta] branch feature/117-Improve-initial-expansion-of-tree-in-applied-rules-view created (now 085d849b)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch feature/117-Improve-initial-expansion-of-tree-in-applied-rules-view in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at 085d849b Merge pull request #115 from apache/maintenance-main-merge No new revisions were added by this update.
[uima-ruta] branch maintenance-main-merge updated (b3e0620e -> a3b4e4d1)
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a change to branch maintenance-main-merge
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
from b3e0620e Merge pull request #112 from
apache/bugfix/110-Usage-of-labels-within-macro-action-definition-is-broken
add a579aad0 [No Jira] Update version after release.
add c427edef Merge pull request #98 from apache/no-issue-update-version
add 309b1d5b [UIMA-6481] Enable issue management in GitHub repos
add 90249e85 Merge pull request #99 from
apache/UIMA-6481-Enable-issue-management-in-GitHub-repos
add 3f2036a6 Issue #102 - RutaResourceLoader should consider TCCL
add 6483de50 Merge pull request #103 from
apache/feature/102-RutaResourceLoader-should-consider-TCCL
add ac8f2631 Issue #100 - Enable type system discovery via SPI in OSGI
add c522a9e5 Issue #100 - Enable type system discovery via SPI in OSGI
add c659fbdb Merge pull request #105 from
apache/feature/100-Enable-type-system-discovery-via-SPI-in-OSGI
add 2ddf7114 Issue #100: Enable type system discovery via SPI in OSGI
add f44c7654 Merge pull request #106 from
apache/feature/100-Enable-type-system-discovery-via-SPI-in-OSGI
add a1d259e4 Issue #107 - Enable loading uimaFIT annotators and other
classes through the TCCL
add 56925fc5 Merge pull request #108 from
apache/feature/107-Enable-loading-uimaFIT-annotators-and-other-classes-through-the-TCCL
add 41608211 Issue #100 - Enable type system discovery via SPI in OSGI
add ccd5a886 Issue #100 - Enable type system discovery via SPI in OSGI
add 08ca8b83 Merge pull request #109 from
apache/feature/100-Enable-type-system-discovery-via-SPI-in-OSGI
add a3b4e4d1 Merge branch 'main' into maintenance-main-merge
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 10 +-
.../ruta-ep-example-extensions/pom.xml | 2 +-
example-projects/ruta-maven-example/pom.xml| 2 +-
installEclipseSettings.sh | 49 ++
pom.xml| 2 +-
ruta-basic-type/.gitignore | 1 +
ruta-basic-type/pom.xml| 20 +-
ruta-core-ext/pom.xml | 2 +-
ruta-core/.gitignore | 1 +
.../marker-file-identifying-osgi-bundle| 0
ruta-core/pom.xml | 54 +-
.../org/apache/uima/ruta/engine/RutaEngine.java| 69 ++-
.../uima/ruta/resource/RutaResourceLoader.java | 23 +-
.../spi/RutaBasicTypeProvider.java}| 68 +--
.../spi/RutaTypeSystemDescriptionProvider.java | 68 +++
.../services/org.apache.uima.spi.JCasClassProvider | 2 +
...g.apache.uima.spi.TypeSystemDescriptionProvider | 1 +
ruta-docbook/pom.xml | 2 +-
ruta-eclipse-feature/feature.xml | 2 +-
ruta-eclipse-feature/pom.xml | 16 +-
ruta-eclipse-update-site/category.xml | 2 +-
ruta-eclipse-update-site/pom.xml | 4 +-
ruta-ep-addons/pom.xml | 2 +-
ruta-ep-caseditor/pom.xml | 2 +-
ruta-ep-core-ext/pom.xml | 2 +-
ruta-ep-engine/pom.xml | 2 +-
ruta-ep-ide-ui/pom.xml | 2 +-
ruta-ep-ide/pom.xml| 2 +-
ruta-ep-parent/pom.xml | 2 +-
ruta-ep-textruler/pom.xml | 2 +-
ruta-maven-archetype/pom.xml | 2 +-
ruta-maven-plugin/pom.xml | 9 +-
ruta-parent/pom.xml| 547 +++--
ruta-typesystem/.gitignore | 1 +
ruta-typesystem/pom.xml| 19 +-
35 files changed, 628 insertions(+), 366 deletions(-)
create mode 100755 installEclipseSettings.sh
create mode 100644 ruta-basic-type/.gitignore
copy
example-projects/ruta-ep-example-extensions/marker-file-identifying-eclipse-plugin
=> ruta-core/marker-file-identifying-osgi-bundle (100%)
copy
ruta-core/src/main/java/org/apache/uima/ruta/{expression/string/StringFunctionFactory.java
=> type/spi/RutaBasicTypeProvider.java} (68%)
create mode 100644
ruta-core/src/main/java/org/apache/uima/ruta/type/spi/RutaTypeSystemDescriptionProvider.java
create mode 100644
ruta-core/src/main/resources/META-INF/services/org.apache.uima.spi.JCasClassProvider
create mode 100644
ruta-core/src/main/resources/META-INF/services/org.apache.uima.spi.TypeSystemDescriptionProvider
create mode 100644 ruta-typesystem/.gitignore
[uima-ruta] branch maintenance-main-merge created (now b3e0620e)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance-main-merge in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at b3e0620e Merge pull request #112 from apache/bugfix/110-Usage-of-labels-within-macro-action-definition-is-broken No new revisions were added by this update.
[uima-ruta] branch maintenance/3.2.x updated (c4538aa4 -> b3e0620e)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.2.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from c4538aa4 Merge pull request #114 from apache/bugfix/111-Support-copy-paste-clipboard-for-feature-values-in-annotation-browser-view-2 add 40fccbcc Issue #110: Usage of labels within macro action definition is broken new b3e0620e Merge pull request #112 from apache/bugfix/110-Usage-of-labels-within-macro-action-definition-is-broken The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/uima/ruta/action/MacroAction.java | 8 --- .../java/org/apache/uima/ruta/rule/RutaRule.java | 18 ++- .../apache/uima/ruta/action/MacroActionTest.java | 61 +- 3 files changed, 76 insertions(+), 11 deletions(-)
[uima-ruta] 01/01: Merge pull request #112 from apache/bugfix/110-Usage-of-labels-within-macro-action-definition-is-broken
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch maintenance/3.2.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit b3e0620e942790e1224202721eb7eaf540c36f19 Merge: c4538aa4 40fccbcc Author: pkluegl AuthorDate: Fri Oct 28 13:04:58 2022 +0200 Merge pull request #112 from apache/bugfix/110-Usage-of-labels-within-macro-action-definition-is-broken Issue #110: Usage of labels within macro action definition is broken .../org/apache/uima/ruta/action/MacroAction.java | 8 --- .../java/org/apache/uima/ruta/rule/RutaRule.java | 18 ++- .../apache/uima/ruta/action/MacroActionTest.java | 61 +- 3 files changed, 76 insertions(+), 11 deletions(-)
[uima-ruta] branch maintenance/3.2.x updated (e166a57a -> c4538aa4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.2.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from e166a57a Merge pull request #89 from apache/release/UIMA-6449-Ruta-3.2.0-release add 3e0ff76c Issue #111: Support copy/paste clipboard for feature values in annotation browser view new c4538aa4 Merge pull request #114 from apache/bugfix/111-Support-copy-paste-clipboard-for-feature-values-in-annotation-browser-view-2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../view/tree/AnnotationTreeViewPage.java | 35 +++--- 1 file changed, 25 insertions(+), 10 deletions(-)
[uima-ruta] 01/01: Merge pull request #114 from apache/bugfix/111-Support-copy-paste-clipboard-for-feature-values-in-annotation-browser-view-2
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch maintenance/3.2.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit c4538aa458666ca3d2b2134b3609229307e0835e Merge: e166a57a 3e0ff76c Author: pkluegl AuthorDate: Fri Oct 28 13:04:51 2022 +0200 Merge pull request #114 from apache/bugfix/111-Support-copy-paste-clipboard-for-feature-values-in-annotation-browser-view-2 Issue #111: Support copy/paste clipboard for feature values in annotation browser view .../view/tree/AnnotationTreeViewPage.java | 35 +++--- 1 file changed, 25 insertions(+), 10 deletions(-)
[uima-ruta] branch bugfix/111-Support-copy-paste-clipboard-for-feature-values-in-annotation-browser-view-2 created (now 3e0ff76c)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/111-Support-copy-paste-clipboard-for-feature-values-in-annotation-browser-view-2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at 3e0ff76c Issue #111: Support copy/paste clipboard for feature values in annotation browser view This branch includes the following new commits: new 3e0ff76c Issue #111: Support copy/paste clipboard for feature values in annotation browser view The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] 01/01: Issue #111: Support copy/paste clipboard for feature values in annotation browser view
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
bugfix/111-Support-copy-paste-clipboard-for-feature-values-in-annotation-browser-view-2
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 3e0ff76c1bc32dffd4a0b594adc5ddf110606591
Author: Peter Klügl
AuthorDate: Fri Oct 28 12:08:05 2022 +0200
Issue #111: Support copy/paste clipboard for feature values in annotation
browser view
- fix clipboard
---
.../view/tree/AnnotationTreeViewPage.java | 35 +++---
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git
a/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewPage.java
b/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewPage.java
index f464d466..c259bd6c 100644
---
a/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewPage.java
+++
b/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewPage.java
@@ -269,23 +269,19 @@ public class AnnotationTreeViewPage extends Page
implements MouseListener, IDoub
@Override
public void keyPressed(KeyEvent e) {
+
int keyCode = e.keyCode;
// backspace or delete: delete annotations
if (keyCode == SWT.BS || keyCode == SWT.DEL) {
deleteSelectedAnnotations();
}
// ctrl and c: copy type name to clipboard
-if ((e.stateMask & SWT.CTRL) == SWT.CTRL && keyCode == 'c') {
+if (e.stateMask == SWT.CTRL && (e.keyCode == 'c' || e.keyCode == 'C'))
{
TreeItem[] selection = treeView.getTree().getSelection();
- if (selection != null && selection.length == 1) {
-Object obj = selection[0].getData();
-if (obj instanceof TypeTreeNode) {
- TypeTreeNode typeTreeNode = (TypeTreeNode) obj;
- Type type = typeTreeNode.getType();
- TextTransfer textTransfer = TextTransfer.getInstance();
- clipboard.setContents(new Object[] { type.getName() },
- new Transfer[] { textTransfer });
-}
+ if (selection != null) {
+Object[] contents = getContents(selection);
+TextTransfer textTransfer = TextTransfer.getInstance();
+clipboard.setContents(contents, new Transfer[] { textTransfer });
}
}
// ctrl and c: copy type name to clipboard:
@@ -302,6 +298,25 @@ public class AnnotationTreeViewPage extends Page
implements MouseListener, IDoub
}
}
+ private Object[] getContents(TreeItem[] selection) {
+
+List list = new ArrayList<>();
+for (TreeItem item : selection) {
+ Object data = item.getData();
+ if(data instanceof TypeTreeNode) {
+list.add(((TypeTreeNode) data).getType().getName());
+ } else if(data instanceof PrimitiveFeatureTreeNode) {
+list.add(((PrimitiveFeatureTreeNode) data).getValue());
+ } else if(data instanceof AnnotationTreeNode) {
+list.add(((AnnotationTreeNode)
data).getAnnotation().getCoveredText());
+ } else if(data instanceof ITreeNode) {
+list.add(((ITreeNode) data).getName());
+ }
+}
+
+return new Object[]{StringUtils.join(list, "\n")};
+ }
+
});
styleListener = new TreeViewAnnotationStyleChangeListener();
[uima-ruta] branch bugfix/111-Support-copy-paste-clipboard-for-feature-values-in-annotation-browser-view updated: Issue #111: Support copy/paste clipboard for feature values in annotation browser view
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
bugfix/111-Support-copy-paste-clipboard-for-feature-values-in-annotation-browser-view
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to
refs/heads/bugfix/111-Support-copy-paste-clipboard-for-feature-values-in-annotation-browser-view
by this push:
new a8f70cbc Issue #111: Support copy/paste clipboard for feature values
in annotation browser view
a8f70cbc is described below
commit a8f70cbc53a7b999e45f714159c644b0c5dfea18
Author: Peter Klügl
AuthorDate: Fri Oct 28 12:03:15 2022 +0200
Issue #111: Support copy/paste clipboard for feature values in annotation
browser view
- fix clipboard
---
.../view/tree/AnnotationTreeViewPage.java | 35 +++---
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git
a/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewPage.java
b/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewPage.java
index f464d466..12efdd0d 100644
---
a/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewPage.java
+++
b/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewPage.java
@@ -269,23 +269,19 @@ public class AnnotationTreeViewPage extends Page
implements MouseListener, IDoub
@Override
public void keyPressed(KeyEvent e) {
+
int keyCode = e.keyCode;
// backspace or delete: delete annotations
if (keyCode == SWT.BS || keyCode == SWT.DEL) {
deleteSelectedAnnotations();
}
// ctrl and c: copy type name to clipboard
-if ((e.stateMask & SWT.CTRL) == SWT.CTRL && keyCode == 'c') {
+if (e.stateMask == SWT.CTRL && (e.keyCode == 'c' || e.keyCode == 'C'))
{
TreeItem[] selection = treeView.getTree().getSelection();
- if (selection != null && selection.length == 1) {
-Object obj = selection[0].getData();
-if (obj instanceof TypeTreeNode) {
- TypeTreeNode typeTreeNode = (TypeTreeNode) obj;
- Type type = typeTreeNode.getType();
- TextTransfer textTransfer = TextTransfer.getInstance();
- clipboard.setContents(new Object[] { type.getName() },
- new Transfer[] { textTransfer });
-}
+ if (selection != null) {
+Object[] contents = getContents(selection);
+TextTransfer textTransfer = TextTransfer.getInstance();
+clipboard.setContents(contents, new Transfer[] { textTransfer });
}
}
// ctrl and c: copy type name to clipboard:
@@ -302,6 +298,25 @@ public class AnnotationTreeViewPage extends Page
implements MouseListener, IDoub
}
}
+ private Object[] getContents(TreeItem[] selection) {
+
+List list = new ArrayList<>();
+for (TreeItem item : selection) {
+ Object data = item.getData();
+ if(data instanceof TypeTreeNode) {
+list.add(((TypeTreeNode) data).getType().getName());
+ } else if(data instanceof PrimitiveFeatureTreeNode) {
+list.add(((PrimitiveFeatureTreeNode) data).getValue());
+ } else if(data instanceof AnnotationTreeNode) {
+list.add(((AnnotationTreeNode)
data).getAnnotation().getCoveredText());
+ } else if(data instanceof ITreeNode) {
+list.add(((ITreeNode) data).getName());
+ }
+}
+
+return new Object[]{StringUtils.join(list, "\n")};
+ }
+
});
styleListener = new TreeViewAnnotationStyleChangeListener();
[uima-ruta] branch bugfix/111-Support-copy-paste-clipboard-for-feature-values-in-annotation-browser-view created (now 08ca8b83)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/111-Support-copy-paste-clipboard-for-feature-values-in-annotation-browser-view in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at 08ca8b83 Merge pull request #109 from apache/feature/100-Enable-type-system-discovery-via-SPI-in-OSGI No new revisions were added by this update.
[uima-ruta] 01/01: Issue #110: Usage of labels within macro action definition is broken
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
bugfix/110-Usage-of-labels-within-macro-action-definition-is-broken
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 40fccbcc986cbed42bf0464e05bd87b907a6021c
Author: Peter Klügl
AuthorDate: Wed Oct 26 14:33:27 2022 +0200
Issue #110: Usage of labels within macro action definition is broken
- changed conventions of usage
- deactivated auto labelling of all action within marco definitions
- collect inlined labels in rule preparation
- added and modified tests
---
.../org/apache/uima/ruta/action/MacroAction.java | 8 ---
.../java/org/apache/uima/ruta/rule/RutaRule.java | 18 ++-
.../apache/uima/ruta/action/MacroActionTest.java | 61 +-
3 files changed, 76 insertions(+), 11 deletions(-)
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/action/MacroAction.java
b/ruta-core/src/main/java/org/apache/uima/ruta/action/MacroAction.java
index 28c654cc..f3bb8f41 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/action/MacroAction.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/action/MacroAction.java
@@ -98,14 +98,6 @@ public class MacroAction extends AbstractRutaAction {
}
}
- @Override
- public void setLabel(String label) {
-super.setLabel(label);
-for (AbstractRutaAction action : actions) {
- action.setLabel(label);
-}
- }
-
public String getName() {
return name;
}
diff --git a/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java
b/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java
index 7c6f6536..105f4199 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java
@@ -21,10 +21,12 @@ package org.apache.uima.ruta.rule;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import org.apache.uima.cas.text.AnnotationFS;
@@ -33,6 +35,7 @@ import org.apache.uima.ruta.RutaEnvironment;
import org.apache.uima.ruta.RutaStatement;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.action.AbstractRutaAction;
+import org.apache.uima.ruta.action.MacroAction;
import org.apache.uima.ruta.block.RutaBlock;
import org.apache.uima.ruta.visitor.InferenceCrowd;
@@ -109,7 +112,7 @@ public class RutaRule extends AbstractRule {
ownLabels.add(ruleElement.getLabel());
}
}
-fillLabelMapWithActions(ruleElement.getActions(), own);
+fillLabelMapWithActions(ruleElement.getActions(), own, new HashSet<>());
if (ruleElement instanceof ComposedRuleElement) {
ComposedRuleElement cre = (ComposedRuleElement) ruleElement;
List ruleElements = cre.getRuleElements();
@@ -121,15 +124,26 @@ public class RutaRule extends AbstractRule {
fillLabelMapWithInlinedRules(ruleElement.getInlinedActionRuleBlocks());
}
- private void fillLabelMapWithActions(List actions,
boolean own) {
+ private void fillLabelMapWithActions(List actions,
boolean own,
+ Set processedActions) {
if (actions != null) {
for (AbstractRutaAction action : actions) {
+// TODO recursive declarations are not supported right now, but we
should check it anyways
+if (processedActions.contains(action)) {
+ continue;
+}
+processedActions.add(action);
+
if (action != null && !StringUtils.isBlank(action.getLabel())) {
labels.put(action.getLabel(), null);
if (own) {
ownLabels.add(action.getLabel());
}
}
+if (action instanceof MacroAction) {
+ MacroAction macroAction = (MacroAction) action;
+ fillLabelMapWithActions(macroAction.getActions(), own,
processedActions);
+}
}
}
}
diff --git
a/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java
index 366899c1..8641ad55 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java
@@ -34,9 +34,12 @@ import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
+import org.apache.uima.fit.util.CasUtil;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
+import org.apache.uima.ruta.extensions.RutaParseRuntimeException;
+import org.assertj.core.api.Assertions;
import org.junit.Ignore;
import org.junit.Test;
[uima-ruta] branch bugfix/110-Usage-of-labels-within-macro-action-definition-is-broken created (now 40fccbcc)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/110-Usage-of-labels-within-macro-action-definition-is-broken in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at 40fccbcc Issue #110: Usage of labels within macro action definition is broken This branch includes the following new commits: new 40fccbcc Issue #110: Usage of labels within macro action definition is broken The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-uimaj] branch feature/UIMA-6374-Create-CAS-de-serialization-test-suite-windows updated: [UIMA-6374] Create CAS (de)serialization test suite
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
feature/UIMA-6374-Create-CAS-de-serialization-test-suite-windows
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to
refs/heads/feature/UIMA-6374-Create-CAS-de-serialization-test-suite-windows by
this push:
new c53ad4f20 [UIMA-6374] Create CAS (de)serialization test suite
c53ad4f20 is described below
commit c53ad4f20284164df305035310b1e0e2e7916bc9
Author: Peter Klügl
AuthorDate: Thu Apr 28 16:48:27 2022 +0200
[UIMA-6374] Create CAS (de)serialization test suite
- fixed tests for windows builds
---
.../org/apache/uima/resource/impl/RelativePathResolver_impl.java | 1 +
.../serdes/CasSerializationDeserialization_BINARY_TSI_Test.java | 8
.../cas/serdes/CasSerializationDeserialization_BINARY_Test.java | 4 ++--
...SerializationDeserialization_COMPRESSED_FILTERED_TSI_Test.java | 8
.../CasSerializationDeserialization_SERIALIZED_TSI_Test.java | 8
.../cas/serdes/CasSerializationDeserialization_XCAS_Test.java | 8
.../CasSerializationDeserialization_XMI_1_0_PRETTY_Test.java | 8
.../CasSerializationDeserialization_XMI_1_1_PRETTY_Test.java | 8
.../org/apache/uima/cas/serdes/scenario/SerRefTestScenario.java | 2 +-
.../apache/uima/resource/impl/RelativePathResolver_implTest.java | 7 ++-
10 files changed, 34 insertions(+), 28 deletions(-)
diff --git
a/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
b/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
index 67be7d25a..392912414 100644
---
a/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
+++
b/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
@@ -112,6 +112,7 @@ public class RelativePathResolver_impl implements
RelativePathResolver {
mDataPath = unmodifiableList(Arrays.stream(aPaths) //
.map(File::getPath) //
+.map(s-> s.replace(File.separator, "/"))
.collect(toList()));
mBaseUrls = new URL[aPaths.length];
for (int i = 0; i < aPaths.length; i++) {
diff --git
a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_TSI_Test.java
b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_TSI_Test.java
index 7277ae72f..ecd7e4124 100644
---
a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_TSI_Test.java
+++
b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_TSI_Test.java
@@ -46,15 +46,15 @@ public class
CasSerializationDeserialization_BINARY_TSI_Test {
private static final int RANDOM_CAS_ITERATIONS = 20;
private static final List serDesCycles =
asList( //
- new CasSerDesCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> serdes(a, b, FORMAT, DEFAULT)),
- new CasSerDesCycleConfiguration(FORMAT + " / REINIT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - REINIT", //
(a, b) -> serdes(a, b, FORMAT, REINIT)));
private static final List desSerCycles =
asList( //
- new CasDesSerCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> desser(createCas(), a, b, FORMAT, DEFAULT)),
- new CasDesSerCycleConfiguration(FORMAT + " / REINIT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - REINIT", //
(a, b) -> desser(createCas(), a, b, FORMAT, REINIT)));
private static List serRefScenarios() {
diff --git
a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_Test.java
b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_Test.java
index 98273c0ca..6c259c2f3 100644
---
a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_Test.java
+++
b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_Test.java
@@ -46,11 +46,11 @@ public class CasSerializationDeserialization_BINARY_Test {
private static final int RANDOM_CAS_ITERATIONS = 20;
private static final List serDesCycles =
asList( //
- new CasSerDesCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> serdes(a, b, FORMAT, DEFAULT,
PRESERVE_ORIGINAL_TSI)));
private static final List desSerCycles =
asList( //
-
[uima-uimaj] branch feature/UIMA-6374-Create-CAS-de-serialization-test-suite-windows created (now 52fa9a8c4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch feature/UIMA-6374-Create-CAS-de-serialization-test-suite-windows in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git at 52fa9a8c4 Merge pull request #196 from apache/refactoring/UIMA-6433-Update-issue-and-PR-templates No new revisions were added by this update.
[uima-ruta] branch maintenance/3.1.x updated (9c0bb3a -> 72c6b01)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 9c0bb3a Merge pull request #73 from apache/bugfix/UIMA-6411-Ruta-avoid-creation-of-RutaBasics-for-bad-annotations add 7d6808d UIMA-6414: Ruta: missing match for optional after sidestep out of composed add be1c456 UIMA-6414: Ruta: missing match for optional after sidestep out of composed add ffad5fb UIMA-6414: Ruta: missing match for optional after sidestep out of composed add 30623e4 UIMA-6414: Ruta: missing match for optional after sidestep out of composed add 84923f4 UIMA-6414: Ruta: missing match for optional after sidestep out of composed new 72c6b01 Merge pull request #74 from apache/bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/uima/ruta/rule/AbstractRuleElement.java | 12 +++--- .../apache/uima/ruta/rule/ComposedRuleElement.java | 3 ++- .../org/apache/uima/ruta/rule/RutaRuleElement.java | 24 ++- .../uima/ruta/ConjunctiveRuleElementTest.java | 12 +++--- .../apache/uima/ruta/rule/ManualAnchoringTest.java | 27 +- .../uima/ruta/rule/SidestepInComposedTest.java | 14 +++ .../ruta/rule/quantifier/MinMaxQuantifierTest.java | 8 +++ 7 files changed, 81 insertions(+), 19 deletions(-)
[uima-ruta] 01/01: Merge pull request #74 from apache/bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 72c6b0177494b79d6290d4ca4e10f9b026ca0cf7 Merge: 9c0bb3a 84923f4 Author: pkluegl AuthorDate: Thu Jan 27 00:45:06 2022 +0100 Merge pull request #74 from apache/bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed UIMA-6414: Ruta: missing match for optional after sidestep out of composed .../apache/uima/ruta/rule/AbstractRuleElement.java | 12 +++--- .../apache/uima/ruta/rule/ComposedRuleElement.java | 3 ++- .../org/apache/uima/ruta/rule/RutaRuleElement.java | 24 ++- .../uima/ruta/ConjunctiveRuleElementTest.java | 12 +++--- .../apache/uima/ruta/rule/ManualAnchoringTest.java | 27 +- .../uima/ruta/rule/SidestepInComposedTest.java | 14 +++ .../ruta/rule/quantifier/MinMaxQuantifierTest.java | 8 +++ 7 files changed, 81 insertions(+), 19 deletions(-)
[uima-ruta] branch bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed updated (30623e4 -> 84923f4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 30623e4 UIMA-6414: Ruta: missing match for optional after sidestep out of composed add 84923f4 UIMA-6414: Ruta: missing match for optional after sidestep out of composed No new revisions were added by this update. Summary of changes: .../org/apache/uima/ruta/rule/AbstractRuleElement.java | 9 +++-- .../org/apache/uima/ruta/rule/ManualAnchoringTest.java | 14 +- 2 files changed, 20 insertions(+), 3 deletions(-)
[uima-ruta] branch bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed updated (ffad5fb -> 30623e4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from ffad5fb UIMA-6414: Ruta: missing match for optional after sidestep out of composed add 30623e4 UIMA-6414: Ruta: missing match for optional after sidestep out of composed No new revisions were added by this update. Summary of changes: .../org/apache/uima/ruta/rule/RutaRuleElement.java | 24 +- .../apache/uima/ruta/rule/ManualAnchoringTest.java | 15 +- 2 files changed, 37 insertions(+), 2 deletions(-)
[uima-ruta] branch bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed updated (be1c456 -> ffad5fb)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from be1c456 UIMA-6414: Ruta: missing match for optional after sidestep out of composed add ffad5fb UIMA-6414: Ruta: missing match for optional after sidestep out of composed No new revisions were added by this update. Summary of changes: .../org/apache/uima/ruta/rule/AbstractRuleElement.java | 5 +++-- .../org/apache/uima/ruta/rule/ComposedRuleElement.java | 3 ++- .../org/apache/uima/ruta/ConjunctiveRuleElementTest.java | 12 +++- .../apache/uima/ruta/rule/RutaOptionalRuleElementTest.java | 14 -- .../org/apache/uima/ruta/rule/SidestepInComposedTest.java | 14 ++ .../uima/ruta/rule/quantifier/MinMaxQuantifierTest.java| 8 6 files changed, 26 insertions(+), 30 deletions(-)
[uima-ruta] branch bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed updated (7d6808d -> be1c456)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 7d6808d UIMA-6414: Ruta: missing match for optional after sidestep out of composed add be1c456 UIMA-6414: Ruta: missing match for optional after sidestep out of composed No new revisions were added by this update. Summary of changes: .../java/org/apache/uima/ruta/rule/RutaOptionalRuleElementTest.java| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[uima-ruta] 01/01: UIMA-6414: Ruta: missing match for optional after sidestep out of composed
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 7d6808d7a1d4e5863d900dc534554b27e9e1b45d
Author: Peter Klügl
AuthorDate: Wed Jan 26 17:31:27 2022 +0100
UIMA-6414: Ruta: missing match for optional after sidestep out of composed
- added test
---
.../uima/ruta/rule/RutaOptionalRuleElementTest.java | 15 +++
1 file changed, 15 insertions(+)
diff --git
a/ruta-core/src/test/java/org/apache/uima/ruta/rule/RutaOptionalRuleElementTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/rule/RutaOptionalRuleElementTest.java
index 4514779..4d3b2b7 100644
---
a/ruta-core/src/test/java/org/apache/uima/ruta/rule/RutaOptionalRuleElementTest.java
+++
b/ruta-core/src/test/java/org/apache/uima/ruta/rule/RutaOptionalRuleElementTest.java
@@ -39,4 +39,19 @@ public class RutaOptionalRuleElementTest {
}
+ @Test
+ public void testOptionalBeforeComposed() throws Exception {
+String document = "test 05/05 test\n";
+document += "test 06/06 . test\n";
+document += "test . 07/07 test\n";
+String script = "ADDRETAINTYPE(WS);";
+script += "_{PARTOF(PM)} (NUM SPECIAL @NUM){-> T1} _{PARTOF({PM})};\n";
+
+CAS cas = RutaTestUtils.getCAS(document);
+Ruta.apply(cas, script);
+
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "05/05");
+
+ }
+
}
[uima-ruta] branch bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed created (now 7d6808d)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at 7d6808d UIMA-6414: Ruta: missing match for optional after sidestep out of composed This branch includes the following new commits: new 7d6808d UIMA-6414: Ruta: missing match for optional after sidestep out of composed The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] 01/01: Merge pull request #73 from apache/bugfix/UIMA-6411-Ruta-avoid-creation-of-RutaBasics-for-bad-annotations
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 9c0bb3abdc170d9511f22c2416f7a6850c903534 Merge: 5c35e16 19a6170 Author: pkluegl AuthorDate: Sun Jan 16 21:22:59 2022 +0100 Merge pull request #73 from apache/bugfix/UIMA-6411-Ruta-avoid-creation-of-RutaBasics-for-bad-annotations UIMA-6411: Ruta: avoid creation of RutaBasics for bad annotations .../src/main/java/org/apache/uima/ruta/RutaStream.java | 5 +++-- .../java/org/apache/uima/ruta/EmptyDocumentTest.java| 17 + 2 files changed, 20 insertions(+), 2 deletions(-)
[uima-ruta] branch maintenance/3.1.x updated (5c35e16 -> 9c0bb3a)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 5c35e16 Merge pull request #72 from apache/bugfix/UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens add d9b3321 UIMA-6411: Ruta: avoid creation of RutaBasics for bad annotations add 19a6170 UIMA-6411: Ruta: avoid creation of RutaBasics for bad annotations new 9c0bb3a Merge pull request #73 from apache/bugfix/UIMA-6411-Ruta-avoid-creation-of-RutaBasics-for-bad-annotations The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/java/org/apache/uima/ruta/RutaStream.java | 5 +++-- .../java/org/apache/uima/ruta/EmptyDocumentTest.java| 17 + 2 files changed, 20 insertions(+), 2 deletions(-)
[uima-ruta] branch bugfix/UIMA-6411-Ruta-avoid-creation-of-RutaBasics-for-bad-annotations updated (d9b3321 -> 19a6170)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/UIMA-6411-Ruta-avoid-creation-of-RutaBasics-for-bad-annotations in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from d9b3321 UIMA-6411: Ruta: avoid creation of RutaBasics for bad annotations add 19a6170 UIMA-6411: Ruta: avoid creation of RutaBasics for bad annotations No new revisions were added by this update. Summary of changes: ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java| 5 +++-- ruta-core/src/test/java/org/apache/uima/ruta/EmptyDocumentTest.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-)
[uima-ruta] branch bugfix/UIMA-6411-Ruta-avoid-creation-of-RutaBasics-for-bad-annotations created (now d9b3321)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/UIMA-6411-Ruta-avoid-creation-of-RutaBasics-for-bad-annotations in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at d9b3321 UIMA-6411: Ruta: avoid creation of RutaBasics for bad annotations This branch includes the following new commits: new d9b3321 UIMA-6411: Ruta: avoid creation of RutaBasics for bad annotations The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] 01/01: UIMA-6411: Ruta: avoid creation of RutaBasics for bad annotations
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
bugfix/UIMA-6411-Ruta-avoid-creation-of-RutaBasics-for-bad-annotations
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit d9b33219716517ba915c92177b0690e0814486a9
Author: Peter Klügl
AuthorDate: Fri Jan 14 17:30:20 2022 +0100
UIMA-6411: Ruta: avoid creation of RutaBasics for bad annotations
- adding test
---
.../java/org/apache/uima/ruta/EmptyDocumentTest.java | 16
1 file changed, 16 insertions(+)
diff --git
a/ruta-core/src/test/java/org/apache/uima/ruta/EmptyDocumentTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/EmptyDocumentTest.java
index 4476a55..ea779c8 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/EmptyDocumentTest.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/EmptyDocumentTest.java
@@ -23,12 +23,15 @@ import static org.junit.Assert.assertEquals;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FSIterator;
+import org.apache.uima.cas.SelectFSs;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.rule.RuleInference1Test;
+import org.apache.uima.ruta.type.RutaBasic;
+import org.junit.Assert;
import org.junit.Test;
public class EmptyDocumentTest {
@@ -62,4 +65,17 @@ public class EmptyDocumentTest {
RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "");
}
+ @Test
+ public void testSpaceWithInvalidAnnotation() throws Exception {
+CAS cas = RutaTestUtils.getCAS(" ");
+cas.createAnnotation(cas.getAnnotationType(), -1, 1);
+Ruta.apply(cas, "Document;");
+
+SelectFSs select = cas.select(RutaBasic.class);
+Assert.assertEquals(1, select.count());
+RutaBasic rutaBasic = select.findAny().get();
+Assert.assertEquals(0, rutaBasic.getBegin());
+Assert.assertEquals(1, rutaBasic.getEnd());
+ }
+
}
[uima-ruta] branch maintenance/3.1.x updated (7b5844e -> 5c35e16)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 7b5844e Merge pull request #70 from apache/UIMA-6408-Ruta-No-type-check-of-features-in-TRANSFER add ade5939 UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens new 5c35e16 Merge pull request #72 from apache/bugfix/UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[uima-ruta] 01/01: Merge pull request #72 from apache/bugfix/UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 5c35e1689fb9ae7e3e30ce330ec671467378422e Merge: 7b5844e ade5939 Author: pkluegl AuthorDate: Fri Jan 14 16:27:44 2022 +0100 Merge pull request #72 from apache/bugfix/UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens UIMA-6409: Ruta: possible endless wildcard lookahead in combination with subtokens .../src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[uima-ruta] branch bugfix/UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens created (now ade5939)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at ade5939 UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens This branch includes the following new commits: new ade5939 UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] 01/01: UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
bugfix/UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit ade59396d77e1ca2e90a315b3619d22a26e5b9c1
Author: Peter Klügl
AuthorDate: Fri Jan 14 15:27:03 2022 +0100
UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens
- improve iterator position check
---
.../src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
b/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
index 94d07d5..1b688a3 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
@@ -507,8 +507,8 @@ public class WildCardRuleElement extends
AbstractRuleElement {
}
if (annotation != null && iterator != null && iterator.isValid()) {
AnnotationFS pointer = iterator.get();
- if ((after && pointer.getEnd() == annotation.getEnd())
- || (!after && pointer.getBegin() == annotation.getBegin())) {
+ if ((after && pointer.getBegin() < annotation.getEnd())
+ || (!after && pointer.getEnd() > annotation.getBegin())) {
moveOn(after, iterator, stream);
}
}
[uima-ruta] branch maintenance/3.1.x updated (30c1013 -> 7b5844e)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 30c1013 Merge pull request #71 from apache/UIMA-6383-Ruta-TRIE-Wordlist-entry-not-annotated add 30ef597 UIMA-6408: Ruta: No type check of features in TRANSFER add ff2dd81 Merge branch 'maintenance/3.1.x' into UIMA-6408-Ruta-No-type-check-of-features-in-TRANSFER new 7b5844e Merge pull request #70 from apache/UIMA-6408-Ruta-No-type-check-of-features-in-TRANSFER The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/uima/ruta/action/TransferAction.java| 15 +++- .../org/apache/uima/ruta/action/TransferTest.java | 44 -- 2 files changed, 54 insertions(+), 5 deletions(-)
[uima-ruta] 01/01: Merge pull request #70 from apache/UIMA-6408-Ruta-No-type-check-of-features-in-TRANSFER
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 7b5844e05c0bee81ab0a1589b684b4d55c681510 Merge: 30c1013 ff2dd81 Author: pkluegl AuthorDate: Mon Jan 10 15:38:43 2022 +0100 Merge pull request #70 from apache/UIMA-6408-Ruta-No-type-check-of-features-in-TRANSFER UIMA-6408: Ruta: No type check of features in TRANSFER .../apache/uima/ruta/action/TransferAction.java| 15 +++- .../org/apache/uima/ruta/action/TransferTest.java | 44 -- 2 files changed, 54 insertions(+), 5 deletions(-)
[uima-ruta] branch UIMA-6408-Ruta-No-type-check-of-features-in-TRANSFER updated (30ef597 -> ff2dd81)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6408-Ruta-No-type-check-of-features-in-TRANSFER in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 30ef597 UIMA-6408: Ruta: No type check of features in TRANSFER add 8abfb30 UIMA-6383: Ruta: TRIE - Wordlist entry not annotated add 33579a7 UIMA-6383: Ruta: TRIE - Wordlist entry not annotated add 3e75c1a UIMA-6383: Ruta: TRIE - Wordlist entry not annotated add 30c1013 Merge pull request #71 from apache/UIMA-6383-Ruta-TRIE-Wordlist-entry-not-annotated add ff2dd81 Merge branch 'maintenance/3.1.x' into UIMA-6408-Ruta-No-type-check-of-features-in-TRANSFER No new revisions were added by this update. Summary of changes: .../uima/ruta/resource/MultiTreeWordList.java | 39 +- ruta-docbook/src/docbook/tools.ruta.howtos.xml | 10 +- .../tools.ruta.workbench.create_dictionaries.xml | 3 ++ .../ruta/utils/twl/MultiTWLConverterHandler.java | 17 -- .../uima/ruta/utils/twl/TWLConverterHandler.java | 17 -- .../ui/preferences/RutaBuilderPreferencePage.java | 13 +--- .../ui/preferences/RutaPreferencesMessages.java| 12 +++ .../preferences/RutaPreferencesMessages.properties | 1 + .../uima/ruta/ide/core/RutaCorePreferences.java| 2 ++ .../ruta/ide/core/RutaPreferenceInitializer.java | 2 ++ ruta-maven-plugin/src/it/wordlists/pom.xml | 2 ++ .../uima/ruta/maven/RutaGenerateMTWLMojo.java | 8 - .../uima/ruta/maven/RutaGenerateTWLMojo.java | 8 - 13 files changed, 113 insertions(+), 21 deletions(-)
[uima-ruta] branch maintenance/3.1.x updated (11af409 -> 30c1013)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 11af409 no issue: fix method sig add 8abfb30 UIMA-6383: Ruta: TRIE - Wordlist entry not annotated add 33579a7 UIMA-6383: Ruta: TRIE - Wordlist entry not annotated add 3e75c1a UIMA-6383: Ruta: TRIE - Wordlist entry not annotated new 30c1013 Merge pull request #71 from apache/UIMA-6383-Ruta-TRIE-Wordlist-entry-not-annotated The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../uima/ruta/resource/MultiTreeWordList.java | 39 +- ruta-docbook/src/docbook/tools.ruta.howtos.xml | 10 +- .../tools.ruta.workbench.create_dictionaries.xml | 3 ++ .../ruta/utils/twl/MultiTWLConverterHandler.java | 17 -- .../uima/ruta/utils/twl/TWLConverterHandler.java | 17 -- .../ui/preferences/RutaBuilderPreferencePage.java | 13 +--- .../ui/preferences/RutaPreferencesMessages.java| 12 +++ .../preferences/RutaPreferencesMessages.properties | 1 + .../uima/ruta/ide/core/RutaCorePreferences.java| 2 ++ .../ruta/ide/core/RutaPreferenceInitializer.java | 2 ++ ruta-maven-plugin/src/it/wordlists/pom.xml | 2 ++ .../uima/ruta/maven/RutaGenerateMTWLMojo.java | 8 - .../uima/ruta/maven/RutaGenerateTWLMojo.java | 8 - 13 files changed, 113 insertions(+), 21 deletions(-)
[uima-ruta] 01/01: Merge pull request #71 from apache/UIMA-6383-Ruta-TRIE-Wordlist-entry-not-annotated
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 30c1013cae4c978f79d230d6778e6233d906d05a Merge: 11af409 3e75c1a Author: pkluegl AuthorDate: Mon Jan 10 14:26:45 2022 +0100 Merge pull request #71 from apache/UIMA-6383-Ruta-TRIE-Wordlist-entry-not-annotated UIMA-6383: Ruta: TRIE - Wordlist entry not annotated .../uima/ruta/resource/MultiTreeWordList.java | 39 +- ruta-docbook/src/docbook/tools.ruta.howtos.xml | 10 +- .../tools.ruta.workbench.create_dictionaries.xml | 3 ++ .../ruta/utils/twl/MultiTWLConverterHandler.java | 17 -- .../uima/ruta/utils/twl/TWLConverterHandler.java | 17 -- .../ui/preferences/RutaBuilderPreferencePage.java | 13 +--- .../ui/preferences/RutaPreferencesMessages.java| 12 +++ .../preferences/RutaPreferencesMessages.properties | 1 + .../uima/ruta/ide/core/RutaCorePreferences.java| 2 ++ .../ruta/ide/core/RutaPreferenceInitializer.java | 2 ++ ruta-maven-plugin/src/it/wordlists/pom.xml | 2 ++ .../uima/ruta/maven/RutaGenerateMTWLMojo.java | 8 - .../uima/ruta/maven/RutaGenerateTWLMojo.java | 8 - 13 files changed, 113 insertions(+), 21 deletions(-)
[uima-ruta] branch UIMA-6383-Ruta-TRIE-Wordlist-entry-not-annotated updated (33579a7 -> 3e75c1a)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6383-Ruta-TRIE-Wordlist-entry-not-annotated in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 33579a7 UIMA-6383: Ruta: TRIE - Wordlist entry not annotated add 3e75c1a UIMA-6383: Ruta: TRIE - Wordlist entry not annotated No new revisions were added by this update. Summary of changes: ruta-docbook/src/docbook/tools.ruta.howtos.xml | 10 +- .../src/docbook/tools.ruta.workbench.create_dictionaries.xml | 3 +++ .../apache/uima/ruta/utils/twl/MultiTWLConverterHandler.java | 2 +- ruta-maven-plugin/src/it/wordlists/pom.xml | 2 ++ 4 files changed, 15 insertions(+), 2 deletions(-)
[uima-ruta] branch UIMA-6383-Ruta-TRIE-Wordlist-entry-not-annotated updated (8abfb30 -> 33579a7)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6383-Ruta-TRIE-Wordlist-entry-not-annotated in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 8abfb30 UIMA-6383: Ruta: TRIE - Wordlist entry not annotated add 33579a7 UIMA-6383: Ruta: TRIE - Wordlist entry not annotated No new revisions were added by this update. Summary of changes: .../ruta/ide/ui/preferences/RutaBuilderPreferencePage.java | 13 - 1 file changed, 8 insertions(+), 5 deletions(-)
[uima-ruta] 01/01: UIMA-6383: Ruta: TRIE - Wordlist entry not annotated
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
UIMA-6383-Ruta-TRIE-Wordlist-entry-not-annotated
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 8abfb30d2315c5f37267e4b7e434e216fc8d44d6
Author: Peter Klügl
AuthorDate: Mon Jan 10 11:57:11 2022 +0100
UIMA-6383: Ruta: TRIE - Wordlist entry not annotated
- add option to select dictRemoveWS in eclipese plugin and maven plugin
---
.../uima/ruta/resource/MultiTreeWordList.java | 39 +-
.../ruta/utils/twl/MultiTWLConverterHandler.java | 15 +++--
.../uima/ruta/utils/twl/TWLConverterHandler.java | 17 --
.../ui/preferences/RutaPreferencesMessages.java| 12 +++
.../preferences/RutaPreferencesMessages.properties | 1 +
.../uima/ruta/ide/core/RutaCorePreferences.java| 2 ++
.../ruta/ide/core/RutaPreferenceInitializer.java | 2 ++
.../uima/ruta/maven/RutaGenerateMTWLMojo.java | 8 -
.../uima/ruta/maven/RutaGenerateTWLMojo.java | 8 -
9 files changed, 90 insertions(+), 14 deletions(-)
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordList.java
b/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordList.java
index 4b6d9ff..fd25685 100644
---
a/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordList.java
+++
b/ruta-core/src/main/java/org/apache/uima/ruta/resource/MultiTreeWordList.java
@@ -63,6 +63,8 @@ public class MultiTreeWordList implements RutaWordList {
/** The cost model we are using. */
private EditDistanceCostMap costMap;
+ private boolean dictRemoveWS = false;
+
/**
* Default constructor.
*
@@ -155,9 +157,25 @@ public class MultiTreeWordList implements RutaWordList {
* When there is a problem reading a path.
*/
public MultiTreeWordList(String[] pathnames, File base) throws IOException {
+this(pathnames, base, false);
+ }
+
+ /**
+ * Constructs a TreeWordList from a file with path = filename
+ *
+ * @param pathnames
+ * path of the file to create a TextWordList from
+ * @param base
+ * - the relative base
+ * @param dictRemoveWS
+ * remove white spaces
+ * @throws IOException
+ * When there is a problem reading a path.
+ */
+ public MultiTreeWordList(String[] pathnames, File base, boolean
dictRemoveWS) throws IOException {
this.root = new MultiTextNode();
this.costMap = new EditDistanceCostMap();
-
+this.dictRemoveWS = dictRemoveWS;
if (pathnames == null) {
return;
}
@@ -177,8 +195,23 @@ public class MultiTreeWordList implements RutaWordList {
* - When there is a problem reading the files.
*/
public MultiTreeWordList(List files, File base) throws IOException {
+this(files, base, false);
+ }
+
+ /**
+ * @param files
+ * - the input files
+ * @param base
+ * - the relative base
+ * @param dictRemoveWS
+ * - remove white spaces
+ * @throws IOException
+ * - When there is a problem reading the files.
+ */
+ public MultiTreeWordList(List files, File base, boolean dictRemoveWS)
throws IOException {
this.root = new MultiTextNode();
this.costMap = new EditDistanceCostMap();
+this.dictRemoveWS = dictRemoveWS;
if (files == null) {
return;
@@ -275,6 +308,10 @@ public class MultiTreeWordList implements RutaWordList {
for (Character each : s.toCharArray()) {
+ if (dictRemoveWS && Character.isWhitespace(each)) {
+continue;
+ }
+
MultiTextNode childNode = pointer.getChildNode(each);
if (childNode == null) {
diff --git
a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/twl/MultiTWLConverterHandler.java
b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/twl/MultiTWLConverterHandler.java
index 8c3fbcd..2decfcd 100755
---
a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/twl/MultiTWLConverterHandler.java
+++
b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/twl/MultiTWLConverterHandler.java
@@ -54,12 +54,16 @@ import org.eclipse.ui.handlers.HandlerUtil;
public class MultiTWLConverterHandler implements IHandler {
private class ConverterHandlerJob extends Job {
ExecutionEvent event;
+
private boolean compress;
-ConverterHandlerJob(ExecutionEvent event, boolean compress) {
+private boolean dictRemoveWS;
+
+ConverterHandlerJob(ExecutionEvent event, boolean compress, boolean
dictRemoveWS) {
super("Converting...");
this.event = event;
this.compress = compress;
+ this.dictRemoveWS = dictRemoveWS;
setUser(true);
}
@@ -126,16 +130,20 @@ public class MultiTWLConverterHandler implements IHandler
{
}
}
+ @Override
public void addHandlerListener(IHandlerListener handlerListener) {
}
+ @Override
public void dispose() {
[uima-ruta] branch UIMA-6383-Ruta-TRIE-Wordlist-entry-not-annotated created (now 8abfb30)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6383-Ruta-TRIE-Wordlist-entry-not-annotated in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at 8abfb30 UIMA-6383: Ruta: TRIE - Wordlist entry not annotated This branch includes the following new commits: new 8abfb30 UIMA-6383: Ruta: TRIE - Wordlist entry not annotated The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] branch UIMA-6408-Ruta-No-type-check-of-features-in-TRANSFER created (now 30ef597)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch UIMA-6408-Ruta-No-type-check-of-features-in-TRANSFER in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at 30ef597 UIMA-6408: Ruta: No type check of features in TRANSFER This branch includes the following new commits: new 30ef597 UIMA-6408: Ruta: No type check of features in TRANSFER The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] 01/01: UIMA-6408: Ruta: No type check of features in TRANSFER
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
UIMA-6408-Ruta-No-type-check-of-features-in-TRANSFER
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 30ef5979dd258f4a2ba91dbf8842b58aee85820d
Author: Peter Klügl
AuthorDate: Mon Jan 10 11:24:01 2022 +0100
UIMA-6408: Ruta: No type check of features in TRANSFER
- log instead of thowing an exception
---
.../apache/uima/ruta/action/TransferAction.java| 15 +++-
.../org/apache/uima/ruta/action/TransferTest.java | 44 --
2 files changed, 54 insertions(+), 5 deletions(-)
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/action/TransferAction.java
b/ruta-core/src/main/java/org/apache/uima/ruta/action/TransferAction.java
index bf38e7b..cb4694b 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/action/TransferAction.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/action/TransferAction.java
@@ -21,6 +21,7 @@ package org.apache.uima.ruta.action;
import java.util.List;
+import org.apache.uima.UimaContextHolder;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.FeatureStructure;
@@ -79,10 +80,20 @@ public class TransferAction extends TypeSensitiveAction {
if (newFeature != null) {
if (feature.getRange().isPrimitive()) {
String value = oldFS.getFeatureValueAsString(feature);
- newFS.setFeatureValueFromString(newFeature, value);
+ try {
+newFS.setFeatureValueFromString(newFeature, value);
+ } catch (Exception e) {
+UimaContextHolder.getContext().getLogger().debug("Unable to
transfer feature {}: {}",
+shortName, e.getMessage());
+ }
} else {
FeatureStructure value = oldFS.getFeatureValue(feature);
- newFS.setFeatureValue(newFeature, value);
+ try {
+newFS.setFeatureValue(newFeature, value);
+ } catch (Exception e) {
+UimaContextHolder.getContext().getLogger().debug("Unable to
transfer feature {}: {}",
+shortName, e.getMessage());
+ }
}
}
}
diff --git
a/ruta-core/src/test/java/org/apache/uima/ruta/action/TransferTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/action/TransferTest.java
index 31f4a89..bac9613 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/action/TransferTest.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/action/TransferTest.java
@@ -21,6 +21,9 @@ package org.apache.uima.ruta.action;
import static org.junit.Assert.assertEquals;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@@ -30,8 +33,10 @@ import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
+import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
+import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
import org.junit.Test;
public class TransferTest {
@@ -45,8 +50,8 @@ public class TransferTest {
complexTypes.put(type, CAS.TYPE_NAME_DOCUMENT_ANNOTATION);
CAS cas = null;
try {
- cas = RutaTestUtils.process(namespace + "/" + name +
RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50, false, false, complexTypes, null);
+ cas = RutaTestUtils.process(namespace + "/" + name +
RutaEngine.SCRIPT_FILE_EXTENSION,
+ namespace + "/" + name + ".txt", 50, false, false, complexTypes,
null);
} catch (Exception e) {
e.printStackTrace();
assert (false);
@@ -63,7 +68,40 @@ public class TransferTest {
Feature featureByBaseName = t.getFeatureByBaseName("language");
String stringValue = afs.getStringValue(featureByBaseName);
assertEquals("x-unspecified", stringValue);
-
+
cas.release();
}
+
+ @Test
+ public void testIncompatibleFeatureRanges() throws Exception {
+
+Map typeMap = new LinkedHashMap();
+typeMap.put("Struct11", "uima.tcas.Annotation");
+typeMap.put("Struct12", "uima.tcas.Annotation");
+typeMap.put("Struct21", "uima.tcas.Annotation");
+typeMap.put("Struct22", "uima.tcas.Annotation");
+Map> featureMap = new TreeMap>();
+featureMap.put("Struct11", Arrays.asList(new TestFeature("f", "",
CAS.TYPE_NAME_ANNOTATION)));
+featureMap.put("Struct12", Arrays.asList(new TestFeature("f", "",
CAS.TYPE_NAME_STRING)));
+featureMap.put("Struct21",
+Arrays.asList(ne
[uima-ruta] branch maintenance/3.1.x updated: no issue: fix method sig
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch maintenance/3.1.x
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
The following commit(s) were added to refs/heads/maintenance/3.1.x by this push:
new 11af409 no issue: fix method sig
11af409 is described below
commit 11af409f47632156147574b116727f9073299101
Author: Peter Klügl
AuthorDate: Fri Jan 7 18:10:44 2022 +0100
no issue: fix method sig
---
.../main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java | 9 ++---
.../main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java | 2 +-
.../src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java | 4 ++--
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java
b/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java
index 7a00d31..6e134e1 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java
@@ -125,19 +125,14 @@ public abstract class AbstractRuleElement extends
RutaElement implements RuleEle
return result;
}
- protected void doneMatching(RuleMatch ruleMatch, RuleApply ruleApply,
RuleElement entryPoint,
- RutaStream stream, InferenceCrowd crowd) {
+ protected void doneMatching(RuleMatch ruleMatch, RuleApply ruleApply,
RutaStream stream,
+ InferenceCrowd crowd) {
if (!ruleMatch.isApplied()) {
ruleApply.add(ruleMatch, stream);
if (ruleMatch.matchedCompletely()) {
RutaRule rule = ruleMatch.getRule();
rule.getEnvironment().acceptTempVariableValues(rule.getOwnLabels());
rule.getRoot().applyRuleElements(ruleMatch, stream, crowd);
-// } else if (entryPoint == null) {
-// we may not clear all temp variables. there could be a valid future
alternative match
-// which requires a previous label
-//// there was no dynamic lookahead, remove temp vars
-//rule.getEnvironment().clearTempVariables(localVariables);
}
ruleMatch.setApplied(true);
}
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
b/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
index a38318c..e25038b 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
@@ -534,7 +534,7 @@ public class ComposedRuleElement extends
AbstractRuleElement implements RuleElem
// take care that failed matches wont be applied
ruleMatch.setMatched(ruleMatch.matched && !failed);
-doneMatching(ruleMatch, ruleApply, entryPoint, stream, crowd);
+doneMatching(ruleMatch, ruleApply, stream, crowd);
return asList(ruleMatch);
}
diff --git
a/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java
b/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java
index 55b6c72..a438cca 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java
@@ -114,7 +114,7 @@ public class RutaRuleElement extends AbstractRuleElement {
result.addAll(fallbackContinue);
} else if (getContainer() instanceof RuleElementIsolator) {
// TODO move and refactor this:
- doneMatching(extendedMatch, ruleApply, entryPoint, stream,
crowd);
+ doneMatching(extendedMatch, ruleApply, stream, crowd);
}
}
}
@@ -329,7 +329,7 @@ public class RutaRuleElement extends AbstractRuleElement {
result.addAll(fallbackContinue);
} else {
// should never happen!
- doneMatching(ruleMatch, ruleApply, entryPoint, stream, crowd);
+ doneMatching(ruleMatch, ruleApply, stream, crowd);
}
}
}
[uima-ruta] branch maintenance/3.1.x updated (78b6ed4 -> 9cc74bd)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 78b6ed4 Merge pull request #66 from apache/bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches add ec58d0a UIMA-6394: Ruta: label assignment in alternative match causes problems add 380d3c9 UIMA-6394: Ruta: label assignment in alternative match causes problems new 9cc74bd Merge pull request #69 from apache/bugfix/UIMA-6394-Ruta-label-assignment-in-alternative-match-causes-problems-bugfix The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/uima/ruta/rule/AbstractRuleElement.java | 19 +++- .../java/org/apache/uima/ruta/rule/RutaRule.java | 35 +- .../org/apache/uima/ruta/rule/RutaRuleElement.java | 4 +++ .../annotation/AnnotationLabelExpressionTest.java | 32 4 files changed, 75 insertions(+), 15 deletions(-)
[uima-ruta] 01/01: Merge pull request #69 from apache/bugfix/UIMA-6394-Ruta-label-assignment-in-alternative-match-causes-problems-bugfix
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 9cc74bde76eb3c4593244d07d78b0681a1cd50a0 Merge: 78b6ed4 380d3c9 Author: pkluegl AuthorDate: Fri Jan 7 18:03:49 2022 +0100 Merge pull request #69 from apache/bugfix/UIMA-6394-Ruta-label-assignment-in-alternative-match-causes-problems-bugfix UIMA-6394: Ruta: label assignment in alternative match causes problems .../apache/uima/ruta/rule/AbstractRuleElement.java | 19 +++- .../java/org/apache/uima/ruta/rule/RutaRule.java | 35 +- .../org/apache/uima/ruta/rule/RutaRuleElement.java | 4 +++ .../annotation/AnnotationLabelExpressionTest.java | 32 4 files changed, 75 insertions(+), 15 deletions(-)
[uima-ruta] branch bugfix/UIMA-6394-Ruta-label-assignment-in-alternative-match-causes-problems-bugfix updated (ec58d0a -> 380d3c9)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/UIMA-6394-Ruta-label-assignment-in-alternative-match-causes-problems-bugfix in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from ec58d0a UIMA-6394: Ruta: label assignment in alternative match causes problems add 380d3c9 UIMA-6394: Ruta: label assignment in alternative match causes problems No new revisions were added by this update. Summary of changes: .../apache/uima/ruta/rule/AbstractRuleElement.java | 19 +++- .../java/org/apache/uima/ruta/rule/RutaRule.java | 35 +- .../org/apache/uima/ruta/rule/RutaRuleElement.java | 4 +++ .../annotation/AnnotationLabelExpressionTest.java | 7 - 4 files changed, 49 insertions(+), 16 deletions(-)
[uima-ruta] 01/01: UIMA-6394: Ruta: label assignment in alternative match causes problems
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch
bugfix/UIMA-6394-Ruta-label-assignment-in-alternative-match-causes-problems-bugfix
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit ec58d0a4280187673096a6f5a9ead44a2effe15e
Author: Peter Klügl
AuthorDate: Fri Jan 7 13:56:07 2022 +0100
UIMA-6394: Ruta: label assignment in alternative match causes problems
- adding test
---
.../annotation/AnnotationLabelExpressionTest.java | 27 ++
1 file changed, 27 insertions(+)
diff --git
a/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
b/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
index c4738aa..dd63f43 100644
---
a/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
+++
b/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
@@ -845,4 +845,31 @@ public class AnnotationLabelExpressionTest {
RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Some text");
}
+ @Test
+ public void testCompareStringFeatures() throws Exception {
+
+String document = "A b.";
+Map typeMap = new TreeMap();
+typeMap.put("Struct1", "uima.tcas.Annotation");
+typeMap.put("Struct2", "uima.tcas.Annotation");
+
+Map> featureMap = new TreeMap>();
+List list = new ArrayList();
+featureMap.put("Struct1", list);
+featureMap.put("Struct2", list);
+list.add(new TestFeature("s", "", "uima.cas.String"));
+
+String script = "";
+script += "SW{->CREATE(Struct2, \"s\" = \"b\")};\n";
+script += "SW{->CREATE(Struct2, \"s\" = \"a\")};\n";
+script += "CW{->CREATE(Struct1, \"s\" = \"a\")};\n";
+script += "(s1:Struct1 s2:Struct2){s1.s==s2.s-> T1};\n";
+
+CAS cas = RutaTestUtils.getCAS(document, typeMap, featureMap);
+Ruta.apply(cas, script);
+
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "A b");
+
+ }
+
}
[uima-ruta] branch bugfix/UIMA-6394-Ruta-label-assignment-in-alternative-match-causes-problems-bugfix created (now ec58d0a)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/UIMA-6394-Ruta-label-assignment-in-alternative-match-causes-problems-bugfix in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. at ec58d0a UIMA-6394: Ruta: label assignment in alternative match causes problems This branch includes the following new commits: new ec58d0a UIMA-6394: Ruta: label assignment in alternative match causes problems The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-ruta] 01/01: Merge pull request #66 from apache/bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 78b6ed43bf11d59a164125c27b83d4a602a13f9a Merge: ae27103 a34dd3e Author: pkluegl AuthorDate: Fri Jan 7 13:47:48 2022 +0100 Merge pull request #66 from apache/bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches UIMA-6404: Ruta: @ with quantifier ignores matches .../org/apache/uima/ruta/rule/RutaRuleElement.java | 3 +++ .../ruta/rule/quantifier/MinMaxQuantifierTest.java | 22 +- 2 files changed, 24 insertions(+), 1 deletion(-)
[uima-ruta] branch maintenance/3.1.x updated (ae27103 -> 78b6ed4)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from ae27103 Merge pull request #67 from apache/bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition add 11e09e0 UIMA-6404: Ruta: @ with quantifier ignores matches add a0e5068 Merge branch 'maintenance/3.1.x' into bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches add a34dd3e UIMA-6404: Ruta: @ with quantifier ignores matches new 78b6ed4 Merge pull request #66 from apache/bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/uima/ruta/rule/RutaRuleElement.java | 3 +++ .../ruta/rule/quantifier/MinMaxQuantifierTest.java | 22 +- 2 files changed, 24 insertions(+), 1 deletion(-)
[uima-ruta] branch bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches updated (a0e5068 -> a34dd3e)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from a0e5068 Merge branch 'maintenance/3.1.x' into bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches add a34dd3e UIMA-6404: Ruta: @ with quantifier ignores matches No new revisions were added by this update. Summary of changes: .../org/apache/uima/ruta/rule/RutaRuleElement.java | 3 +++ .../ruta/rule/quantifier/MinMaxQuantifierTest.java | 23 +++--- 2 files changed, 15 insertions(+), 11 deletions(-)
[uima-ruta] branch bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches updated (11e09e0 -> a0e5068)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 11e09e0 UIMA-6404: Ruta: @ with quantifier ignores matches add 351ddca UIMA-6405: Local variable not captured properly in a wildcard matching condition add e710b31 UIMA-6406: Removing an annotation inside a BLOCK only takes effect outside the block add e781524 UIMA-6406: Removing an annotation inside a BLOCK only takes effect outside the block add 4d6c5bc Merge pull request #68 from apache/bugfix/UIMA-6406-Removing-an-annotation-inside-a-BLOCK-only-takes-effect-outside-the-block add 722ac79 Merge branch 'maintenance/3.1.x' into bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition add 422e193 UIMA-6405: Local variable not captured properly in a wildcard matching condition add ae27103 Merge pull request #67 from apache/bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition add a0e5068 Merge branch 'maintenance/3.1.x' into bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches No new revisions were added by this update. Summary of changes: ruta-core/.gitignore | 2 + .../main/java/org/apache/uima/ruta/RutaStream.java | 6 +- .../org/apache/uima/ruta/engine/RutaTestUtils.java | 112 ++--- .../apache/uima/ruta/rule/AbstractRuleElement.java | 7 +- .../apache/uima/ruta/rule/ComposedRuleElement.java | 2 +- .../org/apache/uima/ruta/rule/RutaRuleElement.java | 7 +- .../org/apache/uima/ruta/action/UnmarkTest.java| 54 +++--- .../org/apache/uima/ruta/rule/WildCard2Test.java | 38 ++- 8 files changed, 165 insertions(+), 63 deletions(-) create mode 100644 ruta-core/.gitignore
[uima-ruta] branch maintenance/3.1.x updated (4d6c5bc -> ae27103)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 4d6c5bc Merge pull request #68 from apache/bugfix/UIMA-6406-Removing-an-annotation-inside-a-BLOCK-only-takes-effect-outside-the-block add 351ddca UIMA-6405: Local variable not captured properly in a wildcard matching condition add 722ac79 Merge branch 'maintenance/3.1.x' into bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition add 422e193 UIMA-6405: Local variable not captured properly in a wildcard matching condition new ae27103 Merge pull request #67 from apache/bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/uima/ruta/rule/AbstractRuleElement.java | 7 ++-- .../apache/uima/ruta/rule/ComposedRuleElement.java | 2 +- .../org/apache/uima/ruta/rule/RutaRuleElement.java | 7 ++-- .../org/apache/uima/ruta/rule/WildCard2Test.java | 38 +++--- 4 files changed, 41 insertions(+), 13 deletions(-)
[uima-ruta] 01/01: Merge pull request #67 from apache/bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch maintenance/3.1.x in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit ae27103c144de60739677fc310178359567db554 Merge: 4d6c5bc 422e193 Author: pkluegl AuthorDate: Fri Jan 7 13:16:31 2022 +0100 Merge pull request #67 from apache/bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition UIMA-6405: Local variable not captured properly in a wildcard matchin… .../apache/uima/ruta/rule/AbstractRuleElement.java | 7 ++-- .../apache/uima/ruta/rule/ComposedRuleElement.java | 2 +- .../org/apache/uima/ruta/rule/RutaRuleElement.java | 7 ++-- .../org/apache/uima/ruta/rule/WildCard2Test.java | 38 +++--- 4 files changed, 41 insertions(+), 13 deletions(-)
[uima-ruta] branch bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition updated (722ac79 -> 422e193)
This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition in repository https://gitbox.apache.org/repos/asf/uima-ruta.git. from 722ac79 Merge branch 'maintenance/3.1.x' into bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition add 422e193 UIMA-6405: Local variable not captured properly in a wildcard matching condition No new revisions were added by this update. Summary of changes: .../main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java | 7 --- .../main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java | 2 +- .../src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java | 7 +++ .../src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java | 5 + 4 files changed, 13 insertions(+), 8 deletions(-)
