Skip to content

Commit

Permalink
Deploying to gh-pages from @ 70ba63b 🚀
Browse files Browse the repository at this point in the history
  • Loading branch information
@nikhilwoodruff
nikhilwoodruff committed Feb 13, 2025
1 parent 77901c7 commit f2787c2
Show file tree
Hide file tree
Showing 16 changed files with 212 additions and 375 deletions.
14 changes: 11 additions & 3 deletions _sources/basic/calculate_economy_comparison.ipynb
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions _sources/basic/calculate_household_comparison.ipynb
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _sources/basic/calculate_single_economy.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.14"
"version": "3.12.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion _sources/basic/calculate_single_household.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.14"
"version": "3.12.9"
}
},
"nbformat": 4,
Expand Down
14 changes: 7 additions & 7 deletions _sources/basic/create_charts.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand All @@ -34,14 +34,14 @@
"from policyengine import Simulation\n",
"from policyengine.outputs.macro.comparison.charts import *\n",
"\n",
"sim = Simulation({\n",
" \"country\": \"uk\",\n",
" \"scope\": \"macro\",\n",
" \"reform\": {\n",
"sim = Simulation(\n",
" country=\"uk\",\n",
" scope=\"macro\",\n",
" reform={\n",
" \"gov.hmrc.income_tax.allowances.personal_allowance.amount\": 10_000,\n",
" },\n",
" \"title\": \"Lowering the personal allowance to £10,000\" # Required for charts\n",
"})\n",
" title=\"Lowering the personal allowance to £10,000\" # Required for charts\n",
")\n",
"\n",
"from policyengine.utils.charts import add_fonts\n",
"\n",
Expand Down
14 changes: 7 additions & 7 deletions _sources/concepts/simulation.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand All @@ -39,12 +39,12 @@
"source": [
"from policyengine import Simulation\n",
"\n",
"sim = Simulation({\n",
" \"country\": \"uk\",\n",
" \"scope\": \"macro\",\n",
" \"reform\": {},\n",
" \"time_period\": 2025,\n",
"})\n",
"sim = Simulation(\n",
" country=\"uk\",\n",
" scope=\"macro\",\n",
" reform={},\n",
" time_period=2025,\n",
")\n",
"\n",
"sim.calculate_economy_comparison()"
]
Expand Down
14 changes: 7 additions & 7 deletions _sources/index.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand All @@ -44,14 +44,14 @@
"source": [
"from policyengine import Simulation\n",
"\n",
"sim = Simulation({\n",
" \"scope\": \"macro\",\n",
" \"country\": \"uk\",\n",
" \"time_period\": 2025,\n",
" \"reform\": {\n",
"sim = Simulation(\n",
" scope=\"macro\",\n",
" country=\"uk\",\n",
" time_period=2025,\n",
" reform={\n",
" \"gov.hmrc.income_tax.allowances.personal_allowance.amount\": 15000\n",
" },\n",
"})\n",
")\n",
"\n",
"sim.calculate_economy_comparison()"
]
Expand Down
28 changes: 2 additions & 26 deletions basic/calculate_household_comparison.html
View file

Large diffs are not rendered by default.

187 changes: 156 additions & 31 deletions basic/create_charts.html
View file

Large diffs are not rendered by default.

26 changes: 7 additions & 19 deletions concepts/simulation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,12 @@ <h1>Simulation interface<a class="headerlink" href="#simulation-interface" title
<div class="cell_input docutils container">
<div class="highlight-ipython3 notranslate"><div class="highlight"><pre><span></span><span class="kn">from</span><span class="w"> </span><span class="nn">policyengine</span><span class="w"> </span><span class="kn">import</span> <span class="n">Simulation</span>

<span class="n">sim</span> <span class="o">=</span> <span class="n">Simulation</span><span class="p">({</span>
<span class="s2">&quot;country&quot;</span><span class="p">:</span> <span class="s2">&quot;uk&quot;</span><span class="p">,</span>
<span class="s2">&quot;scope&quot;</span><span class="p">:</span> <span class="s2">&quot;macro&quot;</span><span class="p">,</span>
<span class="s2">&quot;reform&quot;</span><span class="p">:</span> <span class="p">{},</span>
<span class="s2">&quot;time_period&quot;</span><span class="p">:</span> <span class="mi">2025</span><span class="p">,</span>
<span class="p">})</span>
<span class="n">sim</span> <span class="o">=</span> <span class="n">Simulation</span><span class="p">(</span>
<span class="n">country</span><span class="o">=</span><span class="s2">&quot;uk&quot;</span><span class="p">,</span>
<span class="n">scope</span><span class="o">=</span><span class="s2">&quot;macro&quot;</span><span class="p">,</span>
<span class="n">reform</span><span class="o">=</span><span class="p">{},</span>
<span class="n">time_period</span><span class="o">=</span><span class="mi">2025</span><span class="p">,</span>
<span class="p">)</span>

