prettier expression rendering #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bstabler merged 4 commits into from
Oct 31, 2019
Merged

prettier expression rendering #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b62a0a
clean-up commas so GitHub renders these correctly - https://help.git…
bstabler Oct 8, 2019
cd57bf8
Merge branch 'develop' of https://github.com/ActivitySim/activitysim …
bstabler Oct 8, 2019
ddf6fb9
one more prettier expression rendering fix
bstabler Oct 8, 2019
1df5866
Merge branch 'master' into develop
bstabler Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions example/configs/accessibility.csv
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ Description,Target,Expression
#,,
#,, auto peak
#,,
# assume peak occurs in AM for outbound and PM for inbound
#,, assume peak occurs in AM for outbound and PM for inbound
peak round trip distance,_auPkTime,"skim_od[('SOVTOLL_TIME', 'AM')] + skim_do[('SOVTOLL_TIME', 'PM')]"
decay function,_decay, exp(_auPkTime * dispersion_parameter_automobile)
auto peak retail,auPkRetail,df.RETEMPN * _decay
Expand DownExpand Up@@ -43,7 +43,7 @@ d-o off-peak transit ivt,_inVehicleTime,"skim_do[('WLK_TRN_WLK_IVT', 'MD')]"
d-o off-peak transit ovt,_outOfVehicleTime,"skim_do[('WLK_TRN_WLK_IWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_XWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_WACC', 'MD')] + skim_do[('WLK_TRN_WLK_WAUX', 'MD')] + skim_do[('WLK_TRN_WLK_WEGR', 'MD')]"
d-o off-peak transit time,_trOpTime_do,(_inVehicleTime + out_of_vehicle_time_weight * _outOfVehicleTime) / 100.0
peak transit time,_trOpTime,_trOpTime_od + _trOpTime_do
#FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#,,FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#round trip path is available,_rt_available,(_trOpTime > 0)
round trip path is available,_rt_available,(_trOpTime_od > 0) & (_trOpTime_do > 0)
decay function,_decay,_rt_available * exp(_trOpTime * dispersion_parameter_transit)
Expand Down
2 changes: 1 addition & 1 deletion example/configs/atwork_subtour_frequency_alternatives.csv
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,eat,business,maint
no_subtours,0,0,0
eat,1,0,0
Expand Down
2 changes: 1 addition & 1 deletion example/configs/auto_ownership.csv
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,4 @@ Marin county,@df.county_id == ID_MARIN,,-0.2434,0,0,0
"Retail accessibility (0.66*PK + 0.34*OP) by transit, if 1+ workers",(num_workers>0)*(0.66*trPkRetail+0.34*trOpRetail),,-0.5117,-0.5117,-0.5117,-0.5117
"Retail accessibility by non-motorized, if 0 workers",(num_workers==0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
"Retail accessibility by non-motorized, if 1+ workers",(num_workers>0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
Auto time savings per worker to work","@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693
Auto time savings per worker to work,"@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693
2 changes: 1 addition & 1 deletion example/configs/joint_tour_composition.csv
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Description,Expression,adults,children,mixed
Alternative-specific constant,1,,5.3517,5.6290
Joint tour purpose is eating out (dummy),tour_type=='eat',,-0.9678,-0.8027
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101,
Number of Full-Time Workers in the household,num_full_max3,1.0240,,0.3624
Number of Part-Time Workers in the household,num_part_max3,0.5412,,0.3164
Number of University students in the household,num_univ_max3,0.8245,,
Expand Down
2 changes: 1 addition & 1 deletion example/configs/joint_tour_frequency_alternatives.csv
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building joint tours
#,,,,,alt file for building joint tours
alt,shopping,othmaint,eatout,social,othdiscr
0_tours,0,0,0,0,0
1_Shop,1,0,0,0,0
Expand Down
8 changes: 4 additions & 4 deletions example/configs/joint_tour_participation.csv
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,10 +48,10 @@ Description,Expression,participate,not_participate
"Adult, number of joint tours, mixed",(adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.3584,
"Child, number of joint tours, child only",(~adult & tour_composition_is_children) * num_hh_joint_tours,0.1047,
"Child, number of joint tours, mixed",(~adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.5089,
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1)
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1)
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1)
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1)
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1),,
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1),,
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1),,
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1),,
#,,,
"Adult, log of max window overlap with an adult, adult-only party",(adult & tour_composition_is_adults) * log_time_window_overlap_adult,0.8436,
"Adult, log of max window overlap with a child, mixed",(adult & tour_composition_is_mixed) * log_time_window_overlap_adult,2.189,
Expand Down
2 changes: 1 addition & 1 deletion example/configs/joint_tour_scheduling_annotate_tours_preprocessor.csv
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,5 +5,5 @@ local scalar distance skim,_SOVMD_SKIM,"skim_dict.get(('SOV_TIME', 'MD'))"
temp auto_time_to_destination,_auto_time_to_destination,"_SOVMD_SKIM.get(joint_tours.origin, joint_tours.destination)"
temp auto_time_return,_auto_time_return,"_SOVMD_SKIM.get(joint_tours.destination, joint_tours.origin)"
free flow roundtrip_auto_time,roundtrip_auto_time,"_auto_time_to_destination + _auto_time_return"
#"number of joint tours that this joint tour's point_person participates in",,
#"number of joint tours that this joint tours point_person participates in",,
,num_person_joint_tours,"reindex_i(joint_tour_participants.groupby('person_id').size(), joint_tours.person_id)"
2 changes: 1 addition & 1 deletion example/configs/mandatory_tour_frequency_alternatives.csv
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,work,school
work1,1,0
work2,2,0
Expand Down
2 changes: 1 addition & 1 deletion example/configs/stop_frequency_alternatives.csv
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,out,in
0out_0in,0,0
0out_1in,0,1
Expand Down
2 changes: 1 addition & 1 deletion example/configs/trip_purpose_probs.csv
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ atwork,True,5,23,PTYPE_FULL,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_PART,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_UNIVERSITY,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_DRIVING,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
#
#,,,,,,,,,,,,,
work,False,5,14,PTYPE_FULL,0.175,0,0,0.14,0.27,0.162,0.134,0.05,0.069
work,False,5,14,PTYPE_PART,0.097,0,0,0.252,0.211,0.192,0.159,0.089,0
work,False,5,14,PTYPE_UNIVERSITY,0.134,0,0,0.329,0.114,0.212,0.169,0.042,0
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
prettier expression rendering #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bstabler
merged 4 commits into

