Deploying to gh-pages from @ 4df16eb 🚀

_modules/taxcalc/growfactors.html

@@ -559,14 +559,14 @@ <h1>Source code for taxcalc.growfactors</h1><div class="highlight"><pre>
         <span class="k">if</span> <span class="n">year</span> <span class="o">&gt;</span> <span class="bp">self</span><span class="o">.</span><span class="n">last_year</span><span class="p">:</span>
             <span class="n">msg</span> <span class="o">=</span> <span class="s1">&#39;year=</span><span class="si">{}</span><span class="s1"> &gt; GrowFactors.last_year=</span><span class="si">{}</span><span class="s1">&#39;</span>
             <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="n">msg</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">year</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">last_year</span><span class="p">))</span>
-        <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">gfdf</span><span class="p">[</span><span class="n">name</span><span class="p">][</span><span class="n">year</span><span class="p">]</span></div>
+        <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">gfdf</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">year</span><span class="p">,</span><span class="n">name</span><span class="p">]</span></div>
 
 
 <div class="viewcode-block" id="GrowFactors.update">
 <a class="viewcode-back" href="../../api/growfactors.html#taxcalc.growfactors.GrowFactors.update">[docs]</a>
     <span class="k">def</span> <span class="nf">update</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">year</span><span class="p">,</span> <span class="n">diff</span><span class="p">):</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;</span>
-<span class="sd">        Add to self.gfdf[name][year] the specified diff amount.</span>
+<span class="sd">        Add to self.gfdf (for name and year) the specified diff amount.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">used</span><span class="p">:</span>
             <span class="n">msg</span> <span class="o">=</span> <span class="s1">&#39;cannot update growfactors after they have been used&#39;</span>
@@ -575,7 +575,7 @@ <h1>Source code for taxcalc.growfactors</h1><div class="highlight"><pre>
         <span class="k">assert</span> <span class="n">year</span> <span class="o">&gt;=</span> <span class="bp">self</span><span class="o">.</span><span class="n">first_year</span>
         <span class="k">assert</span> <span class="n">year</span> <span class="o">&lt;=</span> <span class="bp">self</span><span class="o">.</span><span class="n">last_year</span>
         <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">diff</span><span class="p">,</span> <span class="nb">float</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">gfdf</span><span class="p">[</span><span class="n">name</span><span class="p">][</span><span class="n">year</span><span class="p">]</span> <span class="o">+=</span> <span class="n">diff</span></div>
+        <span class="bp">self</span><span class="o">.</span><span class="n">gfdf</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">year</span><span class="p">,</span><span class="n">name</span><span class="p">]</span> <span class="o">+=</span> <span class="n">diff</span></div>
 </div>
 
 </pre></div>

_modules/taxcalc/taxcalcio.html

