Changeset 17570 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization

Timestamp:

05/28/20 16:26:46 (5 years ago)

Author:

abeham

Message:

#2521: adapted knapsack, added base call to symbolic expression tree encoding, changed parameterization operators in base classes

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3

Files:

• BasicProblems/Encoding.cs (modified) (2 diffs)
• BasicProblems/Problem.cs (modified) (2 diffs)
• BasicProblems/SingleObjectiveProblem.cs (modified) (6 diffs)
• Problems/Problem.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

@@ -118 +118 @@
     public virtual void ConfigureOperators(IEnumerable<IItem> operators) {
       ConfigureSingleObjectiveImprovementOperators(operators.OfType<ISingleObjectiveImprovementOperator>());
+      ConfigureSingleObjectivePathRelinker(operators.OfType<ISingleObjectivePathRelinker>());
     }
 
@@ -123 +124 @@
       foreach (var op in operators) {
         op.SolutionParameter.ActualName = Name;
+        op.SolutionParameter.Hidden = true;
+      }
+    }
+
+    protected virtual void ConfigureSingleObjectivePathRelinker(IEnumerable<ISingleObjectivePathRelinker> operators) {
+      foreach (var op in operators.OfType<ISingleObjectivePathRelinker>()) {
+        op.ParentsParameter.ActualName = Name;
+        op.ParentsParameter.Hidden = true;
       }
     }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs

@@ -138 +138 @@
 
     private void RegisterEvents() {
-      EncodingParameter.ValueChanged += (o, e) => OnEncodingChanged();
-      EvaluatorParameter.ValueChanged += (o, e) => OnEvaluatorChanged();
+      EncodingParameter.ValueChanged += (o, e) => { ParameterizeOperators(); OnEncodingChanged(); };
+      EvaluatorParameter.ValueChanged += (o, e) => { ParameterizeOperators(); OnEvaluatorChanged(); };
       //var multiEncoding = Encoding as MultiEncoding;
       //if (multiEncoding != null) multiEncoding.EncodingsChanged += MultiEncodingOnEncodingsChanged;
     }
 
+    protected override void ParameterizeOperators() {
+      base.ParameterizeOperators();
+      Parameterize();
+    }
+
     protected virtual void OnEncodingChanged() {
-      Parameterize();
-
       OnOperatorsChanged();
       OnReset();
@@ -163 +166 @@
         op.EncodingParameter.ActualName = EncodingParameter.Name;
 
+      Encoding.ConfigureOperators(Operators);
       //var multiEncoding = Encoding as MultiEncoding;
       //if (multiEncoding != null) multiEncoding.EncodingsChanged += MultiEncodingOnEncodingsChanged;

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs

@@ -72 +72 @@
       BestKnownQualityParameter = cloner.Clone(original.BestKnownQualityParameter);
       MaximizationParameter = cloner.Clone(original.MaximizationParameter);
-      ParameterizeOperators();
+      Parameterize();
       RegisterEventHandlers();
     }
@@ -90 +90 @@
       Operators.Add(new SingleObjectiveMoveMaker<TEncodedSolution>());
 
-      ParameterizeOperators();
+      Parameterize();
       RegisterEventHandlers();
     }
@@ -105 +105 @@
       Operators.Add(new SingleObjectiveMoveMaker<TEncodedSolution>());
 
-      ParameterizeOperators();
+      Parameterize();
       RegisterEventHandlers();
     }
@@ -111 +111 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      ParameterizeOperators();
+      Parameterize();
       RegisterEventHandlers();
     }
@@ -190 +190 @@
     protected override void OnEvaluatorChanged() {
       base.OnEvaluatorChanged();
+      Evaluator.QualityParameter.ActualNameChanged += QualityParameterOnActualNameChanged;
+    }
+
+    protected virtual void QualityParameterOnActualNameChanged(object sender, EventArgs e) {
       ParameterizeOperators();
     }
 
-    private void ParameterizeOperators() {
+    protected override void ParameterizeOperators() {
+      base.ParameterizeOperators();
+      Parameterize();
+    }
+
+    private void Parameterize() {
       foreach (var op in Operators.OfType<ISingleObjectiveEvaluationOperator<TEncodedSolution>>())
         op.Evaluate = Evaluate;
@@ -200 +209 @@
       foreach (var op in Operators.OfType<INeighborBasedOperator<TEncodedSolution>>())
         op.GetNeighbors = GetNeighbors;
+      foreach (var op in Operators.OfType<ISolutionSimilarityCalculator>()) {
+        op.SolutionVariableName = Encoding.Name;
+        op.QualityVariableName = Evaluator.QualityParameter.ActualName;
+      }
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Problems/Problem.cs

@@ -157 +157 @@
 
 
+    protected virtual void ParameterizeOperators() {
+
+    }
+
 
     #region events
     private void Operators_Changed(object sender, EventArgs e) {
       OnOperatorsChanged();
+      ParameterizeOperators();
     }
     public event EventHandler OperatorsChanged;