from

Oct 31, 2019
 Merged


prettier expression rendering #270
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9b62a0a

clean-up commas so GitHub renders these correctly - https://help.git…


bstabler Oct 8, 2019
cd57bf8

Merge branch 'develop' of https://github.com/ActivitySim/activitysim …


bstabler Oct 8, 2019
ddf6fb9

one more prettier expression rendering fix


bstabler Oct 8, 2019
1df5866

Merge branch 'master' into develop


bstabler Oct 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
example/configs/accessibility.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ Description,Target,Expression
#,,
#,, auto peak
#,,
# assume peak occurs in AM for outbound and PM for inbound
#,, assume peak occurs in AM for outbound and PM for inbound
peak round trip distance,_auPkTime,"skim_od[('SOVTOLL_TIME', 'AM')] + skim_do[('SOVTOLL_TIME', 'PM')]"
decay function,_decay, exp(_auPkTime * dispersion_parameter_automobile)
auto peak retail,auPkRetail,df.RETEMPN * _decay
Expand DownExpand Up@@ -43,7 +43,7 @@ d-o off-peak transit ivt,_inVehicleTime,"skim_do[('WLK_TRN_WLK_IVT', 'MD')]"
d-o off-peak transit ovt,_outOfVehicleTime,"skim_do[('WLK_TRN_WLK_IWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_XWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_WACC', 'MD')] + skim_do[('WLK_TRN_WLK_WAUX', 'MD')] + skim_do[('WLK_TRN_WLK_WEGR', 'MD')]"
d-o off-peak transit time,_trOpTime_do,(_inVehicleTime + out_of_vehicle_time_weight * _outOfVehicleTime) / 100.0
peak transit time,_trOpTime,_trOpTime_od + _trOpTime_do
#FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#,,FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#round trip path is available,_rt_available,(_trOpTime > 0)
round trip path is available,_rt_available,(_trOpTime_od > 0) & (_trOpTime_do > 0)
decay function,_decay,_rt_available * exp(_trOpTime * dispersion_parameter_transit)
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/atwork_subtour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,eat,business,maint
no_subtours,0,0,0
eat,1,0,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/auto_ownership.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,4 @@ Marin county,@df.county_id == ID_MARIN,,-0.2434,0,0,0
"Retail accessibility (0.66*PK + 0.34*OP) by transit, if 1+ workers",(num_workers>0)*(0.66*trPkRetail+0.34*trOpRetail),,-0.5117,-0.5117,-0.5117,-0.5117
"Retail accessibility by non-motorized, if 0 workers",(num_workers==0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
"Retail accessibility by non-motorized, if 1+ workers",(num_workers>0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
Auto time savings per worker to work","@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693
Auto time savings per worker to work,"@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_composition.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Description,Expression,adults,children,mixed
Alternative-specific constant,1,,5.3517,5.6290
Joint tour purpose is eating out (dummy),tour_type=='eat',,-0.9678,-0.8027
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101,
Number of Full-Time Workers in the household,num_full_max3,1.0240,,0.3624
Number of Part-Time Workers in the household,num_part_max3,0.5412,,0.3164
Number of University students in the household,num_univ_max3,0.8245,,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building joint tours
#,,,,,alt file for building joint tours
alt,shopping,othmaint,eatout,social,othdiscr
0_tours,0,0,0,0,0
1_Shop,1,0,0,0,0
Expand Down

8 changes: 4 additions & 4 deletions
example/configs/joint_tour_participation.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,10 +48,10 @@ Description,Expression,participate,not_participate
"Adult, number of joint tours, mixed",(adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.3584,
"Child, number of joint tours, child only",(~adult & tour_composition_is_children) * num_hh_joint_tours,0.1047,
"Child, number of joint tours, mixed",(~adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.5089,
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1)
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1)
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1)
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1)
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1),,
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1),,
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1),,
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1),,
#,,,
"Adult, log of max window overlap with an adult, adult-only party",(adult & tour_composition_is_adults) * log_time_window_overlap_adult,0.8436,
"Adult, log of max window overlap with a child, mixed",(adult & tour_composition_is_mixed) * log_time_window_overlap_adult,2.189,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_scheduling_annotate_tours_preprocessor.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,5 +5,5 @@ local scalar distance skim,_SOVMD_SKIM,"skim_dict.get(('SOV_TIME', 'MD'))"
temp auto_time_to_destination,_auto_time_to_destination,"_SOVMD_SKIM.get(joint_tours.origin, joint_tours.destination)"
temp auto_time_return,_auto_time_return,"_SOVMD_SKIM.get(joint_tours.destination, joint_tours.origin)"
free flow roundtrip_auto_time,roundtrip_auto_time,"_auto_time_to_destination + _auto_time_return"
#"number of joint tours that this joint tour's point_person participates in",,
#"number of joint tours that this joint tours point_person participates in",,
,num_person_joint_tours,"reindex_i(joint_tour_participants.groupby('person_id').size(), joint_tours.person_id)"

2 changes: 1 addition & 1 deletion
example/configs/mandatory_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,work,school
work1,1,0
work2,2,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/stop_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,out,in
0out_0in,0,0
0out_1in,0,1
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/trip_purpose_probs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ atwork,True,5,23,PTYPE_FULL,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_PART,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_UNIVERSITY,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_DRIVING,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
#
#,,,,,,,,,,,,,
work,False,5,14,PTYPE_FULL,0.175,0,0,0.14,0.27,0.162,0.134,0.05,0.069
work,False,5,14,PTYPE_PART,0.097,0,0,0.252,0.211,0.192,0.159,0.089,0
work,False,5,14,PTYPE_UNIVERSITY,0.134,0,0,0.329,0.114,0.212,0.169,0.042,0
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
prettier expression rendering #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bstabler
merged 4 commits into

