Changeset 2830 for trunk/sources/HeuristicLab.Routing.TSP/3.3/TSP.cs
- Timestamp:
- 02/19/10 02:15:10 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Routing.TSP/3.3/TSP.cs
r2805 r2830 34 34 get { return (ValueParameter<DoubleMatrixData>)Parameters["Coordinates"]; } 35 35 } 36 private OperatorParameter Solution GeneratorParameter {37 get { return (OperatorParameter)Parameters["Solution Generator"]; }36 private OperatorParameter SolutionCreatorParameter { 37 get { return (OperatorParameter)Parameters["SolutionCreator"]; } 38 38 } 39 private OperatorParameter EvaluatorParameter {40 get { return (OperatorParameter)Parameters[" Evaluator"]; }39 private OperatorParameter SolutionEvaluatorParameter { 40 get { return (OperatorParameter)Parameters["SolutionEvaluator"]; } 41 41 } 42 42 … … 45 45 set { CoordinatesParameter.Value = value; } 46 46 } 47 public IOperator Solution Generator {48 get { return Solution GeneratorParameter.Value; }49 set { Solution GeneratorParameter.Value = value; }47 public IOperator SolutionCreator { 48 get { return SolutionCreatorParameter.Value; } 49 set { SolutionCreatorParameter.Value = value; } 50 50 } 51 public IOperator Evaluator {52 get { return EvaluatorParameter.Value; }53 set { EvaluatorParameter.Value = value; }51 public IOperator SolutionEvaluator { 52 get { return SolutionEvaluatorParameter.Value; } 53 set { SolutionEvaluatorParameter.Value = value; } 54 54 } 55 55 … … 59 59 Parameters.Add(new ValueParameter<DoubleMatrixData>("Coordinates", "The x- and y-Coordinates of the cities.", new DoubleMatrixData(0, 0))); 60 60 Parameters.Add(new ValueParameter<DoubleData>("BestKnownQuality", "The quality of the best known solution of this TSP instance.")); 61 Parameters.Add(new OperatorParameter("Solution Generator", "The operator which should be used to generate new solutions."));62 Parameters.Add(new OperatorParameter(" Evaluator", "The operator which should be used to evaluate solutions."));61 Parameters.Add(new OperatorParameter("SolutionCreator", "The operator which should be used to create new solutions.")); 62 Parameters.Add(new OperatorParameter("SolutionEvaluator", "The operator which should be used to evaluate solutions.")); 63 63 } 64 64 … … 70 70 RandomPermutationCreator creator = new RandomPermutationCreator(); 71 71 creator.LengthParameter.Value = new IntData(cities); 72 Solution Generator = creator;72 SolutionCreator = creator; 73 73 TSPRoundedEuclideanPathEvaluator evaluator = new TSPRoundedEuclideanPathEvaluator(); 74 Evaluator = evaluator;74 SolutionEvaluator = evaluator; 75 75 } 76 76 }
Note: See TracChangeset
for help on using the changeset viewer.