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

Timestamp:

02/23/10 06:50:50 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on algorithms

Location:

trunk/sources/HeuristicLab.Routing.TSP/3.3

Files:

• TSP.cs (modified) (3 diffs)
• TSPPathEvaluator.cs (modified) (4 diffs)

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

@@ -31 +31 @@
   [Creatable("Problems")]
   [EmptyStorableClass]
-  public sealed class TSP : Problem {
+  public sealed class TSP : SingleObjectiveProblem {
     private ValueParameter<DoubleMatrixData> CoordinatesParameter {
       get { return (ValueParameter<DoubleMatrixData>)Parameters["Coordinates"]; }
-    }
-    private OperatorParameter SolutionCreatorParameter {
-      get { return (OperatorParameter)Parameters["SolutionCreator"]; }
-    }
-    private OperatorParameter SolutionEvaluatorParameter {
-      get { return (OperatorParameter)Parameters["SolutionEvaluator"]; }
     }
 
@@ -46 +40 @@
       set { CoordinatesParameter.Value = value; }
     }
-    public IOperator SolutionCreator {
-      get { return SolutionCreatorParameter.Value; }
-      set { SolutionCreatorParameter.Value = value; }
-    }
-    public IOperator SolutionEvaluator {
-      get { return SolutionEvaluatorParameter.Value; }
-      set { SolutionEvaluatorParameter.Value = value; }
-    }
 
     public TSP()
       : base() {
-      Parameters.Add(new ValueParameter<BoolData>("Maximization", "Set to false as the TSP is a minimization problem.", new BoolData(false)));
+      Maximization = new BoolData(false);
       Parameters.Add(new ValueParameter<DoubleMatrixData>("Coordinates", "The x- and y-Coordinates of the cities.", new DoubleMatrixData(0, 0)));
       Parameters.Add(new ValueParameter<DoubleData>("BestKnownQuality", "The quality of the best known solution of this TSP instance."));
-      Parameters.Add(new OperatorParameter("SolutionCreator", "The operator which should be used to create new solutions."));
-      Parameters.Add(new OperatorParameter("SolutionEvaluator", "The operator which should be used to evaluate solutions."));
+      RandomPermutationCreator creator = new RandomPermutationCreator();
+      creator.LengthParameter.Value = new IntData(0);
+      SolutionCreator = creator;
+      Evaluator = new TSPRoundedEuclideanPathEvaluator();
     }
 
@@ -73 +61 @@
       SolutionCreator = creator;
       TSPRoundedEuclideanPathEvaluator evaluator = new TSPRoundedEuclideanPathEvaluator();
-      SolutionEvaluator = evaluator;
+      Evaluator = evaluator;
     }
   }

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

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -32 +32 @@
   [Item("TSPPathEvaluator", "A base class for operators which evaluate TSP solutions given in path representation.")]
   [EmptyStorableClass]
-  public abstract class TSPPathEvaluator : SingleSuccessorOperator {
+  public abstract class TSPPathEvaluator : SingleObjectiveEvaluator {
     public LookupParameter<DoubleMatrixData> CoordinatesParameter {
       get { return (LookupParameter<DoubleMatrixData>)Parameters["Coordinates"]; }
@@ -39 +39 @@
       get { return (LookupParameter<Permutation.Permutation>)Parameters["Permutation"]; }
     }
-    public LookupParameter<DoubleData> QualityParameter {
-      get { return (LookupParameter<DoubleData>)Parameters["Quality"]; }
-    }
 
     protected TSPPathEvaluator()
@@ -47 +44 @@
       Parameters.Add(new LookupParameter<DoubleMatrixData>("Coordinates", "The x- and y-Coordinates 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."));
     }