From 8f4a44e04b7b96e3cd4327faa6c4d147b91b2cb1 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Mon, 17 Nov 2014 13:37:57 +0200 Subject: misc --- src/textanalysis.js | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/textanalysis.js b/src/textanalysis.js index 2d03d239..f212d07d 100644 --- a/src/textanalysis.js +++ b/src/textanalysis.js @@ -208,7 +208,7 @@ var textAnalyser = function (newtext, finalize) { //Build the words and cuts the main elements sentence = tokenize(newtext, '#', '"'); - //BUILD NEW NODE AND LINK ARRAYS WITH ORDER OF APPEARENCE + // build new node,link arrays in order of appearance for (m = 0; m < sentence.length; m++) { switch (sentence[m]) { case "#": @@ -383,21 +383,20 @@ var textAnalyser = function (newtext, finalize) { ret.applyToGraph = function(graph, backend_commit) { window.ret = ret; - var comp = graph.compareSubset('temp', - ret.nodes.filter( - function(node) { - return !graph.hasNodeByName(node.name, "perm") + + /* + * generate fitered node set who: + * - are not name-present in graph + * - are not of type 'bubble' + */ + var n_set = ret.node_set_add.filter(function(node) { + return false == graph.hasNodeByName(node.name, "perm") && node.type !== 'bubble'; - }).map(function (node) { - return {name: node.name}; - }), - ret.links.map( - function (link) { - return [link.sourceName, link.targetName]; - })); - - var k, n, l; - if (comp.graph_same && !finalize) { + }); + + var comp = graph.compareSubset('temp', n_set, ret.link_set_add); + + if (false == finalize && comp.graph_same) { if (comp.old_name && comp.new_name) { up_to_two_renames(graph, comp.old_name, comp.new_name); } -- cgit v1.3.1