ekms 7.12.2 → 7.12.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (24) hide show
  1. package/common/avatar.js +5 -4
  2. package/common/crew.test.json +45 -45
  3. package/common/dialogues.js +8 -2
  4. package/common/dimension.js +2 -2
  5. package/common/dimension.test.json +204 -158
  6. package/common/edible.test.json +34 -4
  7. package/common/fastfood.instance.json +750 -686
  8. package/common/fastfood.test.json +686 -2164
  9. package/common/formulas.test.json +25 -85
  10. package/common/gdefaults.js +2 -1
  11. package/common/hierarchy.js +2 -2
  12. package/common/math.js +12 -1
  13. package/common/math.test.json +127 -543
  14. package/common/ordering.instance.json +0 -68
  15. package/common/people.instance.json +60 -0
  16. package/common/people.test.json +118 -56
  17. package/common/pipboy.test.json +1800 -86
  18. package/common/pokemon.test.json +1658 -4
  19. package/common/properties.test.json +198 -90
  20. package/common/reports.instance.json +1 -1
  21. package/common/scorekeeper.test.json +46 -46
  22. package/common/temperature.instance.json +28 -56
  23. package/common/weight.test.json +22 -22
  24. package/package.json +2 -2
package/common/reports.instance.json CHANGED
@@ -780,7 +780,7 @@
780
780
  }
781
781
  ]
782
782
  },
