Changeset 15564 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/OSGAContext.cs

Timestamp:

01/01/18 23:52:39 (6 years ago)

Author:

abeham

Message:

#1614:

• Fixed some bugs
• Added OSGA
• Updated ES (added recombination)
• Reusing operators among algorihtms (RelocateEquipmentManipluator)
• Rewrote DiscreteLocationCrossover

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/OSGAContext.cs (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASPContext.cs) (3 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/OSGAContext.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.GRASP {
-  [Item("GRASP+PR (GQAP) Context", "Context for GRASP+PR (GQAP).")]
+namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.Evolutionary {
+  [Item("OSGA (GQAP) Context", "Context for OSGA (GQAP).")]
   [StorableClass]
-  public sealed class GRASPContext : SingleObjectivePopulationContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
+  public sealed class OSGAContext : SingleObjectivePopulationContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
     
     [Storable]
@@ -44 +45 @@
       set { bestSolution.Value = value; }
     }
-    
+
+    [Storable]
+    private IValueParameter<ItemList<ISingleObjectiveSolutionScope<GQAPSolution>>> nextGeneration;
+    public ItemList<ISingleObjectiveSolutionScope<GQAPSolution>> NextGeneration {
+      get { return nextGeneration.Value; }
+      set { nextGeneration.Value = value; }
+    }
+
+    [Storable]
+    private IValueParameter<DoubleValue> selectionPressure;
+    public double SelectionPressure {
+      get { return selectionPressure.Value.Value; }
+      set { selectionPressure.Value.Value = value; }
+    }
+
+    [Storable]
+    private IValueParameter<IntValue> attempts;
+    public int Attempts {
+      get { return attempts.Value.Value; }
+      set { attempts.Value.Value = value; }
+    }
+
     public void SortPopulation() {
       Scope.SubScopes.Replace(Scope.SubScopes.OfType<ISingleObjectiveSolutionScope<GQAPSolution>>().OrderBy(x => Problem.Maximization ? -x.Fitness : x.Fitness).ToList());
@@ -50 +72 @@
     
     [StorableConstructor]
-    private GRASPContext(bool deserializing) : base(deserializing) { }
-    private GRASPContext(GRASPContext original, Cloner cloner)
+    private OSGAContext(bool deserializing) : base(deserializing) { }
+    private OSGAContext(OSGAContext original, Cloner cloner)
       : base(original, cloner) {
       problem = cloner.Clone(original.problem);
       bestSolution = cloner.Clone(original.bestSolution);
+      nextGeneration = cloner.Clone(original.nextGeneration);
+      selectionPressure = cloner.Clone(original.selectionPressure);
+      attempts = cloner.Clone(original.attempts);
     }
-    public GRASPContext() : this("GRASP+PR (GQAP) Context") { }
-    public GRASPContext(string name) : base(name) {
+    public OSGAContext() : this("OSGA (GQAP) Context") { }
+    public OSGAContext(string name) : base(name) {
       Parameters.Add(problem = new ValueParameter<GQAP>("Problem"));
       Parameters.Add(bestSolution = new ValueParameter<GQAPSolution>("BestFoundSolution"));
+      Parameters.Add(nextGeneration = new ValueParameter<ItemList<ISingleObjectiveSolutionScope<GQAPSolution>>>("NextGeneration"));
+      Parameters.Add(selectionPressure = new ValueParameter<DoubleValue>("SelectionPressure", new DoubleValue(0)));
+      Parameters.Add(attempts = new ValueParameter<IntValue>("Attempts", new IntValue(0)));
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new GRASPContext(this, cloner);
+      return new OSGAContext(this, cloner);
     }