from

Oct 31, 2019
 Merged


prettier expression rendering #270
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9b62a0a

clean-up commas so GitHub renders these correctly - https://help.git…


bstabler Oct 8, 2019
cd57bf8

Merge branch 'develop' of https://github.com/ActivitySim/activitysim …


bstabler Oct 8, 2019
ddf6fb9

one more prettier expression rendering fix


bstabler Oct 8, 2019
1df5866

Merge branch 'master' into develop


bstabler Oct 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
example/configs/accessibility.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ Description,Target,Expression
#,,
#,, auto peak
#,,
# assume peak occurs in AM for outbound and PM for inbound
#,, assume peak occurs in AM for outbound and PM for inbound
peak round trip distance,_auPkTime,"skim_od[('SOVTOLL_TIME', 'AM')] + skim_do[('SOVTOLL_TIME', 'PM')]"
decay function,_decay, exp(_auPkTime * dispersion_parameter_automobile)
auto peak retail,auPkRetail,df.RETEMPN * _decay
Expand DownExpand Up@@ -43,7 +43,7 @@ d-o off-peak transit ivt,_inVehicleTime,"skim_do[('WLK_TRN_WLK_IVT', 'MD')]"
d-o off-peak transit ovt,_outOfVehicleTime,"skim_do[('WLK_TRN_WLK_IWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_XWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_WACC', 'MD')] + skim_do[('WLK_TRN_WLK_WAUX', 'MD')] + skim_do[('WLK_TRN_WLK_WEGR', 'MD')]"
d-o off-peak transit time,_trOpTime_do,(_inVehicleTime + out_of_vehicle_time_weight * _outOfVehicleTime) / 100.0
peak transit time,_trOpTime,_trOpTime_od + _trOpTime_do
#FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#,,FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#round trip path is available,_rt_available,(_trOpTime > 0)
round trip path is available,_rt_available,(_trOpTime_od > 0) & (_trOpTime_do > 0)
decay function,_decay,_rt_available * exp(_trOpTime * dispersion_parameter_transit)
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/atwork_subtour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,eat,business,maint
no_subtours,0,0,0
eat,1,0,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/auto_ownership.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,4 @@ Marin county,@df.county_id == ID_MARIN,,-0.2434,0,0,0
"Retail accessibility (0.66*PK + 0.34*OP) by transit, if 1+ workers",(num_workers>0)*(0.66*trPkRetail+0.34*trOpRetail),,-0.5117,-0.5117,-0.5117,-0.5117
"Retail accessibility by non-motorized, if 0 workers",(num_workers==0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
"Retail accessibility by non-motorized, if 1+ workers",(num_workers>0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
Auto time savings per worker to work","@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693
Auto time savings per worker to work,"@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_composition.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Description,Expression,adults,children,mixed
Alternative-specific constant,1,,5.3517,5.6290
Joint tour purpose is eating out (dummy),tour_type=='eat',,-0.9678,-0.8027
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101,
Number of Full-Time Workers in the household,num_full_max3,1.0240,,0.3624
Number of Part-Time Workers in the household,num_part_max3,0.5412,,0.3164
Number of University students in the household,num_univ_max3,0.8245,,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building joint tours
#,,,,,alt file for building joint tours
alt,shopping,othmaint,eatout,social,othdiscr
0_tours,0,0,0,0,0
1_Shop,1,0,0,0,0
Expand Down

8 changes: 4 additions & 4 deletions
example/configs/joint_tour_participation.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,10 +48,10 @@ Description,Expression,participate,not_participate
"Adult, number of joint tours, mixed",(adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.3584,
"Child, number of joint tours, child only",(~adult & tour_composition_is_children) * num_hh_joint_tours,0.1047,
"Child, number of joint tours, mixed",(~adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.5089,
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1)
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1)
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1)
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1)
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1),,
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1),,
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1),,
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1),,
#,,,
"Adult, log of max window overlap with an adult, adult-only party",(adult & tour_composition_is_adults) * log_time_window_overlap_adult,0.8436,
"Adult, log of max window overlap with a child, mixed",(adult & tour_composition_is_mixed) * log_time_window_overlap_adult,2.189,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_scheduling_annotate_tours_preprocessor.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,5 +5,5 @@ local scalar distance skim,_SOVMD_SKIM,"skim_dict.get(('SOV_TIME', 'MD'))"
temp auto_time_to_destination,_auto_time_to_destination,"_SOVMD_SKIM.get(joint_tours.origin, joint_tours.destination)"
temp auto_time_return,_auto_time_return,"_SOVMD_SKIM.get(joint_tours.destination, joint_tours.origin)"
free flow roundtrip_auto_time,roundtrip_auto_time,"_auto_time_to_destination + _auto_time_return"
#"number of joint tours that this joint tour's point_person participates in",,
#"number of joint tours that this joint tours point_person participates in",,
,num_person_joint_tours,"reindex_i(joint_tour_participants.groupby('person_id').size(), joint_tours.person_id)"

2 changes: 1 addition & 1 deletion
example/configs/mandatory_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,work,school
work1,1,0
work2,2,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/stop_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,out,in
0out_0in,0,0
0out_1in,0,1
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/trip_purpose_probs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ atwork,True,5,23,PTYPE_FULL,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_PART,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_UNIVERSITY,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_DRIVING,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
#
#,,,,,,,,,,,,,
work,False,5,14,PTYPE_FULL,0.175,0,0,0.14,0.27,0.162,0.134,0.05,0.069
work,False,5,14,PTYPE_PART,0.097,0,0,0.252,0.211,0.192,0.159,0.089,0
work,False,5,14,PTYPE_UNIVERSITY,0.134,0,0,0.329,0.114,0.212,0.169,0.042,0
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
prettier expression rendering #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bstabler
merged 4 commits into

from

Oct 31, 2019
 Merged


prettier expression rendering #270
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9b62a0a

clean-up commas so GitHub renders these correctly - https://help.git…


bstabler Oct 8, 2019
cd57bf8

Merge branch 'develop' of https://github.com/ActivitySim/activitysim …


bstabler Oct 8, 2019
ddf6fb9

one more prettier expression rendering fix


bstabler Oct 8, 2019
1df5866

Merge branch 'master' into develop


bstabler Oct 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
example/configs/accessibility.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ Description,Target,Expression
#,,
#,, auto peak
#,,
# assume peak occurs in AM for outbound and PM for inbound
#,, assume peak occurs in AM for outbound and PM for inbound
peak round trip distance,_auPkTime,"skim_od[('SOVTOLL_TIME', 'AM')] + skim_do[('SOVTOLL_TIME', 'PM')]"
decay function,_decay, exp(_auPkTime * dispersion_parameter_automobile)
auto peak retail,auPkRetail,df.RETEMPN * _decay
Expand DownExpand Up@@ -43,7 +43,7 @@ d-o off-peak transit ivt,_inVehicleTime,"skim_do[('WLK_TRN_WLK_IVT', 'MD')]"
d-o off-peak transit ovt,_outOfVehicleTime,"skim_do[('WLK_TRN_WLK_IWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_XWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_WACC', 'MD')] + skim_do[('WLK_TRN_WLK_WAUX', 'MD')] + skim_do[('WLK_TRN_WLK_WEGR', 'MD')]"
d-o off-peak transit time,_trOpTime_do,(_inVehicleTime + out_of_vehicle_time_weight * _outOfVehicleTime) / 100.0
peak transit time,_trOpTime,_trOpTime_od + _trOpTime_do
#FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#,,FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#round trip path is available,_rt_available,(_trOpTime > 0)
round trip path is available,_rt_available,(_trOpTime_od > 0) & (_trOpTime_do > 0)
decay function,_decay,_rt_available * exp(_trOpTime * dispersion_parameter_transit)
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/atwork_subtour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,eat,business,maint
no_subtours,0,0,0
eat,1,0,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/auto_ownership.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,4 @@ Marin county,@df.county_id == ID_MARIN,,-0.2434,0,0,0
"Retail accessibility (0.66*PK + 0.34*OP) by transit, if 1+ workers",(num_workers>0)*(0.66*trPkRetail+0.34*trOpRetail),,-0.5117,-0.5117,-0.5117,-0.5117
"Retail accessibility by non-motorized, if 0 workers",(num_workers==0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
"Retail accessibility by non-motorized, if 1+ workers",(num_workers>0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
Auto time savings per worker to work","@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693
Auto time savings per worker to work,"@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_composition.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Description,Expression,adults,children,mixed
Alternative-specific constant,1,,5.3517,5.6290
Joint tour purpose is eating out (dummy),tour_type=='eat',,-0.9678,-0.8027
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101,
Number of Full-Time Workers in the household,num_full_max3,1.0240,,0.3624
Number of Part-Time Workers in the household,num_part_max3,0.5412,,0.3164
Number of University students in the household,num_univ_max3,0.8245,,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building joint tours
#,,,,,alt file for building joint tours
alt,shopping,othmaint,eatout,social,othdiscr
0_tours,0,0,0,0,0
1_Shop,1,0,0,0,0
Expand Down

8 changes: 4 additions & 4 deletions
example/configs/joint_tour_participation.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,10 +48,10 @@ Description,Expression,participate,not_participate
"Adult, number of joint tours, mixed",(adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.3584,
"Child, number of joint tours, child only",(~adult & tour_composition_is_children) * num_hh_joint_tours,0.1047,
"Child, number of joint tours, mixed",(~adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.5089,
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1)
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1)
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1)
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1)
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1),,
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1),,
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1),,
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1),,
#,,,
"Adult, log of max window overlap with an adult, adult-only party",(adult & tour_composition_is_adults) * log_time_window_overlap_adult,0.8436,
"Adult, log of max window overlap with a child, mixed",(adult & tour_composition_is_mixed) * log_time_window_overlap_adult,2.189,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_scheduling_annotate_tours_preprocessor.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,5 +5,5 @@ local scalar distance skim,_SOVMD_SKIM,"skim_dict.get(('SOV_TIME', 'MD'))"
temp auto_time_to_destination,_auto_time_to_destination,"_SOVMD_SKIM.get(joint_tours.origin, joint_tours.destination)"
temp auto_time_return,_auto_time_return,"_SOVMD_SKIM.get(joint_tours.destination, joint_tours.origin)"
free flow roundtrip_auto_time,roundtrip_auto_time,"_auto_time_to_destination + _auto_time_return"
#"number of joint tours that this joint tour's point_person participates in",,
#"number of joint tours that this joint tours point_person participates in",,
,num_person_joint_tours,"reindex_i(joint_tour_participants.groupby('person_id').size(), joint_tours.person_id)"

2 changes: 1 addition & 1 deletion
example/configs/mandatory_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,work,school
work1,1,0
work2,2,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/stop_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,out,in
0out_0in,0,0
0out_1in,0,1
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/trip_purpose_probs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ atwork,True,5,23,PTYPE_FULL,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_PART,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_UNIVERSITY,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_DRIVING,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
#
#,,,,,,,,,,,,,
work,False,5,14,PTYPE_FULL,0.175,0,0,0.14,0.27,0.162,0.134,0.05,0.069
work,False,5,14,PTYPE_PART,0.097,0,0,0.252,0.211,0.192,0.159,0.089,0
work,False,5,14,PTYPE_UNIVERSITY,0.134,0,0,0.329,0.114,0.212,0.169,0.042,0
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
prettier expression rendering #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bstabler
merged 4 commits into

from

Oct 31, 2019
 Merged


prettier expression rendering #270
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9b62a0a

clean-up commas so GitHub renders these correctly - https://help.git…


bstabler Oct 8, 2019
cd57bf8

Merge branch 'develop' of https://github.com/ActivitySim/activitysim …


bstabler Oct 8, 2019
ddf6fb9

one more prettier expression rendering fix


bstabler Oct 8, 2019
1df5866

Merge branch 'master' into develop


bstabler Oct 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
example/configs/accessibility.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ Description,Target,Expression
#,,
#,, auto peak
#,,
# assume peak occurs in AM for outbound and PM for inbound
#,, assume peak occurs in AM for outbound and PM for inbound
peak round trip distance,_auPkTime,"skim_od[('SOVTOLL_TIME', 'AM')] + skim_do[('SOVTOLL_TIME', 'PM')]"
decay function,_decay, exp(_auPkTime * dispersion_parameter_automobile)
auto peak retail,auPkRetail,df.RETEMPN * _decay
Expand DownExpand Up@@ -43,7 +43,7 @@ d-o off-peak transit ivt,_inVehicleTime,"skim_do[('WLK_TRN_WLK_IVT', 'MD')]"
d-o off-peak transit ovt,_outOfVehicleTime,"skim_do[('WLK_TRN_WLK_IWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_XWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_WACC', 'MD')] + skim_do[('WLK_TRN_WLK_WAUX', 'MD')] + skim_do[('WLK_TRN_WLK_WEGR', 'MD')]"
d-o off-peak transit time,_trOpTime_do,(_inVehicleTime + out_of_vehicle_time_weight * _outOfVehicleTime) / 100.0
peak transit time,_trOpTime,_trOpTime_od + _trOpTime_do
#FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#,,FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#round trip path is available,_rt_available,(_trOpTime > 0)
round trip path is available,_rt_available,(_trOpTime_od > 0) & (_trOpTime_do > 0)
decay function,_decay,_rt_available * exp(_trOpTime * dispersion_parameter_transit)
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/atwork_subtour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,eat,business,maint
no_subtours,0,0,0
eat,1,0,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/auto_ownership.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,4 @@ Marin county,@df.county_id == ID_MARIN,,-0.2434,0,0,0
"Retail accessibility (0.66*PK + 0.34*OP) by transit, if 1+ workers",(num_workers>0)*(0.66*trPkRetail+0.34*trOpRetail),,-0.5117,-0.5117,-0.5117,-0.5117
"Retail accessibility by non-motorized, if 0 workers",(num_workers==0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
"Retail accessibility by non-motorized, if 1+ workers",(num_workers>0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
Auto time savings per worker to work","@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693
Auto time savings per worker to work,"@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_composition.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Description,Expression,adults,children,mixed
Alternative-specific constant,1,,5.3517,5.6290
Joint tour purpose is eating out (dummy),tour_type=='eat',,-0.9678,-0.8027
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101,
Number of Full-Time Workers in the household,num_full_max3,1.0240,,0.3624
Number of Part-Time Workers in the household,num_part_max3,0.5412,,0.3164
Number of University students in the household,num_univ_max3,0.8245,,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building joint tours
#,,,,,alt file for building joint tours
alt,shopping,othmaint,eatout,social,othdiscr
0_tours,0,0,0,0,0
1_Shop,1,0,0,0,0
Expand Down

8 changes: 4 additions & 4 deletions
example/configs/joint_tour_participation.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,10 +48,10 @@ Description,Expression,participate,not_participate
"Adult, number of joint tours, mixed",(adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.3584,
"Child, number of joint tours, child only",(~adult & tour_composition_is_children) * num_hh_joint_tours,0.1047,
"Child, number of joint tours, mixed",(~adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.5089,
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1)
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1)
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1)
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1)
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1),,
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1),,
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1),,
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1),,
#,,,
"Adult, log of max window overlap with an adult, adult-only party",(adult & tour_composition_is_adults) * log_time_window_overlap_adult,0.8436,
"Adult, log of max window overlap with a child, mixed",(adult & tour_composition_is_mixed) * log_time_window_overlap_adult,2.189,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_scheduling_annotate_tours_preprocessor.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,5 +5,5 @@ local scalar distance skim,_SOVMD_SKIM,"skim_dict.get(('SOV_TIME', 'MD'))"
temp auto_time_to_destination,_auto_time_to_destination,"_SOVMD_SKIM.get(joint_tours.origin, joint_tours.destination)"
temp auto_time_return,_auto_time_return,"_SOVMD_SKIM.get(joint_tours.destination, joint_tours.origin)"
free flow roundtrip_auto_time,roundtrip_auto_time,"_auto_time_to_destination + _auto_time_return"
#"number of joint tours that this joint tour's point_person participates in",,
#"number of joint tours that this joint tours point_person participates in",,
,num_person_joint_tours,"reindex_i(joint_tour_participants.groupby('person_id').size(), joint_tours.person_id)"

2 changes: 1 addition & 1 deletion
example/configs/mandatory_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,work,school
work1,1,0
work2,2,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/stop_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,out,in
0out_0in,0,0
0out_1in,0,1
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/trip_purpose_probs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ atwork,True,5,23,PTYPE_FULL,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_PART,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_UNIVERSITY,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_DRIVING,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
#
#,,,,,,,,,,,,,
work,False,5,14,PTYPE_FULL,0.175,0,0,0.14,0.27,0.162,0.134,0.05,0.069
work,False,5,14,PTYPE_PART,0.097,0,0,0.252,0.211,0.192,0.159,0.089,0
work,False,5,14,PTYPE_UNIVERSITY,0.134,0,0,0.329,0.114,0.212,0.169,0.042,0
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
prettier expression rendering #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bstabler
merged 4 commits into

from

Oct 31, 2019
 Merged


prettier expression rendering #270
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9b62a0a

clean-up commas so GitHub renders these correctly - https://help.git…


bstabler Oct 8, 2019
cd57bf8

Merge branch 'develop' of https://github.com/ActivitySim/activitysim …


bstabler Oct 8, 2019
ddf6fb9

one more prettier expression rendering fix


bstabler Oct 8, 2019
1df5866

Merge branch 'master' into develop


bstabler Oct 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
example/configs/accessibility.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ Description,Target,Expression
#,,
#,, auto peak
#,,
# assume peak occurs in AM for outbound and PM for inbound
#,, assume peak occurs in AM for outbound and PM for inbound
peak round trip distance,_auPkTime,"skim_od[('SOVTOLL_TIME', 'AM')] + skim_do[('SOVTOLL_TIME', 'PM')]"
decay function,_decay, exp(_auPkTime * dispersion_parameter_automobile)
auto peak retail,auPkRetail,df.RETEMPN * _decay
Expand DownExpand Up@@ -43,7 +43,7 @@ d-o off-peak transit ivt,_inVehicleTime,"skim_do[('WLK_TRN_WLK_IVT', 'MD')]"
d-o off-peak transit ovt,_outOfVehicleTime,"skim_do[('WLK_TRN_WLK_IWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_XWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_WACC', 'MD')] + skim_do[('WLK_TRN_WLK_WAUX', 'MD')] + skim_do[('WLK_TRN_WLK_WEGR', 'MD')]"
d-o off-peak transit time,_trOpTime_do,(_inVehicleTime + out_of_vehicle_time_weight * _outOfVehicleTime) / 100.0
peak transit time,_trOpTime,_trOpTime_od + _trOpTime_do
#FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#,,FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#round trip path is available,_rt_available,(_trOpTime > 0)
round trip path is available,_rt_available,(_trOpTime_od > 0) & (_trOpTime_do > 0)
decay function,_decay,_rt_available * exp(_trOpTime * dispersion_parameter_transit)
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/atwork_subtour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,eat,business,maint
no_subtours,0,0,0
eat,1,0,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/auto_ownership.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,4 @@ Marin county,@df.county_id == ID_MARIN,,-0.2434,0,0,0
"Retail accessibility (0.66*PK + 0.34*OP) by transit, if 1+ workers",(num_workers>0)*(0.66*trPkRetail+0.34*trOpRetail),,-0.5117,-0.5117,-0.5117,-0.5117
"Retail accessibility by non-motorized, if 0 workers",(num_workers==0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
"Retail accessibility by non-motorized, if 1+ workers",(num_workers>0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
Auto time savings per worker to work","@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693
Auto time savings per worker to work,"@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_composition.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Description,Expression,adults,children,mixed
Alternative-specific constant,1,,5.3517,5.6290
Joint tour purpose is eating out (dummy),tour_type=='eat',,-0.9678,-0.8027
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101,
Number of Full-Time Workers in the household,num_full_max3,1.0240,,0.3624
Number of Part-Time Workers in the household,num_part_max3,0.5412,,0.3164
Number of University students in the household,num_univ_max3,0.8245,,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building joint tours
#,,,,,alt file for building joint tours
alt,shopping,othmaint,eatout,social,othdiscr
0_tours,0,0,0,0,0
1_Shop,1,0,0,0,0
Expand Down

8 changes: 4 additions & 4 deletions
example/configs/joint_tour_participation.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,10 +48,10 @@ Description,Expression,participate,not_participate
"Adult, number of joint tours, mixed",(adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.3584,
"Child, number of joint tours, child only",(~adult & tour_composition_is_children) * num_hh_joint_tours,0.1047,
"Child, number of joint tours, mixed",(~adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.5089,
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1)
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1)
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1)
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1)
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1),,
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1),,
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1),,
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1),,
#,,,
"Adult, log of max window overlap with an adult, adult-only party",(adult & tour_composition_is_adults) * log_time_window_overlap_adult,0.8436,
"Adult, log of max window overlap with a child, mixed",(adult & tour_composition_is_mixed) * log_time_window_overlap_adult,2.189,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_scheduling_annotate_tours_preprocessor.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,5 +5,5 @@ local scalar distance skim,_SOVMD_SKIM,"skim_dict.get(('SOV_TIME', 'MD'))"
temp auto_time_to_destination,_auto_time_to_destination,"_SOVMD_SKIM.get(joint_tours.origin, joint_tours.destination)"
temp auto_time_return,_auto_time_return,"_SOVMD_SKIM.get(joint_tours.destination, joint_tours.origin)"
free flow roundtrip_auto_time,roundtrip_auto_time,"_auto_time_to_destination + _auto_time_return"
#"number of joint tours that this joint tour's point_person participates in",,
#"number of joint tours that this joint tours point_person participates in",,
,num_person_joint_tours,"reindex_i(joint_tour_participants.groupby('person_id').size(), joint_tours.person_id)"

2 changes: 1 addition & 1 deletion
example/configs/mandatory_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,work,school
work1,1,0
work2,2,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/stop_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,out,in
0out_0in,0,0
0out_1in,0,1
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/trip_purpose_probs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ atwork,True,5,23,PTYPE_FULL,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_PART,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_UNIVERSITY,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_DRIVING,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
#
#,,,,,,,,,,,,,
work,False,5,14,PTYPE_FULL,0.175,0,0,0.14,0.27,0.162,0.134,0.05,0.069
work,False,5,14,PTYPE_PART,0.097,0,0,0.252,0.211,0.192,0.159,0.089,0
work,False,5,14,PTYPE_UNIVERSITY,0.134,0,0,0.329,0.114,0.212,0.169,0.042,0
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
prettier expression rendering #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bstabler
merged 4 commits into

from

Oct 31, 2019
 Merged


prettier expression rendering #270
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9b62a0a

clean-up commas so GitHub renders these correctly - https://help.git…


bstabler Oct 8, 2019
cd57bf8

Merge branch 'develop' of https://github.com/ActivitySim/activitysim …


bstabler Oct 8, 2019
ddf6fb9

one more prettier expression rendering fix


bstabler Oct 8, 2019
1df5866

Merge branch 'master' into develop


