Context Navigation

Changeset 4288

Timestamp:

08/23/10 14:26:13 (14 years ago)

Author:

svonolfe

Message:

Made intra route inversion and lamda interchange moves work with the SA algorithm (#1039)

Location:

Files:

r4287	r4288
72	72	}
73	73
74		public IVRPEncoding MakeMove(~~IRandom random~~) {
	74	public IVRPEncoding MakeMove() {
75	75	IntraRouteInversionMoveMaker.Apply(Individual as AlbaEncoding, this);
76	76

-                      r4206
+                      r4288
       IOperation next = base.Apply();
-      AlbaEncoding solution = VRPToursParameter.ActualValue as AlbaEncoding;
       IntraRouteInversionMove move = IntraRouteInversionMoveParameter.ActualValue;
       DoubleValue moveQuality = MoveQualityParameter.ActualValue;
 …
       //perform move
       Apply(solution, move);
+      VRPToursParameter.ActualValue = move.MakeMove();
       quality.Value = moveQuality.Value;

r4287	r4288
111	111	}
112	112
113		public IVRPEncoding MakeMove(~~IRandom random~~) {
	113	public IVRPEncoding MakeMove() {
114	114	LambdaInterchangeMoveMaker.Apply(Individual as AlbaEncoding, this);
115	115

-                      r4206
+                      r4288
       IOperation next = base.Apply();
-      AlbaEncoding solution = VRPToursParameter.ActualValue as AlbaEncoding;
       LambdaInterchangeMove move = LambdaInterchangeMoveParameter.ActualValue;
       DoubleValue moveQuality = MoveQualityParameter.ActualValue;
 …
       //perform move
       Apply(solution, move);
+      VRPToursParameter.ActualValue = move.MakeMove();
       quality.Value = moveQuality.Value;

r4287	r4288
34	34	ILookupParameter<DoubleMatrix> distanceMatrix, BoolValue useDistanceMatrix);
35	35
36		IVRPEncoding MakeMove(~~IRandom random~~);
	36	IVRPEncoding MakeMove();
37	37	}
38	38	}

r4287	r4288
114	114
115	115	//perform move
116		VRPToursParameter.ActualValue = move.MakeMove(~~RandomParameter.ActualValue~~);
	116	VRPToursParameter.ActualValue = move.MakeMove();
117	117
118	118	quality.Value = moveQuality.Value;

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