PQ alignment
diff --git a/src/test/java/CosmasTreeTest.java b/src/test/java/CosmasTreeTest.java
index efe86f6..fac29e7 100644
--- a/src/test/java/CosmasTreeTest.java
+++ b/src/test/java/CosmasTreeTest.java
@@ -332,7 +332,7 @@
query="wegen #IN('FE,ALL,%,MIN') <s>";
String opin4 =
"{@type=korap:group, @relation=submatch, @classRef=1, @operands=[" +
- "{@type=korap:group, @relation=position, @position=ident, range=all, @exclude=true, grouping=false, @operands=[" +
+ "{@type=korap:group, @relation=position, @position=matches, range=all, @exclude=true, grouping=false, @operands=[" +
"{@type=korap:span, @value=s}," +
"{@type=korap:group, class=1, @operands=[" +
"{@type=korap:token, @value={@type=korap:term, @value=wegen, @attr=orth, @relation==}}" +
@@ -349,7 +349,7 @@
query="wegen #OV <s>";
String opov1 =
"{@type=korap:group, @relation=submatch, @classRef=1, @operands=[" +
- "{@type=korap:group, @relation=overlaps, @position=any, @operands=[" +
+ "{@type=korap:group, @relation=position, @position=overlaps, @operands=[" +
"{@type=korap:span, @value=s}," +
"{@type=korap:group, class=1, @operands=[" +
"{@type=korap:token, @value={@type=korap:term, @value=wegen, @attr=orth, @relation==}}" +
@@ -363,7 +363,7 @@
query="wegen #OV(L) <s>";
String opov2 =
"{@type=korap:group, @relation=submatch, @classRef=1, @operands=[" +
- "{@type=korap:group, @relation=overlaps, @position=startswith, @operands=[" +
+ "{@type=korap:group, @relation=position, @position=overlaps-left, @operands=[" +
"{@type=korap:span, @value=s}," +
"{@type=korap:group, class=1, @operands=[" +
"{@type=korap:token, @value={@type=korap:term, @value=wegen, @attr=orth, @relation==}}" +
diff --git a/src/test/java/PoliqarpPlusTreeTest.java b/src/test/java/PoliqarpPlusTreeTest.java
index 6090867..078cf8e 100644
--- a/src/test/java/PoliqarpPlusTreeTest.java
+++ b/src/test/java/PoliqarpPlusTreeTest.java
@@ -643,7 +643,7 @@
String align1 =
"{@type=korap:sequence, @operands=[" +
"{@type=korap:token, @value={@type=korap:term, @value=der, @attr=orth, @relation==}}," +
- "{@type=korap:group, @relation=left-align, @operands=[" +
+ "{@type=korap:group, @alignment=left, @operands=[" +
"{@type=korap:token, @value={@type=korap:term, @value=Mann, @attr=orth, @relation==}}" +
"]}" +
"]}";
@@ -651,12 +651,28 @@
map = ppt.getRequestMap().get("query").toString();
assertEquals(align1.replaceAll(" ", ""), map.replaceAll(" ", ""));
+ // [orth=der]^[orth=große][orth=Mann]
+ String query = "[orth=der]^[orth=große][orth=Mann]";
+ String align1b =
+ "{@type=korap:sequence, @operands=[" +
+ "{@type=korap:token, @value={@type=korap:term, @value=der, @attr=orth, @relation==}}," +
+ "{@type=korap:group, @alignment=left, @operands=[" +
+ "{@type=korap:sequence, @operands=[" +
+ "{@type=korap:token, @value={@type=korap:term, @value=große, @attr=orth, @relation==}}," +
+ "{@type=korap:token, @value={@type=korap:term, @value=Mann, @attr=orth, @relation==}}" +
+ "]}" +
+ "]}" +
+ "]}";
+ ppt = new PoliqarpPlusTree(query);
+ map = ppt.getRequestMap().get("query").toString();
+ assertEquals(align1b.replaceAll(" ", ""), map.replaceAll(" ", ""));
+
// "([base=a]^[base=b])|[base=c]",
String align2 =
"{@type=korap:group, @relation=or, @operands=[" +
"{@type=korap:sequence, @operands=[" +
"{@type=korap:token, @value={@type=korap:term, @value=a, @attr=base, @relation==}}," +
- "{@type=korap:group, @relation=left-align, @operands=[" +
+ "{@type=korap:group, @alignment=left, @operands=[" +
"{@type=korap:token, @value={@type=korap:term, @value=b, @attr=base, @relation==}}" +
"]}" +
"]}," +
@@ -671,10 +687,12 @@
"{@type=korap:group, @relation=or, @operands=[" +
"{@type=korap:sequence, @operands=[" +
"{@type=korap:token, @value={@type=korap:term, @value=a, @attr=base, @relation==}}," +
- "{@type=korap:group, @relation=left-align, @operands=[" +
- "{@type=korap:token, @value={@type=korap:term, @value=b, @attr=base, @relation==}}" +
- "]}," +
- "{@type=korap:token, @value={@type=korap:term, @value=c, @attr=base, @relation==}}" +
+ "{@type=korap:group, @alignment=left, @operands=[" +
+ "{@type=korap:sequence, @operands=[" +
+ "{@type=korap:token, @value={@type=korap:term, @value=b, @attr=base, @relation==}}," +
+ "{@type=korap:token, @value={@type=korap:term, @value=c, @attr=base, @relation==}}" +
+ "]}" +
+ "]}" +
"]}," +
"{@type=korap:token, @value={@type=korap:term, @value=d, @attr=base, @relation==}}" +
"]}";
@@ -687,11 +705,13 @@
"{@type=korap:group, @relation=or, @operands=[" +
"{@type=korap:sequence, @operands=[" +
"{@type=korap:token, @value={@type=korap:term, @value=a, @attr=base, @relation==}}," +
- "{@type=korap:group, @relation=left-align, @operands=[" +
- "{@type=korap:token, @value={@type=korap:term, @value=b, @attr=base, @relation==}}" +
- "]}," +
- "{@type=korap:group, @relation=left-align, @operands=[" +
- "{@type=korap:token, @value={@type=korap:term, @value=c, @attr=base, @relation==}}" +
+ "{@type=korap:group, @alignment=left, @operands=[" +
+ "{@type=korap:sequence, @operands=[" +
+ "{@type=korap:token, @value={@type=korap:term, @value=b, @attr=base, @relation==}}," +
+ "{@type=korap:group, @alignment=left, @operands=[" +
+ "{@type=korap:token, @value={@type=korap:term, @value=c, @attr=base, @relation==}}" +
+ "]}" +
+ "]}" +
"]}" +
"]}," +
"{@type=korap:token, @value={@type=korap:term, @value=d, @attr=base, @relation==}}" +
@@ -742,6 +762,20 @@
ppt = new PoliqarpPlusTree("Baum | Stein");
map = ppt.getRequestMap().get("query").toString();
assertEquals(simple4.replaceAll(" ", ""), map.replaceAll(" ", ""));
+
+ // Baum | Stein Haus
+ String query = "(Baum | Stein) Haus";
+ String simple5 =
+ "{@type=korap:sequence, @operands=[" +
+ "{@type=korap:group, @relation=or, @operands=[" +
+ "{@type=korap:token, @value={@type=korap:term, @value=Baum, @attr=orth, @relation==}}, " +
+ "{@type=korap:token, @value={@type=korap:term, @value=Stein, @attr=orth, @relation==}}" +
+ "]}," +
+ "{@type=korap:token, @value={@type=korap:term, @value=Haus, @attr=orth, @relation==}} " +
+ "]}";
+ ppt = new PoliqarpPlusTree(query);
+ map = ppt.getRequestMap().get("query").toString();
+ assertEquals(simple5.replaceAll(" ", ""), map.replaceAll(" ", ""));
}
}