Skip to content

Commit f7649c0

Browse files
committed
Improved docs, refactor data folder
1 parent 276e1b8 commit f7649c0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1756
-261
lines changed

README.md

Lines changed: 0 additions & 1 deletion

configuration/demos_config.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
random_seed = 100
33
base_year = 2010
44
forecast_year = 2019
5-
calibrated_models_dir = "../data/calibrated_configs/custom/06197001"
5+
calibrated_models_dir = "../data/sf_bay_example/calibrated_models_coefficients/"
66
inconsistent_persons_table_behavior = "fix"
77
modules = [
88
"aging",
@@ -31,33 +31,33 @@ initialize_empty_tables = [
3131
[[tables]]
3232
file_type = "h5"
3333
table_name = "persons"
34-
filepath = "../data/custom_mpo_06197001_model_data.h5"
34+
filepath = "../data/sf_bay_example/custom_mpo_06197001_model_data.h5"
3535
h5_key = "persons"
3636

3737
[[tables]]
3838
file_type = "h5"
3939
table_name = "households"
40-
filepath = "../data/custom_mpo_06197001_model_data.h5"
40+
filepath = "../data/sf_bay_example/custom_mpo_06197001_model_data.h5"
4141
h5_key = "households"
4242

4343
## Other static data tables
4444
[[tables]]
4545
file_type = "csv"
4646
table_name = "relational_adjustment_mapping"
47-
filepath = "../data/relmap_06197001.csv"
47+
filepath = "../data/sf_bay_example/relmap_06197001.csv"
4848
index_col = "index"
4949

5050
[[tables]]
5151
file_type = "csv"
5252
table_name = "income_rates"
53-
filepath = "../data/income_rates_06197001.csv"
53+
filepath = "../data/sf_bay_example/observed_calibration_values/income_rates_06197001.csv"
5454
index_col = "year"
5555
custom_dtype_casting = {"lcm_county_id" = "object", "year" = "int", "rate" = "float"}
5656

5757
[[tables]]
5858
file_type = "csv"
5959
table_name = "hsize_ct"
60-
filepath = "../data/hsize_ct_06197001.csv"
60+
filepath = "../data/sf_bay_example/observed_calibration_values/hsize_ct_06197001.csv"
6161
index_col = "year"
6262
custom_dtype_casting = {"lcm_county_id" = "object", "year" = "int", "hh_size" = "object", "total_number_of_households" = "int"}
6363

@@ -67,13 +67,13 @@ custom_dtype_casting = {"lcm_county_id" = "object", "year" = "int", "hh_size" =
6767
[[tables]]
6868
file_type = "csv"
6969
table_name = "observed_employment"
70-
filepath = "../data/calibrated_values/calibration/06197001/employment_obs.csv"
70+
filepath = "../data/sf_bay_example/observed_calibration_values/employment_obs.csv"
7171
index_col = "year"
7272

7373
[[tables]]
7474
file_type = "csv"
7575
table_name = "observed_marrital_data"
76-
filepath = "../data/calibrated_values/calibration/06197001/marrital_status_over_time_obs.csv"
76+
filepath = "../data/sf_bay_example/observed_calibration_values/marrital_status_over_time_obs.csv"
7777
index_col = "year"
7878

7979

@@ -93,7 +93,7 @@ max_iter = 1000
9393
[mortality_module_config.calibration_procedure.observed_values_table]
9494
file_type = "csv"
9595
table_name = "observed_fatalities_data"
96-
filepath = "../data/calibrated_values/calibration/06197001/mortalities_over_time_obs.csv"
96+
filepath = "../data/sf_bay_example/observed_calibration_values/mortalities_over_time_obs.csv"
9797
index_col = "year"
9898

9999
## Birth
@@ -105,7 +105,7 @@ max_iter = 1000
105105
[birth_module_config.calibration_procedure.observed_values_table]
106106
file_type = "csv"
107107
table_name = "observed_births_data"
108-
filepath = "../data/calibrated_values/calibration/06197001/births_over_time_obs.csv"
108+
filepath = "../data/sf_bay_example/observed_calibration_values/births_over_time_obs.csv"
109109
index_col = "year"
110110

111111
## HH Reorg

data/.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
!calibrated_values/**
55
!calibrated_configs/
66
!calibrated_configs/**
7-
**/.DS_Store
7+
!sf_bay_example/
8+
!sf_bay_example/**
9+
**/.DS_Store
10+
**.h5

data/calibrated_values/calibration/48197301/births_over_time_obs.csv

Lines changed: 0 additions & 11 deletions
This file was deleted.

data/calibrated_values/calibration/48197301/enrollment_over_time_obs.csv

Lines changed: 0 additions & 11 deletions
This file was deleted.

data/calibrated_values/calibration/48197301/households_over_time_obs.csv

Lines changed: 0 additions & 12 deletions
This file was deleted.

data/calibrated_values/calibration/48197301/marrital_status_over_time_obs.csv

Lines changed: 0 additions & 51 deletions
This file was deleted.

data/calibrated_values/calibration/48197301/mortalities_over_time_obs.csv

Lines changed: 0 additions & 11 deletions
This file was deleted.

data/calibrated_values/calibration/48197301/pop_over_time_obs.csv

Lines changed: 0 additions & 10 deletions
This file was deleted.

data/calibrated_values/simulation/06197001/age_dist_over_time_06197001.csv

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)