1977

pending completion

Build # 1977

Build Type

Pull #613

travis-ci-com

Committed by

web-flow

Commit Message

Merge c32f2eb8d into f6d4307c1

Pull Request Pull Request #613: Minor bug fix in ThingTalk utils

Run Details

12263 of 25917 branches covered (47.32%)

Branch coverage included in aggregate %.

2 of 2 new or added lines in 1 file covered. (100.0%)

18 existing lines in 8 files now uncovered.

28536 of 48718 relevant lines covered (58.57%)

427831.71 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

69.77

/languages/thingtalk/dialogue_acts/coref-actions.ts

// -*- mode: typescript; indent-tabs-mode: nil; js-basic-offset: 4 -*-
//
// This file is part of Genie
//
// Copyright 2020 The Board of Trustees of the Leland Stanford Junior University
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//    http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>


import assert from 'assert';

import { Ast, } from 'thingtalk';

import * as C from '../ast_manip';
import { ContextInfo } from '../state_manip';

function contextualAction(ctx : ContextInfo, action : Ast.Invocation) {
    assert(action instanceof Ast.Invocation);
    const ctxInvocation = C.getInvocation(ctx.next!);
    if (!ctxInvocation || !(ctxInvocation.selector instanceof Ast.DeviceSelector))
        return null;
    if (!C.isSameFunction(ctxInvocation.schema!, action.schema!))
        return null;
    if (action.in_params.length === 0) // common case, no new parameters
        return ctxInvocation;

    for (const newParam of action.in_params) {
        if (newParam.value.isUndefined)
            continue;

        // check that we don't change a previous parameter

        // if we're introducing a value for the chain parameter that was not previously provided,
        // it must one of the top 3 results
        const nextInfo = ctx.nextInfo!;
        if (newParam.name === nextInfo.chainParameter &&
           !nextInfo.chainParameterFilled) {
            if (!ctx.results)
                return null;
            const results = ctx.results;
            let good = false;
            for (let i = 0; i < Math.min(results.length, 3); i ++) {
                const id = results[i].value.id;
                if (id && id.equals(newParam.value)) {
                    good = true;
                    break;
                }
            }
            if (!good)
                return null;
        }

        for (const oldParam of ctxInvocation.in_params) {
            if (oldParam.value.isUndefined)
                continue;
            if (newParam.name !== oldParam.name)
                continue;

            if (!newParam.value.equals(oldParam.value))
                return null;
        }
    }

    // semi-shallow clone
    const clone = new Ast.Invocation(null, ctxInvocation.selector, ctxInvocation.channel,
        ctxInvocation.in_params.map((ip) => new Ast.InputParam(null, ip.name, ip.value)),
        ctxInvocation.schema);
    for (const newParam of action.in_params) {
        if (newParam.value.isUndefined)
            continue;

        let found = false;
        for (const oldParam of clone.in_params) {
            if (newParam.name === oldParam.name) {
                if (oldParam.value.isUndefined)
                    oldParam.value = newParam.value;
                found = true;
                break;
            }
        }

        if (!found)
            clone.in_params.push(newParam);
    }

    return clone;
}

export {
    contextualAction
};

1	// -- mode: typescript; indent-tabs-mode: nil; js-basic-offset: 4 --
2	//
3	// This file is part of Genie
4	//
5	// Copyright 2020 The Board of Trustees of the Leland Stanford Junior University
6	//
7	// Licensed under the Apache License, Version 2.0 (the "License");
8	// you may not use this file except in compliance with the License.
9	// You may obtain a copy of the License at
10	//
11	// http://www.apache.org/licenses/LICENSE-2.0
12	//
13	// Unless required by applicable law or agreed to in writing, software
14	// distributed under the License is distributed on an "AS IS" BASIS,
15	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16	// See the License for the specific language governing permissions and
17	// limitations under the License.
18	//
19	// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>
20
21
22	import assert from 'assert';	5✔
23
24	import { Ast, } from 'thingtalk';	5✔
25
26	import * as C from '../ast_manip';	5✔
27	import { ContextInfo } from '../state_manip';
28
29	function contextualAction(ctx : ContextInfo, action : Ast.Invocation) {
30	assert(action instanceof Ast.Invocation);	24,562✔
31	const ctxInvocation = C.getInvocation(ctx.next!);	24,562✔
32	if (!ctxInvocation \|\| !(ctxInvocation.selector instanceof Ast.DeviceSelector))	24,562!
33	return null;	×
34	if (!C.isSameFunction(ctxInvocation.schema!, action.schema!))	24,562!
35	return null;	×
36	if (action.in_params.length === 0) // common case, no new parameters	24,562!
UNCOV 37	return ctxInvocation;	×
38
39	for (const newParam of action.in_params) {	24,562✔
40	if (newParam.value.isUndefined)	71,004✔
41	continue;	34,028✔
42
43	// check that we don't change a previous parameter
44
45	// if we're introducing a value for the chain parameter that was not previously provided,
46	// it must one of the top 3 results
47	const nextInfo = ctx.nextInfo!;	36,976✔
48	if (newParam.name === nextInfo.chainParameter &&	36,976!
49	!nextInfo.chainParameterFilled) {
50	if (!ctx.results)	×
51	return null;	×
52	const results = ctx.results;	×
53	let good = false;	×
54	for (let i = 0; i < Math.min(results.length, 3); i ++) {	×
55	const id = results[i].value.id;	×
56	if (id && id.equals(newParam.value)) {	×
57	good = true;	×
58	break;	×
59	}
60	}
61	if (!good)	×
62	return null;	×
63	}
64
65	for (const oldParam of ctxInvocation.in_params) {	36,976✔
66	if (oldParam.value.isUndefined)	115,892✔
67	continue;	62,327✔
68	if (newParam.name !== oldParam.name)	53,565✔
69	continue;	36,749✔
70
71	if (!newParam.value.equals(oldParam.value))	16,816✔
72	return null;	6,660✔
73	}
74	}
75
76	// semi-shallow clone
77	const clone = new Ast.Invocation(null, ctxInvocation.selector, ctxInvocation.channel,	17,902✔
78	ctxInvocation.in_params.map((ip) => new Ast.InputParam(null, ip.name, ip.value)),	57,430✔
79	ctxInvocation.schema);
80	for (const newParam of action.in_params) {	17,902✔
81	if (newParam.value.isUndefined)	57,766✔
82	continue;	31,335✔
83
84	let found = false;	26,431✔
85	for (const oldParam of clone.in_params) {	26,431✔
86	if (newParam.name === oldParam.name) {	53,853✔
87	if (oldParam.value.isUndefined)	24,319✔
88	oldParam.value = newParam.value;	14,424✔
89	found = true;	24,319✔
90	break;	24,319✔
91	}
92	}
93
94	if (!found)	26,431✔
95	clone.in_params.push(newParam);	2,112✔
96	}
97
98	return clone;	17,902✔
99	}
100
101	export {
102	contextualAction	5✔
103	};

stanford-oval / genie-toolkit / 1977

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous