Changeset 12835 for trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSearch.cs
- Timestamp:
- 08/03/15 23:42:33 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSearch.cs
r12810 r12835 168 168 VariableCreator variableCreator = new VariableCreator(); 169 169 variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0))); 170 variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedSolutions", new IntValue( 0)));171 variableCreator.CollectedValues.Add(new ValueParameter< IntValue>("EvaluatedMoves", new IntValue(0)));170 variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedSolutions", new IntValue(1))); 171 variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("EvaluatedSolutionEquivalents", new DoubleValue(1))); 172 172 173 173 ResultsCollector resultsCollector = new ResultsCollector(); 174 174 resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iterations", "The actual iteration.")); 175 resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The number of full solution evaluations.")); 176 resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("EvaluatedMoves", "The number of move evaluations.")); 175 resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "Number of evaluated solutions.")); 177 176 178 177 solutionsCreator = new SolutionsCreator(); 179 178 solutionsCreator.NumberOfSolutions = new IntValue(1); 180 181 IntCounter counter = new IntCounter();182 counter.ValueParameter.ActualName = "EvaluatedSolutions";183 counter.Increment = new IntValue(1);184 179 185 180 Placeholder analyzer = new Placeholder(); … … 202 197 mainOperator.ShortTermMemoryParameter.ActualName = "ShortTermMemory"; 203 198 mainOperator.UseAlternativeAspirationParameter.ActualName = UseAlternativeAspirationParameter.Name; 204 mainOperator.EvaluatedMovesParameter.ActualName = "EvaluatedMoves"; 199 mainOperator.EvaluatedSolutionsParameter.ActualName = "EvaluatedSolutions"; 200 mainOperator.EvaluatedSolutionEquivalentsParameter.ActualName = "EvaluatedSolutionEquivalents"; 205 201 206 202 ConditionalBranch qualityStopBranch = new ConditionalBranch(); … … 235 231 variableCreator.Successor = resultsCollector; 236 232 resultsCollector.Successor = solutionsCreator; 237 solutionsCreator.Successor = counter; 238 counter.Successor = analyzer; 233 solutionsCreator.Successor = analyzer; 239 234 analyzer.Successor = ussp; 240 235 ussp.Operator = mainOperator;
Note: See TracChangeset
for help on using the changeset viewer.