PQ empty tokens as distance groups, Cosmas elem -> element
diff --git a/src/test/java/PoliqarpPlusTreeTest.java b/src/test/java/PoliqarpPlusTreeTest.java
index 35753d6..5561d16 100644
--- a/src/test/java/PoliqarpPlusTreeTest.java
+++ b/src/test/java/PoliqarpPlusTreeTest.java
@@ -84,7 +84,7 @@
"{@type=korap:token, @value={@type=korap:term, @value=base:der, relation==}}," +
"{@type=korap:token, @value={@type=korap:term, @value=base:Mann, relation==}}" +
"]}";
- ppt = new PoliqarpPlusTree("[base=der][][base=Mann]");
+ ppt = new PoliqarpPlusTree("[base=der][][][base=Mann]");
map = ppt.getRequestMap().get("query").toString();
assertEquals(et2.replaceAll(" ", ""), map.replaceAll(" ", ""));
@@ -101,31 +101,36 @@
map = ppt.getRequestMap().get("query").toString();
assertEquals(et3.replaceAll(" ", ""), map.replaceAll(" ", ""));
- // [base=der][]*[base=Mann]
- String et4 =
- "{@type=korap:group, relation=distance, @subtype=incl, constraint=[" +
- "{@type=korap:distance, measure=w, direction=plus, min=0, max=INF}" +
- "], " +
- "operands=[" +
- "{@type=korap:token, @value={@type=korap:term, @value=base:der, relation==}}," +
- "{@type=korap:token, @value={@type=korap:term, @value=base:Mann, relation==}}" +
- "]}";
- ppt = new PoliqarpPlusTree("[base=der][]*[base=Mann]");
- map = ppt.getRequestMap().get("query").toString();
- assertEquals(et4.replaceAll(" ", ""), map.replaceAll(" ", ""));
// startswith(<s>, [][base=Mann]
- String et5 =
- "{@type=korap:group, relation=position, position=startswith, @subtype=incl, operands=[" +
- "{@type=korap:token, @value={@type=korap:elem, @value=s}," +
- "{@type=korap:sequence, offset=1, operands=[" +
+ String et4 =
+ "{@type=korap:group, relation=position, position=startswith, operands=[" +
+ "{@type=korap:element, @value=s}," +
+ "{@type=korap:sequence, offset-min=1, offset-max=1, operands=[" +
"{@type=korap:token, @value={@type=korap:term, @value=base:Mann, relation==}}" +
"]}" +
"]}";
- ppt = new PoliqarpPlusTree("startswith(<s>, [][base=Mann]");
+ ppt = new PoliqarpPlusTree("startswith(<s>, [][base=Mann])");
+ map = ppt.getRequestMap().get("query").toString();
+ assertEquals(et4.replaceAll(" ", ""), map.replaceAll(" ", ""));
+
+ String et5 =
+ "{@type=korap:group, relation=distance, @subtype=incl, constraint=[" +
+ "{@type=korap:distance, measure=w, direction=plus, min=1, max=1}" +
+ "], " +
+ "operands=[" +
+ "{@type=korap:token, @value={@type=korap:term, @value=base:der, relation==}}," +
+ "{@type=korap:group, relation=distance, @subtype=incl, constraint=[" +
+ "{@type=korap:distance, measure=w, direction=plus, min=2, max=2}" +
+ "], " +
+ "operands=[" +
+ "{@type=korap:token, @value={@type=korap:term, @value=base:Mann, relation==}}," +
+ "{@type=korap:token, @value={@type=korap:term, @value=base:Frau, relation==}}" +
+ "]}" +
+ "]}";
+ ppt = new PoliqarpPlusTree("[base=der][][base=Mann][][][base=Frau]");
map = ppt.getRequestMap().get("query").toString();
assertEquals(et5.replaceAll(" ", ""), map.replaceAll(" ", ""));
-
}