reorganize tables

econ-ark · Feb 26, 2024 · 99271e2 · 99271e2
1 parent a1c660b
commit 99271e2
Show file tree

Hide file tree

Showing 35 changed files with 13 additions and 19 deletions.
diff --git a/code/estimark/data/Cagetti2003.csv → code/data/Cagetti2003.csv b/code/estimark/data/Cagetti2003.csv → code/data/Cagetti2003.csv
diff --git a/code/estimark/data/SCFdata.csv → code/data/SCFdata.csv b/code/estimark/data/SCFdata.csv → code/data/SCFdata.csv
diff --git a/code/estimark/estimation.py b/code/estimark/estimation.py
@@ -10,7 +10,6 @@
 """
 
 import csv
-from pathlib import Path
 from time import time  # Timing utility
 
 import matplotlib.pyplot as plt
@@ -35,15 +34,15 @@
 )
 
 # Parameters for the consumer type and the estimation
-from estimark.calibration.parameters import (
+from estimark.parameters import (
     init_consumer_objects,
     init_subjective_labor,
     init_subjective_stock,
     options,
 )
 
 # SCF 2004 data on household wealth
-from estimark.calibration.scf import (
+from estimark.scf import (
     age_groups,
     scf_array,
     scf_data,
@@ -54,7 +53,7 @@
 
 # Pathnames to the other files:
 # Relative directory for primitive parameter files
-tables_dir = "code/tables/"
+tables_dir = "content/tables/"
 # Relative directory for primitive parameter files
 figures_dir = "content/figures/"
 
@@ -152,12 +151,7 @@ def get_targeted_moments(data=scf_data, weights=scf_weights, groups=scf_groups):
 def get_initial_guess(agent_name):
     # start from previous estimation results if available
 
-    csv_file_path = (
-        Path(__file__).resolve().parent
-        / ".."
-        / "tables"
-        / (agent_name + "_estimate_results.csv")
-    )
+    csv_file_path = tables_dir + agent_name + "_estimate_results.csv"
 
     try:
         with open(csv_file_path, "r") as file:
@@ -385,7 +379,7 @@ def smm_obj_func_redux(params):
     print(f"Estimated values: DiscFacAdj={model_estimate[0]}, CRRA={model_estimate[1]}")
 
     # Create the simple estimate table
-    estimate_results_file = tables_dir + "/" + agent_name + "_estimate_results.csv"
+    estimate_results_file = tables_dir + agent_name + "_estimate_results.csv"
 
     with open(estimate_results_file, "wt") as f:
         writer = csv.writer(f)
@@ -427,7 +421,7 @@ def do_compute_se_boostrap(
     print(f"Standard errors: DiscFacAdj--> {std_errors[0]}, CRRA--> {std_errors[1]}")
 
     # Create the simple bootstrap table
-    bootstrap_results_file = tables_dir + "/" + agent_name + "_bootstrap_results.csv"
+    bootstrap_results_file = tables_dir + agent_name + "_bootstrap_results.csv"
 
     with open(bootstrap_results_file, "wt") as f:
         writer = csv.writer(f)
@@ -487,9 +481,9 @@ def simulate_moments_redux(params):
     axs[1].set_ylabel("Sensitivity")
     axs[1].set_xlabel("Median W/Y Ratio")
 
-    plt.savefig(figures_dir + "/" + agent_name + "Sensitivity.pdf")
-    plt.savefig(figures_dir + "/" + agent_name + "Sensitivity.png")
-    plt.savefig(figures_dir + "/" + agent_name + "Sensitivity.svg")
+    plt.savefig(figures_dir + agent_name + "Sensitivity.pdf")
+    plt.savefig(figures_dir + agent_name + "Sensitivity.png")
+    plt.savefig(figures_dir + agent_name + "Sensitivity.svg")
 
     plt.show()
 
@@ -530,9 +524,9 @@ def do_make_contour_plot(agent_name, estimation_agent, model_estimate, target_mo
     plt.plot(model_estimate[1], model_estimate[0], "*r", ms=15)
     plt.xlabel(r"coefficient of relative risk aversion $\rho$", fontsize=14)
     plt.ylabel(r"discount factor adjustment $\beth$", fontsize=14)
-    plt.savefig(figures_dir + "/" + agent_name + "SMMcontour.pdf")
-    plt.savefig(figures_dir + "/" + agent_name + "SMMcontour.png")
-    plt.savefig(figures_dir + "/" + agent_name + "SMMcontour.svg")
+    plt.savefig(figures_dir + agent_name + "SMMcontour.pdf")
+    plt.savefig(figures_dir + agent_name + "SMMcontour.png")
+    plt.savefig(figures_dir + agent_name + "SMMcontour.svg")
     plt.show()
 
 

diff --git a/code/estimark/calibration/parameters.py → code/estimark/parameters.py b/code/estimark/calibration/parameters.py → code/estimark/parameters.py
diff --git a/code/estimark/calibration/scf.py → code/estimark/scf.py b/code/estimark/calibration/scf.py → code/estimark/scf.py
@@ -6,7 +6,7 @@
 
 import numpy as np  # Numerical Python
 import pandas as pd
-from estimark.calibration.parameters import initial_age
+from estimark.parameters import initial_age
 
 # Get the directory containing the current file and construct the full path to the CSV file
 csv_file_path = Path(__file__).resolve().parent / ".." / "data" / "SCFdata.csv"

diff --git a/code/IndShock.ipynb → code/notebooks/IndShock.ipynb b/code/IndShock.ipynb → code/notebooks/IndShock.ipynb
diff --git a/code/Portfolio.ipynb → code/notebooks/Portfolio.ipynb b/code/Portfolio.ipynb → code/notebooks/Portfolio.ipynb
diff --git a/code/WarmGlow.ipynb → code/notebooks/WarmGlow.ipynb b/code/WarmGlow.ipynb → code/notebooks/WarmGlow.ipynb
diff --git a/code/WarmGlowPortfolio.ipynb → code/notebooks/WarmGlowPortfolio.ipynb b/code/WarmGlowPortfolio.ipynb → code/notebooks/WarmGlowPortfolio.ipynb
diff --git a/code/WealthPortfolio.ipynb → code/notebooks/WealthPortfolio.ipynb b/code/WealthPortfolio.ipynb → code/notebooks/WealthPortfolio.ipynb
diff --git a/...hockSub(Labor)Market_estimate_results.csv → ...hockSub(Labor)Market_estimate_results.csv b/...hockSub(Labor)Market_estimate_results.csv → ...hockSub(Labor)Market_estimate_results.csv
diff --git a/...(Stock)(Labor)Market_estimate_results.csv → ...(Stock)(Labor)Market_estimate_results.csv b/...(Stock)(Labor)Market_estimate_results.csv → ...(Stock)(Labor)Market_estimate_results.csv
diff --git a/...hockSub(Stock)Market_estimate_results.csv → ...hockSub(Stock)Market_estimate_results.csv b/...hockSub(Stock)Market_estimate_results.csv → ...hockSub(Stock)Market_estimate_results.csv
diff --git a/code/tables/IndShock_bootstrap_results.csv → ...ent/tables/IndShock_bootstrap_results.csv b/code/tables/IndShock_bootstrap_results.csv → ...ent/tables/IndShock_bootstrap_results.csv
diff --git a/code/tables/IndShock_estimate_results.csv → content/tables/IndShock_estimate_results.csv b/code/tables/IndShock_estimate_results.csv → content/tables/IndShock_estimate_results.csv
diff --git a/...olioSub(Labor)Market_estimate_results.csv → ...olioSub(Labor)Market_estimate_results.csv b/...olioSub(Labor)Market_estimate_results.csv → ...olioSub(Labor)Market_estimate_results.csv
diff --git a/...(Stock)(Labor)Market_estimate_results.csv → ...(Stock)(Labor)Market_estimate_results.csv b/...(Stock)(Labor)Market_estimate_results.csv → ...(Stock)(Labor)Market_estimate_results.csv
diff --git a/...olioSub(Stock)Market_estimate_results.csv → ...olioSub(Stock)Market_estimate_results.csv b/...olioSub(Stock)Market_estimate_results.csv → ...olioSub(Stock)Market_estimate_results.csv
diff --git a/code/tables/Portfolio_bootstrap_results.csv → ...nt/tables/Portfolio_bootstrap_results.csv b/code/tables/Portfolio_bootstrap_results.csv → ...nt/tables/Portfolio_bootstrap_results.csv
diff --git a/code/tables/Portfolio_estimate_results.csv → ...ent/tables/Portfolio_estimate_results.csv b/code/tables/Portfolio_estimate_results.csv → ...ent/tables/Portfolio_estimate_results.csv
diff --git a/...olioSub(Labor)Market_estimate_results.csv → ...olioSub(Labor)Market_estimate_results.csv b/...olioSub(Labor)Market_estimate_results.csv → ...olioSub(Labor)Market_estimate_results.csv
diff --git a/...(Stock)(Labor)Market_estimate_results.csv → ...(Stock)(Labor)Market_estimate_results.csv b/...(Stock)(Labor)Market_estimate_results.csv → ...(Stock)(Labor)Market_estimate_results.csv
diff --git a/...olioSub(Stock)Market_estimate_results.csv → ...olioSub(Stock)Market_estimate_results.csv b/...olioSub(Stock)Market_estimate_results.csv → ...olioSub(Stock)Market_estimate_results.csv
diff --git a/...s/WarmGlowPortfolio_bootstrap_results.csv → ...s/WarmGlowPortfolio_bootstrap_results.csv b/...s/WarmGlowPortfolio_bootstrap_results.csv → ...s/WarmGlowPortfolio_bootstrap_results.csv
diff --git a/...es/WarmGlowPortfolio_estimate_results.csv → ...es/WarmGlowPortfolio_estimate_results.csv b/...es/WarmGlowPortfolio_estimate_results.csv → ...es/WarmGlowPortfolio_estimate_results.csv
diff --git a/...GlowSub(Labor)Market_estimate_results.csv → ...GlowSub(Labor)Market_estimate_results.csv b/...GlowSub(Labor)Market_estimate_results.csv → ...GlowSub(Labor)Market_estimate_results.csv
diff --git a/...(Stock)(Labor)Market_estimate_results.csv → ...(Stock)(Labor)Market_estimate_results.csv b/...(Stock)(Labor)Market_estimate_results.csv → ...(Stock)(Labor)Market_estimate_results.csv
diff --git a/...GlowSub(Stock)Market_estimate_results.csv → ...GlowSub(Stock)Market_estimate_results.csv b/...GlowSub(Stock)Market_estimate_results.csv → ...GlowSub(Stock)Market_estimate_results.csv
diff --git a/code/tables/WarmGlow_bootstrap_results.csv → ...ent/tables/WarmGlow_bootstrap_results.csv b/code/tables/WarmGlow_bootstrap_results.csv → ...ent/tables/WarmGlow_bootstrap_results.csv
diff --git a/code/tables/WarmGlow_estimate_results.csv → content/tables/WarmGlow_estimate_results.csv b/code/tables/WarmGlow_estimate_results.csv → content/tables/WarmGlow_estimate_results.csv
diff --git a/...olioSub(Labor)Market_estimate_results.csv → ...olioSub(Labor)Market_estimate_results.csv b/...olioSub(Labor)Market_estimate_results.csv → ...olioSub(Labor)Market_estimate_results.csv
diff --git a/...(Stock)(Labor)Market_estimate_results.csv → ...(Stock)(Labor)Market_estimate_results.csv b/...(Stock)(Labor)Market_estimate_results.csv → ...(Stock)(Labor)Market_estimate_results.csv
diff --git a/...olioSub(Stock)Market_estimate_results.csv → ...olioSub(Stock)Market_estimate_results.csv b/...olioSub(Stock)Market_estimate_results.csv → ...olioSub(Stock)Market_estimate_results.csv
diff --git a/...les/WealthPortfolio_bootstrap_results.csv → ...les/WealthPortfolio_bootstrap_results.csv b/...les/WealthPortfolio_bootstrap_results.csv → ...les/WealthPortfolio_bootstrap_results.csv
diff --git a/...bles/WealthPortfolio_estimate_results.csv → ...bles/WealthPortfolio_estimate_results.csv b/...bles/WealthPortfolio_estimate_results.csv → ...bles/WealthPortfolio_estimate_results.csv