Changeset 10507 for stable/HeuristicLab.Problems.VehicleRouting

stable

Property svn:mergeinfo changed
/trunk/sources merged: 10149,10231,10261,10291-10292,10295,10298

stable/HeuristicLab.Problems.VehicleRouting

Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting merged: 10295,10298

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Creators/AlbaCreator.cs

r9456	r10507
45	45	}
46	46
47		public override IOperation Apply() {
	47	public override IOperation InstrumentedApply() {
48	48	(VRPToursParameter.ActualValue as AlbaEncoding).Repair();
49	49
50		return base.Apply();
	50	return base.InstrumentedApply();
51	51	}
52	52	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Creators/RandomCreator.cs

r9456	r10507
86	86	}
87	87
88		public override IOperation Apply() {
	88	public override IOperation InstrumentedApply() {
89	89	//choose default encoding here
90	90	VRPToursParameter.ActualValue = AlbaEncoding.ConvertFrom(CreateSolution(), ProblemInstance);
91	91
92		return base.Apply();
	92	return base.InstrumentedApply();
93	93	}
94	94	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Crossovers/AlbaCrossover.cs

-                      r9456
+                      r10507
     protected abstract AlbaEncoding Crossover(IRandom random, AlbaEncoding parent1, AlbaEncoding parent2);
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       ItemArray<IVRPEncoding> parents = new ItemArray<IVRPEncoding>(ParentsParameter.ActualValue.Length);
       for (int i = 0; i < ParentsParameter.ActualValue.Length; i++) {
 …
       (ChildParameter.ActualValue as AlbaEncoding).Repair();
       return base.Apply();
+      return base.InstrumentedApply();
+    }
+  }

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.cs

r9462	r10507
125	125	}
126	126
127		public override IOperation Apply() {
	127	public override IOperation InstrumentedApply() {
128	128	int maxIterations = MaximumIterationsParameter.ActualValue.Value;
129	129	AlbaEncoding solution = null;
…	…
146	146	QualityParameter.ActualValue.Value = quality;
147	147
148		return base.Apply();
	148	return base.InstrumentedApply();
149	149	}
150	150	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaManipulator.cs

r9456	r10507
62	62	}
63	63
64		public override IOperation Apply() {
	64	public override IOperation InstrumentedApply() {
65	65	IVRPEncoding solution = VRPToursParameter.ActualValue;
66	66	if (!(solution is AlbaEncoding)) {
…	…
71	71	(VRPToursParameter.ActualValue as AlbaEncoding).Repair();
72	72
73		return base.Apply();
	73	return base.InstrumentedApply();
74	74	}
75	75	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/AlbaMoveGenerator.cs

r9456	r10507
41	41	}
42	42
43		public override IOperation Apply() {
	43	public override IOperation InstrumentedApply() {
44	44	IVRPEncoding solution = VRPToursParameter.ActualValue;
45	45	if (!(solution is AlbaEncoding)) {
…	…
47	47	}
48	48
49		return base.Apply();
	49	return base.InstrumentedApply();
50	50	}
51	51	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionMoveGenerator.cs

-                      r9456
+                      r10507
     protected abstract AlbaIntraRouteInversionMove[] GenerateMoves(AlbaEncoding individual, IVRPProblemInstance problemInstance);
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       AlbaEncoding individual = VRPToursParameter.ActualValue as AlbaEncoding;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMoveGenerator.cs

-                      r9456
+                      r10507
     protected abstract AlbaLambdaInterchangeMove[] GenerateMoves(AlbaEncoding individual, IVRPProblemInstance problemInstance, int lambda);
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       AlbaEncoding individual = VRPToursParameter.ActualValue as AlbaEncoding;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaStochasticTranslocationSingleMoveGenerator.cs

-                      r9456
+                      r10507
+    }
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       IVRPEncoding solution = VRPToursParameter.ActualValue;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveGenerator.cs

-                      r9456
+                      r10507
+    }
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       IVRPEncoding solution = VRPToursParameter.ActualValue;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveHardTabuCriterion.cs

-                      r9456
+                      r10507
+    }
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       IVRPEncoding solution = VRPToursParameter.ActualValue;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveSoftTabuCriterion.cs

-                      r9456
+                      r10507
+    }
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       IVRPEncoding solution = VRPToursParameter.ActualValue;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveTabuMaker.cs

-                      r9456
+                      r10507
+    }
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       IVRPEncoding solution = VRPToursParameter.ActualValue;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Crossovers/GVRCrossover.cs

