Changeset 2975 for trunk/sources/HeuristicLab.Optimization

Timestamp:

03/09/10 05:45:39 (15 years ago)

Author:

swagner

Message:

Worked on linkage between algorithms and problems (#898)

• finished TSP and started to work on SGA

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• Algorithm.cs (modified) (1 diff)
• Interfaces/IProblem.cs (modified) (2 diffs)
• Interfaces/ISingleObjectiveProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/Algorithm.cs ¶

@@ -147 +147 @@
         ExceptionOccurred(this, new EventArgs<Exception>(exception));
     }
+
     protected virtual void DeregisterProblemEvents() {
       problem.SolutionCreatorChanged -= new EventHandler(Problem_SolutionCreatorChanged);
       problem.EvaluatorChanged -= new EventHandler(Problem_EvaluatorChanged);
+      problem.OperatorsChanged -= new EventHandler(Problem_OperatorsChanged);
     }
     protected virtual void RegisterProblemEvents() {
       problem.SolutionCreatorChanged += new EventHandler(Problem_SolutionCreatorChanged);
       problem.EvaluatorChanged += new EventHandler(Problem_EvaluatorChanged);
+      problem.OperatorsChanged += new EventHandler(Problem_OperatorsChanged);
     }
 
     protected virtual void Problem_SolutionCreatorChanged(object sender, EventArgs e) { }
     protected virtual void Problem_EvaluatorChanged(object sender, EventArgs e) { }
+    protected virtual void Problem_OperatorsChanged(object sender, EventArgs e) { }
     #endregion
   }

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs ¶

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using HeuristicLab.Core;
 
@@ -28 +29 @@
   /// </summary>
   public interface IProblem : IParameterizedNamedItem {
+    IParameter SolutionCreatorParameter { get; }
     ISolutionCreator SolutionCreator { get; }
+    IParameter EvaluatorParameter { get; }
     IEvaluator Evaluator { get; }
-    OperatorSet Operators { get; }
+    IEnumerable<IOperator> Operators { get; }
 
     event EventHandler SolutionCreatorChanged;
     event EventHandler EvaluatorChanged;
+    event EventHandler OperatorsChanged;
   }
 }

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveProblem.cs ¶

@@ -20 +20 @@
 #endregion
 
-using System;
-using HeuristicLab.Data;
+using HeuristicLab.Core;
 
 namespace HeuristicLab.Optimization {
@@ -28 +27 @@
   /// </summary>
   public interface ISingleObjectiveProblem : IProblem {
-    BoolData Maximization { get; }
+    IParameter MaximizationParameter { get; }
     new ISingleObjectiveEvaluator Evaluator { get; }
-
-    event EventHandler MaximizationChanged;
   }
 }