Context Navigation

Changeset 8847

Timestamp:

10/24/12 19:56:10 (12 years ago)

Author:

abeham

Message:

#1904: Fixed a bug

Location:

Files:

r8338	r8847
147	147
148	148	Improve(assignment, weights, distances, quality, localIterations, evaluations, maximization, maxIterations, CancellationToken);
	149
	150	localIterations.Value = 0;
149	151	return base.Apply();
150	152	}

-                      r8338
+                      r8847
       var distances = DistancesParameter.ActualValue;
       var quality = QualityParameter.ActualValue;
       var locationIterations = LocalIterationsParameter.ActualValue;
+      var localIterations = LocalIterationsParameter.ActualValue;
       var evaluations = EvaluatedSolutionsParameter.ActualValue;
       if (locationIterations == null) {
         locationIterations = new IntValue(0);
         LocalIterationsParameter.ActualValue = locationIterations;
+      if (localIterations == null) {
+        localIterations = new IntValue(0);
+        LocalIterationsParameter.ActualValue = localIterations;
+      }
+      Improve(assignment, weights, distances, quality, locationIterations, evaluations, maximization, maxIterations, CancellationToken);
+      Improve(assignment, weights, distances, quality, localIterations, evaluations, maximization, maxIterations, CancellationToken);
+      localIterations.Value = 0;
       return base.Apply();
+    }

r8846	r8847
203	203	else Improve(assignment, weights, distances, quality, localIterations, evaluations, maximization, maxIterations, CancellationToken);
204	204
	205	localIterations.Value = 0;
205	206	return base.Apply();
206	207	}

r8338	r8847
157	157
158	158	Improve(random, assignment, weights, distances, quality, localIterations, evaluations, maximization, maxIterations, neighborhoodSize, CancellationToken);
	159
	160	localIterations.Value = 0;
159	161	return base.Apply();
160	162	}

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