783
- "trace": "\n\n>>>>>>>>>>>>> Counter 1\n 0. price/0 (1, 0) - \"price\"\n {\n default: true\n marker: Operator(price/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 0, 'end': 4}\n text: \"price\"\n value: \"price\"\n word: \"price\"\n }\n 1. list/0 (1, 1) - \"and\"\n {\n default: true\n marker: Operator(list/0, PASS, [\"Selector(Bridge('{ ...next(operator), listable: true, isList: true, value: append(before, after) }'), , same/(), [Type(variable: 'type')]<==>[Type(variable: 'type')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), listable: true, isList: true, value: append(before, after) }')), variables({}) bridge(bridge))\n range: {'start': 6, 'end': 8}\n text: \"and\"\n word: \"and\"\n }\n 2. quantity/0 (1, 2) - \"quantity\"\n {\n default: true\n marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 10, 'end': 17}\n text: \"quantity\"\n value: \"quantity\"\n word: \"quantity\"\n }\n 3. is/0 (1, 3) - \"are\"\n {\n marker: Operator(is/0, [\"Selector(Bridge('{ ...next(operator), one: after[0], two: after[1], query: true }'), , []<==>[Type('queryable'), Type('queryable')], bridge(queryBridge))\", \"Selector(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }'), , [Type('queryable')]<==>[Type('queryable')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }')), variables({}) bridge(bridge))\n number: \"many\"\n range: {'start': 19, 'end': 21}\n text: \"are\"\n word: \"are\"\n }\n 4. property/0 (1, 5) - \"properties\"\n {\n default: true\n marker: Operator(property/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 23, 'end': 32}\n text: \"properties\"\n word: \"properties\"\n }\n<<<<<<<<<<<<<\nNext Op (index=0) is Context({default: True, marker: Operator(price/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge)), range: {'start': 0, 'end': 4}, text: price, value: price, word: price})\n\n>>>>>>>>>>>>> Counter 2\n *0. price/1 (dead) (2, 0) - \"price\"\n {\n dead: true\n default: true\n marker: Operator(price/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 0, 'end': 4}\n text: \"price\"\n value: \"price\"\n word: \"price\"\n }\n 1. list/0 (1, 1) - \"and\"\n {\n default: true\n marker: Operator(list/0, PASS, [\"Selector(Bridge('{ ...next(operator), listable: true, isList: true, value: append(before, after) }'), , same/(), [Type(variable: 'type')]<==>[Type(variable: 'type')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), listable: true, isList: true, value: append(before, after) }')), variables({'type': ['hierarchyAble', 'queryable', 'quantifier', 'quantity', 'object', 'number', 'notAble', 'unknown', 'property', 'theAble']}) bridge(bridge))\n range: {'start': 6, 'end': 8}\n text: \"and\"\n types: [\n ]\n word: \"and\"\n }\n 2. quantity/0 (1, 2) - \"quantity\"\n {\n default: true\n marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 10, 'end': 17}\n text: \"quantity\"\n value: \"quantity\"\n word: \"quantity\"\n }\n 3. is/0 (1, 3) - \"are\"\n {\n marker: Operator(is/0, [\"Selector(Bridge('{ ...next(operator), one: after[0], two: after[1], query: true }'), , []<==>[Type('queryable'), Type('queryable')], bridge(queryBridge))\", \"Selector(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }'), , [Type('queryable')]<==>[Type('queryable')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }')), variables({}) bridge(bridge))\n number: \"many\"\n range: {'start': 19, 'end': 21}\n text: \"are\"\n word: \"are\"\n }\n 4. property/0 (1, 5) - \"properties\"\n {\n default: true\n marker: Operator(property/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 23, 'end': 32}\n text: \"properties\"\n word: \"properties\"\n }\n<<<<<<<<<<<<<\nNext Op (index=1) is Context({default: True, marker: Operator(list/0, PASS, [\"Selector(Bridge('{ ...next(operator), listable: true, isList: true, value: append(before, after) }'), , same/(), [Type(variable: 'type')]<==>[Type(variable: 'type')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), listable: true, isList: true, value: append(before, after) }')), variables({'type': ['hierarchyAble', 'queryable', 'quantifier', 'quantity', 'object', 'number', 'notAble', 'unknown', 'property', 'theAble']}) bridge(bridge)), range: {'start': 6, 'end': 8}, text: and, types: [], word: and})\n\n>>>>>>>>>>>>> Counter 3\n *0. list/1 (3, 0) - \"price and quantity\"\n {\n default: true\n isList: true\n listable: true\n marker: Operator(list/1, PASS, ['Selector(Bridge(\\'{ ...operator, value: append(before, operator.value) }\\'), , same/(), [And([\"Type(variable: \\'type\\')\", \"Listable(Unify(Property((\\'context\\', \\'instance\\')), Property((\\'variables\\', \\'instance\\'))))\"])]<==>[], bridge(bridge), passthrough)'], evaluator(Bridge('{ ...operator, value: append(before, operator.value) }')), variables({'type': ['hierarchyAble', 'queryable', 'quantifier', 'quantity', 'object', 'number', 'notAble', 'unknown', 'property', 'theAble']}) bridge(bridge))\n range: {'start': 0, 'end': 17}\n text: \"price and quantity\"\n types: [\n ]\n value: [\n {\n dead: true\n default: true\n marker: Operator(price/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 0, 'end': 4}\n text: \"price\"\n value: \"price\"\n word: \"price\"\n }\n\n {\n default: true\n marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 10, 'end': 17}\n text: \"quantity\"\n value: \"quantity\"\n word: \"quantity\"\n }\n ]\n word: \"and\"\n }\n 1. is/0 (1, 3) - \"are\"\n {\n marker: Operator(is/0, [\"Selector(Bridge('{ ...next(operator), one: after[0], two: after[1], query: true }'), , []<==>[Type('queryable'), Type('queryable')], bridge(queryBridge))\", \"Selector(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }'), , [Type('queryable')]<==>[Type('queryable')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }')), variables({}) bridge(bridge))\n number: \"many\"\n range: {'start': 19, 'end': 21}\n text: \"are\"\n word: \"are\"\n }\n 2. property/0 (1, 5) - \"properties\"\n {\n default: true\n marker: Operator(property/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 23, 'end': 32}\n text: \"properties\"\n word: \"properties\"\n }\n<<<<<<<<<<<<<\nNext Op (index=2) is Context({default: True, marker: Operator(property/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge)), range: {'start': 23, 'end': 32}, text: properties, word: properties})\n\n>>>>>>>>>>>>> Counter 4\n 0. list/1 (3, 0) - \"price and quantity\"\n {\n default: true\n isList: true\n listable: true\n marker: Operator(list/1, PASS, ['Selector(Bridge(\\'{ ...operator, value: append(before, operator.value) }\\'), , same/(), [And([\"Type(variable: \\'type\\')\", \"Listable(Unify(Property((\\'context\\', \\'instance\\')), Property((\\'variables\\', \\'instance\\'))))\"])]<==>[], bridge(bridge), passthrough)'], evaluator(Bridge('{ ...operator, value: append(before, operator.value) }')), variables({'type': ['hierarchyAble', 'queryable', 'quantifier', 'quantity', 'object', 'number', 'notAble', 'unknown', 'property', 'theAble']}) bridge(bridge))\n range: {'start': 0, 'end': 17}\n text: \"price and quantity\"\n types: [\n ]\n value: [\n {\n dead: true\n default: true\n marker: Operator(price/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 0, 'end': 4}\n text: \"price\"\n value: \"price\"\n word: \"price\"\n }\n\n {\n default: true\n marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 10, 'end': 17}\n text: \"quantity\"\n value: \"quantity\"\n word: \"quantity\"\n }\n ]\n word: \"and\"\n }\n 1. is/0 (1, 3) - \"are\"\n {\n marker: Operator(is/0, [\"Selector(Bridge('{ ...next(operator), one: after[0], two: after[1], query: true }'), , []<==>[Type('queryable'), Type('queryable')], bridge(queryBridge))\", \"Selector(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }'), , [Type('queryable')]<==>[Type('queryable')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }')), variables({}) bridge(bridge))\n number: \"many\"\n range: {'start': 19, 'end': 21}\n text: \"are\"\n word: \"are\"\n }\n *2. property/1 (dead) (2, 1) - \"properties\"\n {\n dead: true\n default: true\n marker: Operator(property/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 23, 'end': 32}\n text: \"properties\"\n word: \"properties\"\n }\n<<<<<<<<<<<<<\nNext Op (index=1) is Context({marker: Operator(is/0, [\"Selector(Bridge('{ ...next(operator), one: after[0], two: after[1], query: true }'), , []<==>[Type('queryable'), Type('queryable')], bridge(queryBridge))\", \"Selector(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }'), , [Type('queryable')]<==>[Type('queryable')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }')), variables({}) bridge(bridge)), number: many, range: {'start': 19, 'end': 21}, text: are, word: are})\n\n>>>>>>>>>>>>> Counter 5\n *0. is/1 (4, 0) - \"price and quantity are properties\"\n {\n marker: Operator(is/1, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n number: \"many\"\n one: {\n default: true\n isList: true\n listable: true\n marker: Operator(list/1, PASS, ['Selector(Bridge(\\'{ ...operator, value: append(before, operator.value) }\\'), , same/(), [And([\"Type(variable: \\'type\\')\", \"Listable(Unify(Property((\\'context\\', \\'instance\\')), Property((\\'variables\\', \\'instance\\'))))\"])]<==>[], bridge(bridge), passthrough)'], evaluator(Bridge('{ ...operator, value: append(before, operator.value) }')), variables({'type': ['hierarchyAble', 'queryable', 'quantifier', 'quantity', 'object', 'number', 'notAble', 'unknown', 'property', 'theAble']}) bridge(bridge))\n number: \"many\"\n range: {'start': 0, 'end': 32}\n text: \"price and quantity\"\n types: [\n 'price'\n ]\n value: [\n {\n dead: true\n default: true\n marker: Operator(price/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 0, 'end': 4}\n text: \"price\"\n value: \"price\"\n word: \"price\"\n }\n\n {\n default: true\n marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 10, 'end': 17}\n text: \"quantity\"\n value: \"quantity\"\n word: \"quantity\"\n }\n ]\n word: \"and\"\n }\n\n range: {'start': 0, 'end': 32}\n text: \"price and quantity are properties\"\n two: {\n dead: true\n default: true\n marker: Operator(property/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 23, 'end': 32}\n text: \"properties\"\n types: [\n 'property'\n ]\n word: \"properties\"\n }\n\n word: \"are\"\n }\n<<<<<<<<<<<<<\nNext Op (index=0) is Context({marker: Operator(is/1, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge)), number: many, one: Context({default: True, isList: True, listable: True, marker: Operator(list/1, PASS, ['Selector(Bridge(\\'{ ...operator, value: append(before, operator.value) }\\'), , same/(), [And([\"Type(variable: \\'type\\')\", \"Listable(Unify(Property((\\'context\\', \\'instance\\')), Property((\\'variables\\', \\'instance\\'))))\"])]<==>[], bridge(bridge), passthrough)'], evaluator(Bridge('{ ...operator, value: append(before, operator.value) }')), variables({'type': ['hierarchyAble', 'queryable', 'quantifier', 'quantity', 'object', 'number', 'notAble', 'unknown', 'property', 'theAble']}) bridge(bridge)), number: many, range: {'start': 0, 'end': 32}, text: price and quantity, types: ['price'], value: [Context({dead: True, default: True, marker: Operator(price/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge)), range: {'start': 0, 'end': 4}, text: price, value: price, word: price}), Context({default: True, marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge)), range: {'start': 10, 'end': 17}, text: quantity, value: quantity, word: quantity})], word: and}), range: {'start': 0, 'end': 32}, text: price and quantity are properties, two: Context({dead: True, default: True, marker: Operator(property/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge)), range: {'start': 23, 'end': 32}, text: properties, types: ['property'], word: properties}), word: are})\n\n>>>>>>>>>>>>> Counter 6\n *0. is/2 (dead) (5, 0) - \"price and quantity are properties\"\n {\n dead: true\n marker: Operator(is/2, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n number: \"many\"\n one: {\n default: true\n isList: true\n listable: true\n marker: Operator(list/1, PASS, ['Selector(Bridge(\\'{ ...operator, value: append(before, operator.value) }\\'), , same/(), [And([\"Type(variable: \\'type\\')\", \"Listable(Unify(Property((\\'context\\', \\'instance\\')), Property((\\'variables\\', \\'instance\\'))))\"])]<==>[], bridge(bridge), passthrough)'], evaluator(Bridge('{ ...operator, value: append(before, operator.value) }')), variables({'type': ['hierarchyAble', 'queryable', 'quantifier', 'quantity', 'object', 'number', 'notAble', 'unknown', 'property', 'theAble']}) bridge(bridge))\n number: \"many\"\n range: {'start': 0, 'end': 32}\n text: \"price and quantity\"\n types: [\n 'price'\n ]\n value: [\n {\n dead: true\n default: true\n marker: Operator(price/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 0, 'end': 4}\n text: \"price\"\n value: \"price\"\n word: \"price\"\n }\n\n {\n default: true\n marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 10, 'end': 17}\n text: \"quantity\"\n value: \"quantity\"\n word: \"quantity\"\n }\n ]\n word: \"and\"\n }\n\n range: {'start': 0, 'end': 32}\n text: \"price and quantity are properties\"\n two: {\n dead: true\n default: true\n marker: Operator(property/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 23, 'end': 32}\n text: \"properties\"\n types: [\n 'property'\n ]\n word: \"properties\"\n }\n\n word: \"are\"\n }\n<<<<<<<<<<<<<\n",
783
+ "trace": "\n\n>>>>>>>>>>>>> Counter 1\n 0. price/0 (1, 0) - \"price\"\n {\n default: true\n marker: Operator(price/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 0, 'end': 4}\n text: \"price\"\n value: \"price\"\n word: \"price\"\n }\n 1. list/0 (1, 1) - \"and\"\n {\n default: true\n marker: Operator(list/0, PASS, [\"Selector(Bridge('{ ...next(operator), listable: true, isList: true, value: append(before, after) }'), , same/(), [Type(variable: 'type')]<==>[Type(variable: 'type')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), listable: true, isList: true, value: append(before, after) }')), variables({}) bridge(bridge))\n range: {'start': 6, 'end': 8}\n text: \"and\"\n word: \"and\"\n }\n 2. quantity/0 (1, 2) - \"quantity\"\n {\n default: true\n marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 10, 'end': 17}\n text: \"quantity\"\n value: \"quantity\"\n word: \"quantity\"\n }\n 3. is/0 (1, 3) - \"are\"\n {\n marker: Operator(is/0, [\"Selector(Bridge('{ ...next(operator), one: after[0], two: after[1], query: true }'), , []<==>[Type('queryable'), Type('queryable')], bridge(queryBridge))\", \"Selector(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }'), , [Type('queryable')]<==>[Type('queryable')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }')), variables({}) bridge(bridge))\n number: \"many\"\n range: {'start': 19, 'end': 21}\n text: \"are\"\n word: \"are\"\n }\n 4. property/0 (1, 5) - \"properties\"\n {\n default: true\n marker: Operator(property/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 23, 'end': 32}\n text: \"properties\"\n word: \"properties\"\n }\n<<<<<<<<<<<<<\nNext Op (index=0) is Context({default: True, marker: Operator(price/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge)), range: {'start': 0, 'end': 4}, text: price, value: price, word: price})\n\n>>>>>>>>>>>>> Counter 2\n *0. price/1 (dead) (2, 0) - \"price\"\n {\n dead: true\n default: true\n marker: Operator(price/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 0, 'end': 4}\n text: \"price\"\n value: \"price\"\n word: \"price\"\n }\n 1. list/0 (1, 1) - \"and\"\n {\n default: true\n marker: Operator(list/0, PASS, [\"Selector(Bridge('{ ...next(operator), listable: true, isList: true, value: append(before, after) }'), , same/(), [Type(variable: 'type')]<==>[Type(variable: 'type')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), listable: true, isList: true, value: append(before, after) }')), variables({'type': ['quantity', 'object', 'number', 'queryable', 'hierarchyAble', 'quantifier', 'property', 'theAble', 'unknown', 'notAble']}) bridge(bridge))\n range: {'start': 6, 'end': 8}\n text: \"and\"\n types: [\n ]\n word: \"and\"\n }\n 2. quantity/0 (1, 2) - \"quantity\"\n {\n default: true\n marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 10, 'end': 17}\n text: \"quantity\"\n value: \"quantity\"\n word: \"quantity\"\n }\n 3. is/0 (1, 3) - \"are\"\n {\n marker: Operator(is/0, [\"Selector(Bridge('{ ...next(operator), one: after[0], two: after[1], query: true }'), , []<==>[Type('queryable'), Type('queryable')], bridge(queryBridge))\", \"Selector(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }'), , [Type('queryable')]<==>[Type('queryable')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }')), variables({}) bridge(bridge))\n number: \"many\"\n range: {'start': 19, 'end': 21}\n text: \"are\"\n word: \"are\"\n }\n 4. property/0 (1, 5) - \"properties\"\n {\n default: true\n marker: Operator(property/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 23, 'end': 32}\n text: \"properties\"\n word: \"properties\"\n }\n<<<<<<<<<<<<<\nNext Op (index=1) is Context({default: True, marker: Operator(list/0, PASS, [\"Selector(Bridge('{ ...next(operator), listable: true, isList: true, value: append(before, after) }'), , same/(), [Type(variable: 'type')]<==>[Type(variable: 'type')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), listable: true, isList: true, value: append(before, after) }')), variables({'type': ['quantity', 'object', 'number', 'queryable', 'hierarchyAble', 'quantifier', 'property', 'theAble', 'unknown', 'notAble']}) bridge(bridge)), range: {'start': 6, 'end': 8}, text: and, types: [], word: and})\n\n>>>>>>>>>>>>> Counter 3\n *0. list/1 (3, 0) - \"price and quantity\"\n {\n default: true\n isList: true\n listable: true\n marker: Operator(list/1, PASS, ['Selector(Bridge(\\'{ ...operator, value: append(before, operator.value) }\\'), , same/(), [And([\"Type(variable: \\'type\\')\", \"Listable(Unify(Property((\\'context\\', \\'instance\\')), Property((\\'variables\\', \\'instance\\'))))\"])]<==>[], bridge(bridge), passthrough)'], evaluator(Bridge('{ ...operator, value: append(before, operator.value) }')), variables({'type': ['quantity', 'object', 'number', 'queryable', 'hierarchyAble', 'quantifier', 'property', 'theAble', 'unknown', 'notAble']}) bridge(bridge))\n range: {'start': 0, 'end': 17}\n text: \"price and quantity\"\n types: [\n ]\n value: [\n {\n dead: true\n default: true\n marker: Operator(price/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 0, 'end': 4}\n text: \"price\"\n value: \"price\"\n word: \"price\"\n }\n\n {\n default: true\n marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 10, 'end': 17}\n text: \"quantity\"\n value: \"quantity\"\n word: \"quantity\"\n }\n ]\n word: \"and\"\n }\n 1. is/0 (1, 3) - \"are\"\n {\n marker: Operator(is/0, [\"Selector(Bridge('{ ...next(operator), one: after[0], two: after[1], query: true }'), , []<==>[Type('queryable'), Type('queryable')], bridge(queryBridge))\", \"Selector(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }'), , [Type('queryable')]<==>[Type('queryable')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }')), variables({}) bridge(bridge))\n number: \"many\"\n range: {'start': 19, 'end': 21}\n text: \"are\"\n word: \"are\"\n }\n 2. property/0 (1, 5) - \"properties\"\n {\n default: true\n marker: Operator(property/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 23, 'end': 32}\n text: \"properties\"\n word: \"properties\"\n }\n<<<<<<<<<<<<<\nNext Op (index=2) is Context({default: True, marker: Operator(property/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge)), range: {'start': 23, 'end': 32}, text: properties, word: properties})\n\n>>>>>>>>>>>>> Counter 4\n 0. list/1 (3, 0) - \"price and quantity\"\n {\n default: true\n isList: true\n listable: true\n marker: Operator(list/1, PASS, ['Selector(Bridge(\\'{ ...operator, value: append(before, operator.value) }\\'), , same/(), [And([\"Type(variable: \\'type\\')\", \"Listable(Unify(Property((\\'context\\', \\'instance\\')), Property((\\'variables\\', \\'instance\\'))))\"])]<==>[], bridge(bridge), passthrough)'], evaluator(Bridge('{ ...operator, value: append(before, operator.value) }')), variables({'type': ['quantity', 'object', 'number', 'queryable', 'hierarchyAble', 'quantifier', 'property', 'theAble', 'unknown', 'notAble']}) bridge(bridge))\n range: {'start': 0, 'end': 17}\n text: \"price and quantity\"\n types: [\n ]\n value: [\n {\n dead: true\n default: true\n marker: Operator(price/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 0, 'end': 4}\n text: \"price\"\n value: \"price\"\n word: \"price\"\n }\n\n {\n default: true\n marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 10, 'end': 17}\n text: \"quantity\"\n value: \"quantity\"\n word: \"quantity\"\n }\n ]\n word: \"and\"\n }\n 1. is/0 (1, 3) - \"are\"\n {\n marker: Operator(is/0, [\"Selector(Bridge('{ ...next(operator), one: after[0], two: after[1], query: true }'), , []<==>[Type('queryable'), Type('queryable')], bridge(queryBridge))\", \"Selector(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }'), , [Type('queryable')]<==>[Type('queryable')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }')), variables({}) bridge(bridge))\n number: \"many\"\n range: {'start': 19, 'end': 21}\n text: \"are\"\n word: \"are\"\n }\n *2. property/1 (dead) (2, 1) - \"properties\"\n {\n dead: true\n default: true\n marker: Operator(property/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 23, 'end': 32}\n text: \"properties\"\n word: \"properties\"\n }\n<<<<<<<<<<<<<\nNext Op (index=1) is Context({marker: Operator(is/0, [\"Selector(Bridge('{ ...next(operator), one: after[0], two: after[1], query: true }'), , []<==>[Type('queryable'), Type('queryable')], bridge(queryBridge))\", \"Selector(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }'), , [Type('queryable')]<==>[Type('queryable')], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator), one: { number: operator.number, ...before[0] }, two: after[0] }')), variables({}) bridge(bridge)), number: many, range: {'start': 19, 'end': 21}, text: are, word: are})\n\n>>>>>>>>>>>>> Counter 5\n *0. is/1 (4, 0) - \"price and quantity are properties\"\n {\n marker: Operator(is/1, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n number: \"many\"\n one: {\n default: true\n isList: true\n listable: true\n marker: Operator(list/1, PASS, ['Selector(Bridge(\\'{ ...operator, value: append(before, operator.value) }\\'), , same/(), [And([\"Type(variable: \\'type\\')\", \"Listable(Unify(Property((\\'context\\', \\'instance\\')), Property((\\'variables\\', \\'instance\\'))))\"])]<==>[], bridge(bridge), passthrough)'], evaluator(Bridge('{ ...operator, value: append(before, operator.value) }')), variables({'type': ['quantity', 'object', 'number', 'queryable', 'hierarchyAble', 'quantifier', 'property', 'theAble', 'unknown', 'notAble']}) bridge(bridge))\n number: \"many\"\n range: {'start': 0, 'end': 32}\n text: \"price and quantity\"\n types: [\n 'price'\n ]\n value: [\n {\n dead: true\n default: true\n marker: Operator(price/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 0, 'end': 4}\n text: \"price\"\n value: \"price\"\n word: \"price\"\n }\n\n {\n default: true\n marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 10, 'end': 17}\n text: \"quantity\"\n value: \"quantity\"\n word: \"quantity\"\n }\n ]\n word: \"and\"\n }\n\n range: {'start': 0, 'end': 32}\n text: \"price and quantity are properties\"\n two: {\n dead: true\n default: true\n marker: Operator(property/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 23, 'end': 32}\n text: \"properties\"\n types: [\n 'property'\n ]\n word: \"properties\"\n }\n\n word: \"are\"\n }\n<<<<<<<<<<<<<\nNext Op (index=0) is Context({marker: Operator(is/1, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge)), number: many, one: Context({default: True, isList: True, listable: True, marker: Operator(list/1, PASS, ['Selector(Bridge(\\'{ ...operator, value: append(before, operator.value) }\\'), , same/(), [And([\"Type(variable: \\'type\\')\", \"Listable(Unify(Property((\\'context\\', \\'instance\\')), Property((\\'variables\\', \\'instance\\'))))\"])]<==>[], bridge(bridge), passthrough)'], evaluator(Bridge('{ ...operator, value: append(before, operator.value) }')), variables({'type': ['quantity', 'object', 'number', 'queryable', 'hierarchyAble', 'quantifier', 'property', 'theAble', 'unknown', 'notAble']}) bridge(bridge)), number: many, range: {'start': 0, 'end': 32}, text: price and quantity, types: ['price'], value: [Context({dead: True, default: True, marker: Operator(price/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge)), range: {'start': 0, 'end': 4}, text: price, value: price, word: price}), Context({default: True, marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge)), range: {'start': 10, 'end': 17}, text: quantity, value: quantity, word: quantity})], word: and}), range: {'start': 0, 'end': 32}, text: price and quantity are properties, two: Context({dead: True, default: True, marker: Operator(property/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge)), range: {'start': 23, 'end': 32}, text: properties, types: ['property'], word: properties}), word: are})\n\n>>>>>>>>>>>>> Counter 6\n *0. is/2 (dead) (5, 0) - \"price and quantity are properties\"\n {\n dead: true\n marker: Operator(is/2, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n number: \"many\"\n one: {\n default: true\n isList: true\n listable: true\n marker: Operator(list/1, PASS, ['Selector(Bridge(\\'{ ...operator, value: append(before, operator.value) }\\'), , same/(), [And([\"Type(variable: \\'type\\')\", \"Listable(Unify(Property((\\'context\\', \\'instance\\')), Property((\\'variables\\', \\'instance\\'))))\"])]<==>[], bridge(bridge), passthrough)'], evaluator(Bridge('{ ...operator, value: append(before, operator.value) }')), variables({'type': ['quantity', 'object', 'number', 'queryable', 'hierarchyAble', 'quantifier', 'property', 'theAble', 'unknown', 'notAble']}) bridge(bridge))\n number: \"many\"\n range: {'start': 0, 'end': 32}\n text: \"price and quantity\"\n types: [\n 'price'\n ]\n value: [\n {\n dead: true\n default: true\n marker: Operator(price/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 0, 'end': 4}\n text: \"price\"\n value: \"price\"\n word: \"price\"\n }\n\n {\n default: true\n marker: Operator(quantity/0, [\"Selector(Bridge('{ ...next(operator) }'), , []<==>[], bridge(bridge))\"], evaluator(Bridge('{ ...next(operator) }')), variables({}) bridge(bridge))\n range: {'start': 10, 'end': 17}\n text: \"quantity\"\n value: \"quantity\"\n word: \"quantity\"\n }\n ]\n word: \"and\"\n }\n\n range: {'start': 0, 'end': 32}\n text: \"price and quantity are properties\"\n two: {\n dead: true\n default: true\n marker: Operator(property/1, ['Selector(None, , []<==>[], bridge(bridge))'], evaluator(None), variables({}) bridge(bridge))\n range: {'start': 23, 'end': 32}\n text: \"properties\"\n types: [\n 'property'\n ]\n word: \"properties\"\n }\n\n word: \"are\"\n }\n<<<<<<<<<<<<<\n",
784
784
  "contexts": [
785
785
  {
786
786
  "number": "many",
package/common/scorekeeper.test.json CHANGED
@@ -4701,7 +4701,7 @@
4701
4701
  ],
4702
4702
  "generatedParenthesized": [
4703
4703
  "",
4704
- "(((players) are (neo trinity and morpheus)))"
4704
+ "(((the (players)) are (neo trinity and morpheus)))"
4705
4705
  ],
4706
4706
  "metadata": {
4707
4707
  "opChoices": [
@@ -5695,12 +5695,12 @@
5695
5695
  },
5696
5696
  "word": "are"
5697
5697
  },
5698
- "generatedParenthesized": "(((players) are (neo trinity and morpheus)))",
5698
+ "generatedParenthesized": "(((the (players)) are (neo trinity and morpheus)))",
5699
5699
  "paraphrases": "who are the players?",
5700
5700
  "paraphrasesParenthesized": "(((who) are (the (players)))?)",
5701
5701
  "responses": [
5702
5702
  "",
5703
- "players are neo trinity and morpheus"
5703
+ "the players are neo trinity and morpheus"
5704
5704
  ]
5705
5705
  },
