ekms 7.12.2-beta.3 → 7.12.2-beta.5
Sign up to get free protection for your applications and to get access to all the features.
- package/common/avatar.js +5 -4
- package/common/crew.test.json +45 -45
- package/common/dialogues.js +8 -2
- package/common/dimension.js +2 -2
- package/common/dimension.test.json +204 -158
- package/common/edible.instance.json +2 -2
- package/common/edible.test.json +34 -4
- package/common/fastfood.instance.json +486 -326
- package/common/fastfood.test.json +686 -2164
- package/common/formulas.test.json +25 -85
- package/common/gdefaults.js +2 -1
- package/common/hierarchy.js +2 -2
- package/common/math.js +12 -1
- package/common/math.test.json +127 -543
- package/common/people.instance.json +46 -14
- package/common/people.test.json +118 -56
- package/common/pipboy.test.json +1800 -86
- package/common/pokemon.test.json +1658 -4
- package/common/properties.test.json +198 -90
- package/common/reports.instance.json +1 -1
- package/common/scorekeeper.test.json +46 -46
- package/common/temperature.instance.json +54 -30
- package/common/weight.test.json +22 -22
- package/package.json +2 -5
|
@@ -1112,7 +1112,7 @@
|
|
|
1112
1112
|
"dead": true,
|
|
1113
1113
|
"level": 1,
|
|
1114
1114
|
"marker": "mathematical_operator",
|
|
1115
|
-
"
|
|
1115
|
+
"modifier_mathematical": {
|
|
1116
1116
|
"level": 0,
|
|
1117
1117
|
"marker": "mathematical",
|
|
1118
1118
|
"range": {
|
|
@@ -1127,7 +1127,7 @@
|
|
|
1127
1127
|
"word": "mathematical"
|
|
1128
1128
|
},
|
|
1129
1129
|
"modifiers": [
|
|
1130
|
-
"
|
|
1130
|
+
"modifier_mathematical"
|
|
1131
1131
|
],
|
|
1132
1132
|
"number": "many",
|
|
1133
1133
|
"range": {
|
|
@@ -2091,7 +2091,7 @@
|
|
|
2091
2091
|
"dead": true,
|
|
2092
2092
|
"level": 1,
|
|
2093
2093
|
"marker": "mathematical_operator",
|
|
2094
|
-
"
|
|
2094
|
+
"modifier_mathematical": {
|
|
2095
2095
|
"level": 0,
|
|
2096
2096
|
"marker": "mathematical",
|
|
2097
2097
|
"range": {
|
|
@@ -2106,7 +2106,7 @@
|
|
|
2106
2106
|
"word": "mathematical"
|
|
2107
2107
|
},
|
|
2108
2108
|
"modifiers": [
|
|
2109
|
-
"
|
|
2109
|
+
"modifier_mathematical"
|
|
2110
2110
|
],
|
|
2111
2111
|
"number": "many",
|
|
2112
2112
|
"range": {
|
|
@@ -3298,7 +3298,7 @@
|
|
|
3298
3298
|
"dead": true,
|
|
3299
3299
|
"level": 1,
|
|
3300
3300
|
"marker": "mathematical_operator",
|
|
3301
|
-
"
|
|
3301
|
+
"modifier_mathematical": {
|
|
3302
3302
|
"level": 0,
|
|
3303
3303
|
"marker": "mathematical",
|
|
3304
3304
|
"range": {
|
|
@@ -3313,7 +3313,7 @@
|
|
|
3313
3313
|
"word": "mathematical"
|
|
3314
3314
|
},
|
|
3315
3315
|
"modifiers": [
|
|
3316
|
-
"
|
|
3316
|
+
"modifier_mathematical"
|
|
3317
3317
|
],
|
|
3318
3318
|
"number": "many",
|
|
3319
3319
|
"range": {
|
|
@@ -5221,7 +5221,7 @@
|
|
|
5221
5221
|
"dead": true,
|
|
5222
5222
|
"level": 1,
|
|
5223
5223
|
"marker": "mathematical_operator",
|
|
5224
|
-
"
|
|
5224
|
+
"modifier_mathematical": {
|
|
5225
5225
|
"level": 0,
|
|
5226
5226
|
"marker": "mathematical",
|
|
5227
5227
|
"range": {
|
|
@@ -5236,7 +5236,7 @@
|
|
|
5236
5236
|
"word": "mathematical"
|
|
5237
5237
|
},
|
|
5238
5238
|
"modifiers": [
|
|
5239
|
-
"
|
|
5239
|
+
"modifier_mathematical"
|
|
5240
5240
|
],
|
|
5241
5241
|
"number": "many",
|
|
5242
5242
|
"range": {
|
|
@@ -6424,7 +6424,7 @@
|
|
|
6424
6424
|
"dead": true,
|
|
6425
6425
|
"level": 1,
|
|
6426
6426
|
"marker": "mathematical_operator",
|
|
6427
|
-
"
|
|
6427
|
+
"modifier_mathematical": {
|
|
6428
6428
|
"level": 0,
|
|
6429
6429
|
"marker": "mathematical",
|
|
6430
6430
|
"range": {
|
|
@@ -6439,7 +6439,7 @@
|
|
|
6439
6439
|
"word": "mathematical"
|
|
6440
6440
|
},
|
|
6441
6441
|
"modifiers": [
|
|
6442
|
-
"
|
|
6442
|
+
"modifier_mathematical"
|
|
6443
6443
|
],
|
|
6444
6444
|
"number": "many",
|
|
6445
6445
|
"range": {
|
|
@@ -7621,7 +7621,7 @@
|
|
|
7621
7621
|
"dead": true,
|
|
7622
7622
|
"level": 1,
|
|
7623
7623
|
"marker": "mathematical_operator",
|
|
7624
|
-
"
|
|
7624
|
+
"modifier_mathematical": {
|
|
7625
7625
|
"level": 0,
|
|
7626
7626
|
"marker": "mathematical",
|
|
7627
7627
|
"range": {
|
|
@@ -7636,7 +7636,7 @@
|
|
|
7636
7636
|
"word": "mathematical"
|
|
7637
7637
|
},
|
|
7638
7638
|
"modifiers": [
|
|
7639
|
-
"
|
|
7639
|
+
"modifier_mathematical"
|
|
7640
7640
|
],
|
|
7641
7641
|
"number": "many",
|
|
7642
7642
|
"range": {
|
|
@@ -9088,7 +9088,7 @@
|
|
|
9088
9088
|
"dead": true,
|
|
9089
9089
|
"level": 1,
|
|
9090
9090
|
"marker": "mathematical_operator",
|
|
9091
|
-
"
|
|
9091
|
+
"modifier_mathematical": {
|
|
9092
9092
|
"level": 0,
|
|
9093
9093
|
"marker": "mathematical",
|
|
9094
9094
|
"range": {
|
|
@@ -9103,7 +9103,7 @@
|
|
|
9103
9103
|
"word": "mathematical"
|
|
9104
9104
|
},
|
|
9105
9105
|
"modifiers": [
|
|
9106
|
-
"
|
|
9106
|
+
"modifier_mathematical"
|
|
9107
9107
|
],
|
|
9108
9108
|
"number": "many",
|
|
9109
9109
|
"range": {
|
|
@@ -9250,36 +9250,6 @@
|
|
|
9250
9250
|
0
|
|
9251
9251
|
]
|
|
9252
9252
|
],
|
|
9253
|
-
[
|
|
9254
|
-
[
|
|
9255
|
-
"divideByOperator",
|
|
9256
|
-
0
|
|
9257
|
-
],
|
|
9258
|
-
[
|
|
9259
|
-
"equals",
|
|
9260
|
-
0
|
|
9261
|
-
],
|
|
9262
|
-
[
|
|
9263
|
-
"leftParenthesis",
|
|
9264
|
-
0
|
|
9265
|
-
],
|
|
9266
|
-
[
|
|
9267
|
-
"number",
|
|
9268
|
-
0
|
|
9269
|
-
],
|
|
9270
|
-
[
|
|
9271
|
-
"plusOperator",
|
|
9272
|
-
0
|
|
9273
|
-
],
|
|
9274
|
-
[
|
|
9275
|
-
"rightParenthesis",
|
|
9276
|
-
0
|
|
9277
|
-
],
|
|
9278
|
-
[
|
|
9279
|
-
"unknown",
|
|
9280
|
-
0
|
|
9281
|
-
]
|
|
9282
|
-
],
|
|
9283
9253
|
[
|
|
9284
9254
|
[
|
|
9285
9255
|
"equals",
|
|
@@ -10850,7 +10820,7 @@
|
|
|
10850
10820
|
"dead": true,
|
|
10851
10821
|
"level": 1,
|
|
10852
10822
|
"marker": "mathematical_operator",
|
|
10853
|
-
"
|
|
10823
|
+
"modifier_mathematical": {
|
|
10854
10824
|
"level": 0,
|
|
10855
10825
|
"marker": "mathematical",
|
|
10856
10826
|
"range": {
|
|
@@ -10865,7 +10835,7 @@
|
|
|
10865
10835
|
"word": "mathematical"
|
|
10866
10836
|
},
|
|
10867
10837
|
"modifiers": [
|
|
10868
|
-
"
|
|
10838
|
+
"modifier_mathematical"
|
|
10869
10839
|
],
|
|
10870
10840
|
"number": "many",
|
|
10871
10841
|
"range": {
|
|
@@ -11846,7 +11816,7 @@
|
|
|
11846
11816
|
"dead": true,
|
|
11847
11817
|
"level": 1,
|
|
11848
11818
|
"marker": "mathematical_operator",
|
|
11849
|
-
"
|
|
11819
|
+
"modifier_mathematical": {
|
|
11850
11820
|
"level": 0,
|
|
11851
11821
|
"marker": "mathematical",
|
|
11852
11822
|
"range": {
|
|
@@ -11861,7 +11831,7 @@
|
|
|
11861
11831
|
"word": "mathematical"
|
|
11862
11832
|
},
|
|
11863
11833
|
"modifiers": [
|
|
11864
|
-
"
|
|
11834
|
+
"modifier_mathematical"
|
|
11865
11835
|
],
|
|
11866
11836
|
"number": "many",
|
|
11867
11837
|
"range": {
|
|
@@ -12008,36 +11978,6 @@
|
|
|
12008
11978
|
0
|
|
12009
11979
|
]
|
|
12010
11980
|
],
|
|
12011
|
-
[
|
|
12012
|
-
[
|
|
12013
|
-
"divideByOperator",
|
|
12014
|
-
0
|
|
12015
|
-
],
|
|
12016
|
-
[
|
|
12017
|
-
"equals",
|
|
12018
|
-
0
|
|
12019
|
-
],
|
|
12020
|
-
[
|
|
12021
|
-
"leftParenthesis",
|
|
12022
|
-
0
|
|
12023
|
-
],
|
|
12024
|
-
[
|
|
12025
|
-
"number",
|
|
12026
|
-
0
|
|
12027
|
-
],
|
|
12028
|
-
[
|
|
12029
|
-
"plusOperator",
|
|
12030
|
-
0
|
|
12031
|
-
],
|
|
12032
|
-
[
|
|
12033
|
-
"rightParenthesis",
|
|
12034
|
-
0
|
|
12035
|
-
],
|
|
12036
|
-
[
|
|
12037
|
-
"unknown",
|
|
12038
|
-
0
|
|
12039
|
-
]
|
|
12040
|
-
],
|
|
12041
11981
|
[
|
|
12042
11982
|
[
|
|
12043
11983
|
"equals",
|
|
@@ -12908,7 +12848,7 @@
|
|
|
12908
12848
|
],
|
|
12909
12849
|
"generatedParenthesized": [
|
|
12910
12850
|
"",
|
|
12911
|
-
"(((
|
|
12851
|
+
"((((the (formulas)) (for) (fahrenheit)) are ((((fahrenheit) = (((celcius) * ((((9) / (5))))) + (32)))))))"
|
|
12912
12852
|
],
|
|
12913
12853
|
"metadata": {
|
|
12914
12854
|
"opChoices": [
|
|
@@ -14611,12 +14551,12 @@
|
|
|
14611
14551
|
},
|
|
14612
14552
|
"word": "are"
|
|
14613
14553
|
},
|
|
14614
|
-
"generatedParenthesized": "(((
|
|
14554
|
+
"generatedParenthesized": "((((the (formulas)) (for) (fahrenheit)) are ((((fahrenheit) = (((celcius) * ((((9) / (5))))) + (32)))))))",
|
|
14615
14555
|
"paraphrases": "what are the formulas for fahrenheit?",
|
|
14616
14556
|
"paraphrasesParenthesized": "(((what) are ((the (formulas)) (for) (fahrenheit)))?)",
|
|
14617
14557
|
"responses": [
|
|
14618
14558
|
"",
|
|
14619
|
-
"
|
|
14559
|
+
"the formulas for fahrenheit are fahrenheit = celcius * (9 / 5) + 32"
|
|
14620
14560
|
]
|
|
14621
14561
|
},
|
|
14622
14562
|
{
|
|
@@ -14781,7 +14721,7 @@
|
|
|
14781
14721
|
"paraphrasesParenthesized": "((fahrenheit) = (((celcius) * ((((9) / (5))))) + (32)))",
|
|
14782
14722
|
"responses": [
|
|
14783
14723
|
"",
|
|
14784
|
-
"
|
|
14724
|
+
"the formulas for fahrenheit are fahrenheit = celcius * (9 / 5) + 32"
|
|
14785
14725
|
]
|
|
14786
14726
|
},
|
|
14787
14727
|
{
|
|
@@ -14939,7 +14879,7 @@
|
|
|
14939
14879
|
"dead": true,
|
|
14940
14880
|
"level": 1,
|
|
14941
14881
|
"marker": "mathematical_operator",
|
|
14942
|
-
"
|
|
14882
|
+
"modifier_mathematical": {
|
|
14943
14883
|
"level": 0,
|
|
14944
14884
|
"marker": "mathematical",
|
|
14945
14885
|
"range": {
|
|
@@ -14954,7 +14894,7 @@
|
|
|
14954
14894
|
"word": "mathematical"
|
|
14955
14895
|
},
|
|
14956
14896
|
"modifiers": [
|
|
14957
|
-
"
|
|
14897
|
+
"modifier_mathematical"
|
|
14958
14898
|
],
|
|
14959
14899
|
"number": "many",
|
|
14960
14900
|
"range": {
|
|
@@ -15051,7 +14991,7 @@
|
|
|
15051
14991
|
"query": "fahrenheit = celcius*(9/5) + 32 what are the formulas for fahrenheit",
|
|
15052
14992
|
"responses": [
|
|
15053
14993
|
"",
|
|
15054
|
-
"
|
|
14994
|
+
"the formulas for fahrenheit are fahrenheit = celcius * (9 / 5) + 32"
|
|
15055
14995
|
]
|
|
15056
14996
|
}
|
|
15057
14997
|
]
|
package/common/gdefaults.js
CHANGED
|
@@ -25,7 +25,8 @@ let configStruct = {
|
|
|
25
25
|
{
|
|
26
26
|
where: where(),
|
|
27
27
|
//({context}) => context.paraphrase && context.modifiers,
|
|
28
|
-
match: ({context}) => context.paraphrase && (context.modifiers || context.postModifiers),
|
|
28
|
+
// match: ({context}) => context.paraphrase && (context.modifiers || context.postModifiers),
|
|
29
|
+
match: ({context}) => (context.modifiers || context.postModifiers),
|
|
29
30
|
apply: ({context, g, gs, callId}) => {
|
|
30
31
|
const text = []
|
|
31
32
|
for (modifier of (context.modifiers || [])) {
|
package/common/hierarchy.js
CHANGED
|
@@ -270,12 +270,12 @@ let configStruct = {
|
|
|
270
270
|
notes: 'types of type', // what are the types of animals
|
|
271
271
|
where: where(),
|
|
272
272
|
match: ({context}) => context.marker == 'type' && context.evaluate && context.object,
|
|
273
|
-
apply: ({context, objects, gs, km}) => {
|
|
273
|
+
apply: ({context, objects, gs, km, isA}) => {
|
|
274
274
|
const api = km('properties').api
|
|
275
275
|
const conceptApi = km('concept').api
|
|
276
276
|
const type = pluralize.singular(context.object.value);
|
|
277
277
|
const children = api.children(type)
|
|
278
|
-
const values = children.map( (t) => conceptApi.getWordForValue(t, { number: 'many'}))
|
|
278
|
+
const values = children.map( (t) => conceptApi.getWordForValue(t, { number: isA(type, 'concept') ? 'one' : 'many'}))
|
|
279
279
|
context.evalue = {
|
|
280
280
|
marker: 'list',
|
|
281
281
|
value: values,
|
package/common/math.js
CHANGED
|
@@ -47,10 +47,21 @@ const mathematicalOperator = (name, words, apply, before = []) => [
|
|
|
47
47
|
const x = toValue(e(context.x))
|
|
48
48
|
const y = toValue(e(context.y))
|
|
49
49
|
if (!x || !y) {
|
|
50
|
-
context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }
|
|
50
|
+
// context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }
|
|
51
|
+
context.isResponse = false
|
|
51
52
|
} else {
|
|
52
53
|
context.evalue = apply(x, y)
|
|
54
|
+
context.evalue.isResponse = true
|
|
55
|
+
context.evalue.paraphrase = false
|
|
56
|
+
// context.paraphrase = false
|
|
57
|
+
// context.isResponse = true
|
|
53
58
|
}
|
|
59
|
+
/*
|
|
60
|
+
if (!context.value) {
|
|
61
|
+
context.isResponse = false
|
|
62
|
+
context.paraphrase = true
|
|
63
|
+
}
|
|
64
|
+
*/
|
|
54
65
|
}
|
|
55
66
|
}
|
|
56
67
|
]
|