Merge pull request #2 from PenugondaAyesha/main

Ayesha updated

Author: LasyaPalla

PAMI/geoReferencedPeriodicFrequentPattern/basic/GPFPMiner.py

@@ -328,7 +328,7 @@ def _save(self, prefix, suffix, tidSetX):
 
 
         """
-        if prefix == None:
+        if prefix is None:
             prefix = suffix
         else:
             prefix = prefix + suffix
@@ -354,7 +354,7 @@ def _Generation(self, prefix, itemSets, tidSets):
             return
         for i in range(len(itemSets)):
             itemX = itemSets[i]
-            if itemX == None:
+            if itemX is None:
                 continue
             tidSetX = tidSets[i]
             classItemSets = []

PAMI/georeferencedFrequentSequencePattern/basic/GFSP_Miner.py

@@ -223,7 +223,7 @@ def _creatingItemSets(self):
             if 'Transactions' in i:
                 temp = self._iFile['Transactions'].tolist()
             if "tid" in i:
-                temp2 = self._iFile[''].tolist()
+                temp2 = self._iFile('').tolist()
             addList = []
             addList.append(temp[0])
             for k in range(len(temp) - 1):
@@ -403,7 +403,7 @@ def make2LenDatabase(self):
             keyNumber += 1
             for key2 in keyList[keyNumber:]:
                 if key1 != key2:
-                    if (key1 in self._NeighboursMap.keys() and key2 in self._NeighboursMap.keys()):
+                    if key1 in self._NeighboursMap.keys() and key2 in self._NeighboursMap.keys():
                         if key1 in self._NeighboursMap[key2]:
 
                             if len(self._Database[key1].keys()) >= len(self._Database[key1].keys()):

PAMI/georeferencedFrequentSequencePattern/basic/GFSPminer.py

@@ -428,7 +428,7 @@ def make2LenDatabase(self):
             keyNumber += 1
             for key2 in keyList[keyNumber:]:
                 if key1 != key2:
-                    if (key1 in self._NeighboursMap.keys() and key2 in self._NeighboursMap.keys()):
+                    if key1 in self._NeighboursMap.keys() and key2 in self._NeighboursMap.keys():
                         if key1 in self._NeighboursMap[key2]:
 
                             if len(self._Database[key1].keys()) >= len(self._Database[key1].keys()):

PAMI/graphTransactionalCoveragePattern/basic/GTCP.py

@@ -109,7 +109,7 @@ def OverlapRatio(self,pattern):
 
         intersection=lastcoverage & lastbutcoverage
         cs= (lastcoverage | lastbutcoverage).count()/len(self.Sf)
-        return (intersection.count()/self.Df[lastitem].count(),cs)
+        return intersection.count()/self.Df[lastitem].count(),cs
 
 
     def GetFIDBasedFlatTransactions(self):
@@ -150,16 +150,16 @@ def join(self,l1,l2):
         newpattern=[]
         for i in range(len(l1)):
             for j in range(i+1,len(l2)):
-                if(l1[i][:-1]==l2[j][:-1]):
-                    if(self.Coverage(l1[i][-1])>=self.Coverage(l2[j][-1])):
+                if l1[i][:-1]==l2[j][:-1]:
+                    if self.Coverage(l1[i][-1])>=self.Coverage(l2[j][-1]):
                         newpattern= l1[i]+[l2[j][-1]]
                     else:
                         newpattern=l2[j]+[l1[i][-1]]
 
                     ov,cs=self.OverlapRatio(newpattern)
 
-                    if(ov<=self.maxOR):
-                        if(cs>=self.minGTPC):
+                    if ov<=self.maxOR:
+                        if cs>=self.minGTPC:
                             self.L.append((newpattern,cs))
                         else:
                             self.Nol.append(newpattern)
@@ -187,7 +187,7 @@ def Cmine(self):
         self.L=[]
         self.Nol_1_temp=[]
         for g in self.Nol_1:
-            if(self.Coverage(g[0])>=self.minGTPC):
+            if self.Coverage(g[0])>=self.minGTPC:
                 self.L.append((g,self.Coverage(g[0])))
             else:
                 self.Nol_1_temp.append(g)
@@ -196,7 +196,7 @@ def Cmine(self):
         self.Nol=[]
 
 
-        while(len(self.Nol_1)>0):
+        while len(self.Nol_1)>0:
             self.Nol=[]
             # print(len(self.Nol_1))
             self.join(self.Nol_1,self.Nol_1)

PAMI/highUtilityFrequentPattern/basic/HUFIM.py

@@ -640,7 +640,7 @@ def _backTrackingHUFIM(self, transactionsOfP: List[_Transaction], itemsToKeep: L
                     else:
                         projectedTransaction = transaction.projectTransaction(positionE)
                         utilityPe += projectedTransaction.prefixUtility
-                        if previousTransaction == []:
+                        if previousTransaction is []:
                             previousTransaction = projectedTransaction
                         elif self._isEqual(projectedTransaction, previousTransaction):
                             if consecutiveMergeCount == 0:
@@ -679,7 +679,7 @@ def _backTrackingHUFIM(self, transactionsOfP: List[_Transaction], itemsToKeep: L
                             previousTransaction = projectedTransaction
                             consecutiveMergeCount = 0
                     transaction.offset = positionE
-            if previousTransaction != []:
+            if previousTransaction is not []:
                 transactionsPe.append(previousTransaction)
                 supportPe += previousTransaction.getSupport()
             # print("support is", supportPe)

PAMI/highUtilityGeoreferencedFrequentPattern/basic/SHUFIM.py

@@ -298,7 +298,7 @@ def createTransaction(self, items, utilities, utilitySum, pmustring):
         utilities = []
         pmus = []
         for idx, item in enumerate(itemsString):
-            if (self.strToInt).get(item) is None:
+            if self.strToInt.get(item) is None:
                 self.strToInt[item] = self.cnt
                 self.intToStr[self.cnt] = item
                 self.cnt += 1
@@ -307,9 +307,9 @@ def createTransaction(self, items, utilities, utilitySum, pmustring):
                 self.maxItem = itemInt
             items.append(itemInt)
             utilities.append(int(utilityString[idx]))
-            if pmuString != None:
+            if pmuString is not None:
                 pmus.append(int(pmuString[idx]))
-        if pmuString == None:
+        if pmuString is None:
             pmus = None
         return _Transaction(items, utilities, transactionUtility, pmus)
 
@@ -643,7 +643,7 @@ def _backtrackingEFIM(self, transactionsOfP, itemsToKeep, itemsToExplore, prefix
                     else:
                         projectedTransaction = transaction.projectTransaction(positionE)
                         utilityPe += projectedTransaction.prefixUtility
-                        if previousTransaction == []:
+                        if previousTransaction is []:
                             previousTransaction = projectedTransaction
                         elif self._isEqual(projectedTransaction, previousTransaction):
                             if consecutiveMergeCount == 0:
@@ -682,7 +682,7 @@ def _backtrackingEFIM(self, transactionsOfP, itemsToKeep, itemsToExplore, prefix
                             previousTransaction = projectedTransaction
                             consecutiveMergeCount = 0
                     transaction.offset = positionE
-            if previousTransaction != []:
+            if previousTransaction is not []:
                 transactionsPe.append(previousTransaction)
                 supportPe += previousTransaction.getSupport()
             self._temp[prefixLength] = self._newNamesToOldNames[e]

PAMI/highUtilityPattern/basic/HMiner.py

@@ -370,7 +370,7 @@ def mine(self):
             for i in range(0, len(items_str)):
                 item = items_str[i]
                 twu = self._mapOfTWU.get(item)
-                if twu == None:
+                if twu is None:
                     twu = transUtility
                 else:
                     twu += transUtility
@@ -431,7 +431,7 @@ def mine(self):
             for i in range(len(revisedTrans) - 1, -1, -1):
                 pair = revisedTrans[i]
                 mapFMAPItem = self._mapFMAP.get(pair.item)
-                if mapFMAPItem == None:
+                if mapFMAPItem is None:
                     mapFMAPItem = {}
                     self._mapFMAP[pair.item] = mapFMAPItem
                 for j in range(i + 1, len(revisedTrans)):
@@ -503,9 +503,9 @@ def _construcCUL(self, x, culs, st, minutil, length):
         exSZ = sz
         for j in range(st + 1, len(culs)):
             mapOfTWUF = self._mapFMAP[x.item]
-            if mapOfTWUF != None:
+            if mapOfTWUF is not None:
                 twuf = mapOfTWUF.get(culs[j].item)
-                if twuf != None and twuf < minutil:
+                if twuf is not None and twuf < minutil:
                     excul[j] = None
                     exSZ = sz - 1
                 else:

PAMI/highUtilityPattern/basic/UPGrowth.py

@@ -492,7 +492,7 @@ def _creatingItemSets(self) -> None:
             if 'UtilitySum' in i:
                 data = self._iFile['UtilitySum'].tolist()
             for i in range(len(data)):
-                tr = [timeStamp[i]]
+                tr = timeStamp[i]
                 tr.append(data[i])
                 self._Database.append(tr)
         if isinstance(self._iFile, str):

PAMI/highUtilityPattern/basic/efimParallel.py

@@ -411,7 +411,7 @@ def _search(self, collections):
         :type collections: list
         """
 