bstabler Oct 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
example/configs/accessibility.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ Description,Target,Expression
#,,
#,, auto peak
#,,
# assume peak occurs in AM for outbound and PM for inbound
#,, assume peak occurs in AM for outbound and PM for inbound
peak round trip distance,_auPkTime,"skim_od[('SOVTOLL_TIME', 'AM')] + skim_do[('SOVTOLL_TIME', 'PM')]"
decay function,_decay, exp(_auPkTime * dispersion_parameter_automobile)
auto peak retail,auPkRetail,df.RETEMPN * _decay
Expand DownExpand Up@@ -43,7 +43,7 @@ d-o off-peak transit ivt,_inVehicleTime,"skim_do[('WLK_TRN_WLK_IVT', 'MD')]"
d-o off-peak transit ovt,_outOfVehicleTime,"skim_do[('WLK_TRN_WLK_IWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_XWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_WACC', 'MD')] + skim_do[('WLK_TRN_WLK_WAUX', 'MD')] + skim_do[('WLK_TRN_WLK_WEGR', 'MD')]"
d-o off-peak transit time,_trOpTime_do,(_inVehicleTime + out_of_vehicle_time_weight * _outOfVehicleTime) / 100.0
peak transit time,_trOpTime,_trOpTime_od + _trOpTime_do
#FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#,,FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#round trip path is available,_rt_available,(_trOpTime > 0)
round trip path is available,_rt_available,(_trOpTime_od > 0) & (_trOpTime_do > 0)
decay function,_decay,_rt_available * exp(_trOpTime * dispersion_parameter_transit)
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/atwork_subtour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,eat,business,maint
no_subtours,0,0,0
eat,1,0,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/auto_ownership.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,4 @@ Marin county,@df.county_id == ID_MARIN,,-0.2434,0,0,0
"Retail accessibility (0.66*PK + 0.34*OP) by transit, if 1+ workers",(num_workers>0)*(0.66*trPkRetail+0.34*trOpRetail),,-0.5117,-0.5117,-0.5117,-0.5117
"Retail accessibility by non-motorized, if 0 workers",(num_workers==0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
"Retail accessibility by non-motorized, if 1+ workers",(num_workers>0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
Auto time savings per worker to work","@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693
Auto time savings per worker to work,"@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_composition.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Description,Expression,adults,children,mixed
Alternative-specific constant,1,,5.3517,5.6290
Joint tour purpose is eating out (dummy),tour_type=='eat',,-0.9678,-0.8027
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101,
Number of Full-Time Workers in the household,num_full_max3,1.0240,,0.3624
Number of Part-Time Workers in the household,num_part_max3,0.5412,,0.3164
Number of University students in the household,num_univ_max3,0.8245,,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building joint tours
#,,,,,alt file for building joint tours
alt,shopping,othmaint,eatout,social,othdiscr
0_tours,0,0,0,0,0
1_Shop,1,0,0,0,0
Expand Down

8 changes: 4 additions & 4 deletions
example/configs/joint_tour_participation.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,10 +48,10 @@ Description,Expression,participate,not_participate
"Adult, number of joint tours, mixed",(adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.3584,
"Child, number of joint tours, child only",(~adult & tour_composition_is_children) * num_hh_joint_tours,0.1047,
"Child, number of joint tours, mixed",(~adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.5089,
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1)
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1)
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1)
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1)
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1),,
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1),,
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1),,
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1),,
#,,,
"Adult, log of max window overlap with an adult, adult-only party",(adult & tour_composition_is_adults) * log_time_window_overlap_adult,0.8436,
"Adult, log of max window overlap with a child, mixed",(adult & tour_composition_is_mixed) * log_time_window_overlap_adult,2.189,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_scheduling_annotate_tours_preprocessor.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,5 +5,5 @@ local scalar distance skim,_SOVMD_SKIM,"skim_dict.get(('SOV_TIME', 'MD'))"
temp auto_time_to_destination,_auto_time_to_destination,"_SOVMD_SKIM.get(joint_tours.origin, joint_tours.destination)"
temp auto_time_return,_auto_time_return,"_SOVMD_SKIM.get(joint_tours.destination, joint_tours.origin)"
free flow roundtrip_auto_time,roundtrip_auto_time,"_auto_time_to_destination + _auto_time_return"
#"number of joint tours that this joint tour's point_person participates in",,
#"number of joint tours that this joint tours point_person participates in",,
,num_person_joint_tours,"reindex_i(joint_tour_participants.groupby('person_id').size(), joint_tours.person_id)"

2 changes: 1 addition & 1 deletion
example/configs/mandatory_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,work,school
work1,1,0
work2,2,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/stop_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,out,in
0out_0in,0,0
0out_1in,0,1
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/trip_purpose_probs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ atwork,True,5,23,PTYPE_FULL,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_PART,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_UNIVERSITY,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_DRIVING,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
#
#,,,,,,,,,,,,,
work,False,5,14,PTYPE_FULL,0.175,0,0,0.14,0.27,0.162,0.134,0.05,0.069
work,False,5,14,PTYPE_PART,0.097,0,0,0.252,0.211,0.192,0.159,0.089,0
work,False,5,14,PTYPE_UNIVERSITY,0.134,0,0,0.329,0.114,0.212,0.169,0.042,0
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
prettier expression rendering #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bstabler
merged 4 commits into

from

Oct 31, 2019
 Merged


prettier expression rendering #270
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
9b62a0a

clean-up commas so GitHub renders these correctly - https://help.git…


bstabler Oct 8, 2019
cd57bf8

Merge branch 'develop' of https://github.com/ActivitySim/activitysim …


bstabler Oct 8, 2019
ddf6fb9

one more prettier expression rendering fix


bstabler Oct 8, 2019
1df5866

Merge branch 'master' into develop


