Changeset 2865

Timestamp:

02/25/10 06:35:43 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on algorithms

Location:

trunk/sources

Files:

• HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Views/3.3/ProblemView.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Interfaces/ICrossover.cs (moved) (moved from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ICrossoverOperator.cs) (2 diffs)
• HeuristicLab.Optimization/3.3/Interfaces/IEvaluator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IManipulator.cs (moved) (moved from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IManipulationOperator.cs) (2 diffs)
• HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveProblem.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Interfaces/ISolutionCreator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IStochasticOperator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IStochasticSolutionCreator.cs (deleted)
• HeuristicLab.Optimization/3.3/Problem.cs (deleted)
• HeuristicLab.Optimization/3.3/SingleObjectiveEvaluator.cs (deleted)
• HeuristicLab.Optimization/3.3/SingleObjectiveProblem.cs (deleted)
• HeuristicLab.Permutation/3.3/AbsolutePositionTopologicalCrossover.cs (modified) (1 diff)
• HeuristicLab.Permutation/3.3/CosaCrossover.cs (modified) (1 diff)
• HeuristicLab.Permutation/3.3/EdgeRecombinationCrossover.cs (modified) (1 diff)
• HeuristicLab.Permutation/3.3/HeuristicLab.Permutation-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Permutation/3.3/IPermutationCreator.cs (added)
• HeuristicLab.Permutation/3.3/IPermutationCrossover.cs (moved) (moved from trunk/sources/HeuristicLab.Permutation/3.3/IPermutationCrossoverOperator.cs) (2 diffs)
• HeuristicLab.Permutation/3.3/IPermutationManipulator.cs (moved) (moved from trunk/sources/HeuristicLab.Permutation/3.3/IPermutationManipulationOperator.cs) (2 diffs)
• HeuristicLab.Permutation/3.3/IPermutationOperator.cs (added)
• HeuristicLab.Permutation/3.3/InsertionManipulator.cs (modified) (1 diff)
• HeuristicLab.Permutation/3.3/OrderBasedCrossover.cs (modified) (1 diff)
• HeuristicLab.Permutation/3.3/PermutationCrossover.cs (modified) (1 diff)
• HeuristicLab.Permutation/3.3/PermutationManipulator.cs (modified) (1 diff)
• HeuristicLab.Permutation/3.3/RandomPermutationCreator.cs (modified) (1 diff)
• HeuristicLab.Routing.TSP/3.3/HeuristicLab.Routing.TSP-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Routing.TSP/3.3/HeuristicLabRoutingTSPPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Routing.TSP/3.3/ITSPEvaluator.cs (added)
• HeuristicLab.Routing.TSP/3.3/TSP.cs (modified) (4 diffs)
• HeuristicLab.Routing.TSP/3.3/TSPDistanceMatrixPathEvaluator.cs (modified) (4 diffs)
• HeuristicLab.Routing.TSP/3.3/TSPEvaluator.cs (added)
• HeuristicLab.Routing.TSP/3.3/TSPPathEvaluator.cs (modified) (2 diffs)
• HeuristicLab.SGA/3.3/SGA.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs

@@ -68 +68 @@
       // problemTabPage
       // 
-      this.problemTabPage.Size = new System.Drawing.Size(482, 148);
+      this.problemTabPage.Size = new System.Drawing.Size(648, 252);
       // 
       // parameterCollectionView
@@ -96 +96 @@
       // 
       this.executionTimeLabel.Location = new System.Drawing.Point(430, 440);
-      this.executionTimeLabel.TabIndex = 11;
+      this.executionTimeLabel.TabIndex = 12;
       // 
       // executionTimeTextBox
       // 
       this.executionTimeTextBox.Location = new System.Drawing.Point(519, 437);
-      this.executionTimeTextBox.TabIndex = 12;
+      this.executionTimeTextBox.TabIndex = 13;
       // 
       // nameTextBox
@@ -150 +150 @@
       this.createUserDefinedAlgorithmButton.Location = new System.Drawing.Point(90, 433);
       this.createUserDefinedAlgorithmButton.Name = "createUserDefinedAlgorithmButton";
