Merge pull request #316 from choubeyy/main

Fixed the errors in getFrequentSubgraphs method of gspan.py
UdayLab · Mar 8, 2024 · d321bc8 · d321bc8
2 parents b8559f8 + 58fe962
commit d321bc8
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/PAMI/subgraphMining/basic/gspan.py b/PAMI/subgraphMining/basic/gspan.py
@@ -629,27 +629,25 @@ def getRuntime(self):
         return self._runtime
 
     def getFrequentSubgraphs(self):
-        i = 0
-        for subgraph in self.frequentSubgraphs:
-            sb = []
-
+        sb = []  
+        for i, subgraph in enumerate(self.frequentSubgraphs):  
             dfsCode = subgraph.dfsCode
-            sb.append(f"t # {i} * {subgraph.support}")
+            subgraphDescription = [f"t # {i} * {subgraph.support}"]  
+
             if dfsCode.size == 1:
                 ee = dfsCode.getEeList()[0]
-                if ee.edgeLabel == -1:
-                    sb.append(f"v 0 {ee.vLabel1}")
-                else:
-                    sb.append(f"v 0 {ee.vLabel1}")
-                    sb.append(f"v 1 {ee.vLabel2}")
-                    sb.append(f"e 0 1 {ee.edgeLabel}")
+                subgraphDescription.append(f"v 0 {ee.vLabel1}")
+                if ee.edgeLabel != -1:
+                    subgraphDescription.append(f"v 1 {ee.vLabel2}")
+                    subgraphDescription.append(f"e 0 1 {ee.edgeLabel}")
             else:
                 vLabels = dfsCode.getAllVLabels()
                 for j, vLabel in enumerate(vLabels):
-                    sb.append(f"v {j} {vLabel}")
+                    subgraphDescription.append(f"v {j} {vLabel}")
                 for ee in dfsCode.getEeList():
-                    sb.append(f"e {ee.v1} {ee.v2} {ee.edgeLabel}")
+                    subgraphDescription.append(f"e {ee.v1} {ee.v2} {ee.edgeLabel}")
+
+            sb.append('\n'.join(subgraphDescription))  
+        return '\n'.join(sb)  
 
-            i += 1
-        return sb