Merge branch 'master'

code/expt/dist_cor.py

@@ -94,6 +94,7 @@ def main(args):
     print(' [OK]', flush=True)
 
 
+<<<<<<< HEAD
 '''
   Parse arguments.
 
@@ -101,14 +102,27 @@ def main(args):
     iter - The number of iterations.
     time - The time limit of the sequence.
 '''
+=======
+>>>>>>> c41503ed41d8a9bd773425e9d430d4468ff45b92
 def parse_args():
+  '''
+    Parse arguments.
+
+    Optional:
+      iter - The number of repetitions.
+      time - The time limit of the sequence.
+  '''
   # Create argument parser.
   parser = argparse.ArgumentParser()
 
   # Mandatory 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)
+>>>>>>> c41503ed41d8a9bd773425e9d430d4468ff45b92
   parser.add_argument('-t', '--time', help='The time limit of the sequence.', type=int, default=100)
 
   # Parse arguments.