Revert "making fixes per review comments"

This reverts commit c05c7f3.

Author: aletzdy

.github/workflows/core_tests.yml

@@ -180,7 +180,7 @@ jobs:
           - prototype_mtc_extended
           - placeholder_sandag
           - prototype_sandag_xborder
-          - production_semcog
+          - example_semcog
           - prototype_mwcog
           - placeholder_multiple_zone
       fail-fast: false

.vscode/settings.json

@@ -488,34 +488,34 @@
       data/final_accessibility.csv
       949994345c9965054be260589fd64079e4032d2e4079e46b9eb9c758a40527c3
 
-- name: production_semcog
+- name: example_semcog
   description: 67 zone test example for the SEMCOG region
-  # activitysim create -e production_semcog -d test_production_semcog
-  # cd test_production_semcog
+  # activitysim create -e example_semcog -d test_example_semcog
+  # cd test_example_semcog
   # python simulation.py -c configs -o output -d data
   # cd ..
   include:
-    - production_semcog/extensions
-    - production_semcog/data
-    - production_semcog/configs
-    - production_semcog/configs_mp
-    - production_semcog/output
-    - production_semcog/README.MD
-    - production_semcog/simulation.py
+    - example_semcog/extensions
+    - example_semcog/data
+    - example_semcog/configs
+    - example_semcog/configs_mp
+    - example_semcog/output
+    - example_semcog/README.MD
+    - example_semcog/simulation.py
 
-- name: production_semcog_full
-  description: 2899 zone full size production model for the SEMCOG region
-  # activitysim create -e production_semcog_full -d test_production_semcog_full
-  # cd test_production_semcog_full
+- name: example_semcog_full
+  description: 2899 zone full size example for the SEMCOG region
+  # activitysim create -e example_semcog_full -d test_example_semcog_full
+  # cd test_example_semcog_full
   # python simulation.py -c configs_mp -c configs -o output -d data
   # cd ..
   include:
-    - production_semcog/extensions
-    - production_semcog/configs
-    - production_semcog/configs_mp
-    - production_semcog/output
-    - production_semcog/README.MD
-    - production_semcog/simulation.py
+    - example_semcog/extensions
+    - example_semcog/configs
+    - example_semcog/configs_mp
+    - example_semcog/output
+    - example_semcog/README.MD
+    - example_semcog/simulation.py
     - https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/semcog_data_full/skims_offpeak.omx
       data/skims_offpeak.omx
       685e93a725e2c04e4b1fc11b92609472c347ce830475448e39b52947fa729d80

activitysim/examples/example_manifest.yaml

@@ -0,0 +1,2 @@
+data_*/
+output_*/

activitysim/examples/example_semcog/.gitignore

@@ -2,6 +2,7 @@ Description,Target,Expression
 #,, annotate households table after import
 ,_PERSON_COUNT,"lambda query, persons, households: persons.query(query).groupby('household_id').size().reindex(households.index).fillna(0).astype(np.int8)"
 #,,FIXME households.income can be negative  - so we clip?
+#,income,households.hincp * households.adjinc/100000
 income,income,households.hincp.fillna(0)
 income_in_thousands,income_in_thousands,(income / 1000).clip(lower=0)
 income_segment,income_segment,"pd.cut(income_in_thousands, bins=[-np.inf, 30, 60, 100, np.inf], labels=[1, 2, 3, 4]).astype(int)"