harmonized types access + finish sliders and changeType

TW.ByType offers faster access to nodes by type + various clarifications with new typestring

settings_explorerjs.js

@@ -214,8 +214,8 @@ TW.conf = (function(TW){
 
   // if fa2Available, the auto-run config:
 
-    TWConf.fa2Enabled= false;        // fa2 auto-run at start and after graph modified ?
-    TWConf.fa2Milliseconds=10000;    // duration of auto-run
+    TWConf.fa2Enabled= true;        // fa2 auto-run at start and after graph modified ?
+    TWConf.fa2Milliseconds=5000;    // duration of auto-run
     TWConf.minNodesForAutoFA2 = 5   // graph size threshold to auto-run
 
 

twmain/enviroment.js

@@ -314,6 +314,7 @@ function changeType(optionaltypeFlag) {
     let typeFlag
     let outgoing = TW.SystemState()
     let oldTypeId = outgoing.activetypes.indexOf(true)
+    let mixedState = (outgoing.activereltypes.length > 1)
     let preservedNodes = {}
 
     // 1 - make the targetTypes choices
@@ -323,7 +324,6 @@ function changeType(optionaltypeFlag) {
     else {
       // "comeback" case: going back from mixed view to nodes0 view
       // ----------
-      let mixedState = (outgoing.activereltypes.length > 1)
       if (mixedState) {
         typeFlag = 0
       }
@@ -359,16 +359,31 @@ function changeType(optionaltypeFlag) {
 
     // 3 - define the projected selection (sourceNids => corresponding opposites)
     let sourceNids = outgoing.selectionNids
-    if (!outgoing.level && ! sourceNids.length) {
+    if (!outgoing.level && !sourceNids.length) {
+      // when local and no selection => all local graph is selection
       sourceNids = TW.partialGraph.graph.nodes().map(function(n){return n.id})
     }
-    let targetNids = getNeighbors(sourceNids, 'XR')
-
+    let targetNids = {}
+    if (!mixedState)       targetNids = getNeighbors(sourceNids, 'XR')
+    else {
+      // in mixed state we need to separate those already tgt state from others
+      let alreadyOk = TW.partialGraph.graph.getNodesByType(typeFlag)
+      let alreadyOkLookup = {}
+      for (var i in alreadyOk) {alreadyOkLookup[alreadyOk[i]] = true}
+      let needTransition = []
+      for (var i in sourceNids) {
+        let nid = sourceNids[i]
+        console.log('nid', nid)
+        if (alreadyOkLookup[nid])         targetNids[nid] = true
+        else                              needTransition.push(nid)
+      }
+      targetNids = Object.assign(targetNids, getNeighbors(needTransition, 'XR'))
+    }
 
     // 4 - define the nodes to be added
     let newNodes = {}
 
-    // when scope is "entire graph" => entire set by type
+    // when scope is "entire graph" => entire sets by type
     if (outgoing.level) {
       for (let typeId in newActivetypes) {
         if (newActivetypes[typeId]) {
@@ -384,13 +399,17 @@ function changeType(optionaltypeFlag) {
     }
     // console.log('newNodes', newNodes)
 
+    // 5 - define the new selection
+    let newselsArr = []
+    if (outgoing.selectionNids.length)  newselsArr = Object.keys(targetNids)
+
 
-    // 5 - effect the changes on nodes
+    // 6 - effect the changes on nodes
+    deselectNodes()
     if (typeFlag != "all") {
       TW.partialGraph.graph.clear()   // a new start is faster except in "jutsu"
     }
     else {
-      deselectNodes()
       TW.partialGraph.graph.getNodesByType(oldTypeId).map(
         function(nid){ preservedNodes[nid]=true }
       )
@@ -402,10 +421,10 @@ function changeType(optionaltypeFlag) {
       } catch(e) {continue}
     }
 
-    // 6 - add the relations
+    // 7 - add the relations
     let newEdges = {}
     let allNodes = TW.partialGraph
-    if (typeFlag != "all") allNodes = newNodes
+    if (typeFlag != "all")  allNodes = newNodes
     else                    allNodes = Object.assign(newNodes, preservedNodes)
     for (var srcnid in allNodes) {
       for (var k in newReltypes) {
@@ -430,24 +449,32 @@ function changeType(optionaltypeFlag) {
       }
     }
 
-    // 7 - effect the changes on edges
+    // 8 - effect the changes on edges
     for (var eid in newEdges) {
       try {
         TW.partialGraph.graph.addEdge(newEdges[eid])
       } catch(e) {continue}
     }
 
-    // 8 - refresh view and record the state
+    // 9 - refresh view and record the state
     TW.partialGraph.camera.goTo({x:0, y:0, ratio:1, angle: 0})
     TW.partialGraph.refresh()
     TW.pushGUIState({
         activetypes: newActivetypes,
         activereltypes: newReltypes,
-        sels: Object.keys(targetNids)
+        sels: newselsArr
         // rels: added by MS2 (highlighted opposite- and same-side neighbours)
         // possible: add it in an early way here and request that MS2 doesn't change state
     })
 
+    // to recreate the new selection in the new type graph, if we had one before
+    // NB relies on new actypes so should be after pushState
+    if (newselsArr.length) {
+      TW.instance.selNgn.MultipleSelection2({nodes: newselsArr});
+      if (TW.conf.debug.logSelections)
+        console.log("selection transitive projection from",sourceNids, "to", newselsArr)
+    }
+
     // update the color menu
     TW.gui.handpickedcolor = false
     changeGraphAppearanceByFacets( getActivetypesNames() )
@@ -465,9 +492,10 @@ function changeType(optionaltypeFlag) {
 // the pool of available nodes of a given type
 function getNodesOfType (typeid){
   let res = {}
-  for (var nid in TW.Nodes) {
-    let n = TW.Nodes[nid]
-    if (TW.catDict[n.type] == typeid) {
+  if (TW.ByType[typeid]) {
+    for (var j in TW.ByType[typeid]) {
+      let nid = TW.ByType[typeid][j]
+      let n = TW.Nodes[TW.ByType[typeid][j]]
       res[nid] = n
     }
   }
@@ -500,6 +528,8 @@ function getNeighbors(sourceNids, relKey) {
 //                         v
 //                   local selection SysSt = {level: false, activetypes:XY}
 //
+//  POSS: rewrite using .hidden instead of add/remove
+//
 function changeLevel() {
     // show waiting cursor
     TW.gui.elHtml.classList.add('waiting');
@@ -522,7 +552,6 @@ function changeLevel() {
       //          [true, true]    <=> '1|1'
 
       var activetypes = present.activetypes;
-      var activetypesKey = activetypes.map(Number).join("|")
       var activereltypes = present.activereltypes
 
       TW.partialGraph.graph.clear();
@@ -616,10 +645,8 @@ function changeLevel() {
         callback: function() {
           TW.gui.elHtml.classList.remove('waiting');
 
-          // when going local, it's nice to see the selected nodes rearrange
-          if (!futurelevel) {
-            sigma_utils.smartForceAtlas()
-          }
+          // rearrange nodes in all cases (&& if fa2Enabled)
+          sigma_utils.smartForceAtlas()
         }
       })
     },500 // cursor waiting
@@ -638,8 +665,8 @@ function changeLevel() {
 function edgeSizesLookup(eTypeStrs, criterion) {
   var edgeweis = {}
 
-  for (let i in TW.edgeIds) {
-    let e = TW.partialGraph.graph.edges(TW.edgeIds[i])
+  for (let eid in TW.Edges) {
+    let e = TW.partialGraph.graph.edges(eid)
 
     for (var etype_i in eTypeStrs) {
       let eTypeStr = eTypeStrs[etype_i]

twmain/extras_explorerjs.js

@@ -196,8 +196,8 @@ function SomeEffect( ValueclassCode ) {
 
 // some colorings cases also modify size and label
 function graphResetLabelsAndSizes(){
-  for(let j in TW.nodeIds){
-    let n = TW.partialGraph.graph.nodes(TW.nodeIds[j])
+  for(let nid in TW.Nodes) {
+    let n = TW.partialGraph.graph.nodes(nid)
     if (n) {
       n.label = TW.Nodes[n.id].label
       n.size = TW.Nodes[n.id].size

twmain/main.js

@@ -4,7 +4,8 @@
 
 TW.Nodes = [];
 TW.Edges = [];
-TW.Relations = {}       // edges sorted by source/target type
+TW.ByType = {}          // node ids sorted by nodetype id   (0, 1)
+TW.Relations = {}       // edges sorted by source/target type id ("00", "11")
 TW.Clusters = [];       // "by value" facet index built in parseCustom
 
 TW.File = ""            // remember the currently opened file
@@ -377,8 +378,7 @@ function mainStartGraph(inFormat, inData, twInstance) {
       TW.Nodes = dicts.nodes;
       TW.Edges = dicts.edges;
 
-      TW.nodeIds = Object.keys(dicts.nodes)  // useful for loops
-      TW.edgeIds = Object.keys(dicts.edges)
+      TW.ByType = dicts.byType  // useful for loops
 
       // in-place: pre-compute all color/unselected color/size properties
       prepareNodesRenderingProperties(TW.Nodes)
@@ -388,7 +388,7 @@ function mainStartGraph(inFormat, inData, twInstance) {
 
       // main console info
       // ===================
-      console.info(`== new graph ${TW.nodeIds.length} nodes (${TW.categories.length > 1 ? 'bipartite': 'monopartite'}), ${TW.edgeIds.length} edges ==`)
+      console.info(`== new graph ${Object.keys(TW.Nodes).length} nodes (${TW.categories.length > 1 ? 'bipartite': 'monopartite'}), ${Object.keys(TW.Edges).length} edges ==`)
 
       // a posteriori categories diagnostic
       // ----------------------------------
@@ -410,37 +410,8 @@ function mainStartGraph(inFormat, inData, twInstance) {
       TW.graphData = {nodes: [], edges: []}
       TW.graphData = sigma_utils.FillGraph( initialActivetypes , initialActivereltypes, TW.catDict  , TW.Nodes , TW.Edges , TW.graphData );
 
-
-          // // ----------- TEST stock parse gexf and use nodes to replace TW's ---------
-          // var gexfData = gexf.fetch('data/politoscope/ProgrammeDesCandidats.gexf')
-          //
-          // TW.graphData = sigmaTools.myGexfParserReplacement(
-          //     gexfData.nodes,
-          //     gexfData.edges
-          // )
-          // console.log ('ex in TW.graphData.nodes[0]', TW.graphData.nodes[0])
-          //
-          // // our holey id-indexed arrays
-          // TW.Nodes = {}
-          // TW.Edges = {}
-          // TW.nodeIds = []
-          // TW.edgeIds = []
-          // for (var j in TW.graphData.nodes) {
-          //   var nid = TW.graphData.nodes[j].id
-          //   TW.Nodes[nid] = TW.graphData.nodes[j]
-          //   TW.nodeIds.push(nid)
-          // }
-          // for (var i in TW.graphData.edges) {
-          //   var eid = TW.graphData.edges[i].id
-          //   TW.Edges[eid] = TW.graphData.edges[i]
-          //   TW.edgeIds.push(eid)
-          // }
-          //
-          //
-          // // -------------------------------------------------------------------------
-
-        if (TW.graphData.nodes.length == 0) console.error("empty graph")
-        if (TW.graphData.edges.length == 0) console.error("no edges in graph")
+      if (TW.graphData.nodes.length == 0) console.error("empty graph")
+      if (TW.graphData.edges.length == 0) console.error("no edges in graph")
 
       // our final sigma params (cf github.com/jacomyal/sigma.js/wiki/Settings)
       TW.customSettings = Object.assign(

twmain/sigma.parseCustom.js

@@ -995,12 +995,15 @@ function dictfyJSON( data , categories ) {
 
     var catDict = {}
     var catCount = {}
-    for(var i in categories)  catDict[categories[i]] = i;
 
-    var edges={}, nodes={}
+    var edges={}, nodes={}, nodesByType={}
 
-    // NB old additional objects by type nodes1 and nodes2 not necessary
-    //    (can use TW.partialGraph.graph.nodesByTypeNSize faster custom index)
+    // NB nodesByType lists arrays of ids per nodetype
+    // (equivalent to TW.partialGraph.graph.getNodesByType but on full nodeset)
+    for(var i in categories)  {
+      catDict[categories[i]] = i
+      nodesByType[i] = []
+    }
 
     // normalization, same as parseGexf
     let minNodeSize = Infinity
@@ -1050,7 +1053,9 @@ function dictfyJSON( data , categories ) {
         if (!catCount[node.type]) catCount[node.type] = 0
         catCount[node.type]++;
 
+        // record
         nodes[node.id] = node;
+        nodesByType[catDict[node.type]].push(node.id)
 
         // creating a faceted index from node.attributes
         if (TW.conf.scanClusters) {
@@ -1133,6 +1138,7 @@ function dictfyJSON( data , categories ) {
     let resDict = {}
     resDict.catCount = catCount;
     resDict.nodes = nodes;
+    resDict.byType = nodesByType;
     resDict.edges = edges;
 
     return resDict;

twmain/sigmaUtils.js

@@ -10,12 +10,6 @@ var SigmaUtils = function () {
         // console.log("FillGraph nodes",nodes)
         // console.log("FillGraph edges",edges)
 
-        // retrocompatibility  -------------------------------- 8< -------------
-        if (!initialActivereltypes.length) {
-          initialActivereltypes = [initialActivetypes.map(Number).join("|")]
-        }
-        // ---------------------------------------------------- 8< -------------
-
         let i = 0
         for(var nid in nodes) {
             var n = nodes[nid];
@@ -676,8 +670,8 @@ function gradientColoring(daclass) {
     TW.gui.handpickedcolor = true
 
     var min_pow = 0;
-    for(var j in TW.nodeIds) {
-        var the_node = TW.Nodes[ TW.nodeIds[j] ]
+    for(var nid in TW.Nodes) {
+        var the_node = TW.Nodes[ nid ]
         var attval = the_node.attributes[daclass];
         if( !isNaN(parseFloat(attval)) ) { //is float
             while(true) {
@@ -696,8 +690,8 @@ function gradientColoring(daclass) {
     var themult = Math.pow(10,min_pow);
     // console.log('themult', themult)
 
-    for(var j in TW.nodeIds) {
-        var the_node = TW.Nodes[ TW.nodeIds[j] ]
+    for(var nid in TW.Nodes) {
+        var the_node = TW.Nodes[ nid ]
         var attval = the_node.attributes[daclass];
         var attnumber = Number(attval);
         if (isNaN(attnumber)) {
@@ -706,7 +700,7 @@ function gradientColoring(daclass) {
 
         var round_number = Math.round(  attnumber*themult ) ;
 
-        NodeID_Val[TW.nodeIds[j]] = { "round":round_number , "real":attnumber };
+        NodeID_Val[nid] = { "round":round_number , "real":attnumber };
 
         if (round_number<real_min) real_min = round_number;
         if (round_number>real_max) real_max = round_number;
@@ -788,9 +782,7 @@ function gradientColoring(daclass) {
 // Edge-colour: precompute alt_rgb by source-target node.alt_color combination
 function repaintEdges() {
 
-  for (var i in TW.edgeIds) {
-    let eid = TW.edgeIds[i]
-
+  for (var eid in TW.Edges) {
     if (eid) {
       let idPair = eid.split(';')
       if (idPair.length != 2) {
@@ -931,12 +923,12 @@ function clusterColoring(daclass) {
     }
 
     if (daclass=="clust_default") {
-        for(var j in TW.nodeIds) {
-          var original_node_color = TW.Nodes[ TW.nodeIds[j] ].color
-          TW.partialGraph.graph.nodes(TW.nodeIds[j]).color = original_node_color
+        for(var nid in TW.Nodes) {
+          var original_node_color = TW.Nodes[ nid ].color
+          TW.partialGraph.graph.nodes(nid).color = original_node_color
 
           // reset the alt_color valflag
-          TW.partialGraph.graph.nodes(TW.nodeIds[j]).customAttrs.alt_color = null
+          TW.partialGraph.graph.nodes(nid).customAttrs.alt_color = null
         }
 
         // reset the global state
@@ -994,15 +986,15 @@ function clusterColoring(daclass) {
       }
       // fallback on old, slower strategy if scanClusters inactive
       else {
-        for(var j in TW.nodeIds) {
-            var the_node = TW.partialGraph.graph.nodes(TW.nodeIds[j])
+        for(var nid in TW.Nodes) {
+            var the_node = TW.partialGraph.graph.nodes(nid)
 
             if (the_node) {
 
               // POSS: use "hidden" in filters instead of remove/readd
               //       then this condition would be more useful here
               if (! the_node.hidden) {
-                var attval = ( !isUndef(the_node.attributes) && !isUndef(the_node.attributes[daclass]) )? the_node.attributes[daclass] : TW.partialGraph.graph.nodes(TW.nodeIds[j])[daclass];
+                var attval = ( !isUndef(the_node.attributes) && !isUndef(the_node.attributes[daclass]) )? the_node.attributes[daclass] : TW.partialGraph.graph.nodes(nid)[daclass];
 
                 let theColor
 
@@ -1017,7 +1009,7 @@ function clusterColoring(daclass) {
                   theColor = colList[ someRepresentativeInt ]
                 }
 
-                // TW.partialGraph.graph.nodes(TW.nodeIds[j]).color = theColor
+                // TW.partialGraph.graph.nodes(nid).color = theColor
                 the_node.customAttrs.alt_color = theColor
                 the_node.customAttrs.altgrey_color = "rgba("+(hex2rgba(theColor).slice(0,3).join(','))+",0.4)"
               }