Context Navigation

Changeset 10929 for stable/HeuristicLab.Problems.VehicleRouting

Timestamp:

06/03/14 16:26:17 (10 years ago)

Author:

abeham

Message:

#2184: merged r10860, r10861 to stable
#2119: merged r10472 to stable (was forgotten)

Location:

stable

Files:

stable
- Property svn:mergeinfo changed
  /trunk/sources merged: 10472,10860-10861
stable/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.VehicleRouting merged: 10472,10860

r10917	r10929
134	134	}
135	135
136		////////////////
	136	//////////////// code has to be duplicated since ActualProbabilitiesParameter.ActualValue are updated and used for operator selection
137	137	IRandom random = RandomParameter.ActualValue;
138	138	DoubleArray probabilities = ActualProbabilitiesParameter.ActualValue;

r10917	r10929
134	134	}
135	135
136		////////////////
	136	//////////////// code has to be duplicated since ActualProbabilitiesParameter.ActualValue are updated and used for operator selection
137	137	IRandom random = RandomParameter.ActualValue;
138	138	DoubleArray probabilities = ActualProbabilitiesParameter.ActualValue;

-                      r10744
+                      r10929
       Name = instance.Name;
       Description = instance.Description;
+      BestKnownQuality = null;
+      BestKnownSolution = null;
       if (ProblemInstance != null && instance.ProblemInstance != null &&
         instance.ProblemInstance.GetType() == ProblemInstance.GetType())
 …
       OnReset();
-      BestKnownQuality = null;
-      BestKnownSolution = null;
       if (instance.BestKnownQuality != null) {

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