diff --git a/matsim/src/main/java/org/matsim/api/core/v01/population/BasicPlan.java b/matsim/src/main/java/org/matsim/api/core/v01/population/BasicPlan.java index c8263d2264a..5bcf541d5a3 100644 --- a/matsim/src/main/java/org/matsim/api/core/v01/population/BasicPlan.java +++ b/matsim/src/main/java/org/matsim/api/core/v01/population/BasicPlan.java @@ -21,11 +21,11 @@ package org.matsim.api.core.v01.population; -import org.matsim.core.replanning.selectors.GenericWorstPlanForRemovalSelector; - public interface BasicPlan { - void setScore( Double score ); + String UNDEFINED_PLAN_TYPE = "undefined"; + + void setScore(Double score ); Double getScore(); @@ -33,7 +33,7 @@ public interface BasicPlan { * Plan type, which may be used to ensure there is at least one plan of a certain type. */ default String getType() { - return GenericWorstPlanForRemovalSelector.UNDEFINED_TYPE; + return UNDEFINED_PLAN_TYPE; } - + } diff --git a/matsim/src/main/java/org/matsim/core/replanning/selectors/GenericWorstPlanForRemovalSelector.java b/matsim/src/main/java/org/matsim/core/replanning/selectors/GenericWorstPlanForRemovalSelector.java index 49d4971caa1..61e2df24a2e 100644 --- a/matsim/src/main/java/org/matsim/core/replanning/selectors/GenericWorstPlanForRemovalSelector.java +++ b/matsim/src/main/java/org/matsim/core/replanning/selectors/GenericWorstPlanForRemovalSelector.java @@ -28,6 +28,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import static org.matsim.api.core.v01.population.BasicPlan.UNDEFINED_PLAN_TYPE; + /** *
Selects the worst plan of a person (most likely for removal), but respects
* the set plan types in a way the no plan is selected that is the last one of
@@ -41,8 +43,6 @@
*/
public class GenericWorstPlanForRemovalSelector