Merge pull request #419 from Tarun-Sreepada/main

CoMine Update

PAMI/AssociationRules/basic/confidence.py

@@ -186,13 +186,15 @@ def _readPatterns(self):
                     # print("Using column: ", col, "for support")
             for i in range(len(pattern)):
                 # if pattern[i] != tuple(): exit()
-                if type(pattern[i]) != tuple:
+                if type(pattern[i]) != str:
                     raise ValueError("Pattern should be a tuple. PAMI is going through a major revision.\
                                       Please raise an issue in the github repository regarding this error and provide information regarding input and algorithm.\
                                       In the meanwhile try saving the patterns to a file using (alg).save() and use the file as input. \
                                       If that doesn't work, please raise an issue in the github repository.\
                                       Got pattern: ", pattern[i], "at index: ", i, "in the dataframe, type: ", type(pattern[i]))
-                s = tuple(sorted(pattern[i]))
+                # s = tuple(sorted(pattern[i]))
+                s = pattern[i].split(self._sep)
+                s = tuple(sorted(s))
                 self._associationRules[s] = support[i]
         if isinstance(self._iFile, str):
             if _ab._validators.url(self._iFile):
@@ -301,7 +303,9 @@ def getAssociationRulesAsDataFrame(self):
         # # dataFrame = dataFrame.replace(r'\r+|\n+|\t+',' ', regex=True)
         # return dataFrame
 
-        dataFrame = _ab._pd.DataFrame(list(self._associationRules.items()), columns=['Patterns', 'Support'])
+        # dataFrame = _ab._pd.DataFrame(list(self._associationRules.items()), columns=['Patterns', 'Support'])
+        # dataFrame = _ab._pd.DataFrame(list([[" ".join(x), y] for x,y in self._finalPatterns.items()]), columns=['Patterns', 'Support'])
+        dataFrame = _ab._pd.DataFrame(list([[" ".join(x), y] for x, y in self._associationRules.items()]), columns=['Patterns', 'Support'])
         return dataFrame
 
     def save(self, outFile: str) -> None:

PAMI/AssociationRules/basic/leverage.py

@@ -179,11 +179,17 @@ def _readPatterns(self):
                     # print("Using column: ", col, "for support")
             for i in range(len(pattern)):
                 # if pattern[i] != tuple(): exit()
-                if type(pattern[i]) != tuple:
-                    raise ValueError("Pattern should be a tuple. PAMI is going through a major revision. Please raise an issue in the github repository regarding this error and provide information regarding input and algorithm.\
-                                     In the meanwhile try saving the patterns to a file using (alg).save() and use the file as input. If that doesn't work, please raise an issue in the github repository.")
-                s = tuple(sorted(pattern[i]))
+                if type(pattern[i]) != str:
+                    raise ValueError("Pattern should be a tuple. PAMI is going through a major revision.\
+                                      Please raise an issue in the github repository regarding this error and provide information regarding input and algorithm.\
+                                      In the meanwhile try saving the patterns to a file using (alg).save() and use the file as input. \
+                                      If that doesn't work, please raise an issue in the github repository.\
+                                      Got pattern: ", pattern[i], "at index: ", i, "in the dataframe, type: ", type(pattern[i]))
+                # s = tuple(sorted(pattern[i]))
+                s = pattern[i].split(self._sep)
+                s = tuple(sorted(s))
                 self._associationRules[s] = support[i] / self._maxTS
+
         if isinstance(self._iFile, str):
             if _ab._validators.url(self._iFile):
                 f = _ab._urlopen(self._iFile)
@@ -294,7 +300,8 @@ def getAssociationRulesAsDataFrame(self):
         # # dataFrame = dataFrame.replace(r'\r+|\n+|\t+',' ', regex=True)
         # return dataFrame
 
-        dataFrame = _ab._pd.DataFrame(list(self._associationRules.items()), columns=['Patterns', 'Support'])
+        # dataFrame = _ab._pd.DataFrame(list(self._associationRules.items()), columns=['Patterns', 'Support'])
+        dataFrame = _ab._pd.DataFrame(list([[" ".join(x), y] for x, y in self._associationRules.items()]), columns=['Patterns', 'Support'])
         return dataFrame
 
     def save(self, outFile: str) -> None:

PAMI/AssociationRules/basic/lift.py

@@ -178,10 +178,15 @@ def _readPatterns(self):
                     # print("Using column: ", col, "for support")
             for i in range(len(pattern)):
                 # if pattern[i] != tuple(): exit()
-                if type(pattern[i]) != tuple:
-                    raise ValueError("Pattern should be a tuple. PAMI is going through a major revision. Please raise an issue in the github repository regarding this error and provide information regarding input and algorithm.\
-                                     In the meanwhile try saving the patterns to a file using (alg).save() and use the file as input. If that doesn't work, please raise an issue in the github repository.")
-                s = tuple(sorted(pattern[i]))
+                if type(pattern[i]) != str:
+                    raise ValueError("Pattern should be a tuple. PAMI is going through a major revision.\
+                                      Please raise an issue in the github repository regarding this error and provide information regarding input and algorithm.\
+                                      In the meanwhile try saving the patterns to a file using (alg).save() and use the file as input. \
+                                      If that doesn't work, please raise an issue in the github repository.\
+                                      Got pattern: ", pattern[i], "at index: ", i, "in the dataframe, type: ", type(pattern[i]))
+                # s = tuple(sorted(pattern[i]))
+                s = pattern[i].split(self._sep)
+                s = tuple(sorted(s))
                 self._associationRules[s] = support[i]
         if isinstance(self._iFile, str):
             if _ab._validators.url(self._iFile):
@@ -276,7 +281,7 @@ def getRuntime(self):
 
         return self._endTime - self._startTime
 
-    def getPatternsAsDataFrame(self):
+    def getAssociationRulesAsDataFrame(self):
         """
         Storing final frequent patterns in a dataframe
 
@@ -292,7 +297,8 @@ def getPatternsAsDataFrame(self):
         # # dataFrame = dataFrame.replace(r'\r+|\n+|\t+',' ', regex=True)
         # return dataFrame
 
-        dataFrame = _ab._pd.DataFrame(list(self._associationRules.items()), columns=['Patterns', 'Support'])
+        # dataFrame = _ab._pd.DataFrame(list(self._associationRules.items()), columns=['Patterns', 'Support'])
+        dataFrame = _ab._pd.DataFrame(list([[" ".join(x), y] for x, y in self._associationRules.items()]), columns=['Patterns', 'Support'])
         return dataFrame
 
     def save(self, outFile: str) -> None: