From 4dc4f3a32a487190d3b7448c817229e969d5f857 Mon Sep 17 00:00:00 2001
From: Sudipta Basak <sudiptab2100@gmail.com>
Date: Tue, 18 Jun 2024 15:55:16 +0000
Subject: [PATCH] Heatmaps updated

---
 DAS/visualizor.py | 20 +++++++-------------
 study.py          |  6 +++---
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/DAS/visualizor.py b/DAS/visualizor.py
index ad50414..deef58e 100644
--- a/DAS/visualizor.py
+++ b/DAS/visualizor.py
@@ -1383,7 +1383,7 @@ class Visualizor:
         rs = []
         for result in self.results: 
             attrbs = self.__get_attrbs__(result)
-            rs.append(int(attrbs['w']))
+            rs.append(int(attrbs['r']))
         
         return max(rs) - min(rs) + 1
     
@@ -1410,13 +1410,11 @@ class Visualizor:
                 "_mn_" + attrbs['mn'] +\
                 "_cusr_" + attrbs['cusr'] +\
                 "_cusc_" + attrbs['cusc'] +\
-                "_vpn1_" + attrbs['vpn1'] +\
-                "_vpn2_" + attrbs['vpn2']
+                "_ntypes_" + attrbs['ntypes']
             identifier = (
                 attrbs['bsrn'], attrbs['bsrk'], attrbs['bscn'],
                 attrbs['bsck'], attrbs['fr'], attrbs['mn'],
-                attrbs['cusr'], attrbs['cusc'], attrbs['vpn1'],
-                attrbs['vpn2']
+                attrbs['cusr'], attrbs['cusc'], attrbs['ntypes']
             )
             if identifier in xyS.keys():
                 xyS[identifier]['x'].append(result.shape.netDegree)
@@ -1476,13 +1474,11 @@ class Visualizor:
                 "_fr_" + attrbs['fr'] +\
                 "_cusr_" + attrbs['cusr'] +\
                 "_cusc_" + attrbs['cusc'] +\
-                "_vpn1_" + attrbs['vpn1'] +\
-                "_vpn2_" + attrbs['vpn2']
+                "_ntypes_" + attrbs['ntypes']
             identifier = (
                 attrbs['bsrn'], attrbs['bsrk'], attrbs['bscn'],
                 attrbs['bsck'], attrbs['fr'], attrbs['nn'],
-                attrbs['cusr'], attrbs['cusc'], attrbs['vpn1'],
-                attrbs['vpn2']
+                attrbs['cusr'], attrbs['cusc'], attrbs['ntypes']
             )
             if identifier in xyS.keys():
                 xyS[identifier]['x'].append(result.shape.netDegree)
@@ -1542,13 +1538,11 @@ class Visualizor:
                 "_mn_" + attrbs['mn'] +\
                 "_cusr_" + attrbs['cusr'] +\
                 "_cusc_" + attrbs['cusc'] +\
-                "_vpn1_" + attrbs['vpn1'] +\
-                "_vpn2_" + attrbs['vpn2']
+                "_ntypes_" + attrbs['ntypes']
             identifier = (
                 attrbs['bsrn'], attrbs['bsrk'], attrbs['bscn'],
                 attrbs['bsck'], attrbs['mn'], attrbs['nn'],
-                attrbs['cusr'], attrbs['cusc'], attrbs['vpn1'],
-                attrbs['vpn2']
+                attrbs['cusr'], attrbs['cusc'], attrbs['ntypes']
             )
             if identifier in xyS.keys():
                 xyS[identifier]['x'].append(result.shape.netDegree)
diff --git a/study.py b/study.py
index a824e66..0e47a77 100644
--- a/study.py
+++ b/study.py
@@ -213,11 +213,11 @@ def study():
     logger.info("A total of %d simulations ran in %d seconds" % (len(results), end-start), extra=format)
 
     if config.visualization:
-        vis = Visualizer(execID, config)
-        vis.plotHeatmaps()
+        # vis = Visualizer(execID, config)
+        # vis.plotHeatmaps()
 
         visual = Visualizor(execID, config, results)
-        visual.plotHeatmaps("nn", "fr")
+        # visual.plotHeatmaps("nn", "fr")
         visual.plotAllHeatMaps()
 
 if __name__ == "__main__":