@@ -1036,12 +1036,24 @@ <h1>Source code for taxcalc.taxcalcio</h1><div class="highlight"><pre>
                                               <span class="n">pop_quantiles</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
                                               <span class="n">weight_by_income_measure</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span>
         <span class="n">gdfx</span> <span class="o">=</span> <span class="n">dfx</span><span class="o">.</span><span class="n">groupby</span><span class="p">(</span><span class="s1">&#39;table_row&#39;</span><span class="p">,</span> <span class="n">as_index</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">observed</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
-        <span class="n">rtns_series</span> <span class="o">=</span> <span class="n">gdfx</span><span class="o">.</span><span class="n">apply</span><span class="p">(</span><span class="n">unweighted_sum</span><span class="p">,</span> <span class="s1">&#39;s006&#39;</span><span class="p">)</span><span class="o">.</span><span class="n">values</span><span class="p">[:,</span> <span class="mi">1</span><span class="p">]</span>
-        <span class="n">xinc_series</span> <span class="o">=</span> <span class="n">gdfx</span><span class="o">.</span><span class="n">apply</span><span class="p">(</span><span class="n">weighted_sum</span><span class="p">,</span> <span class="s1">&#39;expanded_income&#39;</span><span class="p">)</span><span class="o">.</span><span class="n">values</span><span class="p">[:,</span> <span class="mi">1</span><span class="p">]</span>
-        <span class="n">itax_series</span> <span class="o">=</span> <span class="n">gdfx</span><span class="o">.</span><span class="n">apply</span><span class="p">(</span><span class="n">weighted_sum</span><span class="p">,</span> <span class="s1">&#39;iitax&#39;</span><span class="p">)</span><span class="o">.</span><span class="n">values</span><span class="p">[:,</span> <span class="mi">1</span><span class="p">]</span>
-        <span class="n">ptax_series</span> <span class="o">=</span> <span class="n">gdfx</span><span class="o">.</span><span class="n">apply</span><span class="p">(</span><span class="n">weighted_sum</span><span class="p">,</span> <span class="s1">&#39;payrolltax&#39;</span><span class="p">)</span><span class="o">.</span><span class="n">values</span><span class="p">[:,</span> <span class="mi">1</span><span class="p">]</span>
-        <span class="n">htax_series</span> <span class="o">=</span> <span class="n">gdfx</span><span class="o">.</span><span class="n">apply</span><span class="p">(</span><span class="n">weighted_sum</span><span class="p">,</span> <span class="s1">&#39;lumpsum_tax&#39;</span><span class="p">)</span><span class="o">.</span><span class="n">values</span><span class="p">[:,</span> <span class="mi">1</span><span class="p">]</span>
-        <span class="n">ctax_series</span> <span class="o">=</span> <span class="n">gdfx</span><span class="o">.</span><span class="n">apply</span><span class="p">(</span><span class="n">weighted_sum</span><span class="p">,</span> <span class="s1">&#39;combined&#39;</span><span class="p">)</span><span class="o">.</span><span class="n">values</span><span class="p">[:,</span> <span class="mi">1</span><span class="p">]</span>
+        <span class="n">rtns_series</span> <span class="o">=</span> <span class="n">gdfx</span><span class="o">.</span><span class="n">apply</span><span class="p">(</span>
+            <span class="n">unweighted_sum</span><span class="p">,</span> <span class="s1">&#39;s006&#39;</span><span class="p">,</span> <span class="n">include_groups</span><span class="o">=</span><span class="kc">False</span>
+        <span class="p">)</span><span class="o">.</span><span class="n">values</span><span class="p">[:,</span> <span class="mi">1</span><span class="p">]</span>
+        <span class="n">xinc_series</span> <span class="o">=</span> <span class="n">gdfx</span><span class="o">.</span><span class="n">apply</span><span class="p">(</span>
+            <span class="n">weighted_sum</span><span class="p">,</span> <span class="s1">&#39;expanded_income&#39;</span><span class="p">,</span> <span class="n">include_groups</span><span class="o">=</span><span class="kc">False</span>
+        <span class="p">)</span><span class="o">.</span><span class="n">values</span><span class="p">[:,</span> <span class="mi">1</span><span class="p">]</span>
+        <span class="n">itax_series</span> <span class="o">=</span> <span class="n">gdfx</span><span class="o">.</span><span class="n">apply</span><span class="p">(</span>
+            <span class="n">weighted_sum</span><span class="p">,</span> <span class="s1">&#39;iitax&#39;</span><span class="p">,</span> <span class="n">include_groups</span><span class="o">=</span><span class="kc">False</span>
+        <span class="p">)</span><span class="o">.</span><span class="n">values</span><span class="p">[:,</span> <span class="mi">1</span><span class="p">]</span>
+        <span class="n">ptax_series</span> <span class="o">=</span> <span class="n">gdfx</span><span class="o">.</span><span class="n">apply</span><span class="p">(</span>
+            <span class="n">weighted_sum</span><span class="p">,</span> <span class="s1">&#39;payrolltax&#39;</span><span class="p">,</span> <span class="n">include_groups</span><span class="o">=</span><span class="kc">False</span>
+        <span class="p">)</span><span class="o">.</span><span class="n">values</span><span class="p">[:,</span> <span class="mi">1</span><span class="p">]</span>
+        <span class="n">htax_series</span> <span class="o">=</span> <span class="n">gdfx</span><span class="o">.</span><span class="n">apply</span><span class="p">(</span>
+            <span class="n">weighted_sum</span><span class="p">,</span> <span class="s1">&#39;lumpsum_tax&#39;</span><span class="p">,</span> <span class="n">include_groups</span><span class="o">=</span><span class="kc">False</span>
+        <span class="p">)</span><span class="o">.</span><span class="n">values</span><span class="p">[:,</span> <span class="mi">1</span><span class="p">]</span>
+        <span class="n">ctax_series</span> <span class="o">=</span> <span class="n">gdfx</span><span class="o">.</span><span class="n">apply</span><span class="p">(</span>
+            <span class="n">weighted_sum</span><span class="p">,</span> <span class="s1">&#39;combined&#39;</span><span class="p">,</span> <span class="n">include_groups</span><span class="o">=</span><span class="kc">False</span>
+        <span class="p">)</span><span class="o">.</span><span class="n">values</span><span class="p">[:,</span> <span class="mi">1</span><span class="p">]</span>
         <span class="c1"># write decile table to text file</span>
         <span class="n">row</span> <span class="o">=</span> <span class="s1">&#39;Weighted Tax </span><span class="si">{}</span><span class="s1"> by Baseline Expanded-Income Decile</span><span class="se">\n</span><span class="s1">&#39;</span>
         <span class="n">tfile</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="n">row</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">tkind</span><span class="p">))</span>
@@ -1097,6 +1109,15 @@ <h1>Source code for taxcalc.taxcalcio</h1><div class="highlight"><pre>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="n">pos_wght_sum</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">calc</span><span class="o">.</span><span class="n">total_weight</span><span class="p">()</span> <span class="o">&gt;</span> <span class="mf">0.0</span>
         <span class="n">fig</span> <span class="o">=</span> <span class="kc">None</span>
+        <span class="c1"># percentage-aftertax-income-change graph</span>
+        <span class="n">pch_fname</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_output_filename</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s1">&#39;.csv&#39;</span><span class="p">,</span> <span class="s1">&#39;-pch.html&#39;</span><span class="p">)</span>
+        <span class="n">pch_title</span> <span class="o">=</span> <span class="s1">&#39;PCH by Income Percentile&#39;</span>
+        <span class="k">if</span> <span class="n">pos_wght_sum</span><span class="p">:</span>
+            <span class="n">fig</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">calc_base</span><span class="o">.</span><span class="n">pch_graph</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">calc</span><span class="p">,</span> <span class="n">pop_quantiles</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span>
+            <span class="n">write_graph_file</span><span class="p">(</span><span class="n">fig</span><span class="p">,</span> <span class="n">pch_fname</span><span class="p">,</span> <span class="n">pch_title</span><span class="p">)</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="n">reason</span> <span class="o">=</span> <span class="s1">&#39;No graph because sum of weights is not positive&#39;</span>
+            <span class="n">TaxCalcIO</span><span class="o">.</span><span class="n">write_empty_graph_file</span><span class="p">(</span><span class="n">pch_fname</span><span class="p">,</span> <span class="n">pch_title</span><span class="p">,</span> <span class="n">reason</span><span class="p">)</span>
         <span class="c1"># average-tax-rate graph</span>
         <span class="n">atr_fname</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_output_filename</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s1">&#39;.csv&#39;</span><span class="p">,</span> <span class="s1">&#39;-atr.html&#39;</span><span class="p">)</span>
         <span class="n">atr_title</span> <span class="o">=</span> <span class="s1">&#39;ATR by Income Percentile&#39;</span>
@@ -1119,15 +1140,6 @@ <h1>Source code for taxcalc.taxcalcio</h1><div class="highlight"><pre>
         <span class="k">else</span><span class="p">:</span>
             <span class="n">reason</span> <span class="o">=</span> <span class="s1">&#39;No graph because sum of weights is not positive&#39;</span>
             <span class="n">TaxCalcIO</span><span class="o">.</span><span class="n">write_empty_graph_file</span><span class="p">(</span><span class="n">mtr_fname</span><span class="p">,</span> <span class="n">mtr_title</span><span class="p">,</span> <span class="n">reason</span><span class="p">)</span>
-        <span class="c1"># percentage-aftertax-income-change graph</span>
-        <span class="n">pch_fname</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_output_filename</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s1">&#39;.csv&#39;</span><span class="p">,</span> <span class="s1">&#39;-pch.html&#39;</span><span class="p">)</span>
-        <span class="n">pch_title</span> <span class="o">=</span> <span class="s1">&#39;PCH by Income Percentile&#39;</span>
-        <span class="k">if</span> <span class="n">pos_wght_sum</span><span class="p">:</span>
-            <span class="n">fig</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">calc_base</span><span class="o">.</span><span class="n">pch_graph</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">calc</span><span class="p">,</span> <span class="n">pop_quantiles</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span>
-            <span class="n">write_graph_file</span><span class="p">(</span><span class="n">fig</span><span class="p">,</span> <span class="n">pch_fname</span><span class="p">,</span> <span class="n">pch_title</span><span class="p">)</span>
-        <span class="k">else</span><span class="p">:</span>
-            <span class="n">reason</span> <span class="o">=</span> <span class="s1">&#39;No graph because sum of weights is not positive&#39;</span>
-            <span class="n">TaxCalcIO</span><span class="o">.</span><span class="n">write_empty_graph_file</span><span class="p">(</span><span class="n">pch_fname</span><span class="p">,</span> <span class="n">pch_title</span><span class="p">,</span> <span class="n">reason</span><span class="p">)</span>
         <span class="k">if</span> <span class="n">fig</span><span class="p">:</span>
             <span class="k">del</span> <span class="n">fig</span>
             <span class="n">gc</span><span class="o">.</span><span class="n">collect</span><span class="p">()</span></div>