Changeset 11961 for trunk/sources/HeuristicLab.Optimization/3.3/Problems

Timestamp:

02/06/15 17:52:14 (10 years ago)

Author:

abeham

Message:

#2174: Integrated programmable problem into trunk

• Fixed build configuration
• Fixed some assembly references that had CopyLocal set to true
• Added a missing license header
• Cleaned some usings
• Fixed the version number in ExternalEvaluation.GP
• Added ProgrammableProblem and new ExternalEvaluationProblem as a reference to unit tests
• Fixed plugin dependencies and assembly references
• Changed icon of programmable problem to script icon
• Fixed name clash in VRP that also had defined a "PermutationEncoding" class
• (Hopefully) fixed all output paths

Location:

trunk/sources/HeuristicLab.Optimization

Files:

• . (modified) (1 prop)
• 3.3/Problems/HeuristicOptimizationProblem.cs (modified) (1 diff)
• 3.3/Problems/Problem.cs (modified) (1 diff)
• 3.3/Problems/UserDefinedProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization/3.3/Problems/HeuristicOptimizationProblem.cs

@@ -78 +78 @@
 
     public U SolutionCreator {
-      get { return SolutionCreatorParameter.Value; }
+      get { return (U)SolutionCreatorParameter.Value; }
       protected set { SolutionCreatorParameter.Value = value; }
     }
-    public ValueParameter<U> SolutionCreatorParameter {
-      get { return (ValueParameter<U>)Parameters[SolutionCreateParameterName]; }
+    public IValueParameter SolutionCreatorParameter {
+      get { return (IValueParameter)Parameters[SolutionCreateParameterName]; }
     }
     ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator { get { return SolutionCreator; } }

trunk/sources/HeuristicLab.Optimization/3.3/Problems/Problem.cs

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

trunk/sources/HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs

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