removed warnings and added .updateSkills

jsprit-core/src/main/java/jsprit/core/algorithm/state/StateManager.java

@@ -57,8 +57,8 @@ import jsprit.core.problem.solution.route.state.StateFactory.StateId;
  *
  */
 public class StateManager implements RouteAndActivityStateGetter, IterationStartsListener, RuinListener, InsertionStartsListener, JobInsertedListener, InsertionEndsListener {
-	
+
-	static class States_ {
+    static class States_ {
 		
 		private Map<StateId,Object> states = new HashMap<StateId,Object>();
 		
@@ -110,6 +110,8 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
 	private boolean updateLoad = false;
 	
 	private boolean updateTWs = false;
+
+    private boolean updateSkills = false;
 	
 	private void addDefaultStates() {
 		defaultActivityStates_.put(StateFactory.LOAD, Capacity.Builder.newInstance().build());
@@ -164,9 +166,9 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
 	 * can add the default simply by coding <br>
 	 * <code>addDefaultRouteState(StateFactory.createStateId("max_weight"), Integer.class, 0)</code>
 	 * 
-	 * @param stateId
+	 * @param stateId id of state
-	 * @param type
+	 * @param type type of memorized state
-	 * @param defaultState
+	 * @param defaultState actual state
 	 */
 	public <T> void addDefaultRouteState(StateId stateId, Class<T> type, T defaultState){
 		if(StateFactory.isReservedId(stateId)) StateFactory.throwReservedIdException(stateId.toString());
@@ -175,10 +177,10 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
 	
 	/**
 	 * Generic method to add default activity state.
-	 * 
+	 *
-	 * @param stateId
+     * @param stateId id of state
-	 * @param type
+     * @param type type of memorized state
-	 * @param defaultState
+     * @param defaultState actual state
 	 */
 	public <T> void addDefaultActivityState(StateId stateId, Class<T> type, T defaultState){
 		if(StateFactory.isReservedId(stateId)) StateFactory.throwReservedIdException(stateId.toString());
@@ -211,11 +213,12 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
 	}
 
 	/**
-	 * 
+	 *
-	 * @param act
+     * @param act tour activity
-	 * @param stateId
+     * @param stateId id of state
-	 * @param type
+     * @param type of actual state
-	 * @return
+     *
+	 * @return state
 	 */
 	private <T> T getDefaultTypedActivityState(TourActivity act, StateId stateId,Class<T> type) {
 		if(defaultActivityStates_.containsKey(stateId)){
@@ -263,10 +266,10 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
 	 * <p>you can retrieve the load at myActivity by <br>
 	 * <code>Capacity load = stateManager.getActivityState(myActivity, StateFactory.createStateId("act-load"), Capacity.class);</code>
 	 * 
-	 * @param act
+	 * @param act tour activity
-	 * @param stateId
+	 * @param stateId stateId of state to be memorized
-	 * @param type
+	 * @param type type of state
-	 * @param state
+	 * @param state acutall state
 	 */
 	public <T> void putTypedActivityState(TourActivity act, StateId stateId, Class<T> type, T state){
 		if(StateFactory.isReservedId(stateId)) StateFactory.throwReservedIdException(stateId.toString());
@@ -298,10 +301,10 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
 	 * <p>you can retrieve the duration of myRoute then by <br>
 	 * <code>double totalRouteDuration = stateManager.getRouteState(myRoute, StateFactory.createStateId("route-duration"), Double.class);</code> 
 	 * 
-	 * @param route
+	 * @param route vehilcRoute that gets a state
-	 * @param stateId
+	 * @param stateId id of state
-	 * @param type
+	 * @param type of state
-	 * @param state
+	 * @param state actual state
 	 */
 	public <T> void putTypedRouteState(VehicleRoute route, StateId stateId, Class<T> type, T state){
 		if(StateFactory.isReservedId(stateId)) StateFactory.throwReservedIdException(stateId.toString());
@@ -318,7 +321,7 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
 	 * <p>The following rule pertain for activity/route visitors:These visitors visits all activities/route in a route subsequently in two cases. First, if insertionStart (after ruinStrategies have removed activities from routes)
 	 * and, second, if a job has been inserted and thus if a route has changed.
 	 *  
-	 * @param updater
+	 * @param updater to be inserted here
 	 */
 	public void addStateUpdater(StateUpdater updater){
 		if(updater instanceof ActivityVisitor) addActivityVisitor((ActivityVisitor) updater);
@@ -444,5 +447,11 @@ public class StateManager implements RouteAndActivityStateGetter, IterationStart
 		}
 	}
 
+    public void updateSkillStates(){
+        if(!updateSkills){
+            updateSkills=true;
+            addActivityVisitor(new UpdateSkills(this));
+        }
+    }
 	
 }

jsprit-core/src/main/java/jsprit/core/problem/constraint/ConstraintManager.java

@@ -38,7 +38,7 @@ import org.apache.log4j.Logger;
  */
 public class ConstraintManager implements HardActivityStateLevelConstraint, HardRouteStateLevelConstraint, SoftActivityConstraint, SoftRouteConstraint{
 
-	public static enum Priority {
+    public static enum Priority {
 		CRITICAL, HIGH, LOW
 	}
 	
@@ -59,6 +59,8 @@ public class ConstraintManager implements HardActivityStateLevelConstraint, Hard
 	private boolean loadConstraintsSet = false;
 	
 	private boolean timeWindowConstraintsSet = false;
+
+    private boolean skillconstraintSet = false;
 	
 	public ConstraintManager(VehicleRoutingProblem vrp, RouteAndActivityStateGetter stateManager) {
 		this.vrp = vrp;
@@ -113,6 +115,13 @@ public class ConstraintManager implements HardActivityStateLevelConstraint, Hard
 			loadConstraintsSet=true;
 		}
 	}
+
+    public void addSkillsConstraint() {
+        if (!skillconstraintSet){
+            addConstraint(new SkillConstraint(stateManager));
+            skillconstraintSet=true;
+        }
+    }
 	
 //	public void add