r9456	r10507
103	103	}
104	104
105		public override IOperation Apply() {
	105	public override IOperation InstrumentedApply() {
106	106	ItemArray<IVRPEncoding> parents = new ItemArray<IVRPEncoding>(ParentsParameter.ActualValue.Length);
107	107	for (int i = 0; i < ParentsParameter.ActualValue.Length; i++) {
…	…
117	117	ChildParameter.ActualValue = Crossover(RandomParameter.ActualValue, parents[0] as GVREncoding, parents[1] as GVREncoding);
118	118
119		return base.Apply();
	119	return base.InstrumentedApply();
120	120	}
121	121	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRManipulator.cs

-                      r9456
+                      r10507
     protected abstract void Manipulate(IRandom random, GVREncoding individual);
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       IVRPEncoding solution = VRPToursParameter.ActualValue;
       if (!(solution is GVREncoding)) {
 …
       Manipulate(RandomParameter.ActualValue, VRPToursParameter.ActualValue as GVREncoding);
       return base.Apply();
+      return base.InstrumentedApply();
+    }
+  }

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Creators/MultiVRPSolutionCreator.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 VRP creator to choose from.");
101		return base.Apply();
	101	return base.InstrumentedApply();
102	102	}
103	103	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Crossovers/BiasedMultiVRPSolutionCrossover.cs

-                      r9462
+                      r10507
 using System;
-using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using HeuristicLab.Analysis;
+using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Common;
-using HeuristicLab.Analysis;
-using HeuristicLab.Parameters;
-using HeuristicLab.Optimization;
-using HeuristicLab.Data;
-using HeuristicLab.Collections;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
 …
+    }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       IOperator successor = null;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Crossovers/MultiVRPSolutionCrossover.cs

r9456	r10507
106	106	}
107	107
108		public override IOperation Apply() {
	108	public override IOperation InstrumentedApply() {
109	109	if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one permutation crossover to choose from.");
110		return base.Apply();
	110	return base.InstrumentedApply();
111	111	}
112	112	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Crossovers/RandomParentCloneCrossover.cs

r9456	r10507
65	65	}
66	66
67		public override IOperation Apply() {
	67	public override IOperation InstrumentedApply() {
68	68	if (RandomParameter.ActualValue.Next() < 0.5)
69	69	ChildParameter.ActualValue = ParentsParameter.ActualValue[0].Clone() as IVRPEncoding;
…	…
71	71	ChildParameter.ActualValue = ParentsParameter.ActualValue[1].Clone() as IVRPEncoding;
72	72
73		return base.Apply();
	73	return base.InstrumentedApply();
74	74	}
75	75	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Manipulators/BiasedMultiVRPSolutionManipulator.cs

-                      r9462
+                      r10507
 using System;
-using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using HeuristicLab.Analysis;
+using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Common;
-using HeuristicLab.Analysis;
-using HeuristicLab.Parameters;
-using HeuristicLab.Optimization;
-using HeuristicLab.Data;
-using HeuristicLab.Collections;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
 …
       get { return (ValueLookupParameter<DoubleArray>)Parameters["ActualProbabilities"]; }
+    }
     public ValueLookupParameter<StringValue> SuccessProgressAnalyisis {
       get { return (ValueLookupParameter<StringValue>)Parameters["SuccessProgressAnalysis"]; }
 …
       : base() {
       Parameters.Add(new ValueLookupParameter<DoubleArray>("ActualProbabilities", "The array of relative probabilities for each operator."));
       Parameters.Add(new ValueLookupParameter<StringValue>("SuccessProgressAnalysis", "The success progress analyisis to be considered",
+      Parameters.Add(new ValueLookupParameter<StringValue>("SuccessProgressAnalysis", "The success progress analyisis to be considered",
         new StringValue("ExecutedMutationOperator")));
 …
+    }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       IOperator successor = null;

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	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs

-                      r9456
+                      r10507
     protected override void EvaluateMove() { }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       IVRPMove move = VRPMoveParameter.ActualValue as IVRPMove;
 …
       moveEvaluator.VRPMoveParameter.ActualName = VRPMoveParameter.Name;
       OperationCollection next = new OperationCollection(base.Apply());
+      OperationCollection next = new OperationCollection(base.InstrumentedApply());
       next.Insert(0, ExecutionContext.CreateOperation(moveEvaluator));

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs

-                      r9456
+                      r10507
+    }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one VRP move generator choose from.");
       OperationCollection next = new OperationCollection(base.Apply());
+      OperationCollection next = new OperationCollection(base.InstrumentedApply());
       for (int i = 0; i < SelectedOperatorsParameter.ActualValue.Value; i++) {

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveEvaluator.cs

r9456	r10507
76	76	protected abstract void EvaluateMove();
77	77
78		public override IOperation Apply() {
	78	public override IOperation InstrumentedApply() {
79	79	EvaluateMove();
80	80
81		return base.Apply();
	81	return base.InstrumentedApply();
82	82	}
83	83	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveMaker.cs

r9456	r10507
99	99	}
100	100
101		public override IOperation Apply() {
	101	public override IOperation InstrumentedApply() {
102	102	PerformMove();
103	103	UpdateMoveEvaluation();
104	104
105		return base.Apply();
	105	return base.InstrumentedApply();
106	106	}
107	107	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/IterativeInsertionCreator.cs

r9456	r10507
140	140	}
141	141
142		public override IOperation Apply() {
	142	public override IOperation InstrumentedApply() {
143	143	VRPToursParameter.ActualValue = CreateSolution(ProblemInstance, RandomParameter.ActualValue, AdhereTimeWindowsParameter.Value.Value);
144	144
145		return base.Apply();
	145	return base.InstrumentedApply();
146	146	}
147	147	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/PushForwardInsertionCreator.cs

r9456	r10507
373	373	}
374	374
375		public override IOperation Apply() {
	375	public override IOperation InstrumentedApply() {
376	376	VRPToursParameter.ActualValue = CreateSolution(ProblemInstance, RandomParameter.ActualValue,
377	377	Alpha.Value.Value, Beta.Value.Value, Gamma.Value.Value,
378	378	AlphaVariance.Value.Value, BetaVariance.Value.Value, GammaVariance.Value.Value);
379	379
380		return base.Apply();
	380	return base.InstrumentedApply();
381	381	}
382	382	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinCrossover.cs

r9456	r10507
144	144	}
145	145
146		public override IOperation Apply() {
	146	public override IOperation InstrumentedApply() {
147	147	ItemArray<IVRPEncoding> parents = new ItemArray<IVRPEncoding>(ParentsParameter.ActualValue.Length);
148	148	for (int i = 0; i < ParentsParameter.ActualValue.Length; i++) {
…	…
160	160	(ChildParameter.ActualValue as PotvinEncoding).Repair();
161	161
162		return base.Apply();
	162	return base.InstrumentedApply();
163	163	}
164	164	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinManipulator.cs

r9456	r10507
87	87	}
88	88
89		public override IOperation Apply() {
	89	public override IOperation InstrumentedApply() {
90	90	IVRPEncoding solution = VRPToursParameter.ActualValue;
91	91	if (!(solution is PotvinEncoding)) {
…	…
96	96	(VRPToursParameter.ActualValue as PotvinEncoding).Repair();
97	97
98		return base.Apply();
	98	return base.InstrumentedApply();
99	99	}
100	100	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinVehicleAssignmentManipulator.cs

-                      r9456
+                      r10507
+    }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       IVRPEncoding solution = VRPToursParameter.ActualValue;
       if (!(solution is PotvinEncoding)) {
 …
+      }
       OperationCollection next = new OperationCollection(base.Apply());
+      OperationCollection next = new OperationCollection(base.InstrumentedApply());
       VehicleAssignmentParameter.ActualValue = (VRPToursParameter.ActualValue as PotvinEncoding).VehicleAssignment;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveGenerator.cs

-                      r9456
+                      r10507
     protected abstract PotvinCustomerRelocationMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance);
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       PotvinEncoding individual = VRPToursParameter.ActualValue as PotvinEncoding;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveGenerator.cs

-                      r9456
+                      r10507
     protected abstract PotvinPDExchangeMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance);
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       PotvinEncoding individual = VRPToursParameter.ActualValue as PotvinEncoding;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveGenerator.cs

-                      r9456
+                      r10507
     protected abstract PotvinPDRearrangeMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance);
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       PotvinEncoding individual = VRPToursParameter.ActualValue as PotvinEncoding;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveGenerator.cs

-                      r9456
+                      r10507
     protected abstract PotvinPDShiftMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance);
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       PotvinEncoding individual = VRPToursParameter.ActualValue as PotvinEncoding;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PotvinMoveGenerator.cs

r9456	r10507
41	41	}
42	42
43		public override IOperation Apply() {
	43	public override IOperation InstrumentedApply() {
44	44	IVRPEncoding solution = VRPToursParameter.ActualValue;
45	45	if (!(solution is PotvinEncoding)) {
…	…
47	47	}
48	48
49		return base.Apply();
	49	return base.InstrumentedApply();
50	50	}
51	51	}

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveGenerator.cs

-                      r9456
+                      r10507
     protected abstract PotvinTwoOptStarMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance);
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       PotvinEncoding individual = VRPToursParameter.ActualValue as PotvinEncoding;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMoveGenerator.cs

-                      r9456
+                      r10507
     protected abstract PotvinVehicleAssignmentMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance);
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       PotvinEncoding individual = VRPToursParameter.ActualValue as PotvinEncoding;

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Crossovers/PrinsCrossover.cs

-                      r9456
+                      r10507
     protected abstract PrinsEncoding Crossover(IRandom random, PrinsEncoding parent1, PrinsEncoding parent2);
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       ItemArray<IVRPEncoding> parents = new ItemArray<IVRPEncoding>(ParentsParameter.ActualValue.Length);
       for (int i = 0; i < ParentsParameter.ActualValue.Length; i++) {
 …
         Crossover(RandomParameter.ActualValue, parents[0] as PrinsEncoding, parents[1] as PrinsEncoding);
       return base.Apply();
+      return base.InstrumentedApply();
+    }
+  }

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Manipulators/PrinsManipulator.cs

-                      r9456
+                      r10507
     protected abstract void Manipulate(IRandom random, PrinsEncoding individual);
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       IVRPEncoding solution = VRPToursParameter.ActualValue;
       if (!(solution is PrinsEncoding)) {
 …
       Manipulate(RandomParameter.ActualValue, VRPToursParameter.ActualValue as PrinsEncoding);
       return base.Apply();
+      return base.InstrumentedApply();
+    }
+  }

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/VRPOperator.cs

r9456	r10507
30	30	[Item("VRPOperator", "Represents a VRP operator.")]
31	31	[StorableClass]
32		public abstract class VRPOperator : ~~SingleSuccessor~~Operator, IVRPOperator {
	32	public abstract class VRPOperator : InstrumentedOperator, IVRPOperator {
33	33	public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
34	34	get { return (LookupParameter<IVRPProblemInstance>)Parameters["ProblemInstance"]; }

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuCrossover.cs

-                      r9456
+                      r10507
     protected abstract ZhuEncoding Crossover(IRandom random, ZhuEncoding parent1, ZhuEncoding parent2);
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       ItemArray<IVRPEncoding> parents = new ItemArray<IVRPEncoding>(ParentsParameter.ActualValue.Length);
       for (int i = 0; i < ParentsParameter.ActualValue.Length; i++) {
 …
         Crossover(RandomParameter.ActualValue, parents[0] as ZhuEncoding, parents[1] as ZhuEncoding);
       return base.Apply();
+      return base.InstrumentedApply();
+    }
+  }

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Manipulators/ZhuManipulator.cs

-                      r9456
+                      r10507
     protected abstract void Manipulate(IRandom random, ZhuEncoding individual);
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       IVRPEncoding solution = VRPToursParameter.ActualValue;
       if (!(solution is ZhuEncoding)) {
 …
       Manipulate(RandomParameter.ActualValue, VRPToursParameter.ActualValue as ZhuEncoding);
       return base.Apply();
+      return base.InstrumentedApply();
+    }
+  }

stable/HeuristicLab.Problems.VehicleRouting/3.4/Improver/VRPImprovementOperator.cs

-                      r9456
+                      r10507
+    }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       var solution = SolutionParameter.ActualValue as IVRPEncoding;
       var potvinSolution = solution is PotvinEncoding ? solution as PotvinEncoding : PotvinEncoding.ConvertFrom(solution, ProblemInstance);
 …
       LocalEvaluatedSolutions.ActualValue = new IntValue(evaluatedSolutions);
       return base.Apply();
+      return base.InstrumentedApply();
+    }

stable/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluator.cs

-                      r9456
+                      r10507
+    }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       InitResultParameters();
 …
       QualityParameter.ActualValue = new DoubleValue(evaluation.Quality);
       return base.Apply();
+      return base.InstrumentedApply();
+    }

Context Navigation

Legend:

Download in other formats: