Changeset 3048 for trunk/sources/HeuristicLab.Problems.TSP/3.3/TSP.cs

Timestamp:

03/15/10 23:49:54 (14 years ago)

Author:

swagner

Message:

Renamed classes of HeuristicLab.Data (#909)

File:

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

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

@@ -43 +43 @@
 
     #region Parameter Properties
-    public ValueParameter<BoolData> MaximizationParameter {
-      get { return (ValueParameter<BoolData>)Parameters["Maximization"]; }
+    public ValueParameter<BoolValue> MaximizationParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["Maximization"]; }
     }
     IParameter ISingleObjectiveProblem.MaximizationParameter {
       get { return MaximizationParameter; }
     }
-    public ValueParameter<DoubleMatrixData> CoordinatesParameter {
-      get { return (ValueParameter<DoubleMatrixData>)Parameters["Coordinates"]; }
+    public ValueParameter<DoubleMatrix> CoordinatesParameter {
+      get { return (ValueParameter<DoubleMatrix>)Parameters["Coordinates"]; }
     }
     public ValueParameter<IPermutationCreator> SolutionCreatorParameter {
@@ -64 +64 @@
       get { return EvaluatorParameter; }
     }
-    public OptionalValueParameter<DoubleData> BestKnownQualityParameter {
-      get { return (OptionalValueParameter<DoubleData>)Parameters["BestKnownQuality"]; }
+    public OptionalValueParameter<DoubleValue> BestKnownQualityParameter {
+      get { return (OptionalValueParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
     }
     #endregion
 
     #region Properties
-    public DoubleMatrixData Coordinates {
+    public DoubleMatrix Coordinates {
       get { return CoordinatesParameter.Value; }
       set { CoordinatesParameter.Value = value; }
@@ -91 +91 @@
       get { return EvaluatorParameter.Value; }
     }
-    public DoubleData BestKnownQuality {
+    public DoubleValue BestKnownQuality {
       get { return BestKnownQualityParameter.Value; }
       set { BestKnownQualityParameter.Value = value; }
@@ -106 +106 @@
       TSPRoundedEuclideanPathEvaluator evaluator = new TSPRoundedEuclideanPathEvaluator();
 
-      Parameters.Add(new ValueParameter<BoolData>("Maximization", "Set to false as the Traveling Salesman Problem is a minimization problem.", 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<BoolValue>("Maximization", "Set to false as the Traveling Salesman Problem is a minimization problem.", new BoolValue(false)));
+      Parameters.Add(new ValueParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the cities.", new DoubleMatrix(0, 0)));
       Parameters.Add(new ValueParameter<IPermutationCreator>("SolutionCreator", "The operator which should be used to create new TSP solutions.", creator));
       Parameters.Add(new ValueParameter<ITSPEvaluator>("Evaluator", "The operator which should be used to evaluate TSP solutions.", evaluator));
-      Parameters.Add(new OptionalValueParameter<DoubleData>("BestKnownQuality", "The quality of the best known solution of this TSP instance."));
+      Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this TSP instance."));
 
       creator.PermutationParameter.ActualName = "TSPTour";
@@ -131 +131 @@
       TSPLIBParser parser = new TSPLIBParser(filename);
       parser.Parse();
-      Coordinates = new DoubleMatrixData(parser.Vertices);
+      Coordinates = new DoubleMatrix(parser.Vertices);
     }
 
@@ -190 +190 @@
     }
     private void ParameterizeSolutionCreator() {
-      SolutionCreator.LengthParameter.Value = new IntData(Coordinates.Rows);
+      SolutionCreator.LengthParameter.Value = new IntValue(Coordinates.Rows);
     }
     private void ParameterizeEvaluator() {