bstabler Oct 31, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
example/configs/accessibility.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ Description,Target,Expression
#,,
#,, auto peak
#,,
# assume peak occurs in AM for outbound and PM for inbound
#,, assume peak occurs in AM for outbound and PM for inbound
peak round trip distance,_auPkTime,"skim_od[('SOVTOLL_TIME', 'AM')] + skim_do[('SOVTOLL_TIME', 'PM')]"
decay function,_decay, exp(_auPkTime * dispersion_parameter_automobile)
auto peak retail,auPkRetail,df.RETEMPN * _decay
Expand DownExpand Up@@ -43,7 +43,7 @@ d-o off-peak transit ivt,_inVehicleTime,"skim_do[('WLK_TRN_WLK_IVT', 'MD')]"
d-o off-peak transit ovt,_outOfVehicleTime,"skim_do[('WLK_TRN_WLK_IWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_XWAIT', 'MD')] + skim_do[('WLK_TRN_WLK_WACC', 'MD')] + skim_do[('WLK_TRN_WLK_WAUX', 'MD')] + skim_do[('WLK_TRN_WLK_WEGR', 'MD')]"
d-o off-peak transit time,_trOpTime_do,(_inVehicleTime + out_of_vehicle_time_weight * _outOfVehicleTime) / 100.0
peak transit time,_trOpTime,_trOpTime_od + _trOpTime_do
#FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#,,FIXME - _rt_available calculation appears to be wrong in mtctm1 accessibility.job
#round trip path is available,_rt_available,(_trOpTime > 0)
round trip path is available,_rt_available,(_trOpTime_od > 0) & (_trOpTime_do > 0)
decay function,_decay,_rt_available * exp(_trOpTime * dispersion_parameter_transit)
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/atwork_subtour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,eat,business,maint
no_subtours,0,0,0
eat,1,0,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/auto_ownership.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,4 @@ Marin county,@df.county_id == ID_MARIN,,-0.2434,0,0,0
"Retail accessibility (0.66*PK + 0.34*OP) by transit, if 1+ workers",(num_workers>0)*(0.66*trPkRetail+0.34*trOpRetail),,-0.5117,-0.5117,-0.5117,-0.5117
"Retail accessibility by non-motorized, if 0 workers",(num_workers==0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
"Retail accessibility by non-motorized, if 1+ workers",(num_workers>0)*nmRetail,,-0.03,-0.03,-0.03,-0.03
Auto time savings per worker to work","@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693
Auto time savings per worker to work,"@np.where(df.num_workers > 0, df.hh_work_auto_savings_ratio / df.num_workers, 0)",,0.4707,0.6142,0.5705,0.7693

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_composition.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Description,Expression,adults,children,mixed
Alternative-specific constant,1,,5.3517,5.6290
Joint tour purpose is eating out (dummy),tour_type=='eat',,-0.9678,-0.8027
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101
Joint tour purpose is discretionary (dummy),tour_type=='disc',0.7648,0.5101,
Number of Full-Time Workers in the household,num_full_max3,1.0240,,0.3624
Number of Part-Time Workers in the household,num_part_max3,0.5412,,0.3164
Number of University students in the household,num_univ_max3,0.8245,,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building joint tours
#,,,,,alt file for building joint tours
alt,shopping,othmaint,eatout,social,othdiscr
0_tours,0,0,0,0,0
1_Shop,1,0,0,0,0
Expand Down

8 changes: 4 additions & 4 deletions
example/configs/joint_tour_participation.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,10 +48,10 @@ Description,Expression,participate,not_participate
"Adult, number of joint tours, mixed",(adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.3584,
"Child, number of joint tours, child only",(~adult & tour_composition_is_children) * num_hh_joint_tours,0.1047,
"Child, number of joint tours, mixed",(~adult & tour_composition_is_mixed) * num_hh_joint_tours,-0.5089,
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1)
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1)
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1)
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1)
"Adult, number of other adults in the household, adults-only party",(adult & tour_composition_is_adults) * (num_adults - 1),,
"Adult, number of other adults in the household, mixed party",(adult & tour_composition_is_mixed) * (num_adults - 1),,
"Child, number of other children in the household, child-only party",(~adult & tour_composition_is_children) * (num_children - 1),,
"Child, number of other children in the household, mixed",(~adult & tour_composition_is_mixed) * (num_children - 1),,
#,,,
"Adult, log of max window overlap with an adult, adult-only party",(adult & tour_composition_is_adults) * log_time_window_overlap_adult,0.8436,
"Adult, log of max window overlap with a child, mixed",(adult & tour_composition_is_mixed) * log_time_window_overlap_adult,2.189,
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/joint_tour_scheduling_annotate_tours_preprocessor.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,5 +5,5 @@ local scalar distance skim,_SOVMD_SKIM,"skim_dict.get(('SOV_TIME', 'MD'))"
temp auto_time_to_destination,_auto_time_to_destination,"_SOVMD_SKIM.get(joint_tours.origin, joint_tours.destination)"
temp auto_time_return,_auto_time_return,"_SOVMD_SKIM.get(joint_tours.destination, joint_tours.origin)"
free flow roundtrip_auto_time,roundtrip_auto_time,"_auto_time_to_destination + _auto_time_return"
#"number of joint tours that this joint tour's point_person participates in",,
#"number of joint tours that this joint tours point_person participates in",,
,num_person_joint_tours,"reindex_i(joint_tour_participants.groupby('person_id').size(), joint_tours.person_id)"

2 changes: 1 addition & 1 deletion
example/configs/mandatory_tour_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,work,school
work1,1,0
work2,2,0
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/stop_frequency_alternatives.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#alt file for building tours even though simulation is simple_simulate not interaction_simulate
#,,alt file for building tours even though simulation is simple_simulate not interaction_simulate
alt,out,in
0out_0in,0,0
0out_1in,0,1
Expand Down

2 changes: 1 addition & 1 deletion
example/configs/trip_purpose_probs.csv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ atwork,True,5,23,PTYPE_FULL,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_PART,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_UNIVERSITY,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
atwork,True,5,23,PTYPE_DRIVING,0.206,0,0,0.122,0.166,0.247,0.241,0.004,0.014
#
#,,,,,,,,,,,,,
work,False,5,14,PTYPE_FULL,0.175,0,0,0.14,0.27,0.162,0.134,0.05,0.069
work,False,5,14,PTYPE_PART,0.097,0,0,0.252,0.211,0.192,0.159,0.089,0
work,False,5,14,PTYPE_UNIVERSITY,0.134,0,0,0.329,0.114,0.212,0.169,0.042,0
Expand Down