-        if (self.threads > 1):
+        if self.threads > 1:
             with Parallel(n_jobs=self.threads) as parallel:
                 while len(collections) > 0:
                     new_collections = []

PAMI/highUtilityPatternsInStreams/HUPMS.py

@@ -360,25 +360,25 @@ def removeBatchUtility(self, tempNode):
         curBatchUtility = tempNode.utility[0]
         tempNode.shiftUtility()
 
-        if(sum(tempNode.utility) == 0):
-            if(tempNode.itemName in self.headerTable.table):
+        if sum(tempNode.utility) == 0:
+            if tempNode.itemName in self.headerTable.table:
                 curNode = self.headerTable.table[tempNode.itemName][1]
 
-                if(curNode == tempNode):
+                if curNode == tempNode:
                     self.headerTable.table[tempNode.itemName][1] = tempNode.next
 
                 else:
-                    while(curNode != None and curNode.next != tempNode):
+                    while curNode is not None and curNode.next is not tempNode:
                         curNode = curNode.next
 
-                    if(curNode != None):
+                    if curNode is not None:
                         curNode.next = tempNode.next
 
         self.headerTable.removeUtility(tempNode.itemName, curBatchUtility)
 
         curChilds = list(tempNode.children.keys())
         for child in curChilds:
-            if(sum(tempNode.children[child].utility) == 0):
+            if sum(tempNode.children[child].utility) == 0:
                 del tempNode.children[child]
 
 
