Changeset 15698 for branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/RandomSearch

Timestamp:

01/31/18 14:01:55 (7 years ago)

Author:

abeham

Message:

#1614: Added random search and fixed execution time counting for commercial solvers

Location:

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/RandomSearch

Files:

• . (added)
• RandomSearch.cs (copied) (copied from branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/MultistartLS.cs) (4 diffs)
• RandomSearchContext.cs (copied) (copied from branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/LocalSearchContext.cs) (3 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/RandomSearch/RandomSearch.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSearch {
-  [Item("Multi-start Local Search (GQAP)", "Multi-start local search for the GQAP.")]
+  [Item("Random Search (GQAP)", "Random search for the GQAP.")]
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
   [StorableClass]
-  public sealed class MultistartLS : StochasticAlgorithm<LocalSearchContext, IntegerVectorEncoding> {
+  public sealed class RandomSearch : StochasticAlgorithm<LocalSearchContext, IntegerVectorEncoding> {
 
     public override bool SupportsPause {
@@ -49 +49 @@
 
     [StorableConstructor]
-    private MultistartLS(bool deserializing) : base(deserializing) { }
-    private MultistartLS(MultistartLS original, Cloner cloner)
+    private RandomSearch(bool deserializing) : base(deserializing) { }
+    private RandomSearch(RandomSearch original, Cloner cloner)
       : base(original, cloner) {
     }
-    public MultistartLS() {
+    public RandomSearch() {
 
       Problem = new GQAP();
@@ -59 +59 @@
     
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new MultistartLS(this, cloner);
+      return new RandomSearch(this, cloner);
     }
 
@@ -74 +74 @@
 
       while (!StoppingCriterion()) {
-        var lsevaluations = 0;
         var assign = new IntegerVector(Problem.ProblemInstance.Demands.Length, Context.Random, 0, Problem.ProblemInstance.Capacities.Length);
         var eval = Problem.ProblemInstance.Evaluate(assign);
+        var candidate = new GQAPSolution(assign, eval);
         Context.EvaluatedSolutions++;
-
-        var candidate = new GQAPSolution(assign, eval);
-        OneOptLocalSearch.Apply(Context.Random, candidate, Problem.ProblemInstance, out lsevaluations);
-        Context.EvaluatedSolutions += lsevaluations;
 
         var candidateFit = Problem.ProblemInstance.ToSingleObjective(candidate.Evaluation);

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/RandomSearch/RandomSearchContext.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSearch {
-  [Item("Local Search Context", "Context for local search algorithms.")]
+namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.RandomSearch {
+  [Item("Random Search Context", "Context for random search algorithms.")]
   [StorableClass]
-  public sealed class LocalSearchContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
+  public sealed class RandomSearchContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
     [Storable]
     private IValueParameter<GQAP> problem;
@@ -44 +44 @@
     
     [StorableConstructor]
-    private LocalSearchContext(bool deserializing) : base(deserializing) { }
-    private LocalSearchContext(LocalSearchContext original, Cloner cloner)
+    private RandomSearchContext(bool deserializing) : base(deserializing) { }
+    private RandomSearchContext(RandomSearchContext original, Cloner cloner)
     : base(original, cloner) {
       problem = cloner.Clone(original.problem);
       bestSolution = cloner.Clone(original.bestSolution);
     }
-    public LocalSearchContext() {
+    public RandomSearchContext() {
       Parameters.Add(problem = new ValueParameter<GQAP>("Problem"));
       Parameters.Add(bestSolution = new ValueParameter<GQAPSolution>("BestFoundSolution"));
@@ -56 +56 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new LocalSearchContext(this, cloner);
+      return new RandomSearchContext(this, cloner);
     }