Changeset 2906 for trunk/sources/HeuristicLab.Problems.TSP/3.3/TSPDistanceMatrixPathEvaluator.cs

Timestamp:

03/01/10 22:08:05 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• renamed HeuristicLab.Permutation to HeuristicLab.Encodings.Permutation

File:

• trunk/sources/HeuristicLab.Problems.TSP/3.3/TSPDistanceMatrixPathEvaluator.cs (modified) (3 diffs)

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

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.Permutation;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -36 +37 @@
       get { return (LookupParameter<DoubleMatrixData>)Parameters["DistanceMatrix"]; }
     }
-    public LookupParameter<Permutation.Permutation> PermutationParameter {
-      get { return (LookupParameter<Permutation.Permutation>)Parameters["Permutation"]; }
+    public LookupParameter<Permutation> PermutationParameter {
+      get { return (LookupParameter<Permutation>)Parameters["Permutation"]; }
     }
 
@@ -43 +44 @@
       : base() {
       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<Permutation>("Permutation", "The TSP solution given in path representation which should be evaluated."));
     }
 
     public override IOperation Apply() {
       DoubleMatrixData distanceMatrix = DistanceMatrixParameter.ActualValue;
-      Permutation.Permutation permutation = PermutationParameter.ActualValue;
+      Permutation permutation = PermutationParameter.ActualValue;
 
       double length = 0;