Context Navigation

Potvin

Timestamp:

02/25/14 14:00:47 (11 years ago)

Author:

mkommend

Message:

Location:

stable

Files:

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

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	}

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	}

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	}

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	}

-                      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;

-                      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;

-                      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;

-                      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;

-                      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;

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	}

-                      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;

-                      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;

Note: See TracChangeset for help on using the changeset viewer.