manos/the-last-thing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved conflicts

Browse Source
This commit is contained in:
Manos Katsomallos 2021-10-15 14:44:33 +02:00
parent 20010b0167
commit 1bd83b008f
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/expt/dist_cor.py
View File

@ -94,16 +94,6 @@ def main(args):
print(' [OK]', flush=True) print(' [OK]', flush=True)
<<<<<<< HEAD
'''
Parse arguments.
Optional:
iter - The number of iterations.
time - The time limit of the sequence.
'''
=======
>>>>>>> c41503ed41d8a9bd773425e9d430d4468ff45b92
def parse_args(): def parse_args():
''' '''
Parse arguments. Parse arguments.
@ -118,11 +108,7 @@ def parse_args():
# Mandatory arguments. # Mandatory arguments.
# Optional arguments. # Optional arguments.
<<<<<<< HEAD
parser.add_argument('-i', '--iter', help='The number of iterations.', type=int, default=1)
=======
parser.add_argument('-i', '--iter', help='The number of repetitions.', type=int, default=1) parser.add_argument('-i', '--iter', help='The number of repetitions.', type=int, default=1)
>>>>>>> c41503ed41d8a9bd773425e9d430d4468ff45b92
parser.add_argument('-t', '--time', help='The time limit of the sequence.', type=int, default=100) parser.add_argument('-t', '--time', help='The time limit of the sequence.', type=int, default=100)
# Parse arguments. # Parse arguments.