-      this.createUserDefinedAlgorithmButton.Size = new System.Drawing.Size(161, 24);
-      this.createUserDefinedAlgorithmButton.TabIndex = 13;
+      this.createUserDefinedAlgorithmButton.Size = new System.Drawing.Size(254, 24);
+      this.createUserDefinedAlgorithmButton.TabIndex = 11;
       this.createUserDefinedAlgorithmButton.Text = "&Create User Defined Algorithm";
       this.toolTip.SetToolTip(this.createUserDefinedAlgorithmButton, "Create User Defined Algorithm from this Algorithm");

trunk/sources/HeuristicLab.Optimization.Views/3.3/ProblemView.cs

@@ -27 +27 @@
   /// The base class for visual representations of items.
   /// </summary>
-  [Content(typeof(Problem), true)]
-  [Content(typeof(IProblem), false)]
+  [Content(typeof(IProblem), true)]
   public partial class ProblemView : ParameterizedNamedItemView {
     public new IProblem Content {

trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -52 +52 @@
     <None Include="HeuristicLabOptimizationPlugin.cs.frame" />
     <Compile Include="Algorithm.cs" />
+    <Compile Include="Interfaces\IMultiObjectiveProblem.cs" />
+    <Compile Include="Interfaces\IMultiObjectiveEvaluator.cs" />
     <Compile Include="Interfaces\IAlgorithm.cs" />
-    <Compile Include="Interfaces\ICrossoverOperator.cs" />
+    <Compile Include="Interfaces\ICrossover.cs" />
     <Compile Include="Interfaces\IEvaluator.cs" />
-    <Compile Include="Interfaces\IManipulationOperator.cs" />
+    <Compile Include="Interfaces\IManipulator.cs" />
     <Compile Include="Interfaces\IProblem.cs" />
     <Compile Include="Interfaces\ISingleObjectiveEvaluator.cs" />
@@ -61 +63 @@
     <Compile Include="Interfaces\ISolutionCreator.cs" />
     <Compile Include="Interfaces\IStochasticOperator.cs" />
-    <Compile Include="SingleObjectiveProblem.cs" />
-    <Compile Include="SingleObjectiveEvaluator.cs" />
     <Compile Include="UserDefinedAlgorithm.cs" />
     <Compile Include="EngineAlgorithm.cs" />
     <Compile Include="HeuristicLabOptimizationPlugin.cs" />
-    <Compile Include="Problem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ICrossover.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Optimization {
@@ -27 +26 @@
   /// An interface which represents an operator for crossing solutions.
   /// </summary>
-  public interface ICrossoverOperator : IOperator { }
+  public interface ICrossover : IOperator { }
 }

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IEvaluator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Optimization {

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IManipulator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Optimization {
@@ -27 +26 @@
   /// An interface which represents an operator for manipulating solutions.
   /// </summary>
-  public interface IManipulationOperator : IOperator { }
+  public interface IManipulator : IOperator { }
 }

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Core;
-using System;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Optimization {

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

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

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ISolutionCreator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Optimization {

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IStochasticOperator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Optimization {

trunk/sources/HeuristicLab.Permutation/3.3/AbsolutePositionTopologicalCrossover.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Permutation/3.3/CosaCrossover.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Permutation/3.3/EdgeRecombinationCrossover.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Permutation/3.3/HeuristicLab.Permutation-3.3.csproj

@@ -83 +83 @@
     <None Include="HeuristicLabPermutationPlugin.cs.frame" />
     <Compile Include="AbsolutePositionTopologicalCrossover.cs" />
+    <Compile Include="IPermutationCreator.cs" />
+    <Compile Include="IPermutationOperator.cs" />
     <Compile Include="CosaCrossover.cs" />
     <Compile Include="CyclicCrossover.cs" />
@@ -90 +92 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IPermutationCrossoverOperator.cs" />
-    <Compile Include="IPermutationManipulationOperator.cs" />
+    <Compile Include="IPermutationCrossover.cs" />
+    <Compile Include="IPermutationManipulator.cs" />
     <Compile Include="MaximalPreservativeCrossover.cs" />
     <Compile Include="OrderBasedCrossover.cs" />

trunk/sources/HeuristicLab.Permutation/3.3/IPermutationCrossover.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 
@@ -28 +27 @@
   /// An interface which represents an operator for crossing permutations.
   /// </summary>
-  public interface IPermutationCrossoverOperator : ICrossoverOperator { }
+  public interface IPermutationCrossover : IPermutationOperator, ICrossover {
+    ILookupParameter<ItemArray<Permutation>> ParentsParameter { get; }
+    ILookupParameter<Permutation> ChildParameter { get; }
+  }
 }

trunk/sources/HeuristicLab.Permutation/3.3/IPermutationManipulator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 
@@ -28 +27 @@
   /// An interface which represents an operator for manipulating solutions.
   /// </summary>
-  public interface IPermutationManipulationOperator : IManipulationOperator { }
+  public interface IPermutationManipulator : IPermutationOperator, IManipulator {
+    ILookupParameter<Permutation> PermutationParameter { get; }
+  }
 }

trunk/sources/HeuristicLab.Permutation/3.3/InsertionManipulator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Permutation/3.3/OrderBasedCrossover.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Permutation/3.3/PermutationCrossover.cs

@@ -32 +32 @@
   [Item("PermutationCrossover", "A base class for permutation crossover operators.")]
   [EmptyStorableClass]
-  public abstract class PermutationCrossover : SingleSuccessorOperator, IPermutationCrossoverOperator {
+  public abstract class PermutationCrossover : SingleSuccessorOperator, IPermutationCrossover, IStochasticOperator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public SubScopesLookupParameter<Permutation> ParentsParameter {
+    public ILookupParameter<ItemArray<Permutation>> ParentsParameter {
       get { return (SubScopesLookupParameter<Permutation>)Parameters["Parents"]; }
     }
-    public LookupParameter<Permutation> ChildParameter {
-      get { return (LookupParameter<Permutation>)Parameters["Child"]; }
+    public ILookupParameter<Permutation> ChildParameter {
+      get { return (ILookupParameter<Permutation>)Parameters["Child"]; }
     }
 

trunk/sources/HeuristicLab.Permutation/3.3/PermutationManipulator.cs

@@ -32 +32 @@
   [Item("PermutationManipulator", "A base class for permutation manipulation operators.")]
   [EmptyStorableClass]
-  public abstract class PermutationManipulator : SingleSuccessorOperator, IPermutationManipulationOperator {
+  public abstract class PermutationManipulator : SingleSuccessorOperator, IPermutationManipulator, IStochasticOperator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public LookupParameter<Permutation> PermutationParameter {
-      get { return (LookupParameter<Permutation>)Parameters["Permutation"]; }
+    public ILookupParameter<Permutation> PermutationParameter {
+      get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
     }
 

trunk/sources/HeuristicLab.Permutation/3.3/RandomPermutationCreator.cs

@@ -34 +34 @@
   [EmptyStorableClass]
   [Creatable("Test")]
-  public sealed class RandomPermutationCreator : SingleSuccessorOperator, ISolutionCreator {
+  public sealed class RandomPermutationCreator : SingleSuccessorOperator, IPermutationCreator, IStochasticOperator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public ValueLookupParameter<IntData> LengthParameter {
-      get { return (ValueLookupParameter<IntData>)Parameters["Length"]; }
+    public IValueLookupParameter<IntData> LengthParameter {
+      get { return (IValueLookupParameter<IntData>)Parameters["Length"]; }
     }
-    public LookupParameter<Permutation> PermutationParameter {
-      get { return (LookupParameter<Permutation>)Parameters["Permutation"]; }
+    public ILookupParameter<Permutation> PermutationParameter {
+      get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
     }
 

trunk/sources/HeuristicLab.Routing.TSP/3.3/HeuristicLab.Routing.TSP-3.3.csproj

@@ -80 +80 @@
     </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <None Include="HeuristicLabRoutingTSPPlugin.cs.frame" />
+    <Compile Include="TSPEvaluator.cs" />
+    <Compile Include="ITSPEvaluator.cs" />
     <Compile Include="TSPDistanceMatrixPathEvaluator.cs" />
     <Compile Include="TSPLIBParser.cs" />
@@ -96 +99 @@
       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
       <Name>HeuristicLab.Collections-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj">
+      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
+      <Name>HeuristicLab.Common.Resources-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">

trunk/sources/HeuristicLab.Routing.TSP/3.3/HeuristicLabRoutingTSPPlugin.cs.frame

@@ -29 +29 @@
   [PluginFile("HeuristicLab.Routing.TSP-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Common.Resources", "3.2")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSP.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Drawing;
+using System.Linq;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -26 +29 @@
 using HeuristicLab.Permutation;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Routing.TSP {
@@ -32 +35 @@
   [Creatable("Problems")]
   [EmptyStorableClass]
-  public sealed class TSP : SingleObjectiveProblem {
-    private ValueParameter<DoubleMatrixData> CoordinatesParameter {
-      get { return (ValueParameter<DoubleMatrixData>)Parameters["Coordinates"]; }
+  public sealed class TSP : ParameterizedNamedItem, ISingleObjectiveProblem {
+    public override Image ItemImage {
+      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
     }
 
-    public DoubleMatrixData Coordinates {
-      get { return CoordinatesParameter.Value; }
-      set { CoordinatesParameter.Value = value; }
+    private IValueParameter<BoolData> MaximizationParameter {
+      get { return (IValueParameter<BoolData>)Parameters["Maximization"]; }
+    }
+    public IValueParameter<DoubleMatrixData> CoordinatesParameter {
+      get { return (IValueParameter<DoubleMatrixData>)Parameters["Coordinates"]; }
+    }
+    public IValueParameter<DoubleData> BestKnownQualityParameter {
+      get { return (IValueParameter<DoubleData>)Parameters["BestKnownQuality"]; }
+    }
+    public IValueParameter<IPermutationCreator> SolutionCreatorParameter {
+      get { return (IValueParameter<IPermutationCreator>)Parameters["SolutionCreator"]; }
+    }
+    public IValueParameter<ITSPEvaluator> EvaluatorParameter {
+      get { return (IValueParameter<ITSPEvaluator>)Parameters["Evaluator"]; }
+    }
+
+    public BoolData Maximization {
+      get { return MaximizationParameter.Value; }
+    }
+    public ISolutionCreator SolutionCreator {
+      get { return SolutionCreatorParameter.Value; }
+    }
+    public ISingleObjectiveEvaluator Evaluator {
+      get { return EvaluatorParameter.Value; }
+    }
+    IEvaluator IProblem.Evaluator {
+      get { return EvaluatorParameter.Value; }
+    }
+    private OperatorSet operators;
+    public OperatorSet Operators {
+      get { return operators; }
     }
 
     public TSP()
       : base() {
-      Maximization = new BoolData(false);
+      ValueParameter<BoolData> maximizationParameter = new ValueParameter<BoolData>("Maximization", "Set to false as the Traveling Salesman Problem is a minimization problem.", new BoolData(false));
+      maximizationParameter.ValueChanged += new EventHandler(MaximizationParameter_ValueChanged);
+      Parameters.Add(maximizationParameter);
+
       Parameters.Add(new ValueParameter<DoubleMatrixData>("Coordinates", "The x- and y-Coordinates of the cities.", new DoubleMatrixData(0, 0)));
+
+      ValueParameter<IPermutationCreator> solutionCreatorParameter = new ValueParameter<IPermutationCreator>("SolutionCreator", "The operator which should be used to create new TSP solutions.");
+      solutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
+      Parameters.Add(solutionCreatorParameter);
+
+      ValueParameter<ITSPEvaluator> evaluatorParameter = new ValueParameter<ITSPEvaluator>("Evaluator", "The operator which should be used to evaluate TSP solutions.");
+      evaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
+      Parameters.Add(evaluatorParameter);
+
       Parameters.Add(new ValueParameter<DoubleData>("BestKnownQuality", "The quality of the best known solution of this TSP instance."));
+
       RandomPermutationCreator creator = new RandomPermutationCreator();
+      creator.PermutationParameter.ActualName = "TSPTour";
       creator.LengthParameter.Value = new IntData(0);
-      SolutionCreator = creator;
-      Evaluator = new TSPRoundedEuclideanPathEvaluator();
+      SolutionCreatorParameter.Value = creator;
+      TSPRoundedEuclideanPathEvaluator evaluator = new TSPRoundedEuclideanPathEvaluator();
+      evaluator.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
+      evaluator.PermutationParameter.ActualName = creator.PermutationParameter.ActualName;
+      evaluator.QualityParameter.ActualName = "TSPTourLength";
+      EvaluatorParameter.Value = evaluator;
+
+      operators = new OperatorSet();
+      var crossovers = ApplicationManager.Manager.GetInstances<IPermutationCrossover>().ToList();
+      crossovers.ForEach(x => {
+        x.ParentsParameter.ActualName = creator.PermutationParameter.ActualName;
+        x.ChildParameter.ActualName = creator.PermutationParameter.ActualName;
+      });
+      var manipulators = ApplicationManager.Manager.GetInstances<IPermutationManipulator>().ToList();
+      manipulators.ForEach(x => x.PermutationParameter.ActualName = creator.PermutationParameter.ActualName);
+      operators = new OperatorSet(crossovers.Cast<IOperator>().Concat(manipulators.Cast<IOperator>()));
     }
 
@@ -56 +115 @@
       TSPLIBParser parser = new TSPLIBParser(filename);
       parser.Parse();
-      Coordinates = new DoubleMatrixData(parser.Vertices);
-      int cities = Coordinates.Rows;
-      RandomPermutationCreator creator = new RandomPermutationCreator();
-      creator.LengthParameter.Value = new IntData(cities);
-      SolutionCreator = creator;
-      TSPRoundedEuclideanPathEvaluator evaluator = new TSPRoundedEuclideanPathEvaluator();
-      Evaluator = evaluator;
+      CoordinatesParameter.Value = new DoubleMatrixData(parser.Vertices);
+      int cities = CoordinatesParameter.Value.Rows;
+      SolutionCreatorParameter.Value.LengthParameter.Value = new IntData(cities);
+    }
+
+    private void MaximizationParameter_ValueChanged(object sender, EventArgs e) {
+      OnMaximizationChanged();
+    }
+    private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
+      OnSolutionCreatorChanged();
+    }
+    private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
+      OnEvaluatorChanged();
+    }
+
+    public event EventHandler MaximizationChanged;
+    private void OnMaximizationChanged() {
+      if (MaximizationChanged != null)
+        MaximizationChanged(this, EventArgs.Empty);
+    }
+    public event EventHandler SolutionCreatorChanged;
+    private void OnSolutionCreatorChanged() {
+      if (SolutionCreatorChanged != null)
+        SolutionCreatorChanged(this, EventArgs.Empty);
+    }
+    public event EventHandler EvaluatorChanged;
+    private void OnEvaluatorChanged() {
+      if (EvaluatorChanged != null)
+        EvaluatorChanged(this, EventArgs.Empty);
     }
   }

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPDistanceMatrixPathEvaluator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -33 +32 @@
   [Creatable("Test")]
   [EmptyStorableClass]
-  public sealed class TSPDistanceMatrixPathEvaluator : SingleSuccessorOperator {
+  public sealed class TSPDistanceMatrixPathEvaluator : TSPEvaluator {
     public LookupParameter<DoubleMatrixData> DistanceMatrixParameter {
       get { return (LookupParameter<DoubleMatrixData>)Parameters["DistanceMatrix"]; }
@@ -40 +39 @@
       get { return (LookupParameter<Permutation.Permutation>)Parameters["Permutation"]; }
     }
-    public LookupParameter<DoubleData> QualityParameter {
-      get { return (LookupParameter<DoubleData>)Parameters["Quality"]; }
-    }
 
     public TSPDistanceMatrixPathEvaluator()
@@ -48 +44 @@
       Parameters.Add(new LookupParameter<DoubleMatrixData>("DistanceMatrix", "The distance matrix of the cities."));
       Parameters.Add(new LookupParameter<Permutation.Permutation>("Permutation", "The TSP solution given in path representation which should be evaluated."));
-      Parameters.Add(new LookupParameter<DoubleData>("Quality", "The evaluated quality of the given TSP solution."));
     }
 

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPPathEvaluator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -32 +31 @@
   [Item("TSPPathEvaluator", "A base class for operators which evaluate TSP solutions given in path representation.")]
   [EmptyStorableClass]
-  public abstract class TSPPathEvaluator : SingleObjectiveEvaluator {
+  public abstract class TSPPathEvaluator : TSPEvaluator {
     public LookupParameter<DoubleMatrixData> CoordinatesParameter {
       get { return (LookupParameter<DoubleMatrixData>)Parameters["Coordinates"]; }

trunk/sources/HeuristicLab.SGA/3.3/SGA.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Linq;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -27 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
 
 namespace HeuristicLab.SGA {
@@ -40 +41 @@
     [Storable]
     private SGAOperator sgaOperator;
+
+    private ConstrainedValueParameter<ICrossover> CrossoverOperatorParameter {
+      get { return (ConstrainedValueParameter<ICrossover>)Parameters["CrossoverOperator"]; }
+    }
+    private ConstrainedValueParameter<IManipulator> MutationOperatorParameter {
+      get { return (ConstrainedValueParameter<IManipulator>)Parameters["MutationOperator"]; }
+    }
 
     public override Type ProblemType {
@@ -54 +62 @@
       Parameters.Add(new ValueParameter<BoolData>("SetSeedRandomly", "True if the random seed should be set to a random value, otherwise false.", new BoolData(true)));
       Parameters.Add(new ValueParameter<IntData>("PopulationSize", "The size of the population of solutions.", new IntData(100)));
-      Parameters.Add(new OperatorParameter("CrossoverOperator", "The operator used to cross solutions."));
+      Parameters.Add(new ConstrainedValueParameter<ICrossover>("CrossoverOperator", "The operator used to cross solutions."));
       Parameters.Add(new ValueParameter<DoubleData>("MutationProbability", "The probability that the mutation operator is applied on a solution.", new DoubleData(0.05)));
-      Parameters.Add(new OperatorParameter("MutationOperator", "The operator used to mutate solutions."));
+      Parameters.Add(new ConstrainedValueParameter<IManipulator>("MutationOperator", "The operator used to mutate solutions."));
       Parameters.Add(new ValueParameter<IntData>("Elites", "The numer of elite solutions which are kept in each generation.", new IntData(1)));
       Parameters.Add(new ValueParameter<IntData>("MaximumGenerations", "The maximum number of generations which should be processed.", new IntData(1000)));
@@ -103 +111 @@
     protected override void OnProblemChanged() {
       if (Problem.SolutionCreator is IStochasticOperator) ((IStochasticOperator)Problem.SolutionCreator).RandomParameter.ActualName = "Random";
+      if (Problem.Evaluator is IStochasticOperator) ((IStochasticOperator)Problem.Evaluator).RandomParameter.ActualName = "Random";
+      Problem.Operators.Where(x => x is IStochasticOperator).Select(x => (x as IStochasticOperator).RandomParameter.ActualName = "Random");
+
       populationCreator.SolutionCreatorParameter.Value = Problem.SolutionCreator;
       populationCreator.SolutionEvaluatorParameter.Value = Problem.Evaluator;
       sgaOperator.MaximizationParameter.Value = Problem.Maximization;
-      sgaOperator.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.Name;
+      sgaOperator.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
       sgaOperator.SolutionEvaluatorParameter.Value = Problem.Evaluator;
+
+      CrossoverOperatorParameter.ValidValues.Clear();
+      var crossovers = from o in Problem.Operators
+                       where o is ICrossover
+                       select (ICrossover)o;
+      foreach (ICrossover crossover in crossovers)
+        CrossoverOperatorParameter.ValidValues.Add(crossover);
+
+      MutationOperatorParameter.ValidValues.Clear();
+      var mutators = from o in Problem.Operators
+                     where o is IManipulator
+                     select (IManipulator)o;
+      foreach (IManipulator mutator in mutators)
+        MutationOperatorParameter.ValidValues.Add(mutator);
+
       base.OnProblemChanged();
     }
@@ -116 +142 @@
     }
     protected override void Problem_EvaluatorChanged(object sender, EventArgs e) {
+      if (Problem.Evaluator is IStochasticOperator) ((IStochasticOperator)Problem.Evaluator).RandomParameter.ActualName = "Random";
       populationCreator.SolutionEvaluatorParameter.Value = Problem.Evaluator;
-      sgaOperator.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.Name;
+      sgaOperator.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
       sgaOperator.SolutionEvaluatorParameter.Value = Problem.Evaluator;
       base.Problem_EvaluatorChanged(sender, e);