Changeset 12270


Ignore:
Timestamp:
03/31/15 11:44:41 (5 years ago)
Author:
pfleck
Message:

#2350 Renamed EvaluatedSolutions and ResultEvaluatedSolutions to LocalEvaluatedSolutions and EvaluatedSolutions for consistency with other algorithms.

Location:
branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs

    r12220 r12270  
    143143      var initializeAgeProcessor = new UniformSubScopesProcessor();
    144144      var initializeAge = new VariableCreator() { Name = "Initialize Age" };
    145       var initializeEvaluatedSolutions = new ExpressionCalculator() { Name = "Initialize EvaluatedSolutions" };
    146       var initializeResultEvaluatedSolutions = new Assigner() { Name = "Initialize ResultEvaluatedSolutions" };
     145      var initializeLocalEvaluatedSolutions = new ExpressionCalculator() { Name = "Initialize local EvaluatedSolutions" };
     146      var initializeEvaluatedSolutions = new Assigner() { Name = "Initialize EvaluatedSolutions" };
    147147      var initializePopulationSize = new Assigner() { Name = "Initialize PopulationSize" };
    148148      var resultsCollector = new ResultsCollector();
     
    155155      randomCreator.Successor = workingScopeCreator;
    156156
    157       workingScopeCreator.NamesParameter.Value = new StringArray(new[] { "WorkingScope", "LayersScope", "ElitesScope" });
     157      workingScopeCreator.NamesParameter.Value = new StringArray(new[] { "WorkingScope", "LayersScope", });
    158158      workingScopeCreator.Successor = layersProcessor;
    159159
    160160      layersProcessor.TargetScopeParameter.ActualName = "LayersScope";
    161161      layersProcessor.Operator = layerCreator;
    162       layersProcessor.Successor = initializeEvaluatedSolutions;
     162      layersProcessor.Successor = initializeLocalEvaluatedSolutions;
    163163
    164164      layerCreator.NumberOfSubScopesParameter.ActualName = "NumberOfLayers";
     
    183183      initializeAge.CollectedValues.Add(new ValueParameter<IntValue>("LastMove", new IntValue(1)));
    184184
    185       initializeEvaluatedSolutions.ExpressionResultParameter.ActualName = "EvaluatedSolutions";
    186       initializeEvaluatedSolutions.ExpressionParameter.Value = new StringValue("LayerSize NumberOfLayers * toint");
    187       initializeEvaluatedSolutions.CollectedValues.Add(new LookupParameter<IntValue>("LayerSize"));
    188       initializeEvaluatedSolutions.CollectedValues.Add(new LookupParameter<IntValue>("NumberOfLayers"));
    189       initializeEvaluatedSolutions.Successor = initializeResultEvaluatedSolutions;
    190 
    191       initializeResultEvaluatedSolutions.LeftSideParameter.ActualName = "ResultEvaluatedSolutions";
    192       initializeResultEvaluatedSolutions.RightSideParameter.ActualName = "EvaluatedSolutions";
    193       initializeResultEvaluatedSolutions.Successor = initializePopulationSize;
     185      initializeLocalEvaluatedSolutions.ExpressionResultParameter.ActualName = "LocalEvaluatedSolutions";
     186      initializeLocalEvaluatedSolutions.ExpressionParameter.Value = new StringValue("LayerSize NumberOfLayers * toint");
     187      initializeLocalEvaluatedSolutions.CollectedValues.Add(new LookupParameter<IntValue>("LayerSize"));
     188      initializeLocalEvaluatedSolutions.CollectedValues.Add(new LookupParameter<IntValue>("NumberOfLayers"));
     189      initializeLocalEvaluatedSolutions.Successor = initializeEvaluatedSolutions;
     190
     191      initializeEvaluatedSolutions.LeftSideParameter.ActualName = "EvaluatedSolutions";
     192      initializeEvaluatedSolutions.RightSideParameter.ActualName = "LocalEvaluatedSolutions";
     193      initializeEvaluatedSolutions.Successor = initializePopulationSize;
    194194
    195195      initializePopulationSize.LeftSideParameter.ActualName = "PopulationSize";
     
    197197      initializePopulationSize.Successor = resultsCollector;
    198198
    199       resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "ResultEvaluatedSolutions"));
     199      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("EvaluatedSolutions"));
    200200      resultsCollector.CollectedValues.Add(new ScopeTreeLookupParameter<ResultCollection>("LayerResults", "Result set for each layer", "LayerResults", 2));
    201201      resultsCollector.Successor = mainLoop;
  • branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainLoop.cs

    r12223 r12270  
    9898      var resetTargetIndex = new Assigner() { Name = "TargetIndex = MatingPoolSize" };
    9999      var tryMoveUp = new AlpsSsMover() { Name = "Try Move Up" };
    100       var incrementEvaluations = new IntCounter() { Name = "Incr. EvaluatedSolutions" };
     100      var incrementLocalEvaluations = new IntCounter() { Name = "Incr. local EvaluatedSolutions" };
    101101      var incrementBatchIterations = new IntCounter() { Name = "Incr. BatchIterations" };
    102102      var batchFinishedComperator = new Comparator() { Name = "BatchFinished = BatchIterations >= BatchSize" };
    103103      var batchFinishedBranch = new ConditionalBranch() { Name = "BatchFinished?" };
    104104      var incrIterations = new IntCounter() { Name = "Incr. Iterations" };
    105       var updateResultEvaluatedSolutions = new IntCounter() { Name = "Update ResultEvaluatedSolutions" };
     105      var updateEvaluatedSolutions = new IntCounter() { Name = "Update EvaluatedSolutions" };
    106106      var layerAnalyzerProcessor = new UniformSubScopesProcessor();
    107107      var layerAnalyzer = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
     
    176176
    177177      initializeAge.LeftSideParameter.ActualName = "EvalsCreated";
    178       initializeAge.RightSideParameter.ActualName = "EvaluatedSolutions";
     178      initializeAge.RightSideParameter.ActualName = "LocalEvaluatedSolutions";
    179179
    180180      layerSorter.ValueParameter.ActualName = "Quality";
     
    220220      resetTargetIndex.Successor = createRandomIndividual;
    221221
    222       tryMoveUp.Successor = incrementEvaluations;
    223 
    224       incrementEvaluations.ValueParameter.ActualName = "EvaluatedSolutions";
    225       incrementEvaluations.Increment = new IntValue(1);
     222      tryMoveUp.Successor = incrementLocalEvaluations;
     223
     224      incrementLocalEvaluations.ValueParameter.ActualName = "LocalEvaluatedSolutions";
     225      incrementLocalEvaluations.Increment = new IntValue(1);
    226226
    227227      incrementBatchIterations.ValueParameter.ActualName = "BatchIterations";
     
    240240      incrIterations.ValueParameter.ActualName = "Iterations";
    241241      incrIterations.Increment = new IntValue(1);
    242       incrIterations.Successor = updateResultEvaluatedSolutions;
    243 
    244       updateResultEvaluatedSolutions.ValueParameter.ActualName = "ResultEvaluatedSolutions";
    245       updateResultEvaluatedSolutions.IncrementParameter.ActualName = "BatchSize";
    246       updateResultEvaluatedSolutions.IncrementParameter.Value = null;
    247       updateResultEvaluatedSolutions.Successor = layerAnalyzerProcessor;
     242      incrIterations.Successor = updateEvaluatedSolutions;
     243
     244      updateEvaluatedSolutions.ValueParameter.ActualName = "EvaluatedSolutions";
     245      updateEvaluatedSolutions.IncrementParameter.ActualName = "BatchSize";
     246      updateEvaluatedSolutions.IncrementParameter.Value = null;
     247      updateEvaluatedSolutions.Successor = layerAnalyzerProcessor;
    248248
    249249      layerAnalyzerProcessor.Operator = layerAnalyzer;
  • branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/SteadyStateMatingPoolCreator.cs

    r12220 r12270  
    7171      Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions"));
    7272      Parameters.Add(new LookupParameter<IntValue>("PopulationSize"));
    73 
    7473    }
    7574
Note: See TracChangeset for help on using the changeset viewer.