Edits to interpolation method, other bug fixes

mdp0023 · Apr 18, 2024 · 81ad3f0 · 81ad3f0
1 parent 252ca82
commit 81ad3f0
Show file tree

Hide file tree

Showing 64 changed files with 8,173 additions and 1,772 deletions.
diff --git a/SVInsight/__pycache__/svi.cpython-312.pyc b/SVInsight/__pycache__/svi.cpython-312.pyc
diff --git a/SVInsight/svi.py b/SVInsight/svi.py
@@ -657,6 +657,8 @@ def _calc_variance(fa, n_factors, loading_factors, facs, df_variances):
         sig_components, include, df_ratio_var, df_variances = _calc_variance(fa, n_factors, loading_factors, facs, df_variances)
 
         num_refactors+=1
+
+        fa_refactor_df = fa_df[include].copy()
         # 4. Begin refactor loop with initial 'include' array
         while len(include) != len(fa_df.columns):
             fa_refactor_df = fa_df[include].copy()

diff --git a/Travis_County/.DS_Store b/Travis_County/.DS_Store
diff --git a/Travis_County/Data/Travis_County_2018_bg_missing_values.csv b/Travis_County/Data/Travis_County_2018_bg_missing_values.csv
@@ -80,8 +80,8 @@
 484530022092,B25064_001E,Interpolated
 484530023041,B25077_001E,Interpolated
 484530023043,B25077_001E,Interpolated
-484530023081,B25077_001E,Interpolated
 484530023081,B25064_001E,Interpolated
+484530023081,B25077_001E,Interpolated
 484530023083,B25077_001E,Interpolated
 484530023122,B25077_001E,Interpolated
 484530023141,B25077_001E,Interpolated

diff --git a/Travis_County/Data/Travis_County_2018_bg_rawdata.csv b/Travis_County/Data/Travis_County_2018_bg_rawdata.csv
diff --git a/Travis_County/Data/Travis_County_2018_bg_rawdata.gpkg b/Travis_County/Data/Travis_County_2018_bg_rawdata.gpkg
diff --git a/Travis_County/Documentation/Travis_County_2017_bg_config.xlsx b/Travis_County/Documentation/Travis_County_2017_bg_config.xlsx
diff --git a/Travis_County/Documentation/Travis_County_2018_bg_config.xlsx b/Travis_County/Documentation/Travis_County_2018_bg_config.xlsx
diff --git a/Travis_County/SVIs/Travis_County_2017_bg_config_svi.csv b/Travis_County/SVIs/Travis_County_2017_bg_config_svi.csv
diff --git a/Travis_County/SVIs/Travis_County_2017_bg_config_svi.gpkg b/Travis_County/SVIs/Travis_County_2017_bg_config_svi.gpkg
diff --git a/Travis_County/SVIs/Travis_County_2017_bg_config_svi.gpkg-shm b/Travis_County/SVIs/Travis_County_2017_bg_config_svi.gpkg-shm
diff --git a/Travis_County/SVIs/Travis_County_2017_bg_config_svi.gpkg-wal b/Travis_County/SVIs/Travis_County_2017_bg_config_svi.gpkg-wal
diff --git a/Travis_County/SVIs/Travis_County_2018_bg_config_svi.csv b/Travis_County/SVIs/Travis_County_2018_bg_config_svi.csv
diff --git a/Travis_County/SVIs/Travis_County_2018_bg_config_svi.gpkg b/Travis_County/SVIs/Travis_County_2018_bg_config_svi.gpkg
diff --git a/Travis_County/SVIs/Travis_County_2018_bg_config_svi.gpkg-shm b/Travis_County/SVIs/Travis_County_2018_bg_config_svi.gpkg-shm
diff --git a/Travis_County/SVIs/Travis_County_2018_bg_config_svi.gpkg-wal b/Travis_County/SVIs/Travis_County_2018_bg_config_svi.gpkg-wal
diff --git a/examples/svinsight_example_Travis_County.py b/examples/svinsight_example_Travis_County.py
@@ -32,7 +32,7 @@
                     year, 
                     interpolate=True,
                     verbose=True,
-                    overwrite=True)
+                    overwrite=False)
 
 # # # add variable
 # # test2.add_variable(boundary,

diff --git a/tests/.DS_Store b/tests/.DS_Store
diff --git a/tests/__pycache__/test_svinsight.cpython-312-pytest-7.4.0.pyc b/tests/__pycache__/test_svinsight.cpython-312-pytest-7.4.0.pyc
diff --git a/tests/test_project_economic_index/Boundaries/test_project_economic_index_2015_bg.gpkg b/tests/test_project_economic_index/Boundaries/test_project_economic_index_2015_bg.gpkg
diff --git a/tests/test_project_economic_index/Boundaries/test_project_economic_index_2015_tract.gpkg b/tests/test_project_economic_index/Boundaries/test_project_economic_index_2015_tract.gpkg
diff --git a/tests/test_project_economic_index/Boundaries/test_project_economic_index_2017_bg.gpkg b/tests/test_project_economic_index/Boundaries/test_project_economic_index_2017_bg.gpkg
diff --git a/tests/test_project_economic_index/Boundaries/test_project_economic_index_2020_bg.gpkg b/tests/test_project_economic_index/Boundaries/test_project_economic_index_2020_bg.gpkg
diff --git a/tests/test_project_economic_index/Boundaries/test_project_economic_index_2020_tract.gpkg b/tests/test_project_economic_index/Boundaries/test_project_economic_index_2020_tract.gpkg
diff --git a/.../test_project_economic_index/Data/test_project_economic_index_2015_bg_missing_columns.csv b/.../test_project_economic_index/Data/test_project_economic_index_2015_bg_missing_columns.csv
@@ -0,0 +1 @@
+B27001,bg empty
diff --git a/...s/test_project_economic_index/Data/test_project_economic_index_2015_bg_missing_values.csv b/...s/test_project_economic_index/Data/test_project_economic_index_2015_bg_missing_values.csv
@@ -0,0 +1,100 @@
+484530001022,B25064_001E,Interpolated
+484530002031,B25077_001E,Interpolated
+484530005001,B25077_001E,Interpolated
+484530006011,B25077_001E,Interpolated
+484530006012,B25077_001E,Interpolated
+484530006032,B25077_001E,Interpolated
+484530006033,B25077_001E,Interpolated
+484530006035,B25077_001E,Interpolated
+484530006041,B25077_001E,Interpolated
+484530006042,B25077_001E,Interpolated
+484530006043,B25077_001E,Interpolated
+484530015012,B25064_001E,Interpolated
+484530015013,B25064_001E,Interpolated
+484530015014,B25064_001E,Interpolated
+484530016023,B25077_001E,Interpolated
+484530016033,B25064_001E,Interpolated
+484530016042,B25064_001E,Interpolated
+484530017052,B25064_001E,Interpolated
+484530017142,B25064_001E,Interpolated
+484530017143,B25064_001E,Interpolated
+484530017192,B25064_001E,Interpolated
+484530017222,B25077_001E,Interpolated
+484530017332,B25064_001E,Interpolated
+484530017382,B25064_001E,Interpolated
+484530017383,B25064_001E,Interpolated
+484530017451,B25064_001E,Interpolated
+484530017492,B25064_001E,Interpolated
+484530017493,B25077_001E,Interpolated
+484530017501,B25077_001E,Interpolated
+484530017521,B25077_001E,Interpolated
+484530017522,B25077_001E,Interpolated
+484530017531,B25077_001E,Interpolated
+484530017571,B25064_001E,Interpolated
+484530017702,B25064_001E,Interpolated
+484530017741,B25064_001E,Interpolated
+484530017743,B25064_001E,Interpolated
+484530017752,B25064_001E,Interpolated
+484530017791,B25064_001E,Interpolated
+484530017792,B25064_001E,Interpolated
+484530017811,B25064_001E,Interpolated
+484530017852,B25077_001E,Interpolated
+484530017861,B25077_001E,Interpolated
+484530017863,B25077_001E,Interpolated
+484530018043,B25077_001E,Interpolated
+484530018064,B25077_001E,Interpolated
+484530018121,B25077_001E,Interpolated
+484530018122,B25077_001E,Interpolated
+484530018192,B25077_001E,Interpolated
+484530018224,B25077_001E,Interpolated
+484530018413,B25064_001E,Interpolated
+484530018491,B25077_001E,Interpolated
+484530018492,B25077_001E,Interpolated
+484530018493,B25077_001E,Interpolated
+484530018494,B25077_001E,Interpolated
+484530018503,B25077_001E,Interpolated
+484530018531,B25064_001E,Interpolated
+484530018541,B25064_001E,Interpolated
+484530018551,B25064_001E,Interpolated
+484530018555,B25064_001E,Interpolated
+484530018581,B25064_001E,Interpolated
+484530018582,B25064_001E,Interpolated
+484530018583,B25064_001E,Interpolated
+484530018584,B25064_001E,Interpolated
+484530018585,B25064_001E,Interpolated
+484530018591,B25064_001E,Interpolated
+484530018631,B25077_001E,Interpolated
+484530018632,B25077_001E,Interpolated
+484530018642,B25077_001E,Interpolated
+484530019142,B25064_001E,Interpolated
+484530019162,B25064_001E,Interpolated
+484530019171,B25064_001E,Interpolated
+484530019172,B25064_001E,Interpolated
+484530019173,B25064_001E,Interpolated
+484530019174,B25064_001E,Interpolated
+484530019181,B25064_001E,Interpolated
+484530020052,B25077_001E,Interpolated
+484530021063,B25064_001E,Interpolated
+484530023041,B25077_001E,Interpolated
+484530023043,B25077_001E,Interpolated
+484530023083,B25077_001E,Interpolated
+484530023084,B25077_001E,Interpolated
+484530023141,B25077_001E,Interpolated
+484530023142,B25077_001E,Interpolated
+484530023144,B25077_001E,Interpolated
+484530023152,B25077_001E,Interpolated
+484530023161,B25077_001E,Interpolated
+484530023162,B25077_001E,Interpolated
+484530023163,B25077_001E,Interpolated
+484530023172,B25077_001E,Interpolated
+484530024024,B25077_001E,Interpolated
+484530024072,B25064_001E,Interpolated
+484530024191,B25077_001E,Interpolated
+484530024192,B25077_001E,Interpolated
+484530024212,B25064_001E,Interpolated
+484530024301,B25064_001E,Interpolated
+484530024302,B25064_001E,Interpolated
+484530024351,B25064_001E,Interpolated
+484530025001,B25064_001E,Interpolated
+484530006034,B25077_001E,Tract Filled
+484530023143,B25077_001E,Tract Filled