Changeset 2830 for trunk/sources/HeuristicLab.Routing.TSP/3.3/TSP.cs

Timestamp:

02/19/10 02:15:10 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on operators and SGA
• improved performance

File:

• trunk/sources/HeuristicLab.Routing.TSP/3.3/TSP.cs (modified) (4 diffs)

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

@@ -34 +34 @@
       get { return (ValueParameter<DoubleMatrixData>)Parameters["Coordinates"]; }
     }
-    private OperatorParameter SolutionGeneratorParameter {
-      get { return (OperatorParameter)Parameters["SolutionGenerator"]; }
+    private OperatorParameter SolutionCreatorParameter {
+      get { return (OperatorParameter)Parameters["SolutionCreator"]; }
     }
-    private OperatorParameter EvaluatorParameter {
-      get { return (OperatorParameter)Parameters["Evaluator"]; }
+    private OperatorParameter SolutionEvaluatorParameter {
+      get { return (OperatorParameter)Parameters["SolutionEvaluator"]; }
     }
 
@@ -45 +45 @@
       set { CoordinatesParameter.Value = value; }
     }
-    public IOperator SolutionGenerator {
-      get { return SolutionGeneratorParameter.Value; }
-      set { SolutionGeneratorParameter.Value = value; }
+    public IOperator SolutionCreator {
+      get { return SolutionCreatorParameter.Value; }
+      set { SolutionCreatorParameter.Value = value; }
     }
-    public IOperator Evaluator {
-      get { return EvaluatorParameter.Value; }
-      set { EvaluatorParameter.Value = value; }
+    public IOperator SolutionEvaluator {
+      get { return SolutionEvaluatorParameter.Value; }
+      set { SolutionEvaluatorParameter.Value = value; }
     }
 
@@ -59 +59 @@
       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("SolutionGenerator", "The operator which should be used to generate new solutions."));
-      Parameters.Add(new OperatorParameter("Evaluator", "The operator which should be used to evaluate solutions."));
+      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."));
     }
 
@@ -70 +70 @@
       RandomPermutationCreator creator = new RandomPermutationCreator();
       creator.LengthParameter.Value = new IntData(cities);
-      SolutionGenerator = creator;
+      SolutionCreator = creator;
       TSPRoundedEuclideanPathEvaluator evaluator = new TSPRoundedEuclideanPathEvaluator();
-      Evaluator = evaluator;
+      SolutionEvaluator = evaluator;
     }
   }