1012

pending completion

Build # 1012

Build Type

Pull #213

travis-ci-com

Committed by

web-flow

Commit Message

Merge a5ec76eb8 into 942b8d0b3

Pull Request Pull Request #213: force manual annotations to use same entityRetriever as in eval

Run Details

6390 of 14790 branches covered (43.2%)

Branch coverage included in aggregate %.

0 of 1 new or added line in 1 file covered. (0.0%)

2405 existing lines in 57 files now uncovered.

12382 of 21804 relevant lines covered (56.79%)

2465318.45 hits per line

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

1.82

/lib/dataset-tools/evaluation/eval_utils.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
//
// 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>
"use strict";

function* stripOutTypeAnnotations(tokens) {
    for (let token of tokens) {
        if (token.startsWith('param:')) {
            let name = token.split(':')[1];
            yield 'param:'+name;
        } else {
            yield token;
        }
   }
}

function normalizeKeywordParams(program) {
    const newprogram = [];
    for (let i = 0; i < program.length; ) {
        const token = program[i];

        if (!token.startsWith('@')) {
            newprogram.push(token);
            i++;
            continue;
        }

        newprogram.push(token);
        i++;

        const params = {};
        while (i < program.length) {
            if (!program[i].startsWith('param:'))
                break;
            const pn = program[i].split(':')[1];
            i++;
            if (program[i] !== '=') // bad syntax
                break;
            i++;
            let in_string = program[i] === '"';
            const value = [program[i]];
            i++;

            while (i < program.length) {
                if (program[i] === '"')
                    in_string = !in_string;
                if (!in_string &&
                    (program[i].startsWith('param:') || ['on', '=>', '(', ')', '{', '}', 'filter', 'join'].indexOf(program[i]) >= 0))
                    break;
                value.push(program[i]);
                i++;
            }
            params[pn] = value;
        }

        const sorted = Object.keys(params);
        sorted.sort();
        for (let pname of sorted)
            newprogram.push('param:'+pname, '=', ...params[pname]);
    }
    return newprogram;
}

module.exports = {
    stripOutTypeAnnotations,
    normalizeKeywordParams
};

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	// 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	"use strict";
21
22	function* stripOutTypeAnnotations(tokens) {
UNCOV 23	for (let token of tokens) {	×
UNCOV 24	if (token.startsWith('param:')) {	×
25	let name = token.split(':')[1];	×
26	yield 'param:'+name;	×
27	} else {
UNCOV 28	yield token;	×
29	}
30	}
31	}
32
33	function normalizeKeywordParams(program) {
34	const newprogram = [];	×
35	for (let i = 0; i < program.length; ) {	×
36	const token = program[i];	×
37
38	if (!token.startsWith('@')) {	×
39	newprogram.push(token);	×
40	i++;	×
41	continue;	×
42	}
43
44	newprogram.push(token);	×
45	i++;	×
46
47	const params = {};	×
48	while (i < program.length) {	×
49	if (!program[i].startsWith('param:'))	×
50	break;	×
51	const pn = program[i].split(':')[1];	×
52	i++;	×
53	if (program[i] !== '=') // bad syntax	×
54	break;	×
55	i++;	×
56	let in_string = program[i] === '"';	×
57	const value = [program[i]];	×
58	i++;	×
59
60	while (i < program.length) {	×
61	if (program[i] === '"')	×
62	in_string = !in_string;	×
63	if (!in_string &&	×
64	(program[i].startsWith('param:') \|\| ['on', '=>', '(', ')', '{', '}', 'filter', 'join'].indexOf(program[i]) >= 0))
65	break;	×
66	value.push(program[i]);	×
67	i++;	×
68	}
69	params[pn] = value;	×
70	}
71
72	const sorted = Object.keys(params);	×
73	sorted.sort();	×
74	for (let pname of sorted)	×
75	newprogram.push('param:'+pname, '=', ...params[pname]);	×
76	}
77	return newprogram;	×
78	}
79
80	module.exports = {	27✔
81	stripOutTypeAnnotations,
82	normalizeKeywordParams
83	};

stanford-oval / genie-toolkit / 1012

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