Commit d3ac46d2 authored by Romain Loth's avatar Romain Loth

minor adjustments around db to tina weights

parent 0e50ea93
...@@ -94,7 +94,7 @@ class MyExtractor: ...@@ -94,7 +94,7 @@ class MyExtractor:
results=self.cursor.fetchall() results=self.cursor.fetchall()
# debug # debug
# mlog("DEBUG", "getScholarsList<== len(all 2-step neighbors) =", len(results)) mlog("DEBUG", "getScholarsList<== len(all 2-step neighbors) =", len(results))
if len(results) == 0: if len(results) == 0:
# should never happen if input unique_id is valid # should never happen if input unique_id is valid
...@@ -293,10 +293,13 @@ class MyExtractor: ...@@ -293,10 +293,13 @@ class MyExtractor:
scholarsIncluded = 0; scholarsIncluded = 0;
for i in self.scholars: for i in self.scholars:
mlog('INFO', 'extractDataCustom:'+self.scholars[i]['email'])
self.scholars_colors[self.scholars[i]['email'].strip()]=0; self.scholars_colors[self.scholars[i]['email'].strip()]=0;
scholar_keywords = self.scholars[i]['keywords_ids']; scholar_keywords = self.scholars[i]['keywords_ids'];
for k in range(len(scholar_keywords)): for k in range(len(scholar_keywords)):
kw_k = scholar_keywords[k] kw_k = scholar_keywords[k]
mlog('INFO', 'extractDataCustom:keyword'+kw_k)
if kw_k != None and kw_k!="": if kw_k != None and kw_k!="":
# mlog("DEBUG", kw_k) # mlog("DEBUG", kw_k)
if kw_k in termsMatrix: if kw_k in termsMatrix:
......
...@@ -8,7 +8,7 @@ var ForceAtlas2 = function(graph) { ...@@ -8,7 +8,7 @@ var ForceAtlas2 = function(graph) {
linLogMode: false, linLogMode: false,
outboundAttractionDistribution: false, outboundAttractionDistribution: false,
adjustSizes: false, adjustSizes: false,
edgeWeightInfluence: 0, edgeWeightInfluence: 1,
scalingRatio: 1, scalingRatio: 1,
strongGravityMode: false, strongGravityMode: false,
gravity: 1, gravity: 1,
...@@ -367,7 +367,7 @@ var ForceAtlas2 = function(graph) { ...@@ -367,7 +367,7 @@ var ForceAtlas2 = function(graph) {
// Behavior // Behavior
this.p.outboundAttractionDistribution = false; this.p.outboundAttractionDistribution = false;
this.p.linLogMode = false; this.p.linLogMode = false;
this.p.adjustSizes = false; this.p.adjustSizes = true;
this.p.edgeWeightInfluence = 1; this.p.edgeWeightInfluence = 1;
// Performance // Performance
......
...@@ -259,7 +259,7 @@ function bringTheNoise(sourceinfo,type){ ...@@ -259,7 +259,7 @@ function bringTheNoise(sourceinfo,type){
$('#modalloader').modal('show'); $('#modalloader').modal('show');
// console.warn("===> PASSING ON QUERY (type "+type+") TO BRIDGE <===") console.warn("===> PASSING ON QUERY (type "+type+") TO BRIDGE <===")
if(type=="uid") { if(type=="uid") {
// pr("bring the noise, case: unique_id"); // pr("bring the noise, case: unique_id");
// pr(getClientTime()+" : DataExt Ini"); // pr(getClientTime()+" : DataExt Ini");
...@@ -726,15 +726,17 @@ function SigmaLayouting( URL, DATA, NAME) { ...@@ -726,15 +726,17 @@ function SigmaLayouting( URL, DATA, NAME) {
pr(data) pr(data)
if(!isUndef(ourGetUrlParam.seed))seed=ourGetUrlParam.seed; if(!isUndef(ourGetUrlParam.seed))seed=ourGetUrlParam.seed;
extractFromJson(data,seed); extractFromJson(data,seed);
// changeToMacro("social");
pr(getClientTime()+" : DataExt Fin"); pr(getClientTime()+" : DataExt Fin");
// < === DATA EXTRACTED!! === > // < === DATA EXTRACTED!! === >
if(fa2enabled==="off") $("#edgesButton").hide(); // changeToMacro("social");
pushSWClick("social"); pushSWClick("social");
if(fa2enabled==="off") $("#edgesButton").hide();
pr(partialGraph._core.graph.nodes.length) pr(partialGraph._core.graph.nodes.length)
pr(partialGraph._core.graph.edges.length) pr(partialGraph._core.graph.edges.length)
nbnodes = partialGraph._core.graph.nodes.length nbnodes = partialGraph._core.graph.nodes.length
if(nbnodes>=400 && nbnodes<1000) { if(nbnodes>=400 && nbnodes<1000) {
snbnodes = nbnodes+""; snbnodes = nbnodes+"";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment