Update the Enhanced FRS (#795)

* Add progress * Add reweighting update * Fix CB household behaviour * Update Enhanced FRS * Versioning
PolicyEngine · Dec 5, 2023 · fb9f819 · fb9f819
1 parent 3b565ec
commit fb9f819
Show file tree

Hide file tree

Showing 109 changed files with 1,039 additions and 9,523 deletions.
diff --git a/changelog_entry.yaml b/changelog_entry.yaml
@@ -0,0 +1,4 @@
+- bump: minor
+  changes:
+    added:
+    - Enhanced FRS version for December 2023.
diff --git a/policyengine_uk/data/datasets/__init__.py b/policyengine_uk/data/datasets/__init__.py
@@ -2,24 +2,36 @@
     FRS_2018_19,
     FRS_2019_20,
     FRS_2020_21,
+    FRS_2021_22,
+    RawFRS_2021_22,
     PooledFRS_2018_20,
+    PooledFRS_2019_21,
     SPIEnhancedFRS_2019_20,
     SPIEnhancedPooledFRS_2018_20,
+    SPIEnhancedPooledFRS_2019_21,
     CalibratedFRS_2019_20,
+    CalibratedFRS_2019_21,
     CalibratedSPIEnhancedFRS_2019_20,
     CalibratedSPIEnhancedPooledFRS_2018_20,
+    CalibratedSPIEnhancedPooledFRS_2019_21,
     EnhancedFRS,
 )
 
 DATASETS = [
     FRS_2018_19,
     FRS_2019_20,
     FRS_2020_21,
+    FRS_2021_22,
+    RawFRS_2021_22,
     PooledFRS_2018_20,
+    PooledFRS_2019_21,
     SPIEnhancedFRS_2019_20,
     SPIEnhancedPooledFRS_2018_20,
+    SPIEnhancedPooledFRS_2019_21,
     CalibratedFRS_2019_20,
+    CalibratedFRS_2019_21,
     CalibratedSPIEnhancedFRS_2019_20,
     CalibratedSPIEnhancedPooledFRS_2018_20,
+    CalibratedSPIEnhancedPooledFRS_2019_21,
     EnhancedFRS,
 ]
diff --git a/policyengine_uk/data/datasets/frs/__init__.py b/policyengine_uk/data/datasets/frs/__init__.py
@@ -1,15 +1,24 @@
-from .raw_frs import RawFRS, RawFRS_2018_19, RawFRS_2019_20, RawFRS_2020_21
-from .frs import FRS, FRS_2018_19, FRS_2019_20, FRS_2020_21
+from .raw_frs import (
+    RawFRS,
+    RawFRS_2018_19,
+    RawFRS_2019_20,
+    RawFRS_2020_21,
+    RawFRS_2021_22,
+)
+from .frs import FRS, FRS_2018_19, FRS_2019_20, FRS_2020_21, FRS_2021_22
 from .spi_enhanced_frs import (
     SPIEnhancedFRS,
     SPIEnhancedFRS_2019_20,
     SPIEnhancedPooledFRS_2018_20,
+    SPIEnhancedPooledFRS_2019_21,
 )
 from .calibration.calibrated_frs import (
     CalibratedFRS,
     CalibratedFRS_2019_20,
+    CalibratedFRS_2019_21,
     CalibratedSPIEnhancedFRS_2019_20,
     CalibratedSPIEnhancedPooledFRS_2018_20,
+    CalibratedSPIEnhancedPooledFRS_2019_21,
 )
-from .stacked_frs import StackedFRS, PooledFRS_2018_20
+from .stacked_frs import StackedFRS, PooledFRS_2018_20, PooledFRS_2019_21
 from .enhanced_frs import EnhancedFRS