Context Navigation

Alba

Timestamp:

01/07/14 15:05:58 (11 years ago)

Author:

svonolfe

Message:

Adapted all VRP related operators to subclass InstrumentedOperator (#2119)

Location:

Files:

r9456	r10298
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	}

r9456	r10298
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	}

-                      r9456
+                      r10298
     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();
+    }
+  }

r9462	r10298
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	}

r9456	r10298
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	}

r9456	r10298
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	}

-                      r9456
+                      r10298
     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;

-                      r9456
+                      r10298
     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;

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

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

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

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

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

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