Skip to content

Fix for three small bugs: #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pranomostro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for three small bugs: #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions py/competitors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,10 @@ def select(TS, P, C):
if len(P) >= B+1:
break

del U[s]
try:
del U[s]
except:
pass
C = C - set([s])

ptime = time.clock() - ptime_start
Expand Down Expand Up @@ -280,7 +283,10 @@ def select(TS, P, C):
break

Cg = Cg | U[s]
del U[s]
try:
del U[s]
except:
pass
C = C - set([s])

ptime = time.clock() - ptime_start
Expand Down
4 changes: 2 additions & 2 deletions py/experimentAdequate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ def one_(x): return 1
sOut = "{}/{}-{}.pickle".format(sPath, "FAST-all", run+1)
pickle.dump(sel, open(sOut, "wb"))
tOut = "{}/{}-{}.pickle".format(tPath, "FAST-all", run+1)
pickle.dump((pTime, cTime, rTime, fdl, tsr), open(tOut, "wb"))
print("FAST-all", pTime, cTime, rTime, fdl, tsr)
pickle.dump((pTime, cTime, sTime, fdl, tsr), open(tOut, "wb"))
print("FAST-all", pTime, cTime, sTime, fdl, tsr)


# WHITEBOX EXPERIMENTS
Expand Down
6 changes: 3 additions & 3 deletions py/fastr_adequate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def loadSignatures(input_file):
return sig, time.clock() - start


def loadCoverage(wBoxFile):
def loadCoverageStart1(wBoxFile):
C = defaultdict(set)
with open(wBoxFile) as fin:
for tc, cov in enumerate(fin):
Expand All @@ -106,7 +106,7 @@ def fast_pw(input_file, wBoxFile, r, b, bbox=False, k=5, memory=False):
n = r * b # number of hash functions

tC0 = time.clock()
C = loadCoverage(wBoxFile)
C = loadCoverageStart1(wBoxFile)
tC1 = time.clock()
maxCov = reduce(lambda x, y: x | y, C.values())

Expand Down Expand Up @@ -225,7 +225,7 @@ def fast_(input_file, wBoxFile, selsize, r, b, bbox=False, k=5, memory=False):
n = r * b # number of hash functions

tC0 = time.clock()
C = loadCoverage(wBoxFile)
C = loadCoverageStart1(wBoxFile)
tC1 = time.clock()
maxCov = reduce(lambda x, y: x | y, C.values())

Expand Down