Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/20/10 19:04:06 (15 years ago)
Author:
abeham
Message:

changed some things in the main loops #933

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.cs

    r3134 r3143  
    164164
    165165      moveGenerator.Name = "MoveGenerator (placeholder)";
    166       moveGenerator.OperatorParameter.ActualName = "MoveGenerator";
     166      moveGenerator.OperatorParameter.ActualName = MoveGeneratorParameter.Name;
    167167
    168168      moveEvaluator.Name = "MoveEvaluator (placeholder)";
    169       moveEvaluator.OperatorParameter.ActualName = "MoveEvaluator";
     169      moveEvaluator.OperatorParameter.ActualName = MoveEvaluatorParameter.Name;
    170170
    171171      bestSelector.CopySelected = new BoolValue(false);
    172       bestSelector.MaximizationParameter.ActualName = "Maximization";
     172      bestSelector.MaximizationParameter.ActualName = MaximizationParameter.Name;
    173173      bestSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(1);
    174       bestSelector.QualityParameter.ActualName = "MoveQuality";
     174      bestSelector.QualityParameter.ActualName = MoveQualityParameter.Name;
    175175
    176176      moveMakingProcessor.Name = "MoveMaking processor (UniformSequentialSubScopesProcessor)";
    177177
    178       qualityComparator.LeftSideParameter.ActualName = "MoveQuality";
    179       qualityComparator.RightSideParameter.ActualName = "Quality";
     178      qualityComparator.LeftSideParameter.ActualName = MoveQualityParameter.Name;
     179      qualityComparator.RightSideParameter.ActualName = QualityParameter.Name;
    180180      qualityComparator.ResultParameter.ActualName = "IsBetter";
    181181
     
    183183
    184184      moveMaker.Name = "MoveMaker (placeholder)";
    185       moveMaker.OperatorParameter.ActualName = "MoveMaker";
     185      moveMaker.OperatorParameter.ActualName = MoveMakerParameter.Name;
    186186
    187187      subScopesRemover.RemoveAllSubScopes = true;
     
    191191      iterationsCounter.ValueParameter.ActualName = "Iterations";
    192192
    193       iterationsComparator.Name = "Iterations Comparator";
    194       iterationsComparator.Comparison = new Comparison(ComparisonType.Less);
     193      iterationsComparator.Name = "Iterations >= MaximumIterations";
     194      iterationsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
    195195      iterationsComparator.LeftSideParameter.ActualName = "Iterations";
    196       iterationsComparator.RightSideParameter.ActualName = "MaximumIterations";
    197       iterationsComparator.ResultParameter.ActualName = "IterationsCondition";
     196      iterationsComparator.RightSideParameter.ActualName = MaximumIterationsParameter.Name;
     197      iterationsComparator.ResultParameter.ActualName = "Terminate";
    198198
    199199      bestQualityMemorizer3.BestQualityParameter.ActualName = BestKnownQualityParameter.Name;
     
    218218
    219219      iterationsTermination.Name = "Iterations Termination Condition";
    220       iterationsTermination.ConditionParameter.ActualName = "IterationsCondition";
     220      iterationsTermination.ConditionParameter.ActualName = "Terminate";
    221221      #endregion
    222222
     
    252252      qualityDifferenceCalculator2.Successor = visualizer2;
    253253      visualizer2.Successor = iterationsTermination;
    254       iterationsTermination.TrueBranch = mainProcessor;
    255       iterationsTermination.FalseBranch = null;
     254      iterationsTermination.TrueBranch = null;
     255      iterationsTermination.FalseBranch = mainProcessor;
    256256      #endregion
    257257    }
Note: See TracChangeset for help on using the changeset viewer.