5706
5706
  {
@@ -5804,7 +5804,7 @@
5804
5804
  "paraphrasesParenthesized": "((the (players)) are ((neo), (trinity) and (morpheus)))",
5805
5805
  "responses": [
5806
5806
  "",
5807
- "players are neo trinity and morpheus"
5807
+ "the players are neo trinity and morpheus"
5808
5808
  ]
5809
5809
  }
5810
5810
  ]
@@ -5820,7 +5820,7 @@
5820
5820
  "query": "the players are neo trinity and morpheus who are the players",
5821
5821
  "responses": [
5822
5822
  "",
5823
- "players are neo trinity and morpheus"
5823
+ "the players are neo trinity and morpheus"
5824
5824
  ]
5825
5825
  },
5826
5826
  {
@@ -6916,7 +6916,7 @@
6916
6916
  }
6917
6917
  ],
6918
6918
  "generatedParenthesized": [
6919
- "(((scores) are (nothing for everyone)))"
6919
+ "(((the (scores)) are (nothing for everyone)))"
6920
6920
  ],
6921
6921
  "metadata": {
6922
6922
  "opChoices": [
@@ -7503,11 +7503,11 @@
7503
7503
  },
7504
7504
  "word": "are"
7505
7505
  },
7506
- "generatedParenthesized": "(((scores) are (nothing for everyone)))",
7506
+ "generatedParenthesized": "(((the (scores)) are (nothing for everyone)))",
7507
7507
  "paraphrases": "what are the scores?",
