Skip to content

Commit 53727bc

Browse files
authored
Merge pull request #578 from LasyaPalla/main
reverted minor changes
2 parents b236596 + 0f74d75 commit 53727bc

12 files changed

Lines changed: 166 additions & 164 deletions

File tree

PAMI/highUtilityPattern/basic/efimParallel.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ def _read_file(self):
225225
twu = {k: v for k, v in twu.items() if v >= self.minUtil}
226226

227227
# Sort TWU items by utility
228-
twu = {k: v for k, v in sorted(twu.items(), key=lambda item_: item_[1], reverse=True)}
228+
twu = {k: v for k, v in sorted(twu.items(), key=lambda item: item[1], reverse=True)}
229229

230230
strToInt = {}
231231
t = len(twu)
@@ -285,7 +285,7 @@ def _binarySearch(self, arr, item):
285285

286286
low = 0
287287
high = len(arr) - 1
288-
#mid = 0
288+
mid = 0
289289

290290
while low <= high:
291291
mid = (high + low) // 2
@@ -337,7 +337,7 @@ def _project(self, beta, file_data, secondary):
337337
item = beta[-1]
338338

339339
temp = [v for k, v in file_data.items() if item in k]
340-
#start = time.time()
340+
start = time.time()
341341

342342
for v in temp:
343343
index = self._binarySearch(v[0], item)

PAMI/highUtilityPattern/parallel/efimparallel.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@ class efimParallel(_ab._utilityPatterns):
131131

132132
def __init__(self, iFile, minUtil, sep="\t", threads=1):
133133
super().__init__(iFile, minUtil, sep)
134-
self.runtime = None
135-
self.oFile = None
136-
self.start = None
137-
self.memoryUSS = None
138-
self.memoryRSS = None
134+
# self.runtime = None
135+
# self.oFile = None
136+
# self.start = None
137+
# self.memoryUSS = None
138+
# self.memoryRSS = None
139139
self.inputFile = iFile
140140
self.minUtil = minUtil
141141
self.sep = sep
@@ -182,7 +182,7 @@ def _read_file(self):
182182
twu = {k: v for k, v in twu.items() if v >= self.minUtil}
183183

184184
# Sort TWU items by utility
185-
twu = {k: v for k, v in sorted(twu.items(), key=lambda item_: item_[1], reverse=True)}
185+
twu = {k: v for k, v in sorted(twu.items(), key=lambda item: item[1], reverse=True)}
186186

187187
strToInt = {}
188188
t = len(twu)
@@ -248,7 +248,7 @@ def _binarySearch(self, arr, item):
248248

249249
low = 0
250250
high = len(arr) - 1
251-
#mid = 0
251+
mid = 0
252252

253253
while low <= high:
254254
mid = (high + low) // 2
@@ -297,7 +297,7 @@ def _project(self, beta, file_data, secondary):
297297
item = beta[-1]
298298

299299
temp = [v for k, v in file_data.items() if item in k]
300-
#start = time.time()
300+
start = time.time()
301301

302302
for v in temp:
303303
index = self._binarySearch(v[0], item)

