From f85ca8f60de8ee1ede795981ff90c45ff9f91e82 Mon Sep 17 00:00:00 2001
From: Nikhil Woodruff <nikhil.woodruff@outlook.com>
Date: Wed, 16 Oct 2024 17:06:20 +0100
Subject: [PATCH] Increase epochs per year to 10k

---
 CHANGELOG.md                                  | 21 +++++++++++++++++++
 changelog.yaml                                | 15 +++++++++++++
 changelog_entry.yaml                          |  4 ----
 .../datasets/frs/enhanced_frs.py              |  2 +-
 policyengine_uk_data/datasets/frs/frs.py      |  2 +-
 pyproject.toml                                |  2 +-
 6 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1130f8a..de94c95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.0] - 2024-10-16 17:05:58
+
+### Added
+
+- Moved epoch count to 10k per year.
+
+## [1.4.0] - 2024-10-16 17:05:39
+
+### Added
+
+- Missing changelog entry.
+
+## [1.3.0] - 2024-10-16 17:02:56
+
+### Added
+
+- Re-run calibration with more epochs.
+
 ## [1.2.5] - 2024-09-18 13:57:40
 
 ### Fixed
@@ -48,6 +66,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[1.5.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.4.0...1.5.0
+[1.4.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.3.0...1.4.0
+[1.3.0]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.2.5...1.3.0
 [1.2.5]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.2.4...1.2.5
 [1.2.4]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.2.3...1.2.4
 [1.2.3]: https://github.com/PolicyEngine/policyengine-us-data/compare/1.2.2...1.2.3
diff --git a/changelog.yaml b/changelog.yaml
index 955e40b..ac1d6bb 100644
--- a/changelog.yaml
+++ b/changelog.yaml
@@ -39,3 +39,18 @@
     - GH actions naming.
     - Bug causing the Extended FRS to error.
   date: 2024-09-18 13:57:40
+- bump: minor
+  changes:
+    added:
+    - Re-run calibration with more epochs.
+  date: 2024-10-16 17:02:56
+- bump: minor
+  changes:
+    added:
+    - Missing changelog entry.
+  date: 2024-10-16 17:05:39
+- bump: minor
+  changes:
+    added:
+    - Moved epoch count to 10k per year.
+  date: 2024-10-16 17:05:58
diff --git a/changelog_entry.yaml b/changelog_entry.yaml
index 8b63c21..e69de29 100644
--- a/changelog_entry.yaml
+++ b/changelog_entry.yaml
@@ -1,4 +0,0 @@
-- bump: minor
-  changes:
-    added:
-    - Add employer pension contributions.
diff --git a/policyengine_uk_data/datasets/frs/enhanced_frs.py b/policyengine_uk_data/datasets/frs/enhanced_frs.py
index 92844d9..a3bfb81 100644
--- a/policyengine_uk_data/datasets/frs/enhanced_frs.py
+++ b/policyengine_uk_data/datasets/frs/enhanced_frs.py
@@ -104,7 +104,7 @@ def dropout_weights(weights, p):
 
     start_loss = None
 
-    iterator = trange(1_000)
+    iterator = trange(10_000)
     for i in iterator:
         optimizer.zero_grad()
         weights_ = dropout_weights(weights, dropout_rate)
diff --git a/policyengine_uk_data/datasets/frs/frs.py b/policyengine_uk_data/datasets/frs/frs.py
index 203ffc4..7f086b0 100644
--- a/policyengine_uk_data/datasets/frs/frs.py
+++ b/policyengine_uk_data/datasets/frs/frs.py
@@ -759,7 +759,7 @@ def add_expenses(
         sum_to_entity(job.DEDUC1.fillna(0), job.person_id, person.index) * 52,
     )
     frs["employer_pension_contributions"] = (
-        frs["employee_pension_contributions"] * 2.5
+        frs["employee_pension_contributions"] * 3
     )  # Rough estimate based on aggregates.
 
     frs["housing_service_charges"] = (
diff --git a/pyproject.toml b/pyproject.toml
index 276d4bc..1de951e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "policyengine_uk_data"
-version = "1.4.0"
+version = "1.5.0"
 description = "A package to create representative microdata for the UK."
 readme = "README.md"
 authors = [