Commits

stevejb committed db6ab15

Modified the comparative static to only do log(epsilon_P) and the host to run in verbose mode. Probably won't be using these again for this paper

  • Participants
  • Parent commits 01a2b8f

Comments (0)

Files changed (2)

File awslauncher/ISSClient.py

       print("uuid_i   : " +  uuid_i    ) 
       print("uuid_g   : " +  uuid_g    ) 
 
-      runstr = "/home/ec2-user/is-solver/solve_isC-icpc "
+      runstr = "/home/ec2-user/is-solver/solve_isC-icpc --verbose "
       for k in paramDict.keys():
         runstr += "--" + k + "='" + str(float(paramDict[k])) + "' "
       runstr += "--uuid_i='" + filename_prefix +  "'"
       s3_path_prefix = os.path.join(uuid_g, uuid_i)
       # filelist = [ "policy.csv", "paths-00-c00.csv", "paths-00-c02.csv", "trans-only.csv", "perm-only.csv", "full-shocks.csv", "shockstates.csv", "controlstates.csv", "ptrans.csv", "success.txt", "params.csv", "value.csv", "simplepolicyreport.txt", "fs-moments.csv"]
       #filelist = [ "params.csv",  "fs-moments2.csv", "success.txt"]
-      filelist = [ "params.csv",  "fs-moments2.csv", "success.txt", "--trans-only--fs-moments2.csv", "policy.csv", "shockstates.csv", "controlstates.csv",  "value-barr.csv", "value-ddw.csv", "value-barr.bin", "value-ddw.bin", "--trans-only--value-ddw.bin", "--tr--fs-moments2.csv"]
+      filelist = [ "params.csv",  "fs-moments2.csv", "success.txt", "--trans-only--fs-moments2.csv", "policy.csv", "shockstates.csv", "controlstates.csv",  "value-barr.csv", "value-ddw.csv", "value-barr.bin", "value-ddw.bin", "--trans-only--value-ddw.bin", "--tr--fs-moments2.csv", "k_prev_RAW.csv", "p_prev_RAW.csv", "debt_RAW.csv", "epsilon_P_RAW.csv", "eq_issuance_MOMENT.csv", "inv_MOMENT.csv", "lev_MOMENT.csv", "operating_income_MOMENT.csv", "value_RAW.csv"]
       if successful:
         output_strings = {}
         output_strings['success'] = str(1)

File awslauncher/createISS_compstatic_tasks.py

   print("- create " + str(ptable.shape[0]) + " jobs")
   print("- create entries in " + runs_domain)
   print("- create SQS tasks in " + queueName)
-  # ans = raw_input("Press [ENTER] to continue or q to quit")
+  ans = raw_input("Press [ENTER] to continue or q to quit")
 
-  # if not ans == "":
-  #   print("ABANDON SHIP")
-  #   #sys.exit(1)
-  #   return
+  if not ans == "":
+    print("ABANDON SHIP")
+    #sys.exit(1)
+    return
 
   print("============POPULATING RUNS");
 
       length = int(rangeinput[2])
       inrange = np.linspace(start,stop, length)
       paramDict[k] = inrange
+    if(k == "epsilon_P"):
+      print("Taking log")
+      paramDict[k] = np.log(paramDict[k])
+      print str(paramDict[k])
   return(paramDict)
   
 
 
 ###### csRanges
 csRanges = OrderedDict()
-csRanges['theta']     = np.array([0.5, 0.95, 50])
-csRanges['rho']       = np.array([0.15, 0.95, 50])
-csRanges['sigma_v']   = np.array([0.01, 0.6, 50])
-csRanges['a']         = np.array([0.001, 0.1, 50])
-csRanges['gamma']     = np.array([0.0001, 0.1, 50])
-csRanges['s']         = np.array([0.0001, 0.1, 50])
-csRanges['lambda_1']  = np.array([0.01, 0.5, 50])
-csRanges['lambda_2']  = np.array([0.001, 0.1, 50])
-csRanges['sigma_p']   = np.array([0.50])
-csRanges['r']         = np.array([0.01, 0.2, 20])
-csRanges['delta']     = np.array([0.01, 0.3, 30])
-csRanges['tau_c']     = np.array([0.350])
+# csRanges['theta']     = np.array([0.5, 0.95, 50])
+# csRanges['rho']       = np.array([0.15, 0.95, 50])
+# csRanges['sigma_v']   = np.array([0.01, 0.6, 50])
+# csRanges['a']         = np.array([0.001, 0.1, 50])
+# csRanges['gamma']     = np.array([0.0001, 0.1, 50])
+# csRanges['s']         = np.array([0.0001, 0.1, 50])
+# csRanges['lambda_1']  = np.array([0.01, 0.5, 50])
+# csRanges['lambda_2']  = np.array([0.001, 0.1, 50])
+# csRanges['sigma_p']   = np.array([0.50])
+# csRanges['r']         = np.array([0.01, 0.2, 20])
+# csRanges['delta']     = np.array([0.01, 0.3, 30])
+# csRanges['tau_c']     = np.array([0.350])
 csRanges['epsilon_P'] = np.array([0.001, 0.05, 50])