7508
7508
  "paraphrasesParenthesized": "(((what) are (the (scores)))?)",
7509
7509
  "responses": [
7510
- "scores are nothing for everyone"
7510
+ "the scores are nothing for everyone"
7511
7511
  ]
7512
7512
  }
7513
7513
  ]
@@ -7520,7 +7520,7 @@
7520
7520
  ],
7521
7521
  "query": "what are the scores",
7522
7522
  "responses": [
7523
- "scores are nothing for everyone"
7523
+ "the scores are nothing for everyone"
7524
7524
  ]
7525
7525
  },
7526
7526
  {
@@ -7699,7 +7699,7 @@
7699
7699
  }
7700
7700
  ],
7701
7701
  "generatedParenthesized": [
7702
- "(((score) is (nothing for everyone)))"
7702
+ "(((the (score)) is (nothing for everyone)))"
7703
7703
  ],
7704
7704
  "metadata": {
7705
7705
  "opChoices": [
@@ -8284,11 +8284,11 @@
8284
8284
  },
8285
8285
  "word": "is"
8286
8286
  },
8287
- "generatedParenthesized": "(((score) is (nothing for everyone)))",
8287
+ "generatedParenthesized": "(((the (score)) is (nothing for everyone)))",
8288
8288
  "paraphrases": "what is the score?",
