Skip to content
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

Jump to bottom

Use random from ModeChoiceCalculator #1967

Merged
merged 1 commit into from
Jul 11, 2019
Merged

Use random from ModeChoiceCalculator #1967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions src/main/scala/beam/agentsim/agents/choice/mode/ModeChoiceLCCM.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,7 @@ class ModeChoiceLCCM(
/*
* Evaluate and sample from classmembership, then sample from corresponding mode choice model
*/
val random = {
val seed = beamServices.beamConfig.matsim.modules.global.randomSeed
new Random(seed)
}

val chosenClassOpt = lccm
.classMembershipModels(tourType)
.sampleAlternative(classMembershipInputData, random)
Expand Down
3 changes: 1 addition & 2 deletions src/main/scala/beam/agentsim/agents/choice/mode/ModeChoiceMultinomialLogit.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ class ModeChoiceMultinomialLogit(val beamServices: BeamServices, val model: Mult
}.toMap

val chosenModeOpt = {
val seed = beamServices.beamConfig.matsim.modules.global.randomSeed
model.sampleAlternative(inputData, new Random(seed))
model.sampleAlternative(inputData, random)
}
expectedMaximumUtility = model.getExpectedMaximumUtility(inputData).getOrElse(0)

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/beam/agentsim/agents/modalbehaviors/ModeChoiceCalculator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import scala.util.Random
trait ModeChoiceCalculator {

val beamConfig: BeamConfig
implicit lazy val random: Random = new Random(
lazy val random: Random = new Random(
beamConfig.matsim.modules.global.randomSeed
)

Expand Down