estimark

econ-ark · Jan 25, 2024 · 0b5dfb8 · 0b5dfb8
1 parent c8649b6
commit 0b5dfb8
Show file tree

Hide file tree

Showing 16 changed files with 600 additions and 600 deletions.
diff --git a/code/do_all.py b/code/do_all.py
@@ -46,13 +46,13 @@
 still run.
 """
 
-from code.calibration.options import (
+from estimark.calibration.options import (
     all_replications,
     high_resource,
     low_resource,
     medium_resource,
 )
-from code.estimation import estimate
+from estimark.estimation import estimate
 
 
 # Ask the user which replication to run, and run it:

diff --git a/code/do_figs.py b/code/do_figs.py
@@ -1,4 +1,4 @@
-from code.estimation import estimate_all
+from estimark.estimation import estimate_all
 
 if __name__ == "__main__":
     estimate_all()
diff --git a/code/__init__.py → code/estimark/__init__.py b/code/__init__.py → code/estimark/__init__.py
diff --git a/code/agents.py → code/estimark/agents.py b/code/agents.py → code/estimark/agents.py
diff --git a/code/calibration/estimation_parameters.py → ...mark/calibration/estimation_parameters.py b/code/calibration/estimation_parameters.py → ...mark/calibration/estimation_parameters.py
@@ -74,7 +74,7 @@
 )
 
 # Age-varying discount factors over the lifecycle, lifted from Cagetti (2003)
-DiscFac_timevary = np.genfromtxt("../data/Cagetti2003.csv")
+DiscFac_timevary = np.genfromtxt("code/estimark/data/Cagetti2003.csv")
 
 # Survival probabilities over the lifecycle
 liv_prb = parse_ssa_life_table(

diff --git a/code/calibration/options.py → code/estimark/calibration/options.py b/code/calibration/options.py → code/estimark/calibration/options.py
diff --git a/code/calibration/setup_scf_data.py → code/estimark/calibration/setup_scf_data.py b/code/calibration/setup_scf_data.py → code/estimark/calibration/setup_scf_data.py
@@ -2,7 +2,7 @@
 Sets up the SCF data for use in the SolvingMicroDSOPs estimation.
 """
 
-from code.calibration.estimation_parameters import (
+from estimark.calibration.estimation_parameters import (
     empirical_cohort_age_groups,
     initial_age,
 )
@@ -11,7 +11,7 @@
 import pandas as pd
 
 
-scf_data = pd.read_csv("code/data/SCFdata.csv")
+scf_data = pd.read_csv("code/estimark/data/SCFdata.csv")
 
 # Keep only observations with normal incomes > 0,
 # otherwise wealth/income is not well defined

diff --git a/code/data/Cagetti2003.csv → code/estimark/data/Cagetti2003.csv b/code/data/Cagetti2003.csv → code/estimark/data/Cagetti2003.csv
diff --git a/code/data/SCFdata.csv → code/estimark/data/SCFdata.csv b/code/data/SCFdata.csv → code/estimark/data/SCFdata.csv
diff --git a/code/estimation.py → code/estimark/estimation.py b/code/estimation.py → code/estimark/estimation.py
@@ -10,10 +10,10 @@
 """
 
 # Parameters for the consumer type and the estimation
-import code.calibration.estimation_parameters as parameters
-import code.calibration.setup_scf_data as scf_data  # SCF 2004 data on household wealth
+import estimark.calibration.estimation_parameters as parameters
+import estimark.calibration.setup_scf_data as scf_data  # SCF 2004 data on household wealth
 import csv
-from code.agents import (
+from estimark.agents import (
     BequestWarmGlowLifeCycleConsumerType,
     BequestWarmGlowLifeCyclePortfolioType,
     IndShkLifeCycleConsumerType,

diff --git a/code/notebooks/IndShock.ipynb b/code/notebooks/IndShock.ipynb
diff --git a/code/notebooks/Portfolio.ipynb b/code/notebooks/Portfolio.ipynb
diff --git a/code/notebooks/WarmGlow.ipynb b/code/notebooks/WarmGlow.ipynb
diff --git a/code/notebooks/WarmGlowPortfolio.ipynb b/code/notebooks/WarmGlowPortfolio.ipynb
diff --git a/code/notebooks/WealthPortfolio.ipynb b/code/notebooks/WealthPortfolio.ipynb
diff --git a/code/tests.py b/code/tests.py
@@ -1,5 +1,5 @@
-from code.calibration.options import low_resource, medium_resource
-from code.estimation import estimate
+from estimark.calibration.options import low_resource, medium_resource
+from estimark.estimation import estimate
 
 
 def test_low_resource():