<span class="n">sim</span><span class="o">.</span><span class="n">calculate_economy_comparison</span><span class="p">()</span>
</pre></div>
Expand All @@ -304,19 +304,7 @@ <h1>Simulation interface<a class="headerlink" href="#simulation-interface" title
from .autonotebook import tqdm as notebook_tqdm
</pre></div>
</div>
<div class="output traceback highlight-ipythontb notranslate"><div class="highlight"><pre><span></span><span class="gt">---------------------------------------------------------------------------</span>
<span class="ne">TypeError</span><span class="g g-Whitespace"> </span>Traceback (most recent call last)
<span class="n">Cell</span> <span class="n">In</span><span class="p">[</span><span class="mi">1</span><span class="p">],</span> <span class="n">line</span> <span class="mi">3</span>
<span class="g g-Whitespace"> </span><span class="mi">1</span> <span class="kn">from</span><span class="w"> </span><span class="nn">policyengine</span><span class="w"> </span><span class="kn">import</span> <span class="n">Simulation</span>
<span class="ne">----&gt; </span><span class="mi">3</span> <span class="n">sim</span> <span class="o">=</span> <span class="n">Simulation</span><span class="p">({</span>
<span class="g g-Whitespace"> </span><span class="mi">4</span> <span class="s2">&quot;country&quot;</span><span class="p">:</span> <span class="s2">&quot;uk&quot;</span><span class="p">,</span>
<span class="g g-Whitespace"> </span><span class="mi">5</span> <span class="s2">&quot;scope&quot;</span><span class="p">:</span> <span class="s2">&quot;macro&quot;</span><span class="p">,</span>
<span class="g g-Whitespace"> </span><span class="mi">6</span> <span class="s2">&quot;reform&quot;</span><span class="p">:</span> <span class="p">{},</span>
<span class="g g-Whitespace"> </span><span class="mi">7</span> <span class="s2">&quot;time_period&quot;</span><span class="p">:</span> <span class="mi">2025</span><span class="p">,</span>
<span class="g g-Whitespace"> </span><span class="mi">8</span> <span class="p">})</span>
<span class="g g-Whitespace"> </span><span class="mi">10</span> <span class="n">sim</span><span class="o">.</span><span class="n">calculate_economy_comparison</span><span class="p">()</span>

<span class="ne">TypeError</span>: Simulation.__init__() takes 1 positional argument but 2 were given
<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>EconomyComparison(headlines=Headlines(budgetary_impact=0.0, winner_share=0.0), fiscal=FiscalComparison(baseline=FiscalSummary(tax_revenue=658911285719.5891, federal_tax=658911285719.5891, federal_balance=309089098855.4849, state_tax=0.0, government_spending=349822186864.1042, tax_benefit_programs={&#39;income_tax&#39;: 333376287037.05945, &#39;national_insurance&#39;: 52985626776.773834, &#39;ni_employer&#39;: 126330649370.35953, &#39;vat&#39;: 211671832822.39133, &#39;council_tax&#39;: 49007055050.00724, &#39;fuel_duty&#39;: 26506672341.204205, &#39;tax_credits&#39;: -34929879.49872104, &#39;universal_credit&#39;: -73459549194.97665, &#39;child_benefit&#39;: -14311471487.935827, &#39;state_pension&#39;: -132795868621.44594, &#39;pension_credit&#39;: -6252358021.417119}, household_net_income=1566028514855.0789), reform=FiscalSummary(tax_revenue=658911285719.5891, federal_tax=658911285719.5891, federal_balance=309089098855.4849, state_tax=0.0, government_spending=349822186864.1042, tax_benefit_programs={&#39;income_tax&#39;: 333376287037.05945, &#39;national_insurance&#39;: 52985626776.773834, &#39;ni_employer&#39;: 126330649370.35953, &#39;vat&#39;: 211671832822.39133, &#39;council_tax&#39;: 49007055050.00724, &#39;fuel_duty&#39;: 26506672341.204205, &#39;tax_credits&#39;: -34929879.49872104, &#39;universal_credit&#39;: -73459549194.97665, &#39;child_benefit&#39;: -14311471487.935827, &#39;state_pension&#39;: -132795868621.44594, &#39;pension_credit&#39;: -6252358021.417119}, household_net_income=1566028514855.0789), change=FiscalSummary(tax_revenue=0.0, federal_tax=0.0, federal_balance=0.0, state_tax=0.0, government_spending=0.0, tax_benefit_programs={&#39;income_tax&#39;: 0.0, &#39;national_insurance&#39;: 0.0, &#39;ni_employer&#39;: 0.0, &#39;vat&#39;: 0.0, &#39;council_tax&#39;: 0.0, &#39;fuel_duty&#39;: 0.0, &#39;tax_credits&#39;: 0.0, &#39;universal_credit&#39;: 0.0, &#39;child_benefit&#39;: 0.0, &#39;state_pension&#39;: 0.0, &#39;pension_credit&#39;: 0.0}, household_net_income=0.0), relative_change=FiscalSummary(tax_revenue=0.0, federal_tax=0.0, federal_balance=0.0, state_tax=0.0, government_spending=0.0, tax_benefit_programs={&#39;income_tax&#39;: 0.0, &#39;national_insurance&#39;: 0.0, &#39;ni_employer&#39;: 0.0, &#39;vat&#39;: 0.0, &#39;council_tax&#39;: 0.0, &#39;fuel_duty&#39;: 0.0, &#39;tax_credits&#39;: -0.0, &#39;universal_credit&#39;: -0.0, &#39;child_benefit&#39;: -0.0, &#39;state_pension&#39;: -0.0, &#39;pension_credit&#39;: -0.0}, household_net_income=0.0)), inequality=InequalityComparison(baseline=InequalitySummary(gini=0.36255397405553097, top_10_share=0.3260927004295773, top_1_share=0.13145609415091833), reform=InequalitySummary(gini=0.36255397405553097, top_10_share=0.3260927004295773, top_1_share=0.13145609415091833), change=InequalitySummary(gini=0.0, top_10_share=0.0, top_1_share=0.0), relative_change=InequalitySummary(gini=0.0, top_10_share=0.0, top_1_share=0.0)), distributional=DecileImpacts(income=IncomeMeasureSpecificDecileImpacts(income_change=IncomeMeasureSpecificDecileIncomeChange(relative={1: 0.0, 2: 0.0, 3: 0.0, 4: 0.0, 5: 0.0, 6: 0.0, 7: 0.0, 8: 0.0, 9: 0.0, 10: 0.0}, average={1: 0.0, 2: 0.0, 3: 0.0, 4: 0.0, 5: 0.0, 6: 0.0, 7: 0.0, 8: 0.0, 9: 0.0, 10: 0.0}), winners_and_losers=IncomeMeasureSpecificDecileWinnersLosers(deciles={1: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 2: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 3: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 4: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 5: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 6: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 7: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 8: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 9: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 10: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0)}, all=IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0))), wealth=IncomeMeasureSpecificDecileImpacts(income_change=IncomeMeasureSpecificDecileIncomeChange(relative={1: 0.0, 2: 0.0, 3: 0.0, 4: 0.0, 5: 0.0, 6: 0.0, 7: 0.0, 8: 0.0, 9: 0.0, 10: 0.0}, average={1: 0.0, 2: 0.0, 3: 0.0, 4: 0.0, 5: 0.0, 6: 0.0, 7: 0.0, 8: 0.0, 9: 0.0, 10: 0.0}), winners_and_losers=IncomeMeasureSpecificDecileWinnersLosers(deciles={1: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 2: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 3: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 4: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 5: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 6: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 7: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 8: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 9: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0), 10: IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0)}, all=IncomeMeasureSpecificDecileWinnersLosersGroupOutcomes(lose_more_than_5_percent_share=0.0, lose_less_than_5_percent_share=0.0, lose_share=0.0, no_change_share=1.0, gain_share=0.0, gain_less_than_5_percent_share=0.0, gain_more_than_5_percent_share=0.0)))))
</pre></div>
</div>
</div>
Expand Down
Loading

0 comments on commit f2787c2

Please sign in to comment.