diff --git a/src/main/java/org/matsim/run/scoring/AdvancedScoringModule.java b/src/main/java/org/matsim/run/scoring/AdvancedScoringModule.java index 69e94d49..8bf13c8f 100644 --- a/src/main/java/org/matsim/run/scoring/AdvancedScoringModule.java +++ b/src/main/java/org/matsim/run/scoring/AdvancedScoringModule.java @@ -18,7 +18,7 @@ public void install() { bind(ScoringParametersForPerson.class).to(IndividualPersonScoringParameters.class).in(Singleton.class); bind(PseudoRandomScorer.class).in(Singleton.class); - bind(PseudoRandomTripScore.class).to(DefaultPseudoRandomTripScore.class).in(Singleton.class); + bind(PseudoRandomTripError.class).to(DefaultPseudoRandomTripError.class).in(Singleton.class); addControlerListenerBinding().to(AdvancedScoringOutputWriter.class).in(Singleton.class); diff --git a/src/main/java/org/matsim/run/scoring/DefaultPseudoRandomTripScore.java b/src/main/java/org/matsim/run/scoring/DefaultPseudoRandomTripError.java similarity index 87% rename from src/main/java/org/matsim/run/scoring/DefaultPseudoRandomTripScore.java rename to src/main/java/org/matsim/run/scoring/DefaultPseudoRandomTripError.java index a3dfe9b7..b21cc96f 100644 --- a/src/main/java/org/matsim/run/scoring/DefaultPseudoRandomTripScore.java +++ b/src/main/java/org/matsim/run/scoring/DefaultPseudoRandomTripError.java @@ -6,7 +6,7 @@ /** * Computes a random seed based on person id, previous activity and routing mode. */ -public final class DefaultPseudoRandomTripScore implements PseudoRandomTripScore { +public final class DefaultPseudoRandomTripError implements PseudoRandomTripError { @Override public long getSeed(Id personId, String routingMode, String prevActivityType) { diff --git a/src/main/java/org/matsim/run/scoring/PseudoRandomScorer.java b/src/main/java/org/matsim/run/scoring/PseudoRandomScorer.java index 6045241e..f15bbd07 100644 --- a/src/main/java/org/matsim/run/scoring/PseudoRandomScorer.java +++ b/src/main/java/org/matsim/run/scoring/PseudoRandomScorer.java @@ -11,7 +11,7 @@ import org.matsim.core.config.ConfigUtils; /** - * Computes pseudo random scores, which are frozen for certain choice situations, thus representing the unobserved heterogeneity. + * Computes pseudo random errors (epsilons), which are frozen for certain choice situations, thus representing the unobserved heterogeneity. */ public final class PseudoRandomScorer { @@ -20,12 +20,12 @@ public final class PseudoRandomScorer { */ private static final int WARMUP_ITERATIONS = 100; - private final PseudoRandomTripScore tripScore; + private final PseudoRandomTripError tripScore; private final long seed; private final double scale; @Inject - public PseudoRandomScorer(PseudoRandomTripScore tripScore, Config config) { + public PseudoRandomScorer(PseudoRandomTripError tripScore, Config config) { this.tripScore = tripScore; this.seed = config.global().getRandomSeed(); this.scale = ConfigUtils.addOrGetModule(config, AdvancedScoringConfigGroup.class).pseudoRamdomScale; diff --git a/src/main/java/org/matsim/run/scoring/PseudoRandomTripScore.java b/src/main/java/org/matsim/run/scoring/PseudoRandomTripError.java similarity index 77% rename from src/main/java/org/matsim/run/scoring/PseudoRandomTripScore.java rename to src/main/java/org/matsim/run/scoring/PseudoRandomTripError.java index 019e5ab3..79628aa8 100644 --- a/src/main/java/org/matsim/run/scoring/PseudoRandomTripScore.java +++ b/src/main/java/org/matsim/run/scoring/PseudoRandomTripError.java @@ -4,9 +4,9 @@ import org.matsim.api.core.v01.population.Person; /** - * Interface to provide pseudo-random scoring for a trip.* + * Interface to provide pseudo-random errors for a trip. */ -public interface PseudoRandomTripScore { +public interface PseudoRandomTripError { /** * Return a seed for a trip. The seed must be designed such that it is constant for the same choice situations.