Changeset 8660 for branches/GP-MoveOperators/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs
- Timestamp:
- 09/14/12 18:58:15 (12 years ago)
- Location:
- branches/GP-MoveOperators
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/GP-MoveOperators
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting merged: 8231,8246,8346,8455,8497,8600
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs
r8206 r8660 178 178 179 179 private void AttachProblemInstanceEventHandlers() { 180 var solutionCreatorParameter = SolutionCreatorParameter as ConstrainedValueParameter<IVRPCreator>;181 solutionCreatorParameter.ValidValues.Clear();182 183 180 if (ProblemInstance != null) { 184 181 EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator; 185 IVRPCreator defaultCreator = null;186 foreach (IVRPCreator creator in Operators.Where(o => o is IVRPCreator)) {187 solutionCreatorParameter.ValidValues.Add(creator);188 if (creator is Encodings.Alba.RandomCreator)189 defaultCreator = creator;190 }191 if (defaultCreator != null)192 solutionCreatorParameter.Value = defaultCreator;193 194 182 ProblemInstance.EvaluationChanged += new EventHandler(ProblemInstance_EvaluationChanged); 195 183 } … … 246 234 247 235 private void InitializeOperators() { 236 var solutionCreatorParameter = SolutionCreatorParameter as ConstrainedValueParameter<IVRPCreator>; 237 solutionCreatorParameter.ValidValues.Clear(); 238 248 239 Operators.Clear(); 249 240 … … 252 243 ProblemInstance.Operators.Concat( 253 244 ApplicationManager.Manager.GetInstances<IGeneralVRPOperator>().Cast<IOperator>()).OrderBy(op => op.Name)); 245 Operators.Add(new VRPSimilarityCalculator()); 246 247 IVRPCreator defaultCreator = null; 248 foreach (IVRPCreator creator in Operators.Where(o => o is IVRPCreator)) { 249 solutionCreatorParameter.ValidValues.Add(creator); 250 if (creator is Encodings.Alba.RandomCreator) 251 defaultCreator = creator; 252 } 253 if (defaultCreator != null) 254 solutionCreatorParameter.Value = defaultCreator; 254 255 } 255 256 … … 263 264 } 264 265 } 265 } 266 if (ProblemInstance != null) { 267 foreach (ISingleObjectiveImprovementOperator op in Operators.OfType<ISingleObjectiveImprovementOperator>()) { 268 op.SolutionParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName; 269 op.SolutionParameter.Hidden = true; 270 } 271 foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) { 272 op.ParentsParameter.ActualName = SolutionCreator.VRPToursParameter.ActualName; 273 op.ParentsParameter.Hidden = true; 274 } 275 foreach (VRPSimilarityCalculator op in Operators.OfType<VRPSimilarityCalculator>()) { 276 op.SolutionVariableName = SolutionCreator.VRPToursParameter.ActualName; 277 op.QualityVariableName = ProblemInstance.SolutionEvaluator.QualityParameter.ActualName; 278 op.ProblemInstance = ProblemInstance; 279 } 280 } 281 } 282 266 283 #endregion 267 284
Note: See TracChangeset
for help on using the changeset viewer.