Changeset 11786

Timestamp:

01/16/15 11:14:50 (10 years ago)

Author:

mkommend

Message:

#2174: Changed operator parameterization in programmable problem.

Location:

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

Files:

• MultiObjectiveProgrammableProblem.cs (modified) (4 diffs)
• ProgrammableProblem.cs (modified) (4 diffs)
• Scripts/Templates/CompiledMultiObjectiveProblemDefinition.cs (modified) (1 diff)
• SingleObjectiveProgrammableProblem.cs (modified) (4 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/MultiObjectiveProgrammableProblem.cs

@@ -21 +21 @@
 
 using System.Linq;
-using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -43 +42 @@
     protected MultiObjectiveProgrammableProblem()
       : base() {
-        Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", new BoolArray(Maximization)));
+      Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", new BoolArray()));
 
       Operators.Add(Evaluator);
-      Operators.Add(new BestScopeSolutionAnalyzer());
       Operators.Add(new MultiObjectiveAnalyzer());
 
@@ -61 +59 @@
     public virtual void Analyze(Individual[] individuals, double[][] qualities, ResultCollection results) { }
 
+    protected override void OnEncodingChanged() {
+      base.OnEncodingChanged();
+      Parameters["Maximization"].ActualValue = new BoolArray(Maximization);
+    }
 
     protected override void OnEvaluatorChanged() {
@@ -67 +69 @@
     }
 
-    protected override void ParameterizeOperators() {
-      base.ParameterizeOperators();
+    private void ParameterizeOperators() {
       foreach (var op in Operators.OfType<IMultiObjectiveEvaluationOperator>())
         op.EvaluateFunc = Evaluate;

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/ProgrammableProblem.cs

@@ -42 +42 @@
     }
 
+    //mkommend necessary for reuse of operators if the encoding changes
+    private TEncoding oldEncoding;
+
     IEncoding IProblemDefinition.Encoding { get { return Encoding; } }
     public TEncoding Encoding {
@@ -49 +52 @@
         EncodingParameter.Value = value;
       }
-    }
-    //mkommend necessary for reuse of operators if the encoding changes
-    private TEncoding oldEncoding;
-
-    public virtual IEnumerable<Individual> GetNeighbors(Individual individual, IRandom random) {
-      return Enumerable.Empty<Individual>();
     }
 
@@ -97 +94 @@
       oldEncoding = Encoding;
 
+      foreach (var op in Operators.OfType<IEncodingOperator>())
+        op.EncodingParameter.ActualName = EncodingParameter.Name;
+
       var solutionCreatorType = Encoding.GetType().BaseType.GetGenericArguments();
       var paramType = typeof(ValueParameter<>).MakeGenericType(solutionCreatorType);
@@ -111 +111 @@
       base.OnSolutionCreatorChanged();
       Encoding.SolutionCreator = SolutionCreator;
-    }
-
-
-    protected virtual void ParameterizeOperators() {
-      foreach (var op in Operators.OfType<IEncodingOperator>())
-        op.EncodingParameter.ActualName = EncodingParameter.Name;
-      foreach (var op in Operators.OfType<INeighborBasedOperator>())
-        op.GetNeighborsFunc = GetNeighbors;
     }
 

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/Scripts/Templates/CompiledMultiObjectiveProblemDefinition.cs

@@ -31 +31 @@
       var qualities = new[] { 0.0, 0.0 };
       // use vars.yourVariable to access variables in the variable store i.e. yourVariable
-      // qualities = new [] { individual.RealVector(""r"").Sum(x => x * x), individual.RealVector(""r"").Sum(x => x * x * x) };
+      // qualities = new [] { individual.RealVector("r").Sum(x => x * x), individual.RealVector("r").Sum(x => x * x * x) };
       return qualities;
     }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/SingleObjectiveProgrammableProblem.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Analysis;
@@ -44 +45 @@
     protected SingleObjectiveProgrammableProblem()
       : base() {
-      Parameters.Add(new FixedValueParameter<BoolValue>("Maximization", "Set to false if the problem should be minimized.", new BoolValue(Maximization)));
+      Parameters.Add(new FixedValueParameter<BoolValue>("Maximization", "Set to false if the problem should be minimized.", new BoolValue()));
       Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this problem."));
 
@@ -66 +67 @@
     public abstract double Evaluate(Individual individual, IRandom random);
     public virtual void Analyze(Individual[] individuals, double[] qualities, ResultCollection results) { }
+    public virtual IEnumerable<Individual> GetNeighbors(Individual individual, IRandom random) {
+      return Enumerable.Empty<Individual>();
+    }
 
+
+    protected override void OnEncodingChanged() {
+      base.OnEncodingChanged();
+      var max = (BoolValue)Parameters["Maximization"].ActualValue;
+      max.Value = Maximization;
+    }
 
     protected override void OnEvaluatorChanged() {
@@ -73 +83 @@
     }
 
-    protected override void ParameterizeOperators() {
-      base.ParameterizeOperators();
+    private void ParameterizeOperators() {
       foreach (var op in Operators.OfType<ISingleObjectiveEvaluationOperator>())
         op.EvaluateFunc = Evaluate;
       foreach (var op in Operators.OfType<ISingleObjectiveAnalysisOperator>())
         op.AnalyzeAction = Analyze;
+      foreach (var op in Operators.OfType<INeighborBasedOperator>())
+        op.GetNeighborsFunc = GetNeighbors;
     }