PAMI/highUtilityPatterns/parallel/GPUEFIM.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -190,16 +190,16 @@ class GPUEFIM:
190190
"""
191191

192192
def __init__(self, inputFile, minUtil, sep = '\t'):
193-
self.runtime = None
194-
self.memoryUSS = None
195-
self.memoryRSS = None
196-
self.start = None
197-
self.numTransactions = None
198-
self.indexesEnd = None
199-
self.secondaryLen = None
200-
self.indexesStart = None
201-
self.utils = None
202-
self.items = None
193+
# self.runtime = None
194+
# self.memoryUSS = None
195+
# self.memoryRSS = None
196+
# self.start = None
197+
# self.numTransactions = None
198+
# self.indexesEnd = None
199+
# self.secondaryLen = None
200+
# self.indexesStart = None
201+
# self.utils = None
202+
# self.items = None
203203
self.inputFile = inputFile
204204
self.minUtil = minUtil
205205
self.sep = sep
@@ -221,8 +221,8 @@ def read_file(self):
221221
file_data = []
222222
twu = {}
223223

224-
with open(self.inputFile, 'r') as file:
225-
fd = mmap.mmap(file.fileno(), 0, prot=mmap.PROT_READ)
224+
with open(self.inputFile, 'r') as f:
225+
fd = mmap.mmap(f.fileno(), 0, prot=mmap.PROT_READ)
226226

227227
for line in iter(fd.readline, b""):
228228
line = line.decode('utf-8').strip().split(":")
@@ -244,7 +244,7 @@ def read_file(self):
244244
twu = {k: v for k, v in twu.items() if v >= self.minUtil}
245245

246246
# Sort TWU items by utility
247-
twu = {k: v for k, v in sorted(twu.items(), key=lambda item_: item_[1], reverse=True)}
247+
twu = {k: v for k, v in sorted(twu.items(), key=lambda item: item[1], reverse=True)}
248248

249249
strToInt = {}
250250
t = len(twu)
@@ -417,10 +417,10 @@ def save(self, outputFile):
417417
:param outputFile: name of the output file
418418
:type outputFile: csv file
419419
"""
420-
with open(outputFile, 'w') as file_:
420+
with open(outputFile, 'w') as f:
421421
for key, value in self.Patterns.items():
422422
joined = " ".join(key) + " #UTIL: " + str(value) + "\n"
423-
file_.write(joined)
423+
f.write(joined)
424424

425425
@deprecated("It is recommended to use 'mine()' instead of 'mine()' for mining process. Starting from January 2025, 'mine()' will be completely terminated.")
426426
def startMine(self):

PAMI/highUtilityPatternsInStreams/HUPMS.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ def getPatternsAsDataFrame(self):
884884
:rtype: pandas.DataFrame
885885
"""
886886

887-
#dataframe = {}
887+
dataframe = {}
888888
data = []
889889
for x, y in self.__finalPatterns.items():
890890
for pattern in y:

PAMI/highUtilityPatternsInStreams/SHUGrowth.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -674,12 +674,12 @@ def createPrefixBranch(self, root):
674674

675675
chosenItemset = stack[0]
676676
lastUtil = sum(chosenItemset.utility)
677-
#curBacthes = [i for i, e in enumerate(chosenItemset.utility) if e != 0]
677+
curBacthes = [i for i, e in enumerate(chosenItemset.utility) if e != 0]
678678

679679
otherUtilites = []
680680

681681
for i in range(1, len(stack)-1):
682-
#curItemset = stack[i]
682+
curItemset = stack[i]
683683
epu = lastUtil
684684

685685
for j in range(i-1, 0, -1):
@@ -968,7 +968,7 @@ def getPatternsAsDataFrame(self):
968968
:rtype: pandas.DataFrame
969969
"""
970970

971-
#dataframe = {}
971+
dataframe = {}
972972
data = []
973973
for x, y in self.__finalPatterns.items():
974974
for pattern in y:

PAMI/highUtilitySpatialPattern/basic/HDSHUIM.py

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ class HDSHUIM(_ab._utilityPatterns):
293293

294294
def __init__(self, iFile: str, nFile: str, minUtil: int, sep: str="\t") -> None:
295295
super().__init__(iFile, nFile, minUtil, sep)
296-
self.oFile = None
296+
#self.oFile = None
297297
self._startTime = 0
298298
self._endTime = 0
299299
self._huiCount = 0
@@ -344,37 +344,37 @@ def mine(self) -> None:
344344
for line in file1:
345345
line = line.split("\n")[0]
346346
parts = line.split(self._sep)
347-
parts = [i_.strip() for i_ in parts]
347+
parts = [i.strip() for i in parts]
348348
item = parts[0]
349349
neigh1 = list()
350-
for j in range(1, len(parts)):
351-
neigh1.append(parts[j])
350+
for i in range(1, len(parts)):
351+
neigh1.append(parts[i])
352352
self._neighbors[item] = set(neigh1)
353353
with open(self._iFile, 'r') as file:
354354
for line in file:
355355
parts = line.split(":")
356356
itemString = (parts[0].split("\n")[0]).split(self._sep)
357357
utilityString = (parts[2].split("\n")[0]).split(self._sep)
358-
#transUtility = int(parts[1])
358+
transUtility = int(parts[1])
359359
trans1 = set()
360-
for j in range(0, len(itemString)):
361-
trans1.add(itemString[j])
362-
for j in range(0, len(itemString)):
363-
item = itemString[j]
360+
for i in range(0, len(itemString)):
361+
trans1.add(itemString[i])
362+
for i in range(0, len(itemString)):
363+
item = itemString[i]
364364
twu = self._mapOfPMU.get(item)
365365
if twu is None:
366-
twu = int(utilityString[j])
366+
twu = int(utilityString[i])
367367
else:
368-
twu += int(utilityString[j])
368+
twu += int(utilityString[i])
369369
self._mapOfPMU[item] = twu
370370
if self._neighbors.get(item) is None:
371371
continue
372372
neighbours2 = trans1.intersection(self._neighbors.get(item))
373373
for item2 in neighbours2:
374374
if self._mapOfPMU.get(item2) is None:
375-
self._mapOfPMU[item2] = int(utilityString[j])
375+
self._mapOfPMU[item2] = int(utilityString[i])
376376
else:
377-
self._mapOfPMU[item2] += int(utilityString[j])
377+
self._mapOfPMU[item2] += int(utilityString[i])
378378

379379
listOfCUList = []
380380
hashTable = {}
@@ -395,10 +395,10 @@ def mine(self) -> None:
395395
newTwu = 0
396396
txKey = []
397397
revisedTrans = []
398-
for j in range(0, len(items)):
398+
for i in range(0, len(items)):
399399
pair = _Pair()
400-
pair.item = items[j]
401-
pair.utility = int(utilities[j])
400+
pair.item = items[i]
401+
pair.utility = int(utilities[i])
402402
if self._mapOfPMU.get(pair.item) >= minUtil:
403403
revisedTrans.append(pair)
404404
txKey.append(pair.item)
@@ -408,35 +408,35 @@ def mine(self) -> None:
408408
if len(revisedTrans) > 0:
409409
if txKey1 not in hashTable.keys():
410410
hashTable[txKey1] = len(mapItemsToCUList[revisedTrans[len(revisedTrans) - 1].item].elements)
411-
for j in range(len(revisedTrans) - 1, -1, -1):
412-
pair = revisedTrans[j]
411+
for i in range(len(revisedTrans) - 1, -1, -1):
412+
pair = revisedTrans[i]
413413
cuListOfItems = mapItemsToCUList.get(pair.item)
414414
element = _Element(ts, pair.utility, ru, 0, 0)
415-
if j > 0:
416-
element.prevPos = len(mapItemsToCUList[revisedTrans[j - 1].item].elements)
415+
if i > 0:
416+
element.prevPos = len(mapItemsToCUList[revisedTrans[i - 1].item].elements)
417417
else:
418418
element.prevPos = -1
419419
cuListOfItems.addElements(element)
420420
ru += pair.utility
421421
else:
422422
pos = hashTable[txKey1]
423423
ru = 0
424-
for j in range(len(revisedTrans) - 1, -1, -1):
425-
cuListOfItems = mapItemsToCUList[revisedTrans[j].item]
426-
cuListOfItems.elements[pos].snu += revisedTrans[j].utility
424+
for i in range(len(revisedTrans) - 1, -1, -1):
425+
cuListOfItems = mapItemsToCUList[revisedTrans[i].item]
426+
cuListOfItems.elements[pos].snu += revisedTrans[i].utility
427427
cuListOfItems.elements[pos].remainingUtility += ru
428-
cuListOfItems.sumSnu += revisedTrans[j].utility
428+
cuListOfItems.sumSnu += revisedTrans[i].utility
429429
cuListOfItems.sumRemainingUtility += ru
430-
ru += revisedTrans[j].utility
430+
ru += revisedTrans[i].utility
431431
pos = cuListOfItems.elements[pos].prevPos
432432
# EUCS
433-
for j in range(len(revisedTrans) - 1, -1, -1):
434-
pair = revisedTrans[j]
433+
for i in range(len(revisedTrans) - 1, -1, -1):
434+
pair = revisedTrans[i]
435435
mapFMAPItem = self._mapFMAP.get(pair.item)
436436
if mapFMAPItem is None:
437437
mapFMAPItem = {}
438438
self._mapFMAP[pair.item] = mapFMAPItem
439-
for j in range(j + 1, len(revisedTrans)):
439+
for j in range(i + 1, len(revisedTrans)):
440440
pairAfter = revisedTrans[j]
441441
twuSUm = mapFMAPItem.get(pairAfter.item)
442442
if twuSUm is None:
@@ -467,19 +467,19 @@ def _ExploreSearchTree(self, prefix: List[str], uList: List[_CUList], exNeighbou
467467
:type minUtil:int
468468
:return: None
469469
"""
470-
for k in range(0, len(uList)):
471-
x = uList[k]
470+
for i in range(0, len(uList)):
471+
x = uList[i]
472472
if x.item not in exNeighbours:
473473
continue
474474
self._candidates += 1
475-
#sortedPrefix = [0] * (len(prefix) + 1)
475+
sortedPrefix = [0] * (len(prefix) + 1)
476476
sortedPrefix = prefix[0:len(prefix) + 1]
477477
sortedPrefix.append(x.item)
478478
if (x.sumSnu + x.sumCu >= minUtil) and (x.item in exNeighbours):
479479
self._saveItemSet(prefix, len(prefix), x.item, x.sumSnu + x.sumCu)
480480
if x.sumSnu + x.sumCu + x.sumRemainingUtility + x.sumCru >= minUtil: # U-Prune # and (x.item in exNeighbours)):
481481
ULIST = []
482-
for j in range(k, len(uList)):
482+
for j in range(i, len(uList)):
483483
if (uList[j].item in exNeighbours) and (self._neighbors.get(x.item) is not None) and (
484484
uList[j].item in self._neighbors.get(x.item)):
485485
ULIST.append(uList[j])
@@ -512,8 +512,8 @@ def _constructCUL(self, x: _Element, compactUList: List[_CUList], st: int, minUt
512512
lau = []
513513
cUtil = []
514514
eyTs = []
515-
for i__ in range(0, len(compactUList)):
516-
uList = _CUList(compactUList[i__].item)
515+
for i in range(0, len(compactUList)):
516+
uList = _CUList(compactUList[i].item)
517517
exCul.append(uList)
518518
lau.append(0)
519519
cUtil.append(0)
@@ -558,12 +558,12 @@ def _constructCUL(self, x: _Element, compactUList: List[_CUList], st: int, minUt
558558
newT1 = tuple(newT)
559559
if newT1 not in hashTable.keys():
560560
hashTable[newT1] = len(exCul[newT[len(newT) - 1]].elements)
561-
for i__ in range(len(newT) - 1, -1, -1):
562-
cuListOfItems = exCul[newT[i__]]
563-
y = compactUList[newT[i__]].elements[eyTs[newT[i__]]]
561+
for i in range(len(newT) - 1, -1, -1):
562+
cuListOfItems = exCul[newT[i]]
563+
y = compactUList[newT[i]].elements[eyTs[newT[i]]]
564564
element = _Element(ex.ts, ex.snu + y.snu - ex.pu, ru, ex.snu, 0)
565-
if i__ > 0:
566-
element.prevPos = len(exCul[newT[i__ - 1]].elements)
565+
if i > 0:
566+
element.prevPos = len(exCul[newT[i - 1]].elements)
567567
else:
568568
element.prevPos = -1
569569
cuListOfItems.addElements(element)
@@ -660,8 +660,8 @@ def _saveItemSet(self, prefix: List[str], prefixLen: int, item: str, utility: in
660660
"""
661661
self._huiCount += 1
662662
res = str()
663-
for _ in range(0, prefixLen):
664-
res += str(prefix[_]) + "\t"
663+
for i in range(0, prefixLen):
664+
res += str(prefix[i]) + "\t"
665665
res += str(item)
666666
res1 = str(utility)
667667
self._finalPatterns[res] = res1

0 commit comments

Comments
 (0)