Merge branch 'main' of https://github.com/iDataVisualizationLab/PowerMap

Author: rinriko

src/js/MapSetting.js

@@ -336,7 +336,7 @@ let MapSetting = function () {
     };
 
     function handleData() {
-        console.log(scheme.data)
+        // console.log(scheme.data)
         jobsObj = {};
         computersObj = {};
         usersObj = {};
@@ -416,7 +416,7 @@ let MapSetting = function () {
             tableData[d.key].id = d.key;
             d.order = i
         })
-        console.log(_computers,jobsObj,computersObj,usersObj,linkob,tableData,users,jobs,computers,linkdata)
+        // console.log(_computers,jobsObj,computersObj,usersObj,linkob,tableData,users,jobs,computers,linkdata)
     }
 
     function handleCollapseJobs(u) {
@@ -499,7 +499,7 @@ let MapSetting = function () {
 
                 });
             });
-            console.log('compute_tsnedata',compute_tsnedata)
+            // console.log('compute_tsnedata',compute_tsnedata)
             let summary = serviceFullList.map((s, si) => {
                 let min = Infinity;
                 let max = -Infinity;
@@ -574,7 +574,9 @@ let MapSetting = function () {
             // add link to job
             jobsObj[jobKey]._node_list = jobsObj[jobKey].node_list.slice();
             jobsObj[jobKey].node_list = [compKey];
+            jobsObj[jobKey].job_ids = job_ids;
             jobsObj[jobKey].links[compKey] = compKey + '|' + jobKey;
+            // console.log('collapse job', u.key, jobsObj[jobKey], computersObj[compKey], linkob[compKey + '|' + jobKey]);
         }
         jobs = d3.values(jobsObj);
         computers = d3.values(computersObj);
@@ -605,6 +607,7 @@ let MapSetting = function () {
             g.select('.job_title').classed('hide', true);
         }
         let jobNode = nodeg.selectAll('.jobNode').data(jobs, function (d) {
+            // console.log('jobNode', d)
             return d.key
         });
         jobNode.exit().remove();
@@ -643,8 +646,8 @@ let MapSetting = function () {
             }
         });
         jobNode.select('.lelftext').text(d => `#Computes: ${d.node_list.length}`)
-        jobNode.select('.righttext').text(d => d.values ? `#Jobs: ${d.values.length}` : '')
-
+        jobNode.select('.righttext').text(d => d.key ? `Job ID: ${d.key}` : '')
+        // console.log('jobNode', jobNode)
         jobNode.selectAll('path').style('stroke', 'black').style('stroke-width', d => d.values ? Jobscale(d.values.length) : 1.5);
         return jobNode;
     }
@@ -1546,7 +1549,7 @@ let MapSetting = function () {
                 }
             });
             alldataPoint.sort((a, b) => Math.abs(b.value) - Math.abs(a.value));
-            console.log(alldataPoint)
+            // console.log(alldataPoint)
             for (let i = 0; i < 10; i++) {
                 const step = alldataPoint[i].timestep;
                 computersObj[alldataPoint[i].name].highlightData.notEmpty = true;

src/js/main.js

@@ -803,11 +803,49 @@ function handleInputSlumrData(data) {
     data.jobs_info = jobs_info;
     return data;
 }
+function updateServiceRanges(data) {
+  const metrics = serviceListattr; // like ["system_power", "cpu_power", ...]
+  const rangeMap = {};
+
+  // Initialize min/max for each metric
+  for (const metric of metrics) {
+    rangeMap[metric] = { min: Infinity, max: -Infinity };
+  }
+
+  // Loop through nodes and update min/max values
+  for (const node in data.nodes_info) {
+    const info = data.nodes_info[node];
+    metrics.forEach(metric => {
+      const values = (info[metric] || []).flat(); // Flatten 2D array if needed
+      for (const v of values) {
+        if (v != null && !isNaN(v)) {
+          rangeMap[metric].min = Math.min(rangeMap[metric].min, v);
+          rangeMap[metric].max = Math.max(rangeMap[metric].max, v);
+        }
+      }
+    });
+  }
+
+  // Update serviceLists.sub.range
+  for (const service of serviceLists) {
+    const metric = service.text;
+    const r = rangeMap[metric];
+    if (r.min !== Infinity && r.max !== -Infinity) {
+      service.sub[0].range = [Math.floor(r.min), Math.ceil(r.max)];
+    }
+  }
+
+  console.log("Updated ranges:", serviceLists.map(s => ({
+    metric: s.text,
+    range: s.sub[0].range
+  })));
+}
 
 function initTimeElement() {
     request.onDataChange.push((data) => {
         updateProcess({percentage: 50, text: 'Preprocess data'})
         setTimeout(() => {
+          updateServiceRanges(data);
             d3.select('#dataTime').text(new Date(data.time_stamp[0]).toDateString());
             serviceControl();
             handleRankingData(data);