Changeset 11880 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators

Timestamp:

02/04/15 00:03:14 (10 years ago)

Author:

abeham

Message:

#2174:

• Added IImprovmentOperator interface to SingleObjectiveImprover
• Added Random parameter to Analyze method and IStochasticOperator interface to the resp. analyzer
• Updated code template text of the compiled single- and multi-objective problem definitions
• Prevent ProblemDefinitionScript from silently ignoring exceptions
• Added equality comparer in Encoding's cloning constructor
• Small adaption of ProblemDefinitionScriptView to changes in new code editor

Location:

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators

Files:

• MultiObjectiveAnalyzer.cs (modified) (4 diffs)
• SingleObjectiveAnalyzer.cs (modified) (5 diffs)
• SingleObjectiveImprover.cs (modified) (1 diff)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/MultiObjectiveAnalyzer.cs

@@ -13 +13 @@
   [Item("Multi-objective Analyzer", "Calls the Analyze method of the problem definition.")]
   [StorableClass]
-  public class MultiObjectiveAnalyzer : SingleSuccessorOperator, IMultiObjectiveAnalysisOperator {
+  public class MultiObjectiveAnalyzer : SingleSuccessorOperator, IMultiObjectiveAnalysisOperator, IStochasticOperator {
     public bool EnabledByDefault { get { return true; } }
 
@@ -28 +28 @@
     }
 
-    public Action<Individual[], double[][], ResultCollection> AnalyzeAction { get; set; }
+    public ILookupParameter<IRandom> RandomParameter {
+      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
+    }
+
+    public Action<Individual[], double[][], ResultCollection, IRandom> AnalyzeAction { get; set; }
 
     [StorableConstructor]
@@ -47 +51 @@
       var encoding = EncodingParameter.ActualValue;
       var results = ResultsParameter.ActualValue;
+      var random = RandomParameter.ActualValue;
 
       IEnumerable<IScope> scopes = new[] { ExecutionContext.Scope };
@@ -53 +58 @@
 
       var individuals = scopes.Select(encoding.GetIndividual).ToArray();
-      AnalyzeAction(individuals, QualitiesParameter.ActualValue.Select(x => x.ToArray()).ToArray(), results);
+      AnalyzeAction(individuals, QualitiesParameter.ActualValue.Select(x => x.ToArray()).ToArray(), results, random);
       return base.Apply();
     }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/SingleObjectiveAnalyzer.cs

@@ -13 +13 @@
   [Item("Single-objective Analyzer", "Calls the script's Analyze method to be able to write into the results collection.")]
   [StorableClass]
-  public sealed class SingleObjectiveAnalyzer : SingleSuccessorOperator, ISingleObjectiveAnalysisOperator, IAnalyzer {
+  public sealed class SingleObjectiveAnalyzer : SingleSuccessorOperator, ISingleObjectiveAnalysisOperator, IAnalyzer, IStochasticOperator {
     public bool EnabledByDefault { get { return true; } }
 
@@ -28 +28 @@
     }
 
-    public Action<Individual[], double[], ResultCollection> AnalyzeAction { get; set; }
+    public ILookupParameter<IRandom> RandomParameter {
+      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
+    }
+
+    public Action<Individual[], double[], ResultCollection, IRandom> AnalyzeAction { get; set; }
 
     [StorableConstructor]
@@ -37 +41 @@
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The quality of the parameter vector."));
       Parameters.Add(new LookupParameter<ResultCollection>("Results", "The results collection to write to."));
+      Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
     }
 
@@ -46 +51 @@
       var encoding = EncodingParameter.ActualValue;
       var results = ResultsParameter.ActualValue;
+      var random = RandomParameter.ActualValue;
 
       IEnumerable<IScope> scopes = new[] { ExecutionContext.Scope };
@@ -52 +58 @@
 
       var individuals = scopes.Select(encoding.GetIndividual).ToArray();
-      AnalyzeAction(individuals, QualityParameter.ActualValue.Select(x => x.Value).ToArray(), results);
+      AnalyzeAction(individuals, QualityParameter.ActualValue.Select(x => x.Value).ToArray(), results, random);
       return base.Apply();
     }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/SingleObjectiveImprover.cs

@@ -34 +34 @@
   [Item("Single-objective Improver", "Improves a solution by calling GetNeighbors and Evaluate of the corresponding problem definition.")]
   [StorableClass]
-  public sealed class SingleObjectiveImprover : SingleSuccessorOperator, INeighborBasedOperator, ISingleObjectiveEvaluationOperator, IStochasticOperator {
+  public sealed class SingleObjectiveImprover : SingleSuccessorOperator, INeighborBasedOperator, IImprovementOperator, ISingleObjectiveEvaluationOperator, IStochasticOperator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }