svn commit: r1573919 - in /stanbol/trunk: ./ enhancement-engines/ enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/ enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhan...

[rwesten]

Author: rwesten
Date: Tue Mar  4 08:02:45 2014
New Revision: 1573919

URL: http://svn.apache.org/r1573919
Log:
merged fix for IndexOutOfBoundsException related to STANBOL-1283 from 0.12.1 to 
trunk

Modified:
    stanbol/trunk/   (props changed)
    stanbol/trunk/enhancement-engines/   (props changed)
    
stanbol/trunk/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/EntityLinker.java
    
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java

Propchange: stanbol/trunk/
------------------------------------------------------------------------------
  Merged /stanbol/branches/release-0.12:r1573918

Propchange: stanbol/trunk/enhancement-engines/
------------------------------------------------------------------------------
  Merged /stanbol/branches/release-0.12/enhancement-engines:r1573918

Modified: 
stanbol/trunk/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/EntityLinker.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/EntityLinker.java?rev=1573919&r1=1573918&r2=1573919&view=diff
==============================================================================
--- 
stanbol/trunk/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/EntityLinker.java
 (original)
+++ 
stanbol/trunk/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/EntityLinker.java
 Tue Mar  4 08:02:45 2014
@@ -316,7 +316,7 @@ public class EntityLinker {
                     log.warn("  ... this will result in worng confidence 
values relative to the best match");
                 }
                 int maxSuggestions = linkerConfig.getMaxSuggestions();
-                if(suggestions.size() > maxSuggestions && 
+                if((suggestions.size() + 1) > maxSuggestions && 
                         linkerConfig.isIncludeSuggestionsWithSimilarScore()){
                     //include suggestions with similar score
                     double minIncludeScore = 
suggestions.get(maxSuggestions).getScore();

Modified: 
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java?rev=1573919&r1=1573918&r2=1573919&view=diff
==============================================================================
--- 
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java
 (original)
+++ 
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngine.java
 Tue Mar  4 08:02:45 2014
@@ -295,7 +295,7 @@ public class FstLinkingEngine implements
                 //sort based on score
                 Collections.sort(suggestions, Match.SCORE_COMPARATOR);
                 int maxSuggestions = elConfig.getMaxSuggestions();
-                if(suggestions.size() > maxSuggestions && 
+                if((suggestions.size() > maxSuggestions + 1) && 
                         elConfig.isIncludeSuggestionsWithSimilarScore()){
                     //include suggestions with similar score
                     double minIncludeScore = 
suggestions.get(maxSuggestions).getScore();