Browse Source

Have run_experiments print whether it's doing public or private routing

Ian Goldberg 1 year ago
parent
commit
1b774a6160
1 changed files with 4 additions and 2 deletions
  1. 4 2
      run_experiments.py

+ 4 - 2
run_experiments.py

@@ -88,7 +88,8 @@ def run_exp(LOG_FOLDER, PRIVATE_ROUTE, NUM_EPOCHS, N, M, T, B, PRIV_OUT, PRIV_IN
                         os.mkdir(log_subfolder)
 
                     if(run == "diagnostic"):
-                        print("\n\n   Running DIAGNOSTIC t = %d, m = %d, n = %d \n\n" % (t, m, n))
+                        print("\n\n   Running %s DIAGNOSTIC t = %d, m = %d, n = %d \n\n" %
+                            ("private routing" if PRIVATE_ROUTE else "public routing", t, m, n))
                         # Manifest generated by diagnostic can be reused by the actual experiment
                         generate_manifest(n, m, t, b, PRIVATE_ROUTE, PRIV_OUT, PRIV_IN, PUB_OUT, PUB_IN)
                         generate_config(n, m, t, b, PRIVATE_ROUTE, PRIV_OUT, PRIV_IN, PUB_OUT, PUB_IN, num_WN_to_precompute)
@@ -99,7 +100,8 @@ def run_exp(LOG_FOLDER, PRIVATE_ROUTE, NUM_EPOCHS, N, M, T, B, PRIV_OUT, PRIV_IN
                         #num_sizes, pwn_max, epoch_max, scm_max = parse_output_logs(DIAGNOSTIC_FOLDER, experiment_name)
                         #print("From logs_to_csv: num_sizes = %d, pwn_max = %f, epoch_max = %f, scm_max = %f"
                         #% (num_sizes, pwn_max, epoch_max, scm_max))
-                        print("\n\n   Running EXPERIMENT t = %d, m = %d, n = %d \n\n" % (t, m, n))
+                        print("\n\n   Running %s EXPERIMENT t = %d, m = %d, n = %d \n\n" %
+                            ("private routing" if PRIVATE_ROUTE else "public routing", t, m, n))
                         #num_WN_to_precompute = math.ceil((num_sizes * pwn_max)/epoch_max)
                         #print("num_WN_to_precompute = %d" %(num_WN_to_precompute))
                         #if(num_WN_to_precompute < 2 * num_sizes):