8289
8289
  "paraphrasesParenthesized": "(((what) is (the (score)))?)",
8290
8290
  "responses": [
8291
- "score is nothing for everyone"
8291
+ "the score is nothing for everyone"
8292
8292
  ]
8293
8293
  }
8294
8294
  ]
@@ -8301,7 +8301,7 @@
8301
8301
  ],
8302
8302
  "query": "what is the score",
8303
8303
  "responses": [
8304
- "score is nothing for everyone"
8304
+ "the score is nothing for everyone"
8305
8305
  ]
8306
8306
  },
8307
8307
  {
@@ -11270,7 +11270,7 @@
11270
11270
  "(who are the players?)",
11271
11271
  "(The players are greg and joe)",
11272
11272
  "",
11273
- "(((scores) are (greg has 12 points)))"
11273
+ "(((the (scores)) are (greg has 12 points)))"
11274
11274
  ],
11275
11275
  "metadata": {
11276
11276
  "opChoices": [
@@ -12357,13 +12357,13 @@
12357
12357
  },
12358
12358
  "word": "is"
12359
12359
  },
12360
- "generatedParenthesized": "(((scores) are (greg has 12 points)))",
12360
+ "generatedParenthesized": "(((the (scores)) are (greg has 12 points)))",
12361
12361
  "paraphrases": "what is the scores?",
