deploy: 41c713c

Author: yamilbknsu

_modules/demos/config.html

@@ -461,9 +461,7 @@ <h1>Source code for demos.config</h1><div class="highlight"><pre>
     <span class="n">kids_moving_module_config</span><span class="p">:</span> <span class="n">KidsMovingModuleConfig</span> <span class="o">=</span> <span class="n">Field</span><span class="p">(</span>
         <span class="n">default_factory</span><span class="o">=</span><span class="n">KidsMovingModuleConfig</span>
     <span class="p">)</span>
-    <span class="n">income_module_config</span><span class="p">:</span> <span class="n">IncomeModuleConfig</span> <span class="o">=</span> <span class="n">Field</span><span class="p">(</span>
-        <span class="n">default_factory</span><span class="o">=</span><span class="n">IncomeModuleConfig</span>
-    <span class="p">)</span>
+    <span class="n">income_module_config</span><span class="p">:</span> <span class="n">IncomeModuleConfig</span> <span class="o">=</span> <span class="n">Field</span><span class="p">(</span><span class="n">default_factory</span><span class="o">=</span><span class="n">IncomeModuleConfig</span><span class="p">)</span>
 
     <span class="k">def</span><span class="w"> </span><span class="nf">model_post_init</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">__context</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kc">None</span><span class="p">:</span>
         <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">output_fname</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>

_modules/demos/models/household_reorg.html

@@ -1215,7 +1215,11 @@ <h1>Source code for demos.models.household_reorg</h1><div class="highlight"><pre
         <span class="p">]</span><span class="o">.</span><span class="n">values</span>
         <span class="n">households</span><span class="o">.</span><span class="n">local</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">new_households</span><span class="p">,</span> <span class="n">module_config</span><span class="o">.</span><span class="n">geoid_col</span><span class="p">]</span> <span class="o">=</span> <span class="n">geoid_assignment</span>
     <span class="n">county_assignment</span> <span class="o">=</span> <span class="n">households</span><span class="o">.</span><span class="n">local</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">old_household_id</span><span class="p">,</span> <span class="s2">&quot;lcm_county_id&quot;</span><span class="p">]</span><span class="o">.</span><span class="n">values</span>
-    <span class="n">households</span><span class="o">.</span><span class="n">local</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">new_households</span><span class="p">,</span> <span class="s2">&quot;lcm_county_id&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">county_assignment</span></div>
+    <span class="n">households</span><span class="o">.</span><span class="n">local</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">new_households</span><span class="p">,</span> <span class="s2">&quot;lcm_county_id&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">county_assignment</span>
+    <span class="n">not_met_area_assignment</span> <span class="o">=</span> <span class="n">households</span><span class="o">.</span><span class="n">local</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span>
+        <span class="n">old_household_id</span><span class="p">,</span> <span class="s2">&quot;not_met_area&quot;</span>
+    <span class="p">]</span><span class="o">.</span><span class="n">values</span>
+    <span class="n">households</span><span class="o">.</span><span class="n">local</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">new_households</span><span class="p">,</span> <span class="s2">&quot;not_met_area&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">not_met_area_assignment</span></div>
 
 
 

_modules/demos/models/income.html

@@ -284,8 +284,10 @@ <h1>Source code for demos.models.income</h1><div class="highlight"><pre>
 
     <span class="c1"># Calibrate if needed</span>
     <span class="k">if</span> <span class="n">income_config</span><span class="o">.</span><span class="n">calibration_procedure</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
-        <span class="n">predicted</span> <span class="o">=</span> <span class="n">income_config</span><span class="o">.</span><span class="n">calibration_procedure</span><span class="o">.</span><span class="n">calibrate_and_run_model</span><span class="p">(</span>
-            <span class="n">model</span><span class="p">,</span> <span class="n">model_data</span>
+        <span class="n">predicted</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">exp</span><span class="p">(</span>
+            <span class="n">income_config</span><span class="o">.</span><span class="n">calibration_procedure</span><span class="o">.</span><span class="n">calibrate_and_run_model</span><span class="p">(</span>
+                <span class="n">model</span><span class="p">,</span> <span class="n">model_data</span>
+            <span class="p">)</span>
         <span class="p">)</span>
     <span class="k">else</span><span class="p">:</span>
         <span class="n">predicted</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">exp</span><span class="p">(</span><span class="n">model</span><span class="o">.</span><span class="n">predict</span><span class="p">(</span><span class="n">model_data</span><span class="p">))</span>
