Changeset 2683 for trunk

Timestamp:

01/25/10 15:26:00 (15 years ago)

Author:

gkronber

Message:

Implemented operator to calculate variable impacts based on the log of variable frequencies over the whole GP run and integrated operators into default SGP and OSGP algorithms. #853 (Operator to calculate variable impacts as integral over the relative frequencies of variable references over the whole GP run and the whole population)

Location:

trunk/sources

Files:

• HeuristicLab.GP.Algorithms/3.2/AlgorithmBase.cs (modified) (1 diff)
• HeuristicLab.GP.Algorithms/3.2/OffspringSelectionGP.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/DefaultStructureIdentificationOperators.cs (modified) (4 diffs)
• HeuristicLab.GP.StructureIdentification/3.3/Evaluators/VariableFrequencyBasedImpactCalculator.cs (added)
• HeuristicLab.Modeling/3.2/ModelingResult.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP.Algorithms/3.2/AlgorithmBase.cs

@@ -287 +287 @@
       loop.AddSubOperator(seq);
 
+      seq.AddSubOperator(CreateGenerationStepHook());
+      seq.AddSubOperator(qualityCalculator);
+      seq.AddSubOperator(loggingOperator);
+      seq.AddSubOperator(counter);
       seq.AddSubOperator(childCreater);
       seq.AddSubOperator(replacement);
-      seq.AddSubOperator(qualityCalculator);
-      seq.AddSubOperator(CreateGenerationStepHook());
-      seq.AddSubOperator(loggingOperator);
-      seq.AddSubOperator(counter);
       seq.AddSubOperator(terminationCriterionExtractor);
       seq.AddSubOperator(loop);

trunk/sources/HeuristicLab.GP.Algorithms/3.2/OffspringSelectionGP.cs

@@ -70 +70 @@
       injector.AddVariable(new HeuristicLab.Core.Variable("ComparisonFactor", new DoubleData()));
       injector.AddVariable(new HeuristicLab.Core.Variable("SelectionPressureLimit", new DoubleData()));
+      injector.AddVariable(new HeuristicLab.Core.Variable("SelectionPressure", new DoubleData(1)));
       injector.AddVariable(new HeuristicLab.Core.Variable("SuccessRatioLimit", new DoubleData()));
       return injector;

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/DefaultStructureIdentificationOperators.cs

@@ -30 +30 @@
 using System.Collections.Generic;
 using System;
+using HeuristicLab.GP.Operators;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -60 +61 @@
       CombinedOperator op = new CombinedOperator();
       SequentialProcessor seq = new SequentialProcessor();
+
+      SymbolFrequencyAnalyser symbolFrequencyAnalyser = new SymbolFrequencyAnalyser();
+      seq.AddSubOperator(symbolFrequencyAnalyser);
+
+      VariableFrequencyAnalyser varFrequencyAnalyser = new VariableFrequencyAnalyser();
+      seq.AddSubOperator(varFrequencyAnalyser);
+
       UniformSequentialSubScopesProcessor subScopesProc = new UniformSequentialSubScopesProcessor();
       SequentialProcessor individualProc = new SequentialProcessor();
@@ -170 +178 @@
       solutionProc.AddSubOperator(nodeImpactCalculator);
 
+      VariableFrequencyBasedImpactCalculator frequencyImpactCalculator = new VariableFrequencyBasedImpactCalculator();
+      solutionProc.AddSubOperator(frequencyImpactCalculator);
+
       #endregion
 
@@ -198 +209 @@
         model.AddInputVariable(variableName);
       }
+      ItemList frequencyImpacts = bestModelScope.GetVariableValue<ItemList>(ModelingResult.RelativeFrequencyVariableImpact.ToString(), false);
+      foreach (ItemList row in frequencyImpacts) {
+        string variableName = ((StringData)row[0]).Data;
+        double impact = ((DoubleData)row[1]).Data;
+        model.SetVariableResult(ModelingResult.RelativeFrequencyVariableImpact, variableName, impact);
+        model.AddInputVariable(variableName);
+      }
+
       #endregion
 

trunk/sources/HeuristicLab.Modeling/3.2/ModelingResult.cs

@@ -79 +79 @@
     VariableQualityImpact,
     VariableEvaluationImpact,
-    VariableNodeImpact
+    VariableNodeImpact,
+    RelativeFrequencyVariableImpact,
   }
 }