Changeset 2865 for trunk/sources/HeuristicLab.Routing.TSP

Timestamp:

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

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on algorithms

Location:

trunk/sources/HeuristicLab.Routing.TSP/3.3

Files:

• HeuristicLab.Routing.TSP-3.3.csproj (modified) (2 diffs)
• HeuristicLabRoutingTSPPlugin.cs.frame (modified) (1 diff)
• ITSPEvaluator.cs (added)
• TSP.cs (modified) (4 diffs)
• TSPDistanceMatrixPathEvaluator.cs (modified) (4 diffs)
• TSPEvaluator.cs (added)
• TSPPathEvaluator.cs (modified) (2 diffs)

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"]; }