Changeset 11595

Timestamp:

11/27/14 11:42:47 (10 years ago)

Author:

mkommend

Message:

#2174: Added possibility to look up parameters of the encoding and removed them from the programmable problem.

Location:

branches/ProgrammableProblem

Files:

• HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problems/Problem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs (modified) (6 diffs)

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs

@@ -159 +159 @@
       if ((engine != null) && (operatorGraph.InitialOperator != null)) {
         ExecutionContext context = null;
-        if (Problem != null) context = new ExecutionContext(context, Problem, globalScope);
+        if (Problem != null) {
+          foreach (var item in Problem.ExecutionContextItems)
+            context = new ExecutionContext(context, item, globalScope);
+        }
         context = new ExecutionContext(context, this, globalScope);
         context = new ExecutionContext(context, operatorGraph.InitialOperator, globalScope);

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs

@@ -31 +31 @@
     IEnumerable<IItem> Operators { get; }
 
+
+    IEnumerable<IParameterizedItem> ExecutionContextItems { get; }
     event EventHandler OperatorsChanged;
     event EventHandler Reset;

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/Problems/Problem.cs

@@ -116 +116 @@
     IEnumerable<IItem> IProblem.Operators { get { return GetOperators(); } }
 
-    protected virtual IEnumerable<IItem> GetOperators()
-    {
+    protected virtual IEnumerable<IItem> GetOperators() {
       return Operators;
+    }
+
+    public virtual IEnumerable<IParameterizedItem> ExecutionContextItems {
+      get { yield return this; }
     }
     #endregion

branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs

@@ -115 +115 @@
       get { return OperatorsParameter.Value; }
     }
+
+    public IEnumerable<IParameterizedItem> ExecutionContextItems {
+      get { yield return this; }
+    }
     #endregion
 

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

@@ -58 +58 @@
     }
 
-
     public ISingleObjectiveProblemDefinition ProblemDefinition {
       get { return ProblemDefinitionParameter.Value; }
@@ -64 +63 @@
     }
 
-    [Storable]
-    protected List<IParameter> DynamicEncodingParameters;
-
+
+    public override IEnumerable<IParameterizedItem> ExecutionContextItems {
+      get { return base.ExecutionContextItems.Concat(new[] { ProblemDefinition.Encoding }); }
+    }
     protected override IEnumerable<IItem> GetOperators() {
       return base.GetOperators().Concat(ProblemDefinition.Encoding.Operators);
@@ -76 +76 @@
     protected SingleObjectiveProgrammableProblem(SingleObjectiveProgrammableProblem original, Cloner cloner)
       : base(original, cloner) {
-      DynamicEncodingParameters = original.DynamicEncodingParameters.Select(cloner.Clone).ToList();
       RegisterEventHandlers();
     }
@@ -84 +83 @@
       Parameters.Add(new ValueParameter<IEncoding>("Encoding", "Describes the configuration of the encoding, what the variables are called, what type they are and their bounds if any."));
 
-      DynamicEncodingParameters = new List<IParameter>();
 
       Operators.Add(new BestScopeSolutionAnalyzer());
@@ -158 +156 @@
         analyzeOp.ProblemDefinitionParameter.ActualName = ProblemDefinitionParameter.Name;
         analyzeOp.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-      }
-
-      foreach (var param in DynamicEncodingParameters)
-        if (Parameters.Contains(param)) Parameters.Remove(param);
-      DynamicEncodingParameters.Clear();
-
-      DynamicEncodingParameters.AddRange(encoding.Parameters);
-      foreach (var param in DynamicEncodingParameters) {
-        param.Hidden = true;
-        Parameters.Add(param);
       }
 
@@ -215 +203 @@
       }
     }
-
-
   }
 }