Deploying to gh-pages from @ 81bf6b0 🚀

_modules/taxcalc/calculator.html

@@ -1146,7 +1146,8 @@ <h1>Source code for taxcalc.calculator</h1><div class="highlight"><pre>
                                   <span class="bp">self</span><span class="o">.</span><span class="n">policy_param</span><span class="p">(</span><span class="s1">&#39;FICA_ss_trt_employee&#39;</span><span class="p">)</span> <span class="o">+</span>
                                   <span class="bp">self</span><span class="o">.</span><span class="n">policy_param</span><span class="p">(</span><span class="s1">&#39;FICA_mc_trt_employer&#39;</span><span class="p">)</span> <span class="o">+</span>
                                   <span class="bp">self</span><span class="o">.</span><span class="n">policy_param</span><span class="p">(</span><span class="s1">&#39;FICA_mc_trt_employee&#39;</span><span class="p">)),</span>
-                           <span class="mf">0.5</span> <span class="o">*</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">policy_param</span><span class="p">(</span><span class="s1">&#39;FICA_mc_trt_employer&#39;</span><span class="p">)</span> <span class="o">+</span> <span class="bp">self</span><span class="o">.</span><span class="n">policy_param</span><span class="p">(</span><span class="s1">&#39;FICA_mc_trt_employee&#39;</span><span class="p">)))</span>
+                           <span class="mf">0.5</span> <span class="o">*</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">policy_param</span><span class="p">(</span><span class="s1">&#39;FICA_mc_trt_employer&#39;</span><span class="p">)</span> <span class="o">+</span>
+                                  <span class="bp">self</span><span class="o">.</span><span class="n">policy_param</span><span class="p">(</span><span class="s1">&#39;FICA_mc_trt_employee&#39;</span><span class="p">)))</span>
         <span class="k">else</span><span class="p">:</span>
             <span class="n">adj</span> <span class="o">=</span> <span class="mf">0.0</span>
         <span class="c1"># compute marginal tax rates</span>
@@ -1652,11 +1653,10 @@ <h1>Source code for taxcalc.calculator</h1><div class="highlight"><pre>
                 <span class="k">for</span> <span class="n">pname</span> <span class="ow">in</span> <span class="n">baseline</span><span class="o">.</span><span class="n">keys</span><span class="p">():</span>
                     <span class="n">upda_value</span> <span class="o">=</span> <span class="nb">getattr</span><span class="p">(</span><span class="n">updated</span><span class="p">,</span> <span class="n">pname</span><span class="p">)</span>
                     <span class="n">base_value</span> <span class="o">=</span> <span class="nb">getattr</span><span class="p">(</span><span class="n">baseline</span><span class="p">,</span> <span class="n">pname</span><span class="p">)</span>
+                    <span class="n">is_array</span> <span class="o">=</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">upda_value</span><span class="p">,</span> <span class="n">np</span><span class="o">.</span><span class="n">ndarray</span><span class="p">)</span>
                     <span class="k">if</span> <span class="p">(</span>
-                        <span class="p">(</span><span class="nb">isinstance</span><span class="p">(</span><span class="n">upda_value</span><span class="p">,</span> <span class="n">np</span><span class="o">.</span><span class="n">ndarray</span><span class="p">)</span> <span class="ow">and</span>
-                         <span class="n">np</span><span class="o">.</span><span class="n">allclose</span><span class="p">(</span><span class="n">upda_value</span><span class="p">,</span> <span class="n">base_value</span><span class="p">))</span> <span class="ow">or</span>
-                        <span class="p">(</span><span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">upda_value</span><span class="p">,</span> <span class="n">np</span><span class="o">.</span><span class="n">ndarray</span><span class="p">)</span> <span class="ow">and</span>
-                         <span class="n">upda_value</span> <span class="o">!=</span> <span class="n">base_value</span><span class="p">)</span>
+                        <span class="p">(</span><span class="n">is_array</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">np</span><span class="o">.</span><span class="n">allclose</span><span class="p">(</span><span class="n">upda_value</span><span class="p">,</span> <span class="n">base_value</span><span class="p">))</span>
+                        <span class="ow">or</span> <span class="p">(</span><span class="n">is_array</span> <span class="o">==</span> <span class="kc">False</span> <span class="ow">and</span> <span class="n">upda_value</span> <span class="o">!=</span> <span class="n">base_value</span><span class="p">)</span>
                     <span class="p">):</span>
                         <span class="n">params_with_diff</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">pname</span><span class="p">)</span>
                 <span class="k">if</span> <span class="n">params_with_diff</span><span class="p">:</span>

_modules/taxcalc/growfactors.html

@@ -430,7 +430,7 @@ <h1>Source code for taxcalc.growfactors</h1><div class="highlight"><pre>
 <span class="sd">    which is for use with puf and cps data from the taxdata repository.</span>
 <span class="sd">    &quot;&quot;&quot;</span>
 
-    <span class="n">PACKAGE_FILE_NAMES</span> <span class="o">=</span> <span class="p">[</span><span class="s1">&#39;growfactors.csv&#39;</span><span class="p">,</span> <span class="s1">&#39;tmd_growfactors.csv&#39;</span><span class="p">]</span>
+    <span class="n">PACKAGE_FILE_NAMES</span> <span class="o">=</span> <span class="p">[</span><span class="s1">&#39;growfactors.csv&#39;</span><span class="p">]</span>
     <span class="n">FILE_PATH</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">abspath</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">dirname</span><span class="p">(</span><span class="vm">__file__</span><span class="p">))</span>
 
     <span class="n">VALID_NAMES</span> <span class="o">=</span> <span class="nb">set</span><span class="p">([</span><span class="s1">&#39;ABOOK&#39;</span><span class="p">,</span> <span class="s1">&#39;ACGNS&#39;</span><span class="p">,</span> <span class="s1">&#39;ACPIM&#39;</span><span class="p">,</span> <span class="s1">&#39;ACPIU&#39;</span><span class="p">,</span>

_sources/guide/input_vars.md

@@ -92,15 +92,15 @@ _IRS Form Location:_
 ##  `blind_head`  
 _Description_: 1 if taxpayer is blind; otherwise 0  
 _Datatype_: int  
-_Availability_: taxdata_puf, taxdata_cps  
+_Availability_: taxdata_cps  
 _IRS Form Location:_  
 2013-2016: 1040 line 39a  
 
 
 ##  `blind_spouse`  
 _Description_: 1 if spouse is blind; otherwise 0  
 _Datatype_: int  
-_Availability_: taxdata_puf, taxdata_cps  
+_Availability_: taxdata_cps  
 _IRS Form Location:_  
 2013-2016: 1040 line 39a  
 
@@ -629,31 +629,31 @@ _IRS Form Location:_
 ##  `a_lineno`  
 _Description_: CPS line number for the person record of the head of the tax filing unit (not used in tax-calculation logic)  
 _Datatype_: int  
-_Availability_: taxdata_puf, taxdata_cps  
+_Availability_: taxdata_cps  
 _IRS Form Location:_  
 2013-2016: sample construction info  
 
 
 ##  `ffpos`  
 _Description_: CPS family identifier within household (not used in tax-calculation logic)  
 _Datatype_: int  
-_Availability_: taxdata_puf, taxdata_cps  
+_Availability_: taxdata_cps  
 _IRS Form Location:_  
 2013-2016: sample construction info  
 
 
 ##  `fips`  
 _Description_: FIPS state code (not used in tax-calculation logic)  
 _Datatype_: int  
-_Availability_: taxdata_puf, taxdata_puf, taxdata_cps  
+_Availability_: taxdata_puf, taxdata_cps  
 _IRS Form Location:_  
 2013-2016: sample construction info  
 
 
 ##  `h_seq`  
 _Description_: CPS household sequence number (not used in tax-calculation logic)  
 _Datatype_: int  
-_Availability_: taxdata_puf, taxdata_cps  
+_Availability_: taxdata_cps  
 _IRS Form Location:_  
 2013-2016: sample construction info  
 

_sources/guide/output_vars.md

@@ -103,8 +103,8 @@ _IRS Form Location:_
 _Description_: Total federal individual income tax liability; appears as INCTAX variable in tc CLI minimal output  
 _Datatype_: float  
 _IRS Form Location:_  
-2013-2013: 1040 line 61 minus lines 56, 60a, 64a, 65, and 66  
-2014-2016: 1040 line 63 minus lines 57, 62a, 66a, 67, and 68  
+2013-2013: 1040 line 61 minus line 56 minus line 60a  
+2014-2016: 1040 line 63 minus line 57 minus line 62a  
 
 
 ##  `num`  
@@ -242,7 +242,7 @@ _IRS Form Location:_
 
 
 ##  `c05200`  
-_Description_: Tax amount from Sch X,Y,Z tables  
+_Description_: Tax amount from Sch X,Y,X tables  
 _Datatype_: float  
 _IRS Form Location:_  
 2013-20??: calculated variable  
@@ -544,27 +544,6 @@ _IRS Form Location:_
 2013-20??: calculated variable  
 
 
-##  `ctc_total`  
-_Description_: Total CTC amount (c07220 + c11070 + odc + ctc_new)  
-_Datatype_: float  
-_IRS Form Location:_  
-2013-20??: calculated variable  
-
-
-##  `ctc_nonrefundable`  
-_Description_: Portion of total CTC amount that is nonrefundable  
-_Datatype_: float  
-_IRS Form Location:_  
-2013-20??: calculated variable  
-
-
-##  `ctc_refundable`  
-_Description_: Portion of total CTC amount that is refundable  
-_Datatype_: float  
-_IRS Form Location:_  
-2013-20??: calculated variable  
-
-
 ##  `personal_refundable_credit`  
 _Description_: Personal refundable credit  
 _Datatype_: float  
@@ -621,13 +600,6 @@ _IRS Form Location:_
 2013-20??: calculated variable  
 
 
-##  `dwks43`  
-_Description_: separate tax on long-term capital gains and qualified dividends  
-_Datatype_: float  
-_IRS Form Location:_  
-2013-20??: calculated variable  
-
-
 ##  `fstax`  
 _Description_: search taxcalc/calcfunctions.py for how calculated and used  
 _Datatype_: float