Changeset 15331

Timestamp:

08/17/17 16:05:58 (7 years ago)

Author:

abeham

Message:

#2457: added FLA Characterizer algorithm

Location:

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3

Files:

• Algorithms/FLACharacterizer.cs (copied) (copied from branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/Algorithms/RandomWalk.cs) (1 diff)
• HeuristicLab.Analysis.FitnessLandscape-3.3.csproj (modified) (1 diff)

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/Algorithms/FLACharacterizer.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Selection;
-using System.Linq;
+using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
-  [Item("Random Walk", "A random walk applies a certain manipulation operation over and over.")]
+  [Item("FLA Characterizer", "An algorithm that executes a characteristic calculator.")]
   [StorableClass]
-  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis + CreatableAttribute.Categories.SplitToken + "1" + CreatableAttribute.Categories.OrderToken + "FLA", Priority = 301)]
-  public sealed class RandomWalk : LocalAnalysis<RandomSelector> {
+  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis + CreatableAttribute.Categories.SplitToken + "1" + CreatableAttribute.Categories.OrderToken + "FLA", Priority = 300)]
+  public sealed class FLACharacterizer : BasicAlgorithm {
+    public override bool SupportsPause { get { return false; } }
+    
+    public IValueParameter<ICharacteristicCalculator> CalculatorParameter {
+      get { return (IValueParameter<ICharacteristicCalculator>)Parameters["Calculator"]; }
+    }
 
     [StorableConstructor]
-    private RandomWalk(bool deserializing) : base(deserializing) { }
-    private RandomWalk(RandomWalk original, Cloner cloner) : base(original, cloner) { }
-    public RandomWalk()
-      : base(new RandomSelector()) {
-      SelectorParameter.Value.NumberOfSelectedSubScopesParameter.Hidden = true;
-      MainLoop.SampleSizeParameter.Value = new IntValue(1);
-      var trailAnalyzer = AnalyzerParameter.Value.Operators.OfType<QualityTrailMultiAnalyzer>().Single();
-      var upDown = trailAnalyzer.Operators.OfType<UpDownWalkAnalyzer>().Single();
-      trailAnalyzer.Operators.SetItemCheckedState(upDown, false);
+    private FLACharacterizer(bool deserializing) : base(deserializing) { }
+    private FLACharacterizer(FLACharacterizer original, Cloner cloner) : base(original, cloner) { }
+    public FLACharacterizer() : base() {
+      Parameters.Add(new ValueParameter<ICharacteristicCalculator>("Calculator", "The FLA characteristic calculator.", new RandomWalkCalculator()));
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new RandomWalk(this, cloner);
+      return new FLACharacterizer(this, cloner);
+    }
+
+    protected override void Run(CancellationToken cancellationToken) {
+      var calculator = CalculatorParameter.Value;
+      calculator.Problem = Problem;
+      if (calculator.CanCalculate()) {
+        foreach (var result in calculator.Calculate()) {
+          Results.Add(result);
+        }
+      } else throw new InvalidOperationException("Calculator cannot be applied.");
     }
   }

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/HeuristicLab.Analysis.FitnessLandscape-3.3.csproj

@@ -189 +189 @@
   <ItemGroup>
     <Compile Include="Algorithms\AdaptiveWalk.cs" />
+    <Compile Include="Algorithms\FLACharacterizer.cs" />
     <Compile Include="Algorithms\UpDownWalk.cs" />
     <Compile Include="Algorithms\RandomWalk.cs" />