deprecation path for 'frame'
diff --git a/src/test/java/PoliqarpPlusTreeTest.java b/src/test/java/PoliqarpPlusTreeTest.java
index 6cbd2a2..4cac667 100644
--- a/src/test/java/PoliqarpPlusTreeTest.java
+++ b/src/test/java/PoliqarpPlusTreeTest.java
@@ -389,7 +389,7 @@
"{@type=korap:group, operation=operation:position, frames=[],sharedClasses=[includes], operands=[" +
"{@type=korap:span, key=s}," +
"{@type=korap:span, key=np}" +
- "]}" +
+ "], frame=contains}" +
"], inOrder=true, distances=[" +
"{@type=korap:distance, key=w, boundary={@type=korap:boundary, min=1}, min=1}" +
"]}" +
@@ -409,7 +409,7 @@
"{@type=korap:token}," +
"{@type=korap:token, wrap={@type=korap:term, layer=lemma, key=Mann, match=match:eq}}" +
"]}" +
- "]}";
+ "], frame=startswith}";
ppt = new PoliqarpPlusTree("startswith(<s>, [][base=Mann])");
map = ppt.getRequestMap().get("query").toString();
assertEquals(et1.replaceAll(" ", ""), map.replaceAll(" ", ""));
@@ -472,7 +472,7 @@
"{@type=korap:group, operation=operation:position, frames=[],sharedClasses=[includes], operands=[" +
"{@type=korap:span, key=s}," +
"{@type=korap:span, key=np}" +
- "]}," +
+ "], frame=contains}," +
"{@type=korap:group, operation=operation:repetition, operands=[" +
"{@type=korap:token}" +
"], boundary={@type=korap:boundary, min=2, max=2}, min=2, max=2}" +
@@ -912,14 +912,14 @@
String pos1 = "{@type=korap:group, operation=operation:position, frames=[],sharedClasses=[includes], operands=[" +
"{@type=korap:span, key=s}," +
"{@type=korap:span, key=np}" +
- "]}";
+ "], frame=contains}";
assertTrue(equalsQueryContent(pos1, "contains(<s>,<np>)"));
// contains(<s>,[base=Mann])
String pos2 = "{@type=korap:group, operation=operation:position, frames=[],sharedClasses=[includes], operands=[" +
"{@type=korap:span, key=s}," +
"{@type=korap:token, wrap= {@type=korap:term, layer=lemma, key=Mann, match=match:eq}}" +
- "]}";
+ "], frame=contains}";
assertTrue(equalsQueryContent(pos2, "contains(<s>,[base=Mann])"));
// contains(<s>,[orth=der][orth=Mann])
@@ -929,7 +929,7 @@
"{@type=korap:token, wrap={@type=korap:term, layer=orth, key=der, match=match:eq}}," +
"{@type=korap:token, wrap={@type=korap:term, layer=orth, key=Mann, match=match:eq}}" +
"]}" +
- "]}";
+ "], frame=contains}";
ppt = new PoliqarpPlusTree("contains(<s>,[orth=der][orth=Mann])");
map = ppt.getRequestMap().get("query").toString();
assertEquals(pos3.replaceAll(" ", ""), map.replaceAll(" ", ""));
@@ -941,7 +941,7 @@
"{@type=korap:group, operation=operation:position, frames=[],sharedClasses=[includes], operands=[" +
"{@type=korap:span, key=s}," +
"{@type=korap:token, wrap={@type=korap:term, layer=lemma, key=Mann, match=match:eq}}" +
- "]}" +
+ "], frame=contains}" +
"]}";
ppt = new PoliqarpPlusTree("[base=Auto]contains(<s>,[base=Mann])");
map = ppt.getRequestMap().get("query").toString();
@@ -955,7 +955,7 @@
"operands=[{@type=korap:token, wrap={@type=korap:term, layer=pos, key=N, match=match:eq}}" +
"], boundary={@type=korap:boundary, min=0}, min=0" +
"}" +
- "]}";
+ "], frame=contains}";
ppt = new PoliqarpPlusTree("contains(<s>,[pos=N]*)");
map = ppt.getRequestMap().get("query").toString();
assertEquals(pos5.replaceAll(" ", ""), map.replaceAll(" ", ""));
@@ -970,7 +970,7 @@
"operands=[{@type=korap:token, wrap={@type=korap:term, layer=pos, key=N, match=match:eq}}" +
"], boundary={@type=korap:boundary, min=0}, min=0" +
"}" +
- "]}" +
+ "], frame=contains}" +
"]}";
ppt = new PoliqarpPlusTree("[base=Auto]contains(<s>,[pos=N]*)");
map = ppt.getRequestMap().get("query").toString();
@@ -986,8 +986,8 @@
"{@type=korap:group, operation=operation:position, frames=[startswith],sharedClasses=[includes], operands=[" +
"{@type=korap:span, key=np}," +
"{@type=korap:token, wrap={@type=korap:term, layer=orth, key=Der, match=match:eq}}" +
- "]}" +
- "]}";
+ "], frame=startswith}" +
+ "], frame=contains}";
ppt = new PoliqarpPlusTree("contains(<s>, startswith(<np>,[orth=Der]))");
map = ppt.getRequestMap().get("query").toString();
assertEquals(npos1.replaceAll(" ", ""), map.replaceAll(" ", ""));
@@ -1051,7 +1051,7 @@
"{@type=korap:group, operation=operation:class, class=1, operands=[" +
"{@type=korap:span, key=np}" +
"]}" +
- "]}" +
+ "], frame=startswith}" +
"]}";
ppt = new PoliqarpPlusTree("focus(1:startswith(<s>,{1:<np>}))");
map = ppt.getRequestMap().get("query").toString();
@@ -1075,7 +1075,7 @@
"]}" +
"]}" +
"]}" +
- "]}" +
+ "], frame=startswith}" +
"]}";
ppt = new PoliqarpPlusTree("focus(3:startswith(<s>,{3:[base=der]{1:[mate/p=ADJA]{2:[tt/p=NN]}}})) ");
map = ppt.getRequestMap().get("query").toString();
@@ -1099,7 +1099,7 @@
"]}" +
"]}" +
"]}" +
- "]}" +
+ "], frame=startswith}" +
"]}";
ppt = new PoliqarpPlusTree("split(3:startswith(<s>,{3:[base=der]{1:[mate/p=ADJA]{2:[tt/p=NN]}}})) ");
map = ppt.getRequestMap().get("query").toString();
@@ -1123,7 +1123,7 @@
"]}" +
"]}" +
"]}" +
- "]}" +
+ "], frame=startswith}" +
"]}";
ppt = new PoliqarpPlusTree("split(2|3:startswith(<s>,{3:[base=der]{1:[mate/p=ADJA]{2:[tt/p=NN]}}})) ");
map = ppt.getRequestMap().get("query").toString();
@@ -1175,7 +1175,7 @@
"{@type=korap:group, operation=operation:position, frames=[],sharedClasses=[includes], operands=[" +
"{@type=korap:span, key=s}," +
"{@type=korap:token, wrap= {@type=korap:term, layer=lemma, key=Haus, match=match:eq}}" +
- "]}" +
+ "], frame=contains}" +
"], spanRef=[1,4]" +
"}";
ppt = new PoliqarpPlusTree(query);