Changeset 3426

Timestamp:

04/20/10 00:13:43 (14 years ago)

Author:

abeham

Message:

Added evaluated solutions result to OSGA (this slows down execution extremely if the update is not decoupled in some way)
Made comparison factor modifier an optional parameter #976

Location:

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3

Files:

• OffspringSelectionGeneticAlgorithm.cs (modified) (3 diffs)
• OffspringSelectionGeneticAlgorithmMainLoop.cs (modified) (11 diffs)

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

@@ -89 +89 @@
       get { return (ValueLookupParameter<DoubleValue>)Parameters["ComparisonFactorUpperBound"]; }
     }
-    private ConstrainedValueParameter<IDiscreteDoubleValueModifier> ComparisonFactorModifierParameter {
-      get { return (ConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["ComparisonFactorModifier"]; }
+    private OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier> ComparisonFactorModifierParameter {
+      get { return (OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["ComparisonFactorModifier"]; }
     }
     private ValueLookupParameter<DoubleValue> MaximumSelectionPressureParameter {
@@ -193 +193 @@
       Parameters.Add(new ValueLookupParameter<DoubleValue>("ComparisonFactorLowerBound", "The lower bound of the comparison factor (start).", new DoubleValue(0)));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("ComparisonFactorUpperBound", "The upper bound of the comparison factor (end).", new DoubleValue(1)));
-      Parameters.Add(new ConstrainedValueParameter<IDiscreteDoubleValueModifier>("ComparisonFactorModifier", "The operator used to modify the comparison factor."));
+      Parameters.Add(new OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier>("ComparisonFactorModifier", "The operator used to modify the comparison factor.", new ItemSet<IDiscreteDoubleValueModifier>(new IDiscreteDoubleValueModifier[] { new LinearDiscreteDoubleValueModifier() }), new LinearDiscreteDoubleValueModifier()));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("MaximumSelectionPressure", "The maximum selection pressure that terminates the algorithm.", new DoubleValue(100)));
       Parameters.Add(new ValueLookupParameter<BoolValue>("OffspringSelectionBeforeMutation", "True if the offspring selection step should be applied before mutation, false if it should be applied after mutation.", new BoolValue(false)));
@@ -386 +386 @@
     private void UpdateComparisonFactorModifiers() {
       IDiscreteDoubleValueModifier oldModifier = ComparisonFactorModifier;
-      if (oldModifier == null) oldModifier = new LinearDiscreteDoubleValueModifier();
 
       ComparisonFactorModifierParameter.ValidValues.Clear();
       foreach (IDiscreteDoubleValueModifier modifier in comparisonFactorModifiers)
         ComparisonFactorModifierParameter.ValidValues.Add(modifier);
-      
-      IDiscreteDoubleValueModifier mod = ComparisonFactorModifierParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldModifier.GetType());
-      if (mod != null) ComparisonFactorModifierParameter.Value = mod;
+
+      if (oldModifier != null) {
+        IDiscreteDoubleValueModifier mod = ComparisonFactorModifierParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldModifier.GetType());
+        if (mod != null) ComparisonFactorModifierParameter.Value = mod;
+      }
     }
     private void UpdateCrossovers() {

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs

@@ -152 +152 @@
       ConditionalBranch osBeforeMutationBranch = new ConditionalBranch();
       Placeholder evaluator1 = new Placeholder();
+      IntCounter evaluationCounter1 = new IntCounter();
       WeightedParentsQualityComparator qualityComparer1 = new WeightedParentsQualityComparator();
       StochasticBranch mutationBranch1 = new StochasticBranch();
       Placeholder mutator1 = new Placeholder();
       Placeholder evaluator2 = new Placeholder();
+      IntCounter evaluationCounter2 = new IntCounter();
       StochasticBranch mutationBranch2 = new StochasticBranch();
       Placeholder mutator2 = new Placeholder();
       Placeholder evaluator3 = new Placeholder();
+      IntCounter evaluationCounter3 = new IntCounter();
       WeightedParentsQualityComparator qualityComparer2 = new WeightedParentsQualityComparator();
       SubScopesRemover subScopesRemover = new SubScopesRemover();
@@ -171 +174 @@
       Comparator comparator1 = new Comparator();
       Comparator comparator2 = new Comparator();
+      Assigner evaluatedSolutionsAssigner = new Assigner();
+      ResultsCollector evalSolCollector = new ResultsCollector();
       BestQualityMemorizer bestQualityMemorizer3 = new BestQualityMemorizer();
       BestQualityMemorizer bestQualityMemorizer4 = new BestQualityMemorizer();
@@ -184 +189 @@
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("SelectionPressure", new DoubleValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("CurrentSuccessRatio", new DoubleValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedSolutions", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedSolutionsResult", new IntValue(0)));
 
       variableAssigner.LeftSideParameter.ActualName = "ComparisonFactor";
@@ -222 +229 @@
 
       resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Generations"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "EvaluatedSolutionsResult"));
       resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Current Best Quality", null, "CurrentBestQuality"));
       resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Current Average Quality", null, "CurrentAverageQuality"));
@@ -250 +258 @@
       evaluator1.OperatorParameter.ActualName = EvaluatorParameter.Name;
 
+      evaluationCounter1.Name = "EvaluatedSolutions++";
+      evaluationCounter1.Increment = new IntValue(1);
+      evaluationCounter1.ValueParameter.ActualName = "EvaluatedSolutions";
+
       qualityComparer1.ComparisonFactorParameter.ActualName = "ComparisonFactor";
       qualityComparer1.LeftSideParameter.ActualName = QualityParameter.Name;
@@ -265 +277 @@
       evaluator2.OperatorParameter.ActualName = EvaluatorParameter.Name;
 
+      evaluationCounter2.Name = "EvaluatedSolutions++";
+      evaluationCounter2.Increment = new IntValue(1);
+      evaluationCounter2.ValueParameter.ActualName = "EvaluatedSolutions";
+
       mutationBranch2.ProbabilityParameter.ActualName = MutationProbabilityParameter.Name;
       mutationBranch2.RandomParameter.ActualName = RandomParameter.Name;
@@ -273 +289 @@
       evaluator3.Name = "Evaluator (placeholder)";
       evaluator3.OperatorParameter.ActualName = EvaluatorParameter.Name;
+
+      evaluationCounter3.Name = "EvaluatedSolutions++";
+      evaluationCounter3.Increment = new IntValue(1);
+      evaluationCounter3.ValueParameter.ActualName = "EvaluatedSolutions";
 
       qualityComparer2.ComparisonFactorParameter.ActualName = "ComparisonFactor";
@@ -313 +333 @@
       comparator2.ResultParameter.ActualName = "TerminateSelectionPressure";
       comparator2.RightSideParameter.ActualName = MaximumSelectionPressureParameter.Name;
+
+      evaluatedSolutionsAssigner.LeftSideParameter.ActualName = "EvaluatedSolutionsResult";
+      evaluatedSolutionsAssigner.RightSideParameter.ActualName = "EvaluatedSolutions";
+
+      evalSolCollector.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "EvaluatedSolutionsResult"));
+      evalSolCollector.ResultsParameter.ActualName = ResultsParameter.Name;
 
       bestQualityMemorizer3.BestQualityParameter.ActualName = "BestQuality";
