Changeset 10142 for branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Timestamp:

11/20/13 10:52:38 (11 years ago)

Author:

mkommend

Message:

#1997: Worked on symbolic data analysis island algorithms:

• Refactored and removed unnecessary code in symbolic island GA and symbolic island GA evaluator.
• Added EnumerableItem to ease the passing of rows to the actual evaluator.
• Added prototype of island offspring selection GA.
• Corrected build configuration (plugin classes, project settings, ...)

Location:

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Files:

• HeuristicLab.Algorithms.GeneticAlgorithm-3.3.csproj (modified) (2 diffs)
• IslandGeneticAlgorithm.cs (modified) (18 diffs)
• Plugin.cs.frame (modified) (1 diff)
• Properties/AssemblyInfo.cs.frame (modified) (1 diff)

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/HeuristicLab.Algorithms.GeneticAlgorithm-3.3.csproj

@@ -52 +52 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -103 +103 @@
     <Reference Include="HeuristicLab.Analysis-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Collections-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Common-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Core-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Data-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Operators-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Optimization-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Optimization.Operators-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Parameters-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Persistence-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Random-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Selection-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Selection-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

@@ -41 +41 @@
   [Creatable("Algorithms")]
   [StorableClass]
-  public sealed class IslandGeneticAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
+  public class IslandGeneticAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     public string Filename { get; set; }
 
@@ -55 +55 @@
 
     #region Parameter Properties
-    private ValueParameter<IntValue> SeedParameter {
+    protected ValueParameter<IntValue> SeedParameter {
       get { return (ValueParameter<IntValue>)Parameters["Seed"]; }
     }
-    private ValueParameter<BoolValue> SetSeedRandomlyParameter {
+    protected ValueParameter<BoolValue> SetSeedRandomlyParameter {
       get { return (ValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; }
     }
-    private ValueParameter<IntValue> NumberOfIslandsParameter {
+    protected ValueParameter<IntValue> NumberOfIslandsParameter {
       get { return (ValueParameter<IntValue>)Parameters["NumberOfIslands"]; }
     }
-    private ValueParameter<IntValue> MigrationIntervalParameter {
+    protected ValueParameter<IntValue> MigrationIntervalParameter {
       get { return (ValueParameter<IntValue>)Parameters["MigrationInterval"]; }
     }
-    private ValueParameter<PercentValue> MigrationRateParameter {
+    protected ValueParameter<PercentValue> MigrationRateParameter {
       get { return (ValueParameter<PercentValue>)Parameters["MigrationRate"]; }
     }
@@ -79 +79 @@
       get { return (IConstrainedValueParameter<IReplacer>)Parameters["ImmigrationReplacer"]; }
     }
-    private ValueParameter<IntValue> PopulationSizeParameter {
+    protected ValueParameter<IntValue> PopulationSizeParameter {
       get { return (ValueParameter<IntValue>)Parameters["PopulationSize"]; }
     }
-    private ValueParameter<IntValue> MaximumGenerationsParameter {
+    protected ValueParameter<IntValue> MaximumGenerationsParameter {
       get { return (ValueParameter<IntValue>)Parameters["MaximumGenerations"]; }
     }
@@ -91 +91 @@
       get { return (IConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
     }
-    private ValueParameter<PercentValue> MutationProbabilityParameter {
+    protected ValueParameter<PercentValue> MutationProbabilityParameter {
       get { return (ValueParameter<PercentValue>)Parameters["MutationProbability"]; }
     }
@@ -97 +97 @@
       get { return (IConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
     }
-    private ValueParameter<IntValue> ElitesParameter {
+    protected ValueParameter<IntValue> ElitesParameter {
       get { return (ValueParameter<IntValue>)Parameters["Elites"]; }
     }
-    private IFixedValueParameter<BoolValue> ReevaluateElitesParameter {
+    protected IFixedValueParameter<BoolValue> ReevaluateElitesParameter {
       get { return (IFixedValueParameter<BoolValue>)Parameters["ReevaluateElites"]; }
     }
-    private ValueParameter<MultiAnalyzer> AnalyzerParameter {
+    protected ValueParameter<MultiAnalyzer> AnalyzerParameter {
       get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     }
-    private ValueParameter<MultiAnalyzer> IslandAnalyzerParameter {
+    protected ValueParameter<MultiAnalyzer> IslandAnalyzerParameter {
       get { return (ValueParameter<MultiAnalyzer>)Parameters["IslandAnalyzer"]; }
     }
@@ -184 +184 @@
       set { IslandAnalyzerParameter.Value = value; }
     }
-    private RandomCreator RandomCreator {
+    protected RandomCreator RandomCreator {
       get { return (RandomCreator)OperatorGraph.InitialOperator; }
     }
-    private UniformSubScopesProcessor IslandProcessor {
+    protected UniformSubScopesProcessor IslandProcessor {
       get { return OperatorGraph.Iterate().OfType<UniformSubScopesProcessor>().First(x => x.Operator is SolutionsCreator); }
     }
-    private SolutionsCreator SolutionsCreator {
+    protected SolutionsCreator SolutionsCreator {
       get { return (SolutionsCreator)IslandProcessor.Operator; }
     }
-    private IslandGeneticAlgorithmMainLoop MainLoop {
+    protected IslandGeneticAlgorithmMainLoop MainLoop {
       get { return FindMainLoop(IslandProcessor.Successor); }
     }
     [Storable]
-    private BestAverageWorstQualityAnalyzer islandQualityAnalyzer;
+    protected BestAverageWorstQualityAnalyzer islandQualityAnalyzer;
     [Storable]
-    private BestAverageWorstQualityAnalyzer qualityAnalyzer;
+    protected BestAverageWorstQualityAnalyzer qualityAnalyzer;
     #endregion
 
     [StorableConstructor]
-    private IslandGeneticAlgorithm(bool deserializing) : base(deserializing) { }
+    protected IslandGeneticAlgorithm(bool deserializing) : base(deserializing) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
@@ -215 +215 @@
       Initialize();
     }
-    private IslandGeneticAlgorithm(IslandGeneticAlgorithm original, Cloner cloner)
+    protected IslandGeneticAlgorithm(IslandGeneticAlgorithm original, Cloner cloner)
       : base(original, cloner) {
       islandQualityAnalyzer = cloner.Clone(original.islandQualityAnalyzer);
@@ -422 +422 @@
 
     #region Helpers
-    private void Initialize() {
+    protected virtual void Initialize() {
       PopulationSizeParameter.ValueChanged += new EventHandler(PopulationSizeParameter_ValueChanged);
       PopulationSize.ValueChanged += new EventHandler(PopulationSize_ValueChanged);
@@ -433 +433 @@
       }
     }
-    private void ParameterizeSolutionsCreator() {
+    protected virtual void ParameterizeSolutionsCreator() {
       SolutionsCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
       SolutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
     }
-    private void ParameterizeMainLoop() {
+    protected virtual void ParameterizeMainLoop() {
       MainLoop.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name;
       MainLoop.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
@@ -443 +443 @@
       MainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
     }
-    private void ParameterizeStochasticOperator(IOperator op) {
+    protected virtual void ParameterizeStochasticOperator(IOperator op) {
       IStochasticOperator stochasticOp = op as IStochasticOperator;
       if (stochasticOp != null) {
@@ -450 +450 @@
       }
     }
-    private void ParameterizeStochasticOperatorForIsland(IOperator op) {
+    protected virtual void ParameterizeStochasticOperatorForIsland(IOperator op) {
       IStochasticOperator stochasticOp = op as IStochasticOperator;
       if (stochasticOp != null) {
@@ -457 +457 @@
       }
     }
-    private void ParameterizeSelectors() {
+    protected virtual void ParameterizeSelectors() {
       foreach (ISelector selector in SelectorParameter.ValidValues) {
         selector.CopySelected = new BoolValue(true);
@@ -494 +494 @@
       }
     }
-    private void ParameterizeAnalyzers() {
+    protected virtual void ParameterizeAnalyzers() {
       islandQualityAnalyzer.ResultsParameter.ActualName = "Results";
       islandQualityAnalyzer.ResultsParameter.Hidden = true;
@@ -517 +517 @@
       }
     }
-    private void ParameterizeIterationBasedOperators() {
+    protected virtual void ParameterizeIterationBasedOperators() {
       if (Problem != null) {
         foreach (IIterationBasedOperator op in Problem.Operators.OfType<IIterationBasedOperator>()) {
@@ -527 +527 @@
       }
     }
-    private void UpdateCrossovers() {
+    protected virtual void UpdateCrossovers() {
       ICrossover oldCrossover = CrossoverParameter.Value;
       ICrossover defaultCrossover = Problem.Operators.OfType<ICrossover>().FirstOrDefault();
@@ -543 +543 @@
         CrossoverParameter.Value = defaultCrossover;
     }
-    private void UpdateMutators() {
+    protected virtual void UpdateMutators() {
       IManipulator oldMutator = MutatorParameter.Value;
       MutatorParameter.ValidValues.Clear();
@@ -555 +555 @@
       }
     }
-    private void UpdateAnalyzers() {
+    protected virtual void UpdateAnalyzers() {
       IslandAnalyzer.Operators.Clear();
       Analyzer.Operators.Clear();
@@ -568 +568 @@
       Analyzer.Operators.Add(qualityAnalyzer, qualityAnalyzer.EnabledByDefault);
     }
-    private IslandGeneticAlgorithmMainLoop FindMainLoop(IOperator start) {
+    protected virtual IslandGeneticAlgorithmMainLoop FindMainLoop(IOperator start) {
       IOperator mainLoop = start;
       while (mainLoop != null && !(mainLoop is IslandGeneticAlgorithmMainLoop))

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Plugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Algorithms.GeneticAlgorithm plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Algorithms.GeneticAlgorithm", "3.3.8.$WCREV$")]
+  [Plugin("HeuristicLab.Algorithms.GeneticAlgorithm", "3.3.9.$WCREV$")]
   [PluginFile("HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/Properties/AssemblyInfo.cs.frame

@@ -53 +53 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.8.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.9.$WCREV$")]