remove unnecessary layout tokens list, renaming stuff

kermitt2 · Dec 6, 2024 · e0e217d · e0e217d
1 parent 7780804
commit e0e217d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/grobid-core/src/main/java/org/grobid/core/data/Figure.java b/grobid-core/src/main/java/org/grobid/core/data/Figure.java
@@ -88,9 +88,6 @@ public boolean apply(GraphicObject graphicObject) {
     private List<BoundingBox> textArea;
     private List<LayoutToken> layoutTokens;
 
-    // Contains the raw layoutTokens from the fulltext model
-    protected List<LayoutToken> rawLayoutTokens = new ArrayList<>();
-
     // coordinates
     private int page = -1;
     private double y = 0.0;
@@ -576,11 +573,4 @@ public void setUri(URI uri) {
         this.uri = uri;
     }
 
-    public List<LayoutToken> getRawLayoutTokens() {
-        return rawLayoutTokens;
-    }
-
-    public void setRawLayoutTokens(List<LayoutToken> rawLayoutTokens) {
-        this.rawLayoutTokens = rawLayoutTokens;
-    }
 }
diff --git a/grobid-core/src/main/java/org/grobid/core/engines/FullTextParser.java b/grobid-core/src/main/java/org/grobid/core/engines/FullTextParser.java
@@ -369,10 +369,10 @@ private static String revertResultsForBadItems(List<? extends Figure> badItems,
                 .map(l -> Arrays.stream(l.split("\t")).collect(Collectors.toList()))
                 .collect(Collectors.toList());
 
-            for (Figure badTable : badItems) {
+            for (Figure badItem : badItems) {
                 // Find the index of the first layoutToken of the table in the tokenization
-                List<LayoutToken> rawLayoutTokenTable = badTable.getRawLayoutTokens();
-                LayoutToken firstLayoutTokenTable = rawLayoutTokenTable.get(0);
+                List<LayoutToken> rawLayoutTokenTable = badItem.getLayoutTokens();
+                LayoutToken firstLayoutTokenItem = rawLayoutTokenTable.get(0);
 
 //                        final List<LayoutToken>  documentTokenization = layoutTokenization.getTokenization();
 
@@ -387,14 +387,14 @@ private static String revertResultsForBadItems(List<? extends Figure> badItems,
 //                            .orElse(-1);
 
                 List<Integer> candidateIndexes = IntStream.range(0, splitResult.size())
-                    .filter(i -> splitResult.get(i).get(0).equals(firstLayoutTokenTable.getText())
+                    .filter(i -> splitResult.get(i).get(0).equals(firstLayoutTokenItem.getText())
                         && Iterables.getLast(splitResult.get(i)).equals("I-"+itemLabel))
                     .boxed()
                     .collect(Collectors.toList());
 
                 if (candidateIndexes.isEmpty()) {
                     candidateIndexes = IntStream.range(0, splitResult.size())
-                    .filter(i -> splitResult.get(i).get(0).equals(firstLayoutTokenTable.getText())
+                    .filter(i -> splitResult.get(i).get(0).equals(firstLayoutTokenItem.getText())
                         && Iterables.getLast(splitResult.get(i)).equals(itemLabel))
                     .boxed()
                     .collect(Collectors.toList());
@@ -2289,7 +2289,7 @@ protected List<Table> processTables(String rese,
 
             for (Table result : localResults) {
                 List<LayoutToken> localTokenizationTable = result.getLayoutTokens();
-                result.setRawLayoutTokens(tokenizationTable);
+//                result.setRawLayoutTokens(tokenizationTable);
 
                 // block setting: we restrict to the tokenization of this particular table
                 SortedSet<Integer> blockPtrs = new TreeSet<>();