@@ -377 +403 @@
       osBeforeMutationBranch.FalseBranch = mutationBranch2;
       osBeforeMutationBranch.Successor = subScopesRemover;
-      evaluator1.Successor = qualityComparer1;
+      evaluator1.Successor = evaluationCounter1;
+      evaluationCounter1.Successor = qualityComparer1;
       qualityComparer1.Successor = mutationBranch1;
       mutationBranch1.FirstBranch = mutator1;
@@ -383 +410 @@
       mutationBranch1.Successor = null;
       mutator1.Successor = evaluator2;
-      evaluator2.Successor = null;
+      evaluator2.Successor = evaluationCounter2;
+      evaluationCounter2.Successor = null;
       mutationBranch2.FirstBranch = mutator2;
       mutationBranch2.SecondBranch = null;
       mutationBranch2.Successor = evaluator3;
       mutator2.Successor = null;
-      evaluator3.Successor = qualityComparer2;
+      evaluator3.Successor = evaluationCounter3;
+      evaluationCounter3.Successor = qualityComparer2;
       subScopesRemover.Successor = null;
       offspringSelector.OffspringCreator = selector;
@@ -401 +430 @@
       comparisonFactorModifier.Successor = comparator1;
       comparator1.Successor = comparator2;
-      comparator2.Successor = bestQualityMemorizer3;
+      comparator2.Successor = evaluatedSolutionsAssigner;
+      evaluatedSolutionsAssigner.Successor = evalSolCollector;
+      evalSolCollector.Successor = bestQualityMemorizer3;
       bestQualityMemorizer3.Successor = bestQualityMemorizer4;
       bestQualityMemorizer4.Successor = bestAverageWorstQualityCalculator2;