Changeset 15563 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/pLAHCContext.cs

Timestamp:

12/30/17 23:10:29 (6 years ago)

Author:

abeham

Message:

#1614:

• Added LAHC and pLAHC-s
• Changed all algorithms to update high frequency results only every second

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC

Files:

• . (added)
• pLAHCContext.cs (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/LocalSearchContext.cs) (2 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/pLAHCContext.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSearch {
-  public sealed class LocalSearchContext : SingleObjectiveSingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
+namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LAHC {
+  public sealed class PLAHCContext : SingleObjectiveSingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
     [Storable]
     private IValueParameter<GQAP> problem;
@@ -40 +41 @@
       set { bestSolution.Value = value; }
     }
+
+    [Storable]
+    private IValueParameter<IntValue> sprintIterations;
+    public int SprintIterations {
+      get { return sprintIterations.Value.Value; }
+      set { sprintIterations.Value.Value = value; }
+    }
+
+    [Storable]
+    private IValueParameter<DoubleArray> memory;
+    public DoubleArray Memory {
+      get { return memory.Value; }
+      set { memory.Value = value; }
+    }
+
+    [Storable]
+    private IValueParameter<IntValue> lastSuccess;
+    public int LastSuccess {
+      get { return lastSuccess.Value.Value; }
+      set { lastSuccess.Value.Value = value; }
+    }
+
+    [Storable]
+    private IValueParameter<ItemList<DoubleValue>> bestList;
+    public ItemList<DoubleValue> BestList {
+      get { return bestList.Value; }
+      set { bestList.Value = value; }
+    }
     
     [StorableConstructor]
-    private LocalSearchContext(bool deserializing) : base(deserializing) { }
-    private LocalSearchContext(LocalSearchContext original, Cloner cloner)
+    private PLAHCContext(bool deserializing) : base(deserializing) { }
+    private PLAHCContext(PLAHCContext original, Cloner cloner)
     : base(original, cloner) {
       problem = cloner.Clone(original.problem);
       bestSolution = cloner.Clone(original.bestSolution);
+      sprintIterations = cloner.Clone(original.sprintIterations);
+      memory = cloner.Clone(original.memory);
+      lastSuccess = cloner.Clone(original.lastSuccess);
+      bestList = cloner.Clone(original.bestList);
     }
-    public LocalSearchContext() {
+    public PLAHCContext() {
       Parameters.Add(problem = new ValueParameter<GQAP>("Problem"));
       Parameters.Add(bestSolution = new ValueParameter<GQAPSolution>("BestFoundSolution"));
+      Parameters.Add(sprintIterations = new ValueParameter<IntValue>("SprintIterations"));
+      Parameters.Add(memory = new ValueParameter<DoubleArray>("Memory"));
+      Parameters.Add(lastSuccess = new ValueParameter<IntValue>("LastSuccess"));
+      Parameters.Add(bestList = new ValueParameter<ItemList<DoubleValue>>("BestList"));
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new LocalSearchContext(this, cloner);
+      return new PLAHCContext(this, cloner);
     }