fix Sankey data format

Zipexpo · Zipexpo · commit d7965c18a75d · 2022-11-10T13:02:51.000-06:00
diff --git a/sankeyViewer/index.html b/sankeyViewer/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>Job Stream</title>
+    <title>Sankey Viewer</title>
 
 <!--    <script src="src/lib/jquery-3.2.1.min.js"></script>-->
     <link rel="icon" href="src/favicon.png" type="image/gif">
diff --git a/sankeyViewer/src/js/sankey.js b/sankeyViewer/src/js/sankey.js
@@ -390,6 +390,7 @@ let Sankey = function(){
             });
             graph_ = {nodes, links};
             console.log('#links: ',graph_.links.length);
+            debugger
             let isAnimate = true;
             if (links.length>400)
                 isAnimate = false;
diff --git a/sankeyViewer/src/js/setting.js b/sankeyViewer/src/js/setting.js
@@ -76,7 +76,7 @@ function handleDataUrl(dataRaw) {
         }
     });
     d3.keys(dataRaw.jobs_info).forEach(jID=>{
-        dataRaw.jobs_info[jID].node_list = dataRaw.jobs_info[jID].node_list.map(c=>c.split('-')[0]);
+        // dataRaw.jobs_info[jID].node_list = dataRaw.jobs_info[jID].node_list.map(c=>c.split('-')[0]);
         if(dataRaw.jobs_info[jID].start_time>9999999999999)
         {dataRaw.jobs_info[jID].start_time = dataRaw.jobs_info[jID].start_time/1000000
         dataRaw.jobs_info[jID].submit_time = dataRaw.jobs_info[jID].submit_time/1000000
diff --git a/sankeyViewer/src/js/simulation.js b/sankeyViewer/src/js/simulation.js
@@ -18,6 +18,10 @@ class Simulation {
         if (!this.isRealTime) {
             console.time('load data')
             let updatePromise=(_.isString(url)?d3.json(url):url).then((data) => {
+                let handleCore = (c,n)=>c/n;
+                // FIX THIS LATER
+                if (data.cpu_cores)
+                    handleCore = 1;
                 data.time_stamp = data.time_stamp.map(d=>new Date(d/1000000));
                 d3.keys(data.jobs_info).forEach(jID=>{if (!this.userDict[data.jobs_info[jID].user_name] && !this.userReverseDict[data.jobs_info[jID].user_name]){
                          const encoded =  'user'+d3.keys(this.userDict).length;
@@ -29,9 +33,11 @@ class Simulation {
                }
                     data.jobs_info[jID].node_list_obj = {};
                     data.jobs_info[jID].node_list = data.jobs_info[jID].node_list.map(c=>{
-                        let split = c.split('-');
-                        data.jobs_info[jID].node_list_obj[split[0]] = +split[1];
-                        return split[0];
+                        // let split = c.split('-');
+                        // data.jobs_info[jID].node_list_obj[split[0]] = +split[1];
+                        // return split[0];
+                        data.jobs_info[jID].node_list_obj[c] = Math.round(handleCore(data.jobs_info[jID].cpu_cores,data.jobs_info[jID].node_list.length));
+                        return c;
                     });
                     if(data.jobs_info[jID].start_time>9999999999999)
                     {data.jobs_info[jID].start_time = data.jobs_info[jID].start_time/1000000
diff --git a/src/image/HiperView3D.gif b/src/image/HiperView3D.gif

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ function handleDataUrl(dataRaw) {`
`76`	`76`	`}`
`77`	`77`	`});`
`78`	`78`	`d3.keys(dataRaw.jobs_info).forEach(jID=>{`
`79`		`- dataRaw.jobs_info[jID].node_list = dataRaw.jobs_info[jID].node_list.map(c=>c.split('-')[0]);`
	`79`	`+ // dataRaw.jobs_info[jID].node_list = dataRaw.jobs_info[jID].node_list.map(c=>c.split('-')[0]);`
`80`	`80`	`if(dataRaw.jobs_info[jID].start_time>9999999999999)`
`81`	`81`	`{dataRaw.jobs_info[jID].start_time = dataRaw.jobs_info[jID].start_time/1000000`
`82`	`82`	`dataRaw.jobs_info[jID].submit_time = dataRaw.jobs_info[jID].submit_time/1000000`