stanford-oval / genie-toolkit / 794

pending completion

Build # 794

Build Type

Pull #145

travis-ci-com

Committed by

web-flow

Commit Message

Merge beb8e495e into 6c6a00144

Pull Request Pull Request #145: Inference mode dialogue templates

Run Details

1359 of 5113 branches covered (26.58%)

Branch coverage included in aggregate %.

101 of 406 new or added lines in 18 files covered. (24.88%)

3 existing lines in 2 files now uncovered.

4167 of 10187 relevant lines covered (40.91%)

16217.46 hits per line

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

5.43

/languages/thingtalk/slot_bag.js

// -*- mode: js; 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
//
// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>
//
// See COPYING for details
"use strict";

const assert = require('assert');

const ThingTalk = require('thingtalk');
const Ast = ThingTalk.Ast;
const Type = ThingTalk.Type;

class SlotBag {
    constructor(schema) {
        this.schema = schema;
        this.store = new Map;
    }

    static merge(b1, b2) {
        if (b1.schema !== null && b2.schema !== null && b1.schema !== b2.schema)
            return null;
        const newbag = new SlotBag(b1.schema || b2.schema);
        for (let [key, value] of b1.entries())
            newbag.set(key, value.clone());
        for (let [key, value] of b2.entries()) {
            if (newbag.has(key))
                return null;
            newbag.set(key, value.clone());
        }
        return newbag;
    }

    clone() {
        let newbag = new SlotBag(this.schema);
        for (let [key, value] of this.entries())
            newbag.set(key, value.clone());
        return newbag;
    }

    get size() {
        return this.store.size;
    }
    entries() {
        return this.store.entries();
    }
    get(key) {
        return this.store.get(key);
    }
    has(key) {
        return this.store.has(key);
    }
    keys() {
        return this.store.keys();
    }
    values() {
        return this.store.values();
    }
    [Symbol.iterator]() {
        return this.store[Symbol.iterator]();
    }
    set(key, value) {
        assert(value instanceof Ast.Value);
        this.store.set(key, value);
    }
    clear() {
        return this.store.clear();
    }
    delete(key) {
        return this.store.delete(key);
    }
}

function checkAndAddSlot(bag, filter) {
    assert(bag instanceof SlotBag);
    if (!filter.isAtom)
        return null;
    const arg = bag.schema.getArgument(filter.name);
    if (!arg || arg.is_input)
        return null;
    const ptype = arg.type;
    if (!ptype)
        return null;
    const vtype = filter.value.getType();
    if (filter.operator === 'contains' || filter.operator === 'contains~') {
        if (!ptype.equals(new Type.Array(vtype)))
            return null;
        const clone = bag.clone();
        if (clone.has(filter.name))
            clone.get(filter.name).value.push(filter.value);
        else
            clone.set(filter.name, new Ast.Value.Array([filter.value]));
        return clone;
    } else {
        if (filter.operator !== '==' && filter.operator !== '=~')
            return null;
        if (!ptype.equals(vtype))
            return null;
        if (bag.has(filter.name))
            return null;
        const clone = bag.clone();
        clone.set(filter.name, filter.value);
        return clone;
    }
}


module.exports = {
    SlotBag,
    checkAndAddSlot,
};

1	// -- mode: js; 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	// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>
8	//
9	// See COPYING for details
10	"use strict";
11
12	const assert = require('assert');	2✔
13
14	const ThingTalk = require('thingtalk');	2✔
15	const Ast = ThingTalk.Ast;	2✔
16	const Type = ThingTalk.Type;	2✔
17
18	class SlotBag {
19	constructor(schema) {
20	this.schema = schema;	×
21	this.store = new Map;	×
22	}
23
24	static merge(b1, b2) {
NEW 25	if (b1.schema !== null && b2.schema !== null && b1.schema !== b2.schema)	×
NEW 26	return null;	×
NEW 27	const newbag = new SlotBag(b1.schema \|\| b2.schema);	×
NEW 28	for (let [key, value] of b1.entries())	×
NEW 29	newbag.set(key, value.clone());	×
NEW 30	for (let [key, value] of b2.entries()) {	×
NEW 31	if (newbag.has(key))	×
NEW 32	return null;	×
NEW 33	newbag.set(key, value.clone());	×
34	}
NEW 35	return newbag;	×
36	}
37
38	clone() {
39	let newbag = new SlotBag(this.schema);	×
40	for (let [key, value] of this.entries())	×
41	newbag.set(key, value.clone());	×
42	return newbag;	×
43	}
44
45	get size() {
46	return this.store.size;	×
47	}
48	entries() {
49	return this.store.entries();	×
50	}
51	get(key) {
52	return this.store.get(key);	×
53	}
54	has(key) {
55	return this.store.has(key);	×
56	}
57	keys() {
58	return this.store.keys();	×
59	}
60	values() {
61	return this.store.values();	×
62	}
63	[Symbol.iterator]() {
64	return this.store[Symbol.iterator]();	×
65	}
66	set(key, value) {
67	assert(value instanceof Ast.Value);	×
68	this.store.set(key, value);	×
69	}
70	clear() {
71	return this.store.clear();	×
72	}
73	delete(key) {
74	return this.store.delete(key);	×
75	}
76	}
77
78	function checkAndAddSlot(bag, filter) {
79	assert(bag instanceof SlotBag);	×
80	if (!filter.isAtom)	×
81	return null;	×
NEW 82	const arg = bag.schema.getArgument(filter.name);	×
NEW 83	if (!arg \|\| arg.is_input)	×
NEW 84	return null;	×
NEW 85	const ptype = arg.type;	×
86	if (!ptype)	×
87	return null;	×
88	const vtype = filter.value.getType();	×
89	if (filter.operator === 'contains' \|\| filter.operator === 'contains~') {	×
90	if (!ptype.equals(new Type.Array(vtype)))	×
91	return null;	×
92	const clone = bag.clone();	×
93	if (clone.has(filter.name))	×
94	clone.get(filter.name).value.push(filter.value);	×
95	else
96	clone.set(filter.name, new Ast.Value.Array([filter.value]));	×
97	return clone;	×
98	} else {
99	if (filter.operator !== '==' && filter.operator !== '=~')	×
100	return null;	×
101	if (!ptype.equals(vtype))	×
102	return null;	×
103	if (bag.has(filter.name))	×
104	return null;	×
105	const clone = bag.clone();	×
106	clone.set(filter.name, filter.value);	×
107	return clone;	×
108	}
109	}
110
111
112	module.exports = {	2✔
113	SlotBag,
114	checkAndAddSlot,
115	};

stanford-oval / genie-toolkit / 794

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