12362
12362
  "paraphrasesParenthesized": "(((what) is (the (scores)))?)",
12363
12363
  "responses": [
12364
12364
  "The players are greg and joe",
12365
12365
  "",
12366
- "scores are greg has 12 points"
12366
+ "the scores are greg has 12 points"
12367
12367
  ]
12368
12368
  },
12369
12369
  {
@@ -12439,7 +12439,7 @@
12439
12439
  "responses": [
12440
12440
  "The players are greg and joe",
12441
12441
  "",
12442
- "scores are greg has 12 points"
12442
+ "the scores are greg has 12 points"
12443
12443
  ]
12444
12444
  },
12445
12445
  {
@@ -12493,7 +12493,7 @@
12493
12493
  "responses": [
12494
12494
  "The players are greg and joe",
12495
12495
  "",
12496
- "scores are greg has 12 points"
12496
+ "the scores are greg has 12 points"
12497
12497
  ]
12498
12498
  },
12499
12499
  {
@@ -12606,7 +12606,7 @@
12606
12606
  "who are the players?",
12607
12607
  "The players are greg and joe",
12608
12608
  "",
12609
- "scores are greg has 12 points"
12609
+ "the scores are greg has 12 points"
12610
12610
  ]
12611
12611
  },
12612
12612
  {
@@ -19130,7 +19130,7 @@
19130
19130
  "",
19131
19131
  "(what is the winning score?)",
19132
19132
  "(what is the winning score?)",
19133
- "(((scores) are (greg has 10 points)))",
19133
+ "(((the (scores)) are (greg has 10 points)))",
19134
19134
  "(what is the winning score?)",
19135
19135
  "(what is the winning score?)"
19136
19136
  ],
@@ -20850,7 +20850,7 @@
20850
20850
  "",
20851
20851
  "what is the winning score?",
20852
20852
  "what is the winning score?",
20853
- "scores are greg has 10 points",
20853
+ "the scores are greg has 10 points",
20854
20854
  "what is the winning score?",
20855
20855
  "what is the winning score?"
20856
20856
  ]
@@ -20876,7 +20876,7 @@
20876
20876
  "",
20877
20877
  "what is the winning score?",
20878
20878
  "what is the winning score?",
20879
- "scores are greg has 10 points",
20879
+ "the scores are greg has 10 points",
20880
20880
  "what is the winning score?",
20881
20881
  "what is the winning score?"
20882
20882
  ]
@@ -21010,7 +21010,7 @@
21010
21010
  },
21011
21011
  "word": "are"
21012
21012
  },
21013
- "generatedParenthesized": "(((scores) are (greg has 10 points)))",
21013
+ "generatedParenthesized": "(((the (scores)) are (greg has 10 points)))",
21014
21014
  "paraphrases": "what are the scores?",
21015
21015
  "paraphrasesParenthesized": "(((what) are (the (scores)))?)",
21016
21016
  "responses": [
@@ -21024,7 +21024,7 @@
21024
21024
  "",
21025
21025
  "what is the winning score?",
21026
21026
  "what is the winning score?",
21027
- "scores are greg has 10 points",
21027
+ "the scores are greg has 10 points",
21028
21028
  "what is the winning score?",
21029
21029
  "what is the winning score?"
21030
21030
  ]
@@ -21050,7 +21050,7 @@
21050
21050
  "",
21051
21051
  "what is the winning score?",
21052
21052
  "what is the winning score?",
21053
- "scores are greg has 10 points",
21053
+ "the scores are greg has 10 points",
21054
21054
  "what is the winning score?",
21055
21055
  "what is the winning score?"
21056
21056
  ]
@@ -21076,7 +21076,7 @@
21076
21076
  "",
21077
21077
  "what is the winning score?",
21078
21078
  "what is the winning score?",
21079
- "scores are greg has 10 points",
21079
+ "the scores are greg has 10 points",
21080
21080
  "what is the winning score?",
21081
21081
  "what is the winning score?"
21082
21082
  ]
@@ -21162,7 +21162,7 @@
21162
21162
  "",
21163
21163
  "what is the winning score?",
21164
21164
  "what is the winning score?",
21165
- "scores are greg has 10 points",
21165
+ "the scores are greg has 10 points",
21166
21166
  "what is the winning score?",
21167
21167
  "what is the winning score?"
21168
21168
  ]
@@ -21214,7 +21214,7 @@
21214
21214
  "",
21215
21215
  "what is the winning score?",
21216
21216
  "what is the winning score?",
21217
- "scores are greg has 10 points",
21217
+ "the scores are greg has 10 points",
21218
21218
  "what is the winning score?",
21219
21219
  "what is the winning score?"
21220
21220
  ]
@@ -21721,7 +21721,7 @@
21721
21721
  "",
21722
21722
  "",
21723
21723
  "(what is the winning score?)",
21724
- "(((scores) are (nothing for everyone)))",
21724
+ "(((the (scores)) are (nothing for everyone)))",
21725
21725
  "(what is the winning score?)"
21726
21726
  ],
21727
21727
  "metadata": {
@@ -22803,7 +22803,7 @@
22803
22803
  "",
22804
22804
  "",
22805
22805
  "what is the winning score?",
22806
- "scores are nothing for everyone",
22806
+ "the scores are nothing for everyone",
22807
22807
  "what is the winning score?"
22808
22808
  ]
22809
22809
  },
@@ -22936,14 +22936,14 @@
22936
22936
  },
22937
22937
  "word": "are"
22938
22938
  },
22939
- "generatedParenthesized": "(((scores) are (nothing for everyone)))",
22939
+ "generatedParenthesized": "(((the (scores)) are (nothing for everyone)))",
22940
22940
  "paraphrases": "what are the scores?",
22941
22941
  "paraphrasesParenthesized": "(((what) are (the (scores)))?)",
22942
22942
  "responses": [
22943
22943
  "",
22944
22944
  "",
22945
22945
  "what is the winning score?",
22946
- "scores are nothing for everyone",
22946
+ "the scores are nothing for everyone",
22947
22947
  "what is the winning score?"
22948
22948
  ]
22949
22949
  },
@@ -22961,7 +22961,7 @@
22961
22961
  "",
22962
22962
  "",
22963
22963
  "what is the winning score?",
22964
- "scores are nothing for everyone",
22964
+ "the scores are nothing for everyone",
22965
22965
  "what is the winning score?"
22966
22966
  ]
22967
22967
  },
@@ -23027,7 +23027,7 @@
23027
23027
  "",
23028
23028
  "",
23029
23029
  "what is the winning score?",
23030
- "scores are nothing for everyone",
23030
+ "the scores are nothing for everyone",
23031
23031
  "what is the winning score?"
23032
23032
  ]
23033
23033
  },
@@ -23105,7 +23105,7 @@
23105
23105
  "",
23106
23106
  "",
23107
23107
  "what is the winning score?",
23108
- "scores are nothing for everyone",
23108
+ "the scores are nothing for everyone",
23109
23109
  "what is the winning score?"
23110
23110
  ]
23111
23111
  },
@@ -23217,7 +23217,7 @@
23217
23217
  "",
23218
23218
  "",
23219
23219
  "what is the winning score?",
23220
- "scores are nothing for everyone",
23220
+ "the scores are nothing for everyone",
23221
23221
  "what is the winning score?"
23222
23222
  ]
23223
23223
  },
@@ -29909,7 +29909,7 @@
29909
29909
  "generatedParenthesized": [
29910
29910
  "",
29911
29911
  "",
29912
- "(((scores) are (greg has 10 points)))"
29912
+ "(((the (scores)) are (greg has 10 points)))"
29913
29913
  ],
29914
29914
  "metadata": {
29915
29915
  "opChoices": [
@@ -30885,12 +30885,12 @@
30885
30885
  },
30886
30886
  "word": "are"
30887
30887
  },
