- Timestamp:
- 02/25/14 14:00:47 (11 years ago)
- Location:
- stable
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 10149,10231,10261,10291-10292,10295,10298
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting merged: 10295,10298
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Manipulators/BiasedMultiVRPSolutionManipulator.cs
r9462 r10507 21 21 22 22 using System; 23 using System.Collections.Generic;24 23 using System.Linq; 25 using System.Text; 24 using HeuristicLab.Analysis; 25 using HeuristicLab.Collections; 26 using HeuristicLab.Common; 26 27 using HeuristicLab.Core; 28 using HeuristicLab.Data; 29 using HeuristicLab.Optimization; 30 using HeuristicLab.Parameters; 27 31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 using HeuristicLab.Common;29 using HeuristicLab.Analysis;30 using HeuristicLab.Parameters;31 using HeuristicLab.Optimization;32 using HeuristicLab.Data;33 using HeuristicLab.Collections;34 32 35 33 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General { … … 40 38 get { return (ValueLookupParameter<DoubleArray>)Parameters["ActualProbabilities"]; } 41 39 } 42 40 43 41 public ValueLookupParameter<StringValue> SuccessProgressAnalyisis { 44 42 get { return (ValueLookupParameter<StringValue>)Parameters["SuccessProgressAnalysis"]; } … … 63 61 : base() { 64 62 Parameters.Add(new ValueLookupParameter<DoubleArray>("ActualProbabilities", "The array of relative probabilities for each operator.")); 65 Parameters.Add(new ValueLookupParameter<StringValue>("SuccessProgressAnalysis", "The success progress analyisis to be considered", 63 Parameters.Add(new ValueLookupParameter<StringValue>("SuccessProgressAnalysis", "The success progress analyisis to be considered", 66 64 new StringValue("ExecutedMutationOperator"))); 67 65 … … 81 79 } 82 80 83 public override IOperation Apply() {81 public override IOperation InstrumentedApply() { 84 82 IOperator successor = null; 85 83 -
stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Manipulators/MultiVRPSolutionManipulator.cs
r9456 r10507 97 97 } 98 98 99 public override IOperation Apply() {99 public override IOperation InstrumentedApply() { 100 100 if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one permutation manipulator to choose from."); 101 return base. Apply();101 return base.InstrumentedApply(); 102 102 } 103 103 }
Note: See TracChangeset
for help on using the changeset viewer.