From 3a0a946903f072116c8ba7cfe4e0802d646e7439 Mon Sep 17 00:00:00 2001
From: donboyd5 <donboyd5@gmail.com>
Date: Tue, 19 Nov 2024 04:11:58 -0500
Subject: [PATCH 01/11] initial move of files to subfolder

---
 tmd/areas/targets/prepare/.netlify/state.json       |   3 ---
 .../targets/prepare/{ => prepare_cds}/.Rprofile     |   0
 .../targets/prepare/{ => prepare_cds}/.gitignore    |   2 +-
 .../targets/prepare/{ => prepare_cds}/R/constants.R |   0
 .../targets/prepare/{ => prepare_cds}/R/functions.R |   0
 .../targets/prepare/{ => prepare_cds}/R/libraries.R |   0
 tmd/areas/targets/prepare/prepare_cds/README.md     |   6 ++++++
 .../targets/prepare/{ => prepare_cds}/_quarto.yml   |   2 +-
 .../{ => prepare_cds}/cd_IRS_documentation.qmd      |   0
 .../cd_compare_us_totals_tmd_vs_irs_published.qmd   |   0
 .../cd_construct_long_soi_data_file.qmd             |   0
 .../cd_construct_soi_variable_documentation.qmd     |   0
 .../cd_construct_variable_documentation.qmd         |   0
 ...ate_basefile_for_117Congress_cd_target_files.qmd |   0
 .../cd_create_basefile_multiple_sessions.qmd        |   0
 ...eate_cd_117_118_crosswalk_and_cdbasefile_118.qmd |   0
 .../cd_create_variable_mapping.qmd                  |   0
 ...cd_download_and_clean_census_population_data.qmd |   0
 .../{ => prepare_cds}/cd_download_soi_data.qmd      |   0
 .../cd_enhance_basefile_with_special_targets.qmd    |   0
 .../{ => prepare_cds}/cd_issues_and_TODOs.qmd       |   0
 .../{ => prepare_cds}/cdrecipes/cdrecipe.json       |   0
 .../cdrecipes/cdrecipe_template.json                |   0
 .../prepare/{ => prepare_cds}/cdrecipes/phase4.json |   0
 .../{ => prepare_cds}/cdrecipes/phase4_118.json     |   0
 .../prepare/{ => prepare_cds}/cdrecipes/phase5.json |   0
 .../{ => prepare_cds}/cdrecipes/phase5_salt.json    |   0
 .../cdrecipes/phase6_add_socsec.json                |   0
 .../prepare/{ => prepare_cds}/cds/final/.gitignore  |   0
 .../{ => prepare_cds}/cds/intermediate/.gitignore   |   0
 .../cds/raw_data/21incddocguide.docx                | Bin
 ...entation_extracted_from_21incddocguide.docx.xlsx | Bin
 .../cds/raw_data/cdpop1year_acs.csv                 |   0
 .../cds/raw_data/congressional2021.zip              | Bin
 .../cds/raw_data/geocorr2022_2428906586.csv         |   0
 .../prepare/{ => prepare_cds}/cdtargets/.gitignore  |   0
 .../prepare/{ => prepare_cds}/create_cdtargets.R    |   0
 .../prepare/{ => prepare_cds}/examine_variation.R   |   0
 .../images/Image 2024-10-20 at 5.23.32 PM.jpeg      | Bin
 .../images/clipboard-719051713.png                  | Bin
 .../prepare/{ => prepare_cds}/images/raw_data.jpeg  | Bin
 .../targets/prepare/{ => prepare_cds}/index.qmd     |   0
 .../prepare_cds.Rproj}                              |   0
 .../targets/prepare/{ => prepare_cds}/renv.lock     |   0
 .../prepare/{ => prepare_cds}/renv/.gitignore       |   0
 .../prepare/{ => prepare_cds}/renv/activate.R       |   0
 .../prepare/{ => prepare_cds}/renv/settings.json    |   0
 .../prepare/{ => prepare_cds}/tools/renv_notes.R    |   0
 .../targets/prepare/{ => prepare_cds}/usage.qmd     |   0
 49 files changed, 8 insertions(+), 5 deletions(-)
 delete mode 100644 tmd/areas/targets/prepare/.netlify/state.json
 rename tmd/areas/targets/prepare/{ => prepare_cds}/.Rprofile (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/.gitignore (97%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/R/constants.R (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/R/functions.R (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/R/libraries.R (100%)
 create mode 100644 tmd/areas/targets/prepare/prepare_cds/README.md
 rename tmd/areas/targets/prepare/{ => prepare_cds}/_quarto.yml (97%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cd_IRS_documentation.qmd (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cd_compare_us_totals_tmd_vs_irs_published.qmd (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cd_construct_long_soi_data_file.qmd (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cd_construct_soi_variable_documentation.qmd (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cd_construct_variable_documentation.qmd (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cd_create_basefile_for_117Congress_cd_target_files.qmd (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cd_create_basefile_multiple_sessions.qmd (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cd_create_cd_117_118_crosswalk_and_cdbasefile_118.qmd (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cd_create_variable_mapping.qmd (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cd_download_and_clean_census_population_data.qmd (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cd_download_soi_data.qmd (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cd_enhance_basefile_with_special_targets.qmd (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cd_issues_and_TODOs.qmd (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cdrecipes/cdrecipe.json (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cdrecipes/cdrecipe_template.json (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cdrecipes/phase4.json (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cdrecipes/phase4_118.json (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cdrecipes/phase5.json (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cdrecipes/phase5_salt.json (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cdrecipes/phase6_add_socsec.json (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cds/final/.gitignore (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cds/intermediate/.gitignore (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cds/raw_data/21incddocguide.docx (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cds/raw_data/cd_documentation_extracted_from_21incddocguide.docx.xlsx (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cds/raw_data/cdpop1year_acs.csv (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cds/raw_data/congressional2021.zip (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cds/raw_data/geocorr2022_2428906586.csv (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/cdtargets/.gitignore (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/create_cdtargets.R (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/examine_variation.R (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/images/Image 2024-10-20 at 5.23.32 PM.jpeg (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/images/clipboard-719051713.png (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/images/raw_data.jpeg (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/index.qmd (100%)
 rename tmd/areas/targets/prepare/{prepare.Rproj => prepare_cds/prepare_cds.Rproj} (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/renv.lock (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/renv/.gitignore (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/renv/activate.R (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/renv/settings.json (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/tools/renv_notes.R (100%)
 rename tmd/areas/targets/prepare/{ => prepare_cds}/usage.qmd (100%)

diff --git a/tmd/areas/targets/prepare/.netlify/state.json b/tmd/areas/targets/prepare/.netlify/state.json
deleted file mode 100644
index e9c5fb68..00000000
--- a/tmd/areas/targets/prepare/.netlify/state.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"siteId": "4d646266-9d1f-4d69-acb4-b9a17b63a5ff"
-}
\ No newline at end of file
diff --git a/tmd/areas/targets/prepare/.Rprofile b/tmd/areas/targets/prepare/prepare_cds/.Rprofile
similarity index 100%
rename from tmd/areas/targets/prepare/.Rprofile
rename to tmd/areas/targets/prepare/prepare_cds/.Rprofile
diff --git a/tmd/areas/targets/prepare/.gitignore b/tmd/areas/targets/prepare/prepare_cds/.gitignore
similarity index 97%
rename from tmd/areas/targets/prepare/.gitignore
rename to tmd/areas/targets/prepare/prepare_cds/.gitignore
index 8b50314d..dbedf0d4 100644
--- a/tmd/areas/targets/prepare/.gitignore
+++ b/tmd/areas/targets/prepare/prepare_cds/.gitignore
@@ -1,4 +1,4 @@
-# prepare
+# prepare_cds
 
 # ignore quarto at the root level
 /.quarto/
diff --git a/tmd/areas/targets/prepare/R/constants.R b/tmd/areas/targets/prepare/prepare_cds/R/constants.R
similarity index 100%
rename from tmd/areas/targets/prepare/R/constants.R
rename to tmd/areas/targets/prepare/prepare_cds/R/constants.R
diff --git a/tmd/areas/targets/prepare/R/functions.R b/tmd/areas/targets/prepare/prepare_cds/R/functions.R
similarity index 100%
rename from tmd/areas/targets/prepare/R/functions.R
rename to tmd/areas/targets/prepare/prepare_cds/R/functions.R
diff --git a/tmd/areas/targets/prepare/R/libraries.R b/tmd/areas/targets/prepare/prepare_cds/R/libraries.R
similarity index 100%
rename from tmd/areas/targets/prepare/R/libraries.R
rename to tmd/areas/targets/prepare/prepare_cds/R/libraries.R
diff --git a/tmd/areas/targets/prepare/prepare_cds/README.md b/tmd/areas/targets/prepare/prepare_cds/README.md
new file mode 100644
index 00000000..cf578402
--- /dev/null
+++ b/tmd/areas/targets/prepare/prepare_cds/README.md
@@ -0,0 +1,6 @@
+# areas / targets / prepare
+
+Contains code and data used to generate sub-national area targets files.
+
+Evolving preparation documentation is available at [this
+website](https://tmd-areas-prepare-targets.netlify.app).
diff --git a/tmd/areas/targets/prepare/_quarto.yml b/tmd/areas/targets/prepare/prepare_cds/_quarto.yml
similarity index 97%
rename from tmd/areas/targets/prepare/_quarto.yml
rename to tmd/areas/targets/prepare/prepare_cds/_quarto.yml
index c2009149..113d6da5 100644
--- a/tmd/areas/targets/prepare/_quarto.yml
+++ b/tmd/areas/targets/prepare/prepare_cds/_quarto.yml
@@ -28,7 +28,7 @@ execute:
   freeze: false  # auto: during global project renders, re-render only when source changes
 
 book:
-  title: "Develop targets for subnational areas"
+  title: "Develop targets for Congressional districts"
   subtitle: "Create csv target files for use by area targeting routines"
   # author: "Don Boyd"
   date: today
diff --git a/tmd/areas/targets/prepare/cd_IRS_documentation.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_IRS_documentation.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/cd_IRS_documentation.qmd
rename to tmd/areas/targets/prepare/prepare_cds/cd_IRS_documentation.qmd
diff --git a/tmd/areas/targets/prepare/cd_compare_us_totals_tmd_vs_irs_published.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_compare_us_totals_tmd_vs_irs_published.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/cd_compare_us_totals_tmd_vs_irs_published.qmd
rename to tmd/areas/targets/prepare/prepare_cds/cd_compare_us_totals_tmd_vs_irs_published.qmd
diff --git a/tmd/areas/targets/prepare/cd_construct_long_soi_data_file.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_construct_long_soi_data_file.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/cd_construct_long_soi_data_file.qmd
rename to tmd/areas/targets/prepare/prepare_cds/cd_construct_long_soi_data_file.qmd
diff --git a/tmd/areas/targets/prepare/cd_construct_soi_variable_documentation.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_construct_soi_variable_documentation.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/cd_construct_soi_variable_documentation.qmd
rename to tmd/areas/targets/prepare/prepare_cds/cd_construct_soi_variable_documentation.qmd
diff --git a/tmd/areas/targets/prepare/cd_construct_variable_documentation.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_construct_variable_documentation.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/cd_construct_variable_documentation.qmd
rename to tmd/areas/targets/prepare/prepare_cds/cd_construct_variable_documentation.qmd
diff --git a/tmd/areas/targets/prepare/cd_create_basefile_for_117Congress_cd_target_files.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_create_basefile_for_117Congress_cd_target_files.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/cd_create_basefile_for_117Congress_cd_target_files.qmd
rename to tmd/areas/targets/prepare/prepare_cds/cd_create_basefile_for_117Congress_cd_target_files.qmd
diff --git a/tmd/areas/targets/prepare/cd_create_basefile_multiple_sessions.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_create_basefile_multiple_sessions.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/cd_create_basefile_multiple_sessions.qmd
rename to tmd/areas/targets/prepare/prepare_cds/cd_create_basefile_multiple_sessions.qmd
diff --git a/tmd/areas/targets/prepare/cd_create_cd_117_118_crosswalk_and_cdbasefile_118.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_create_cd_117_118_crosswalk_and_cdbasefile_118.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/cd_create_cd_117_118_crosswalk_and_cdbasefile_118.qmd
rename to tmd/areas/targets/prepare/prepare_cds/cd_create_cd_117_118_crosswalk_and_cdbasefile_118.qmd
diff --git a/tmd/areas/targets/prepare/cd_create_variable_mapping.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_create_variable_mapping.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/cd_create_variable_mapping.qmd
rename to tmd/areas/targets/prepare/prepare_cds/cd_create_variable_mapping.qmd
diff --git a/tmd/areas/targets/prepare/cd_download_and_clean_census_population_data.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_download_and_clean_census_population_data.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/cd_download_and_clean_census_population_data.qmd
rename to tmd/areas/targets/prepare/prepare_cds/cd_download_and_clean_census_population_data.qmd
diff --git a/tmd/areas/targets/prepare/cd_download_soi_data.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_download_soi_data.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/cd_download_soi_data.qmd
rename to tmd/areas/targets/prepare/prepare_cds/cd_download_soi_data.qmd
diff --git a/tmd/areas/targets/prepare/cd_enhance_basefile_with_special_targets.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_enhance_basefile_with_special_targets.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/cd_enhance_basefile_with_special_targets.qmd
rename to tmd/areas/targets/prepare/prepare_cds/cd_enhance_basefile_with_special_targets.qmd
diff --git a/tmd/areas/targets/prepare/cd_issues_and_TODOs.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_issues_and_TODOs.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/cd_issues_and_TODOs.qmd
rename to tmd/areas/targets/prepare/prepare_cds/cd_issues_and_TODOs.qmd
diff --git a/tmd/areas/targets/prepare/cdrecipes/cdrecipe.json b/tmd/areas/targets/prepare/prepare_cds/cdrecipes/cdrecipe.json
similarity index 100%
rename from tmd/areas/targets/prepare/cdrecipes/cdrecipe.json
rename to tmd/areas/targets/prepare/prepare_cds/cdrecipes/cdrecipe.json
diff --git a/tmd/areas/targets/prepare/cdrecipes/cdrecipe_template.json b/tmd/areas/targets/prepare/prepare_cds/cdrecipes/cdrecipe_template.json
similarity index 100%
rename from tmd/areas/targets/prepare/cdrecipes/cdrecipe_template.json
rename to tmd/areas/targets/prepare/prepare_cds/cdrecipes/cdrecipe_template.json
diff --git a/tmd/areas/targets/prepare/cdrecipes/phase4.json b/tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase4.json
similarity index 100%
rename from tmd/areas/targets/prepare/cdrecipes/phase4.json
rename to tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase4.json
diff --git a/tmd/areas/targets/prepare/cdrecipes/phase4_118.json b/tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase4_118.json
similarity index 100%
rename from tmd/areas/targets/prepare/cdrecipes/phase4_118.json
rename to tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase4_118.json
diff --git a/tmd/areas/targets/prepare/cdrecipes/phase5.json b/tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase5.json
similarity index 100%
rename from tmd/areas/targets/prepare/cdrecipes/phase5.json
rename to tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase5.json
diff --git a/tmd/areas/targets/prepare/cdrecipes/phase5_salt.json b/tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase5_salt.json
similarity index 100%
rename from tmd/areas/targets/prepare/cdrecipes/phase5_salt.json
rename to tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase5_salt.json
diff --git a/tmd/areas/targets/prepare/cdrecipes/phase6_add_socsec.json b/tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase6_add_socsec.json
similarity index 100%
rename from tmd/areas/targets/prepare/cdrecipes/phase6_add_socsec.json
rename to tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase6_add_socsec.json
diff --git a/tmd/areas/targets/prepare/cds/final/.gitignore b/tmd/areas/targets/prepare/prepare_cds/cds/final/.gitignore
similarity index 100%
rename from tmd/areas/targets/prepare/cds/final/.gitignore
rename to tmd/areas/targets/prepare/prepare_cds/cds/final/.gitignore
diff --git a/tmd/areas/targets/prepare/cds/intermediate/.gitignore b/tmd/areas/targets/prepare/prepare_cds/cds/intermediate/.gitignore
similarity index 100%
rename from tmd/areas/targets/prepare/cds/intermediate/.gitignore
rename to tmd/areas/targets/prepare/prepare_cds/cds/intermediate/.gitignore
diff --git a/tmd/areas/targets/prepare/cds/raw_data/21incddocguide.docx b/tmd/areas/targets/prepare/prepare_cds/cds/raw_data/21incddocguide.docx
similarity index 100%
rename from tmd/areas/targets/prepare/cds/raw_data/21incddocguide.docx
rename to tmd/areas/targets/prepare/prepare_cds/cds/raw_data/21incddocguide.docx
diff --git a/tmd/areas/targets/prepare/cds/raw_data/cd_documentation_extracted_from_21incddocguide.docx.xlsx b/tmd/areas/targets/prepare/prepare_cds/cds/raw_data/cd_documentation_extracted_from_21incddocguide.docx.xlsx
similarity index 100%
rename from tmd/areas/targets/prepare/cds/raw_data/cd_documentation_extracted_from_21incddocguide.docx.xlsx
rename to tmd/areas/targets/prepare/prepare_cds/cds/raw_data/cd_documentation_extracted_from_21incddocguide.docx.xlsx
diff --git a/tmd/areas/targets/prepare/cds/raw_data/cdpop1year_acs.csv b/tmd/areas/targets/prepare/prepare_cds/cds/raw_data/cdpop1year_acs.csv
similarity index 100%
rename from tmd/areas/targets/prepare/cds/raw_data/cdpop1year_acs.csv
rename to tmd/areas/targets/prepare/prepare_cds/cds/raw_data/cdpop1year_acs.csv
diff --git a/tmd/areas/targets/prepare/cds/raw_data/congressional2021.zip b/tmd/areas/targets/prepare/prepare_cds/cds/raw_data/congressional2021.zip
similarity index 100%
rename from tmd/areas/targets/prepare/cds/raw_data/congressional2021.zip
rename to tmd/areas/targets/prepare/prepare_cds/cds/raw_data/congressional2021.zip
diff --git a/tmd/areas/targets/prepare/cds/raw_data/geocorr2022_2428906586.csv b/tmd/areas/targets/prepare/prepare_cds/cds/raw_data/geocorr2022_2428906586.csv
similarity index 100%
rename from tmd/areas/targets/prepare/cds/raw_data/geocorr2022_2428906586.csv
rename to tmd/areas/targets/prepare/prepare_cds/cds/raw_data/geocorr2022_2428906586.csv
diff --git a/tmd/areas/targets/prepare/cdtargets/.gitignore b/tmd/areas/targets/prepare/prepare_cds/cdtargets/.gitignore
similarity index 100%
rename from tmd/areas/targets/prepare/cdtargets/.gitignore
rename to tmd/areas/targets/prepare/prepare_cds/cdtargets/.gitignore
diff --git a/tmd/areas/targets/prepare/create_cdtargets.R b/tmd/areas/targets/prepare/prepare_cds/create_cdtargets.R
similarity index 100%
rename from tmd/areas/targets/prepare/create_cdtargets.R
rename to tmd/areas/targets/prepare/prepare_cds/create_cdtargets.R
diff --git a/tmd/areas/targets/prepare/examine_variation.R b/tmd/areas/targets/prepare/prepare_cds/examine_variation.R
similarity index 100%
rename from tmd/areas/targets/prepare/examine_variation.R
rename to tmd/areas/targets/prepare/prepare_cds/examine_variation.R
diff --git a/tmd/areas/targets/prepare/images/Image 2024-10-20 at 5.23.32 PM.jpeg b/tmd/areas/targets/prepare/prepare_cds/images/Image 2024-10-20 at 5.23.32 PM.jpeg
similarity index 100%
rename from tmd/areas/targets/prepare/images/Image 2024-10-20 at 5.23.32 PM.jpeg
rename to tmd/areas/targets/prepare/prepare_cds/images/Image 2024-10-20 at 5.23.32 PM.jpeg
diff --git a/tmd/areas/targets/prepare/images/clipboard-719051713.png b/tmd/areas/targets/prepare/prepare_cds/images/clipboard-719051713.png
similarity index 100%
rename from tmd/areas/targets/prepare/images/clipboard-719051713.png
rename to tmd/areas/targets/prepare/prepare_cds/images/clipboard-719051713.png
diff --git a/tmd/areas/targets/prepare/images/raw_data.jpeg b/tmd/areas/targets/prepare/prepare_cds/images/raw_data.jpeg
similarity index 100%
rename from tmd/areas/targets/prepare/images/raw_data.jpeg
rename to tmd/areas/targets/prepare/prepare_cds/images/raw_data.jpeg
diff --git a/tmd/areas/targets/prepare/index.qmd b/tmd/areas/targets/prepare/prepare_cds/index.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/index.qmd
rename to tmd/areas/targets/prepare/prepare_cds/index.qmd
diff --git a/tmd/areas/targets/prepare/prepare.Rproj b/tmd/areas/targets/prepare/prepare_cds/prepare_cds.Rproj
similarity index 100%
rename from tmd/areas/targets/prepare/prepare.Rproj
rename to tmd/areas/targets/prepare/prepare_cds/prepare_cds.Rproj
diff --git a/tmd/areas/targets/prepare/renv.lock b/tmd/areas/targets/prepare/prepare_cds/renv.lock
similarity index 100%
rename from tmd/areas/targets/prepare/renv.lock
rename to tmd/areas/targets/prepare/prepare_cds/renv.lock
diff --git a/tmd/areas/targets/prepare/renv/.gitignore b/tmd/areas/targets/prepare/prepare_cds/renv/.gitignore
similarity index 100%
rename from tmd/areas/targets/prepare/renv/.gitignore
rename to tmd/areas/targets/prepare/prepare_cds/renv/.gitignore
diff --git a/tmd/areas/targets/prepare/renv/activate.R b/tmd/areas/targets/prepare/prepare_cds/renv/activate.R
similarity index 100%
rename from tmd/areas/targets/prepare/renv/activate.R
rename to tmd/areas/targets/prepare/prepare_cds/renv/activate.R
diff --git a/tmd/areas/targets/prepare/renv/settings.json b/tmd/areas/targets/prepare/prepare_cds/renv/settings.json
similarity index 100%
rename from tmd/areas/targets/prepare/renv/settings.json
rename to tmd/areas/targets/prepare/prepare_cds/renv/settings.json
diff --git a/tmd/areas/targets/prepare/tools/renv_notes.R b/tmd/areas/targets/prepare/prepare_cds/tools/renv_notes.R
similarity index 100%
rename from tmd/areas/targets/prepare/tools/renv_notes.R
rename to tmd/areas/targets/prepare/prepare_cds/tools/renv_notes.R
diff --git a/tmd/areas/targets/prepare/usage.qmd b/tmd/areas/targets/prepare/prepare_cds/usage.qmd
similarity index 100%
rename from tmd/areas/targets/prepare/usage.qmd
rename to tmd/areas/targets/prepare/prepare_cds/usage.qmd

From 1ee554e06628763844edb26eec372a0dbb617bed Mon Sep 17 00:00:00 2001
From: donboyd5 <donboyd5@gmail.com>
Date: Tue, 19 Nov 2024 04:17:50 -0500
Subject: [PATCH 02/11] load utility functions

---
 .../prepare_cds/cd_download_and_clean_census_population_data.qmd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tmd/areas/targets/prepare/prepare_cds/cd_download_and_clean_census_population_data.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_download_and_clean_census_population_data.qmd
index eac7605e..19f63813 100644
--- a/tmd/areas/targets/prepare/prepare_cds/cd_download_and_clean_census_population_data.qmd
+++ b/tmd/areas/targets/prepare/prepare_cds/cd_download_and_clean_census_population_data.qmd
@@ -13,6 +13,7 @@ editor_options:
 
 source(here::here("R", "libraries.R"))
 source(here::here("R", "constants.R"))
+source(here::here("R", "functions.R"))
 
 # 334283385.27000004 national pop
 

From 68712bf8ff7a7b40ddd02ca19350c46ba27549c8 Mon Sep 17 00:00:00 2001
From: donboyd5 <donboyd5@gmail.com>
Date: Tue, 19 Nov 2024 04:18:51 -0500
Subject: [PATCH 03/11] update introduction to reflect CD-only focus of this
 project

---
 tmd/areas/targets/prepare/prepare_cds/index.qmd | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tmd/areas/targets/prepare/prepare_cds/index.qmd b/tmd/areas/targets/prepare/prepare_cds/index.qmd
index 03bffc59..af134a61 100644
--- a/tmd/areas/targets/prepare/prepare_cds/index.qmd
+++ b/tmd/areas/targets/prepare/prepare_cds/index.qmd
@@ -6,11 +6,7 @@ editor_options:
 
 # Introduction {.unnumbered}
 
-This R project constructs subnational area targets for:
-
--   States (to come)
-
--   Congressional districts (in progress)
+This R project constructs subnational area targets for Congressional districts.
 
 In addition, it creates a local web page that a user can upload to a web service if desired. An in-progress version can be viewed on the web [here](https://tmd-areas-prepare-targets.netlify.app/). During development, it may not be identical to what your clone creates.
 

From d4ea3ede7c5654a8538e7a6c3852ea1c3892e0ec Mon Sep 17 00:00:00 2001
From: donboyd5 <donboyd5@gmail.com>
Date: Tue, 19 Nov 2024 04:27:30 -0500
Subject: [PATCH 04/11] update CD website name

---
 tmd/areas/targets/prepare/prepare_cds/index.qmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmd/areas/targets/prepare/prepare_cds/index.qmd b/tmd/areas/targets/prepare/prepare_cds/index.qmd
index af134a61..d1130a32 100644
--- a/tmd/areas/targets/prepare/prepare_cds/index.qmd
+++ b/tmd/areas/targets/prepare/prepare_cds/index.qmd
@@ -8,6 +8,6 @@ editor_options:
 
 This R project constructs subnational area targets for Congressional districts.
 
-In addition, it creates a local web page that a user can upload to a web service if desired. An in-progress version can be viewed on the web [here](https://tmd-areas-prepare-targets.netlify.app/). During development, it may not be identical to what your clone creates.
+In addition, it creates a local web page that a user can upload to a web service if desired. An in-progress version can be viewed on the web [here](https://tmd-areas-prepare-cd-targets.netlify.app/). During development, it may not be identical to what your clone creates.
 
 This R project is part of the larger tax-microdata-benchmarking project, and is in the subfolder "tmd/areas/targets/prepare/".

From 2fda27f3983f29f1480af56b0d4b0a25260504f3 Mon Sep 17 00:00:00 2001
From: donboyd5 <donboyd5@gmail.com>
Date: Tue, 19 Nov 2024 04:27:48 -0500
Subject: [PATCH 05/11] load utility functions

---
 tmd/areas/targets/prepare/prepare_cds/cd_download_soi_data.qmd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tmd/areas/targets/prepare/prepare_cds/cd_download_soi_data.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_download_soi_data.qmd
index 36c73080..37d69439 100644
--- a/tmd/areas/targets/prepare/prepare_cds/cd_download_soi_data.qmd
+++ b/tmd/areas/targets/prepare/prepare_cds/cd_download_soi_data.qmd
@@ -25,6 +25,7 @@ To re-download data and save to the "../cds/raw_data" folder, set option `eval:
 
 source(here::here("R", "libraries.R"))
 source(here::here("R", "constants.R"))
+source(here::here("R", "functions.R"))
 
 ```
 

From a357c69e36fa016c81625ef0eb12afaf062fae66 Mon Sep 17 00:00:00 2001
From: donboyd5 <donboyd5@gmail.com>
Date: Tue, 19 Nov 2024 04:30:02 -0500
Subject: [PATCH 06/11] update usage to reflect folder name changes

---
 tmd/areas/targets/prepare/prepare_cds/usage.qmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmd/areas/targets/prepare/prepare_cds/usage.qmd b/tmd/areas/targets/prepare/prepare_cds/usage.qmd
index 745a9497..a6b7645a 100644
--- a/tmd/areas/targets/prepare/prepare_cds/usage.qmd
+++ b/tmd/areas/targets/prepare/prepare_cds/usage.qmd
@@ -43,7 +43,7 @@ At present the code prepares target files with targets we believe are useful and
 
 ## To create area weights using the target files in tax-microdata-benchmarking
 
--   copy desired target .csv files from ".../targets/prepare/cds/final/" folder to the ".../targets/" folder
+-   copy desired target .csv files from ".../targets/prepare/prepare_cds/cdtargets/" folder to the ".../targets/" folder
 -   follow tax-microdata-benchmarking instructions to run `make_all.py` or \`create_area_weights.py'
 
 ## Additional notes

From 07d631cc69b3df1dfe4b28d8eadc568218d3ef6d Mon Sep 17 00:00:00 2001
From: donboyd5 <donboyd5@gmail.com>
Date: Tue, 19 Nov 2024 04:31:52 -0500
Subject: [PATCH 07/11] load utility functions

---
 .../prepare_cds/cd_construct_soi_variable_documentation.qmd      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tmd/areas/targets/prepare/prepare_cds/cd_construct_soi_variable_documentation.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_construct_soi_variable_documentation.qmd
index 889512b3..10244a6c 100644
--- a/tmd/areas/targets/prepare/prepare_cds/cd_construct_soi_variable_documentation.qmd
+++ b/tmd/areas/targets/prepare/prepare_cds/cd_construct_soi_variable_documentation.qmd
@@ -13,6 +13,7 @@ editor_options:
 
 source(here::here("R", "libraries.R"))
 source(here::here("R", "constants.R"))
+source(here::here("R", "functions.R"))
 
 ```
 

From 7aade4adae6f3adb4466dcbcd82eb5df9c8f5f4e Mon Sep 17 00:00:00 2001
From: donboyd5 <donboyd5@gmail.com>
Date: Tue, 19 Nov 2024 04:47:46 -0500
Subject: [PATCH 08/11] define TMDDATA as relative path to storage/output
 folder and place in constants file

---
 tmd/areas/targets/prepare/prepare_cds/R/constants.R          | 5 +++++
 .../cd_compare_us_totals_tmd_vs_irs_published.qmd            | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tmd/areas/targets/prepare/prepare_cds/R/constants.R b/tmd/areas/targets/prepare/prepare_cds/R/constants.R
index 477d50c5..711e3665 100644
--- a/tmd/areas/targets/prepare/prepare_cds/R/constants.R
+++ b/tmd/areas/targets/prepare/prepare_cds/R/constants.R
@@ -8,3 +8,8 @@ CDINTERMEDIATE <- fs::path(CDDIR, "intermediate")
 CDFINAL <- fs::path(CDDIR, "final")
 
 CDDOCEXTRACT <- "cd_documentation_extracted_from_21incddocguide.docx.xlsx"
+
+TMDHOME <- fs::path(here::here(), "..", "..", "..", "..", "..")
+# normalizePath(TMDHOME)
+TMDDATA <- fs::path(TMDHOME, "tmd", "storage", "output")
+# normalizePath(TMDDATA)
diff --git a/tmd/areas/targets/prepare/prepare_cds/cd_compare_us_totals_tmd_vs_irs_published.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_compare_us_totals_tmd_vs_irs_published.qmd
index 9e6899b2..cb5a654a 100644
--- a/tmd/areas/targets/prepare/prepare_cds/cd_compare_us_totals_tmd_vs_irs_published.qmd
+++ b/tmd/areas/targets/prepare/prepare_cds/cd_compare_us_totals_tmd_vs_irs_published.qmd
@@ -26,8 +26,7 @@ source(here::here("R", "functions.R"))
 vmap <- read_csv(fs::path(CDINTERMEDIATE, "cd_variable_mapping.csv"))
 cdirs <- read_csv(fs::path(CDINTERMEDIATE, "cdbasefile_sessions.csv"))
 
-TMDDIR <- here::here("..", "..", "..", "storage", "output")
-fpath <-  fs::path(TMDDIR, "cached_allvars.csv")
+fpath <-  fs::path(TMDDATA, "cached_allvars.csv")
 tmd2021 <- vroom(fpath)
 ns(tmd2021)
 

From 821945eae519d2ac4c8f538a8f93326411303467 Mon Sep 17 00:00:00 2001
From: donboyd5 <donboyd5@gmail.com>
Date: Tue, 19 Nov 2024 04:49:24 -0500
Subject: [PATCH 09/11] update to reflect new constant TMDDATA

---
 .../prepare_cds/cd_enhance_basefile_with_special_targets.qmd   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tmd/areas/targets/prepare/prepare_cds/cd_enhance_basefile_with_special_targets.qmd b/tmd/areas/targets/prepare/prepare_cds/cd_enhance_basefile_with_special_targets.qmd
index eed32750..6ce47538 100644
--- a/tmd/areas/targets/prepare/prepare_cds/cd_enhance_basefile_with_special_targets.qmd
+++ b/tmd/areas/targets/prepare/prepare_cds/cd_enhance_basefile_with_special_targets.qmd
@@ -79,8 +79,7 @@ Get the unenhanced target data and the tmd2021 cached data.
 
 stack <- read_csv(fs::path(CDINTERMEDIATE, "cdbasefile_sessions.csv"))
 
-TMDDIR <- here::here("..", "..", "..", "storage", "output")
-fpath <-  fs::path(TMDDIR, "cached_allvars.csv")
+fpath <-  fs::path(TMDDATA, "cached_allvars.csv")
 tmd2021 <- vroom(fpath)
 ns(tmd2021)
 

From d1d3f51a49d5805c030eee5e20936c03cea505a2 Mon Sep 17 00:00:00 2001
From: donboyd5 <donboyd5@gmail.com>
Date: Tue, 19 Nov 2024 05:04:55 -0500
Subject: [PATCH 10/11] correct interpretation of list of CDs, when creating
 targets

---
 tmd/areas/targets/prepare/prepare_cds/create_cdtargets.R | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tmd/areas/targets/prepare/prepare_cds/create_cdtargets.R b/tmd/areas/targets/prepare/prepare_cds/create_cdtargets.R
index d2fb3859..b23dc768 100644
--- a/tmd/areas/targets/prepare/prepare_cds/create_cdtargets.R
+++ b/tmd/areas/targets/prepare/prepare_cds/create_cdtargets.R
@@ -1,6 +1,6 @@
 
 # run from terminal with:
-#   Rscript create_cdtargets.R phase5.json
+#   Rscript create_cdtargets.R phase6_add_socsec.json (or phase5.json)
 
 # Rscript test.r > output.log 2>&1
 
@@ -150,7 +150,10 @@ targets_matchframe <- target_stubs |>
 ##.. filtering Congressional districts ----
 cdlist <- unlist(cdrecipe$cdlist)
 cdlist
-if(cdlist != "all"){
+if(
+  (length(cdlist) > 1) ||
+  ((length(cdlist) ==1) && (cdlist != "all"))
+   ){
   cd_filter <- expr(statecd %in% cdlist)
 } else if(length(cdlist) == 1 & cdlist == "all") {
   cd_filter <- TRUE

From 21229c1b2ec39e1f1528c1acb5ed64f7ab5a9658 Mon Sep 17 00:00:00 2001
From: donboyd5 <donboyd5@gmail.com>
Date: Tue, 19 Nov 2024 05:57:35 -0500
Subject: [PATCH 11/11] clean up targeting code

---
 .../cdrecipes/phase6_add_socsec.json          |  8 +++----
 .../prepare/prepare_cds/create_cdtargets.R    | 24 ++++++++++++-------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase6_add_socsec.json b/tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase6_add_socsec.json
index 17f98365..a40798bb 100644
--- a/tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase6_add_socsec.json
+++ b/tmd/areas/targets/prepare/prepare_cds/cdrecipes/phase6_add_socsec.json
@@ -6,7 +6,7 @@
 	// "cdlist": "all",  // all, or a list such as ["AK00", "DE00"],
 	"cdlist": ["NY21"],   // all, or a list such as ["AK00", "DE00"],
 	// "cdlist": ["AK00", "DE00"],   // all, or a list such as ["AK00", "DE00"],
-	// "cdlist": ["AK00", "DE00", "ID01", "ID02", "ME02", "MT00", "ND00", "PA08", "SD00", "WY00"],
+  // "cdlist": ["AK00", "DE00", "ID01", "ID02", "ME02", "MT00", "ND00", "PA08", "SD00", "WY00"],
 	
 	// target parameters
 	"notzero": true, // true or false
@@ -27,19 +27,19 @@
     {
       "varname": "c00100",
       "scope": 1,
-      "count": 1,
+      "count": 2,
       "fstatus": 1
     },      
     {
       "varname": "c00100",
       "scope": 1,
-      "count": 1,
+      "count": 2,
       "fstatus": 2
     },      
     {
       "varname": "c00100",
       "scope": 1,
-      "count": 1,
+      "count": 2,
       "fstatus": 4
     },          
     {
diff --git a/tmd/areas/targets/prepare/prepare_cds/create_cdtargets.R b/tmd/areas/targets/prepare/prepare_cds/create_cdtargets.R
index b23dc768..32ccc144 100644
--- a/tmd/areas/targets/prepare/prepare_cds/create_cdtargets.R
+++ b/tmd/areas/targets/prepare/prepare_cds/create_cdtargets.R
@@ -125,22 +125,18 @@ if("agi_exclude" %in% names(target_rules)){
 # target_stubs
   
 # create a dataframe to match against the stack data for targets
-vmap
+# vmap
 vmap2 <- vmap |> 
-  mutate(fstatus=case_when(basevname=="MARS1" ~ 1,
-                           basevname=="MARS2" ~ 2,
-                           basevname=="MARS4" ~ 4,
-                           .default = 0))
+  mutate(fstatus=ifelse(str_starts(basevname, "MARS"),
+                        str_sub(basevname, -1),
+                        0),
+         fstatus=as.integer(fstatus))
 
 targets_matchframe <- target_stubs |>
   mutate(sort=row_number() + 1) |> 
   rows_insert(tibble(varname="XTOT", scope=0, count=0, fstatus=0, agistub=0, sort=1),
               by="varname") |> 
   left_join(vmap2, by = join_by(varname, fstatus),  relationship = "many-to-many") |>
-  mutate(basevname = case_when(fstatus == 1 ~ "MARS1",
-                               fstatus == 2 ~ "MARS2",
-                               fstatus == 4 ~ "MARS4",
-                               .default = basevname)) |> 
   relocate(sort) |> 
   arrange(sort)
 
@@ -188,7 +184,17 @@ mapped <- targets_matchframe |>
             relationship = "many-to-many") |> 
   arrange(statecd, sort)
 
+tmp <- stack |>
+  filter(!!cd_filter,
+         !!zero_filter,
+         !!negative_filter,
+         session %in% cdrecipe$session)
+count(tmp, basevname, vname)
+
+tmp |> 
+  filter(basevname=="v00100")
 
+count(stack, count)
 
 # checks
 # mapped |> filter(target == 0)