Changeset 11609 for branches

Timestamp:

12/01/14 16:23:24 (10 years ago)

Author:

pfleck

Message:

#2269

• Fixed Bugs with Per-Layer-Results.
• Fixed Bugs in EldersSelector.
• Added LayerCreator instead of LastSubScopeCloner for avoiding operators for some temporary hacks.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithm.cs (modified) (4 diffs)
• AlpsGeneticAlgorithmMainLoop.cs (modified) (3 diffs)
• EldersSelector.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.ALPS-3.3.csproj (modified) (1 diff)
• LastSubScopeCloner.cs (modified) (1 diff)
• LayerCreator.cs (added)
• LayerUpdator.cs (modified) (4 diffs)
• MatingPoolCreator.cs (modified) (1 diff)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithm.cs

@@ -254 +254 @@
 
       layerVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Layer", new IntValue(0)));
-      layerVariableCreator.CollectedValues.Add(new ValueParameter<ResultCollection>("Results", new ResultCollection()));
+      //layerVariableCreator.CollectedValues.Add(new ValueParameter<ResultCollection>("Results", new ResultCollection()));
       layerVariableCreator.Successor = layerSolutionsCreator;
 
@@ -275 +275 @@
       initializeGlobalEvaluatedSolutions.Successor = resultsCollector;
 
-      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("EvaluatedSolutions"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "EvaluatedSolutions"));
       resultsCollector.Successor = mainLoop;
 
@@ -375 +375 @@
       MainLoop.LayerUpdator.SolutionsCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
       MainLoop.LayerUpdator.SolutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
-
     }
     private void ParameterizeMainLoop() {
@@ -387 +386 @@
       MainLoop.EldersEmigrator.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
       MainLoop.EldersEmigrator.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
+      MainLoop.LayerUpdator.SolutionsCreator.NumberOfSolutionsParameter.ActualName = PopulationSizeParameter.Name;
     }
     private void ParameterizeSelectors() {

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.cs

@@ -74 +74 @@
 
       var variableCreator = new VariableCreator() { Name = "Initialize" };
-      var resultsCollector = new ResultsCollector();
-      var initAnalyzerPlaceholder = new Placeholder() { Name = "Analyzer (Placeholder)" };
       var initLayerAnalyzerProcessor = new SubScopesProcessor();
       var layerVariableCreator = new VariableCreator() { Name = "Initialize Layer" };
       var initLayerAnalyzerPlaceholder = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
+      var initAnalyzerPlaceholder = new Placeholder() { Name = "Analyzer (Placeholder)" };
+      var resultsCollector = new ResultsCollector();
       var matingPoolCreator = new MatingPoolCreator() { Name = "Create Mating Pools" };
       var matingPoolProcessor = new UniformSubScopesProcessor();
@@ -97 +97 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("GenerationsSinceLastRefresh", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("OpenLayers", new IntValue(1)));
-      variableCreator.Successor = resultsCollector;
-
-      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Generations"));
-      resultsCollector.CollectedValues.Add(new ScopeTreeLookupParameter<ResultCollection>("LayerResults", "Result set for each layer", "Results"));
-      resultsCollector.Successor = initAnalyzerPlaceholder;
-
-      initAnalyzerPlaceholder.OperatorParameter.ActualName = AnalyzerParameter.Name;
-      initAnalyzerPlaceholder.Successor = initLayerAnalyzerProcessor;
+      variableCreator.Successor = initLayerAnalyzerProcessor;
 
       initLayerAnalyzerProcessor.Operators.Add(layerVariableCreator);
-      initLayerAnalyzerProcessor.Successor = matingPoolCreator;
+      initLayerAnalyzerProcessor.Successor = initAnalyzerPlaceholder;
 
       layerVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>("LayerEvaluatedSolutions"));
@@ -115 +108 @@
       initLayerAnalyzerPlaceholder.OperatorParameter.ActualName = LayerAnalyzerParameter.Name;
       initLayerAnalyzerPlaceholder.Successor = null;
+
+      initAnalyzerPlaceholder.OperatorParameter.ActualName = AnalyzerParameter.Name;
+      initAnalyzerPlaceholder.Successor = resultsCollector;
+
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Generations"));
+      resultsCollector.CollectedValues.Add(new ScopeTreeLookupParameter<ResultCollection>("LayerResults", "Result set for each layer", "Results"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("OpenLayers"));
+      resultsCollector.CopyValue = new BoolValue(false);
+      resultsCollector.Successor = matingPoolCreator;
 
       matingPoolCreator.Successor = matingPoolProcessor;

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/EldersSelector.cs

@@ -65 +65 @@
       int layer = LayerParameter.ActualValue.Value;
 
-      if (layer >= numberOfLayers) // is max layer?
+      if (layer >= numberOfLayers - 1) // is max layer?
         return new IScope[0];
 
       int limit = ageLimits[layer];
-      var elders =
+      var eldersQuery =
         from scope in scopes
         let age = ((IntValue)scope.Variables["Age"].Value).Value
@@ -75 +75 @@
         select scope;
 
-      return elders.ToArray();
+      var elders = eldersQuery.ToArray();
+
+      if (!CopySelected.Value)
+        foreach (var elder in elders)
+          scopes.Remove(elder);
+
+      return elders;
     }
   }

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj

@@ -84 +84 @@
     <Compile Include="EldersSelector.cs" />
     <Compile Include="LastSubScopeCloner.cs" />
+    <Compile Include="LayerCreator.cs" />
     <Compile Include="LayerUpdator.cs" />
     <Compile Include="MatingPoolCreator.cs" />

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/LastSubScopeCloner.cs

@@ -57 +57 @@
       var clone = (IScope)lastSubScope.Clone(new Cloner());
 
+      int number;
+      if (int.TryParse(clone.Name, out number))
+        clone.Name = (number + 1).ToString();
+
       scopes.Add(clone);
 

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/LayerUpdator.cs

@@ -56 +56 @@
       var openNewLayerCalculator = new OpenNewLayerCalculator();
       var openNewLayerBranch = new ConditionalBranch() { Name = "OpenNewLayer?" };
-      var layerCloner = new LastSubScopeCloner() { Name = "Copy Lower Layer" };
+      //var layerCloner = new LastSubScopeCloner() { Name = "Copy Lower Layer" };
+      var layerCreator = new LayerCreator() { Name = "Create new Layer" };
       var incrOpenLayers = new IntCounter() { Name = "Incr. OpenLayers" };
+      var newLayerResultsCollector = new ResultsCollector() { Name = "Collect new Layer Results" };
       var newLayerProsessor = new LastSubScopeProcessor();
       var layerInitializer = new Assigner() { Name = "Init Layer" };
+      var correctAgeProcessor = new UniformSubScopesProcessor() { Name = "Hack: Decrement Age" };
+      var correctAgeDecrementor = new IntCounter() { Name = "Age = Age - 1" };
       var incrEvaluatedSolutionsForNewLayer = new SubScopesCounter() { Name = "Update EvaluatedSolutions" };
       var newResultCollectionAssigner = new Assigner() { Name = "Empty Results" };
@@ -94 +98 @@
 
       openNewLayerBranch.ConditionParameter.ActualName = "OpenNewLayer";
-      openNewLayerBranch.TrueBranch = layerCloner;
+      openNewLayerBranch.TrueBranch = layerCreator;
       openNewLayerBranch.Successor = regenerateLayerZeroProsessor;
 
-      layerCloner.Successor = newLayerProsessor;
+      //layerCloner.Successor = newLayerProsessor;
+      layerCreator.Successor = newLayerProsessor;
 
-      newLayerProsessor.Operator = layerInitializer;
+      //newLayerProsessor.Operator = layerInitializer;
+      newLayerProsessor.Operator = incrEvaluatedSolutionsForNewLayer;
       newLayerProsessor.Successor = incrOpenLayers;
 
       layerInitializer.LeftSideParameter.ActualName = "Layer";
       layerInitializer.RightSideParameter.ActualName = "OpenLayers";
-      layerInitializer.Successor = incrEvaluatedSolutionsForNewLayer;
+      layerInitializer.Successor = correctAgeProcessor;
+
+      correctAgeProcessor.Operator = correctAgeDecrementor;
+      correctAgeProcessor.Successor = incrEvaluatedSolutionsForNewLayer;
+
+      correctAgeDecrementor.Increment = new IntValue(-1);
+      correctAgeDecrementor.ValueParameter.ActualName = "Age";
 
       incrEvaluatedSolutionsForNewLayer.ValueParameter.ActualName = "EvaluatedSolutions";
       incrEvaluatedSolutionsForNewLayer.AccumulateParameter.Value = new BoolValue(true);
-      incrEvaluatedSolutionsForNewLayer.Successor = newResultCollectionAssigner;
+      //incrEvaluatedSolutionsForNewLayer.Successor = newResultCollectionAssigner;
+      incrEvaluatedSolutionsForNewLayer.Successor = mainOperator;
 
       newResultCollectionAssigner.LeftSideParameter.ActualName = "Results";
@@ -117 +130 @@
       incrOpenLayers.ValueParameter.ActualName = "OpenLayers";
       incrOpenLayers.Increment = new IntValue(1);
-      incrOpenLayers.Successor = null;
+      incrOpenLayers.Successor = newLayerResultsCollector;
+
+      newLayerResultsCollector.CollectedValues.Add(new ScopeTreeLookupParameter<ResultCollection>("LayerResults", "Result set for each layer", "Results"));
+      newLayerResultsCollector.CopyValue = new BoolValue(false);
+      newLayerResultsCollector.Successor = null;
 
       regenerateLayerZeroProsessor.Operator = subScopesRemover;
@@ -137 +154 @@
 
       resetGenSlr.LeftSideParameter.ActualName = "GenerationsSinceLastRefresh";
-      resetGenSlr.RightSideParameter.Value = new IntValue(1);
+      resetGenSlr.RightSideParameter.Value = new IntValue(0);
       resetGenSlr.Successor = null;
     }

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/MatingPoolCreator.cs

@@ -45 +45 @@
       var subPopulations = ExecutionContext.Scope.SubScopes;
 
-      for (int i = subPopulations.Count - 1; i > 0; i++) {
+      for (int i = subPopulations.Count - 1; i > 0; i--) {
         var currentSubPopulation = subPopulations[i].SubScopes;
         var prevSubPopulation = subPopulations[i - 1].SubScopes;