@@ -359,9 +361,7 @@ <h1>Source code for demos.models.income</h1><div class="highlight"><pre>
             <span class="sa">f</span><span class="s2">&quot;years: </span><span class="si">{</span><span class="n">missing</span><span class="si">}</span><span class="s2">.  Ensure the table covers all simulation years.&quot;</span>
         <span class="p">)</span>
 
-    <span class="n">cumulative_factor</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span>
-        <span class="p">(</span><span class="mi">1</span> <span class="o">+</span> <span class="n">adj_table</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="nb">list</span><span class="p">(</span><span class="n">years</span><span class="p">),</span> <span class="s2">&quot;adjustment&quot;</span><span class="p">])</span><span class="o">.</span><span class="n">prod</span><span class="p">()</span>
-    <span class="p">)</span>
+    <span class="n">cumulative_factor</span> <span class="o">=</span> <span class="nb">float</span><span class="p">((</span><span class="mi">1</span> <span class="o">+</span> <span class="n">adj_table</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="nb">list</span><span class="p">(</span><span class="n">years</span><span class="p">),</span> <span class="s2">&quot;adjustment&quot;</span><span class="p">])</span><span class="o">.</span><span class="n">prod</span><span class="p">())</span>
     <span class="k">if</span> <span class="ow">not</span> <span class="n">forward</span><span class="p">:</span>
         <span class="n">cumulative_factor</span> <span class="o">=</span> <span class="mf">1.0</span> <span class="o">/</span> <span class="n">cumulative_factor</span>
 

_modules/demos/models/kids_moving.html

@@ -378,11 +378,16 @@ <h1>Source code for demos.models.kids_moving</h1><div class="highlight"><pre>
     <span class="p">]</span><span class="o">.</span><span class="n">values</span>
     <span class="n">county_assignment</span> <span class="o">=</span> <span class="n">households</span><span class="o">.</span><span class="n">local</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">old_household_id</span><span class="p">,</span> <span class="s2">&quot;lcm_county_id&quot;</span><span class="p">]</span><span class="o">.</span><span class="n">values</span>
 
+    <span class="n">not_met_area_assignment</span> <span class="o">=</span> <span class="n">households</span><span class="o">.</span><span class="n">local</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span>
+        <span class="n">old_household_id</span><span class="p">,</span> <span class="s2">&quot;not_met_area&quot;</span>
+    <span class="p">]</span><span class="o">.</span><span class="n">values</span>
+
     <span class="n">new_households</span> <span class="o">=</span> <span class="n">get_new_households</span><span class="p">(</span><span class="n">kids_moving_index</span><span class="o">.</span><span class="n">sum</span><span class="p">())</span>
     <span class="n">persons</span><span class="o">.</span><span class="n">local</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">kids_moving_index</span><span class="p">,</span> <span class="s2">&quot;household_id&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">new_households</span>
     <span class="n">persons</span><span class="o">.</span><span class="n">local</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">kids_moving_index</span><span class="p">,</span> <span class="s2">&quot;relate&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="mi">0</span>
     <span class="n">households</span><span class="o">.</span><span class="n">local</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">new_households</span><span class="p">,</span> <span class="n">module_config</span><span class="o">.</span><span class="n">geoid_col</span><span class="p">]</span> <span class="o">=</span> <span class="n">geoid_assignment</span>
     <span class="n">households</span><span class="o">.</span><span class="n">local</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">new_households</span><span class="p">,</span> <span class="s2">&quot;lcm_county_id&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">county_assignment</span>
+    <span class="n">households</span><span class="o">.</span><span class="n">local</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">new_households</span><span class="p">,</span> <span class="s2">&quot;not_met_area&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">not_met_area_assignment</span>
 
 
 <span class="k">def</span><span class="w"> </span><span class="nf">run_and_calibrate_model</span><span class="p">(</span><span class="n">persons</span><span class="p">):</span>