Skip to content

Commit

Permalink
update config, small cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@rakow
rakow committed Oct 23, 2023
1 parent a401753 commit 849f014
Show file tree
Hide file tree
Showing 4 changed files with 143 additions and 342 deletions.
55 changes: 27 additions & 28 deletions input/v1.2/leipzig-v1.2-25pct.config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
<param name="useTransit" value="true"/>
</module>

<module name="counts">
<param name="inputCountsFile" value="./leipzig-v1.2-counts-car-bast.xml.gz"/>
</module>
<module name="counts">
<param name="inputCountsFile" value="./leipzig-v1.2-counts-car-bast.xml.gz"/>
</module>

<module name="planscalcroute">
<!-- Some typical teleportation routing params are set by default, such as for walk and bike. Setting this switch to "true" will clear them. Note that this will also clear settings for helper modes such as for non_network_walk -->
Expand All @@ -61,12 +61,11 @@
</module>

<module name="qsim">
<param name="startTime" value="00:00:00"/>
<param name="endTime" value="36:00:00"/>
<param name="flowCapacityFactor" value="0.25"/>
<param name="mainMode" value="car,freight"/>
<param name="numberOfThreads" value="8"/>

<param name="startTime" value="00:00:00"/>
<param name="endTime" value="36:00:00"/>
<param name="flowCapacityFactor" value="0.25"/>
<param name="mainMode" value="car,freight"/>
<param name="numberOfThreads" value="8"/>
<param name="storageCapacityFactor" value="0.25"/>
<param name="stuckTime" value="30.0"/>
<param name="trafficDynamics" value="kinematicWaves"/>
Expand All @@ -75,24 +74,24 @@
<param name="vehiclesSource" value="modeVehicleTypesFromVehiclesData"/>
<param name="insertingWaitingVehiclesBeforeDrivingVehicles" value="true"/>

<param name="simEndtimeInterpretation" value="minOfEndtimeAndMobsimFinished" />
<param name="simEndtimeInterpretation" value="onlyUseEndtime" />
<param name="simStarttimeInterpretation" value="onlyUseStarttime" />
</module>

<module name="ReplanningAnnealer" >
<param name="activateAnnealingModule" value="true" />
<parameterset type="AnnealingVariable" >
<param name="annealParameter" value="globalInnovationRate" />
<param name="annealType" value="sigmoid" />
<param name="defaultSubpopulation" value="person" />
<!-- this parameter enters the exponential and sigmoid formulas. May be an iteration or a share, i.e. 0.5 for halfLife at 50% of iterations. Exponential: startValue / exp(it/halfLife) -->
<param name="halfLife" value="0.5" />
<!-- sigmoid: 1/(1+e^(shapeFactor*(it - halfLife))); geometric: startValue * shapeFactor^it; msa: startValue / it^shapeFactor -->
<param name="shapeFactor" value="0.01" />
<param name="startValue" value="0.45" />
<param name="endValue" value="0.01" />
</parameterset>
</module>
<module name="ReplanningAnnealer" >
<param name="activateAnnealingModule" value="true" />
<parameterset type="AnnealingVariable" >
<param name="annealParameter" value="globalInnovationRate" />
<param name="annealType" value="sigmoid" />
<param name="defaultSubpopulation" value="person" />
<!-- this parameter enters the exponential and sigmoid formulas. May be an iteration or a share, i.e. 0.5 for halfLife at 50% of iterations. Exponential: startValue / exp(it/halfLife) -->
<param name="halfLife" value="0.5" />
<!-- sigmoid: 1/(1+e^(shapeFactor*(it - halfLife))); geometric: startValue * shapeFactor^it; msa: startValue / it^shapeFactor -->
<param name="shapeFactor" value="0.01" />
<param name="startValue" value="0.45" />
<param name="endValue" value="0.01" />
</parameterset>
</module>
<module name="strategy">
<param name="fractionOfIterationsToDisableInnovation" value="0.9"/>
<parameterset type="strategysettings">
Expand All @@ -115,7 +114,7 @@
<param name="subpopulation" value="person"/>
<param name="weight" value="0.10"/>
</parameterset>
<!-- Strategies for other subpopulations are added in code -->
<!-- Strategies for other subpopulations are added in code -->
</module>

<module name="subtourModeChoice">
Expand Down Expand Up @@ -150,8 +149,8 @@
<param name="writeExperiencedPlans" value="true"/>

<parameterset type="scoringParameters">
<!-- Inflation adjusted -->
<param name="performing" value="6.67"/>
<!-- Inflation adjusted -->
<param name="performing" value="6.67"/>

<parameterset type="modeParams">
<param name="constant" value="-1.4"/>
Expand All @@ -162,7 +161,7 @@
</parameterset>
<parameterset type="modeParams">
<param name="constant" value="-0.0"/>
<!-- #(2.0+1.0)*6+(2.0+1)*0.5 -->
<!-- #(2.0+1.0)*6+(2.0+1)*0.5 -->
<param name="marginalUtilityOfTraveling_util_hr" value="-19.5"/>
<param name="mode" value="ride"/>
<param name="monetaryDistanceRate" value="-0.0005"/>
Expand Down
Loading

0 comments on commit 849f014

Please sign in to comment.