@@ -604,7 +604,7 @@ def createPrefixBranch(self, root):
         """
         stack = []
 
-        while(root is not None):
+        while root is not None:
             stack.append(root)
             root = root.parent
 
@@ -621,10 +621,10 @@ def fixUtility(self, root):
         :type root: Node
         """
 
-        if(root is None):
+        if root is None:
             return
 
-        if(len(root.utility) > 1):
+        if len(root.utility) > 1:
             root.utility = [sum(root.utility)]
 
         for child in root.children:
@@ -654,12 +654,12 @@ def createConditionalTree(self, root, transactions, minUtil):
 
         for transaction in transactions:
             for item in transaction["transaction"]:
-                if(root.headerTable.table[item][0] < minUtil):
+                if root.headerTable.table[item][0] < minUtil:
                     transaction["transaction"].remove(item)
 
         tempTree = _HUSTree(1, 1)
         for transaction in transactions:
-            if(len(transaction["transaction"]) != 0):
+            if len(transaction["transaction"]) != 0:
                 tempTree.addTransaction(transaction["transaction"], transaction["utility"])
 
         self.fixUtility(tempTree.root)
@@ -685,7 +685,7 @@ def contains(self, superset, subset):
 
         return reduce(and_, [i in superset for i in subset])
 
-    def treeGenerations(self, root, netUtil, candidatePattern, curItem = []):
+    def treeGenerations(self, root, netUtil, candidatePattern, curItem = None):
         """
         Generates the tree of the high utility patterns
 
@@ -706,12 +706,12 @@ def treeGenerations(self, root, netUtil, candidatePattern, curItem = []):
         :type curItem: list
         """
 
-        if(root is None):
+        if root is None:
             return
 
 
         for item in reversed(root.headerTable.orderedItems):
-            if(root.headerTable.table[item][0] >= netUtil):
+            if root.headerTable.table[item][0] >= netUtil:
                 prefixBranches = []
 
                 tempNode = root.headerTable.table[item][1]
@@ -738,13 +738,13 @@ def treeGenerations(self, root, netUtil, candidatePattern, curItem = []):
                 newItemset = curItem.copy()
                 newItemset.append(item)
 
-                if(len(newItemset) not in candidatePattern):
+                if len(newItemset) not in candidatePattern:
                     candidatePattern[len(newItemset)] = [newItemset]
 
                 else:
                     candidatePattern[len(newItemset)].append(newItemset)
 
-                if(len(conditionalTree.headerTable.table) != 0):
+                if len(conditionalTree.headerTable.table) != 0:
                     self.treeGenerations(conditionalTree, netUtil, candidatePattern, newItemset)
 
     @deprecated("It is recommended to use 'mine()' instead of 'mine()' for mining process. Starting from January 2025, 'mine()' will be completely terminated.")
@@ -792,7 +792,7 @@ def mine(self):
         startIndex = 0
         endIndex = self.__windowSize * self.__paneSize
 
-        while (endIndex <= len(self._transactions)):
+        while endIndex <= len(self._transactions):
 
             filteredItemsets = {}
 
@@ -808,12 +808,12 @@ def mine(self):
                             for item in itemSet:
                                 itemSetUtility += transactionwiseUtility[transId][item]
 
-                    if (itemSetUtility >= self._minUtil):
+                    if itemSetUtility >= self._minUtil:
                         results.append([itemSet, itemSetUtility])
 
             self.__finalPatterns[(startIndex, endIndex)] = results
 
-            if (endIndex >= len(self._transactions)):
+            if endIndex >= len(self._transactions):
                 break
 
             self.__tree.removeBatch()