Changeset 3679 for trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3
- Timestamp:
- 05/06/10 17:23:31 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs
r3636 r3679 123 123 Placeholder analyzer1 = new Placeholder(); 124 124 ResultsCollector resultsCollector1 = new ResultsCollector(); 125 ResultsCollector resultsCollector2 = new ResultsCollector(); 125 126 SubScopesProcessor solutionProcessor = new SubScopesProcessor(); 126 127 Placeholder moveGenerator = new Placeholder(); … … 144 145 SubScopesProcessor subScopesProcessor1 = new SubScopesProcessor(); 145 146 Placeholder analyzer2 = new Placeholder(); 146 ResultsCollector resultsCollector 2= new ResultsCollector();147 ResultsCollector resultsCollector3 = new ResultsCollector(); 147 148 ConditionalBranch iterationsTermination = new ConditionalBranch(); 148 149 … … 159 160 analyzer1.Name = "Analyzer (placeholder)"; 160 161 analyzer1.OperatorParameter.ActualName = AnalyzerParameter.Name; 161 162 163 resultsCollector1.CopyValue = new BoolValue(false); 162 164 resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Iterations")); 163 165 resultsCollector1.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Quality", null, "BestQuality")); 164 resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Moves", null, "EvaluatedMoves"));165 166 resultsCollector1.ResultsParameter.ActualName = ResultsParameter.Name; 167 168 resultsCollector2.CopyValue = new BoolValue(true); 169 resultsCollector2.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Moves", null, "EvaluatedMoves")); 170 resultsCollector2.ResultsParameter.ActualName = ResultsParameter.Name; 166 171 167 172 moveGenerator.Name = "MoveGenerator (placeholder)"; … … 222 227 analyzer2.Name = "Analyzer (placeholder)"; 223 228 analyzer2.OperatorParameter.ActualName = AnalyzerParameter.Name; 224 225 resultsCollector2.CollectedValues.Add(new LookupParameter<IntValue>("Iterations")); 226 resultsCollector2.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Quality", null, "BestQuality")); 227 resultsCollector2.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Moves", null, "EvaluatedMoves")); 228 resultsCollector2.ResultsParameter.ActualName = ResultsParameter.Name; 229 230 resultsCollector3.CopyValue = new BoolValue(true); 231 resultsCollector3.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Moves", null, "EvaluatedMoves")); 232 resultsCollector3.ResultsParameter.ActualName = ResultsParameter.Name; 229 233 230 234 emptyNeighborhoodBranch2.Name = "Neighborhood empty?"; … … 240 244 subScopesProcessor0.Operators.Add(bestQualityInitializer); 241 245 subScopesProcessor0.Successor = resultsCollector1; 242 resultsCollector1.Successor = solutionProcessor; 246 resultsCollector1.Successor = resultsCollector2; 247 resultsCollector2.Successor = solutionProcessor; 243 248 solutionProcessor.Operators.Add(moveGenerator); 244 249 solutionProcessor.Successor = iterationsCounter; … … 264 269 iterationsComparator.Successor = subScopesProcessor1; 265 270 subScopesProcessor1.Operators.Add(analyzer2); 266 subScopesProcessor1.Successor = resultsCollector 2;267 resultsCollector 2.Successor = emptyNeighborhoodBranch2;271 subScopesProcessor1.Successor = resultsCollector3; 272 resultsCollector3.Successor = emptyNeighborhoodBranch2; 268 273 emptyNeighborhoodBranch2.TrueBranch = null; 269 274 emptyNeighborhoodBranch2.FalseBranch = iterationsTermination;
Note: See TracChangeset
for help on using the changeset viewer.