Changeset 11512

Timestamp:

10/30/14 12:01:16 (9 years ago)

Author:

ascheibe

Message:

#2267 minor fixes

Location:

branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm

Files:

• OffspringCollector.cs (modified) (2 diffs)
• ProbabilitiesGenerator.cs (modified) (3 diffs)

branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/OffspringCollector.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -44 +45 @@
     public override IOperation Apply() {
       IScope scope = ExecutionContext.Scope;
+
+      if (scope.SubScopes.Count != 2) {
+        throw new InvalidOperationException(Name + ": Wrong number of scopes.");
+      }
+
       IScope offspring = scope.SubScopes[1];
+
+      if (GeneratedOffspringParameter.ActualValue == null) {
+        throw new InvalidOperationException(Name + ": GeneratedOffspring list is not initialized. Have you forgotten to add the ProbabilitiesGenerator to the analyzers?");
+      }
 
       GeneratedOffspringParameter.ActualValue.AddRange(offspring.SubScopes);

branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/ProbabilitiesGenerator.cs

@@ -44 +44 @@
       get { return (ValueParameter<StringValue>)Parameters["OperatorNameVariable"]; }
     }
-    public LookupParameter<IOperator> CrossoverParameter {
-      get { return (LookupParameter<IOperator>)Parameters["Crossover"]; }
+    public LookupParameter<IOperator> OperatorParameter {
+      get { return (LookupParameter<IOperator>)Parameters["Operator"]; }
     }
     public LookupParameter<DoubleArray> ProbablilitiesParameter {
@@ -68 +68 @@
       Parameters.Add(new ValueParameter<StringValue>("SuccessfulOffspringFlag", "The name of the flag which indicates if the individual was successful.", new StringValue("SuccessfulOffspring")));
       Parameters.Add(new ValueParameter<StringValue>("OperatorNameVariable", "The properties of the successful offspring that should be collected.", new StringValue("SelectedCrossoverOperator")));
-      Parameters.Add(new LookupParameter<DoubleArray>("Probabilities"));
-      Parameters.Add(new LookupParameter<IOperator>("Crossover"));
+      Parameters.Add(new LookupParameter<DoubleArray>("Probabilities", "The probability vector a multi crossover/mutator uses to decide which operator to use"));
+      Parameters.Add(new LookupParameter<IOperator>("Operator", "The multioperator that contains the list of used crossovers/mutators", "Crossover"));
       Parameters.Add(new ValueParameter<DoubleValue>("MinimumOperatorUsage", "Minimum percentage of operator usage. ", new DoubleValue(0.05)));
       Parameters.Add(new LookupParameter<ItemList<IScope>>("GeneratedOffspring", "Temporary store of the offspring population."));
@@ -85 +85 @@
       Dictionary<string, int> successfulOperatorCount = new Dictionary<string, int>();
 
-      var crossover = CrossoverParameter.ActualValue;
+      var crossover = OperatorParameter.ActualValue;
       if (crossover.GetType().GetInterfaces().Any(x => x.IsGenericType &&
         x.GetGenericTypeDefinition() == typeof(ICheckedMultiOperator<>))) {