30888
- "generatedParenthesized": "(((scores) are (greg has 10 points)))",
30888
+ "generatedParenthesized": "(((the (scores)) are (greg has 10 points)))",
30889
30889
  "paraphrases": "what are the scores?",
30890
30890
  "paraphrasesParenthesized": "(((what) are (the (scores)))?)",
30891
30891
  "responses": [
30892
30892
  "",
30893
- "scores are greg has 10 points"
30893
+ "the scores are greg has 10 points"
30894
30894
  ]
30895
30895
  },
30896
30896
  {
@@ -30965,7 +30965,7 @@
30965
30965
  "paraphrasesParenthesized": "((greg) got ((10) (points)))",
30966
30966
  "responses": [
30967
30967
  "",
30968
- "scores are greg has 10 points"
30968
+ "the scores are greg has 10 points"
30969
30969
  ]
30970
30970
  },
30971
30971
  {
@@ -31068,7 +31068,7 @@
31068
31068
  "responses": [
31069
31069
  "",
31070
31070
  "",
31071
- "scores are greg has 10 points"
31071
+ "the scores are greg has 10 points"
31072
31072
  ]
31073
31073
  },
31074
31074
  {
@@ -31451,7 +31451,7 @@
31451
31451
  "generatedParenthesized": [
31452
31452
  "",
31453
31453
  "",
31454
- "(((score) is (greg has 10 points)))"
31454
+ "(((the (score)) is (greg has 10 points)))"
31455
31455
  ],
31456
31456
  "metadata": {
31457
31457
  "opChoices": [
@@ -32425,12 +32425,12 @@
32425
32425
  },
32426
32426
  "word": "is"
32427
32427
  },
32428
- "generatedParenthesized": "(((score) is (greg has 10 points)))",
32428
+ "generatedParenthesized": "(((the (score)) is (greg has 10 points)))",
32429
32429
  "paraphrases": "what is the score?",
32430
32430
  "paraphrasesParenthesized": "(((what) is (the (score)))?)",
32431
32431
  "responses": [
32432
32432
  "",
32433
- "score is greg has 10 points"
32433
+ "the score is greg has 10 points"
32434
32434
  ]
32435
32435
  },
32436
32436
  {
@@ -32505,7 +32505,7 @@
32505
32505
  "paraphrasesParenthesized": "((greg) got ((10) (points)))",
32506
32506
  "responses": [
32507
32507
  "",
32508
- "score is greg has 10 points"
32508
+ "the score is greg has 10 points"
32509
32509
  ]
32510
32510
  },
32511
32511
  {
@@ -32608,7 +32608,7 @@
32608
32608
  "responses": [
32609
32609
  "",
32610
32610
  "",
32611
- "score is greg has 10 points"
32611
+ "the score is greg has 10 points"
32612
32612
  ]
32613
32613
  },
32614
32614
  {
package/common/temperature.instance.json CHANGED
@@ -3612,36 +3612,6 @@
3612
3612
  0
3613
3613
  ]
3614
3614
  ],
3615
- [
3616
- [
3617
- "celcius",
3618
- 0
3619
- ],
3620
- [
3621
- "divideByOperator",
3622
- 0
3623
- ],
3624
- [
3625
- "equals",
3626
- 0
3627
- ],
3628
- [
3629
- "fahrenheit",
3630
- 0
3631
- ],
3632
- [
3633
- "number",
3634
- 0
3635
- ],
3636
- [
3637
- "plusOperator",
3638
- 0
3639
- ],
3640
- [
3641
- "timesOperator",
3642
- 0
3643
- ]
3644
- ],
3645
3615
  [
3646
3616
  [
3647
3617
  "celcius",
@@ -5138,6 +5108,10 @@
5138
5108
  "equals",
5139
5109
  0
5140
5110
  ],
5111
+ [
5112
+ "fahrenheit",
5113
+ 0
5114
+ ],
5141
5115
  [
5142
5116
  "leftParenthesis",
5143
5117
  0
@@ -5180,6 +5154,10 @@
5180
5154
  "leftParenthesis",
5181
5155
  0
5182
5156
  ],
5157
+ [
5158
+ "minusOperator",
5159
+ 0
5160
+ ],
5183
5161
  [
5184
5162
  "number",
5185
5163
  0
@@ -5222,6 +5200,10 @@
5222
5200
  "plusOperator",
5223
5201
  0
5224
5202
  ],
5203
+ [
5204
+ "rightParenthesis",
5205
+ 0
5206
+ ],
5225
5207
  [
5226
5208
  "timesOperator",
5227
5209
  0
@@ -5240,6 +5222,10 @@
5240
5222
  "equals",
5241
5223
  0
5242
5224
  ],
5225
+ [
5226
+ "leftParenthesis",
5227
+ 0
5228
+ ],
5243
5229
  [
5244
5230
  "number",
5245
5231
  0
@@ -5511,6 +5497,14 @@
5511
5497
  "fahrenheit",
5512
5498
  0
5513
5499
  ],
5500
+ [
5501
+ "leftParenthesis",
5502
+ 0
5503
+ ],
5504
+ [
5505
+ "minusOperator",
5506
+ 0
5507
+ ],
5514
5508
  [
5515
5509
  "number",
5516
5510
  0
@@ -5519,6 +5513,10 @@
5519
5513
  "plusOperator",
5520
5514
  0
5521
5515
  ],
5516
+ [
5517
+ "rightParenthesis",
5518
+ 0
5519
+ ],
5522
5520
  [
5523
5521
  "timesOperator",
5524
5522
  0
@@ -5708,32 +5706,6 @@
5708
5706
  0
5709
5707
  ]
5710
5708
  ],
5711
- [
5712
- [
5713
- "celcius",
5714
- 0
5715
- ],
5716
- [
5717
- "divideByOperator",
5718
- 0
5719
- ],
5720
- [
5721
- "equals",
5722
- 0
5723
- ],
5724
- [
5725
- "number",
5726
- 0
5727
- ],
5728
- [
5729
- "plusOperator",
5730
- 0
5731
- ],
5732
- [
5733
- "timesOperator",
5734
- 0
5735
- ]
5736
- ],
5737
5709
  [
5738
5710
  [
5739
5711
  "celcius",