Changeset 5576 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization

Timestamp:

03/01/11 10:25:48 (14 years ago)

Author:

cneumuel

Message:

#1215

• implemented best solution history analyzer
• implemented quality analyzer for each base-level problem

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3

Files:

• Analyzers/BestParameterConfigurationAnalyzer.cs (modified) (1 diff)
• Analyzers/PMOBestSolutionHistoryAnalyzer.cs (added)
• Analyzers/PMOProblemQualitiesAnalyzer.cs (added)
• Encoding/ParameterConfigurationTree.cs (modified) (1 diff)
• Encoding/RangeConstraints/Range.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization-3.3.csproj (modified) (1 diff)
• MetaOptimizationProblem.cs (modified) (3 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Analyzers/BestParameterConfigurationAnalyzer.cs

@@ -97 +97 @@
       RunCollection rc = new RunCollection();
       foreach (ParameterConfigurationTree pt in parameterTrees.OrderBy(x => x.AverageQualityNormalized)) { // todo: respect Maximization:true/false
-        IRun run = new Run();
-        run.Name = string.Format("Individual {0} ({1})", i, pt.ParameterInfoString);
-        pt.CollectResultValues(run.Results);
-        pt.CollectParameterValues(run.Parameters);
-        MetaOptimizationUtil.ClearParameters(run, pt.GetOptimizedParameterNames());
-        rc.Add(run);
+        rc.Add(pt.ToRun(string.Format("Individual {0} ({1})", i, pt.ParameterInfoString)));
         i++;
       }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurationTree.cs

@@ -240 +240 @@
       return this.Name;
     }
+
+    public IRun ToRun() {
+      return ToRun(this.ParameterInfoString);
+    }
+
+    public IRun ToRun(string name) {
+      IRun run = new Run();
+      run.Name = name;
+      this.CollectResultValues(run.Results);
+      this.CollectParameterValues(run.Parameters);
+      MetaOptimizationUtil.ClearParameters(run, this.GetOptimizedParameterNames());
+      return run;
+    }
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/Range.cs

@@ -53 +53 @@
         if (stepSize != value) {
           if (stepSize != null) {
-            stepSize.ValueChanged -= new EventHandler(upperBound_ToStringChanged);
+            stepSize.ValueChanged -= new EventHandler(stepSize_ToStringChanged);
           }
           stepSize = value;

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/HeuristicLab.Problems.MetaOptimization-3.3.csproj

@@ -139 +139 @@
   <ItemGroup>
     <Compile Include="Analyzers\BestParameterConfigurationAnalyzer.cs" />
+    <Compile Include="Analyzers\PMOBestSolutionHistoryAnalyzer.cs" />
+    <Compile Include="Analyzers\PMOProblemQualitiesAnalyzer.cs" />
     <Compile Include="Analyzers\PMOPopulationDiversityAnalyzer.cs" />
     <Compile Include="ConstrainedTypeValue.cs" />
     <Compile Include="MetaOptimizationUtil.cs" />
+    <Compile Include="Operators\Crossovers\MultiIntValueCrossover.cs" />
     <Compile Include="TypeValue.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/MetaOptimizationProblem.cs

@@ -109 +109 @@
     private PMOPopulationDiversityAnalyzer PMOPopulationDiversityAnalyzer {
       get { return Operators.OfType<PMOPopulationDiversityAnalyzer>().FirstOrDefault(); }
-    }    
+    }
+    private PMOProblemQualitiesAnalyzer PMOProblemQualitiesAnalyzer {
+      get { return Operators.OfType<PMOProblemQualitiesAnalyzer>().FirstOrDefault(); }
+    }
+    private PMOBestSolutionHistoryAnalyzer PMOBestSolutionHistoryAnalyzer {
+      get { return Operators.OfType<PMOBestSolutionHistoryAnalyzer>().FirstOrDefault(); }
+    }
     #endregion
 
@@ -174 +180 @@
       Operators.Add(new SolutionCacheAnalyzer());
       Operators.Add(new PMOPopulationDiversityAnalyzer());
+      Operators.Add(new PMOProblemQualitiesAnalyzer());
+      Operators.Add(new PMOBestSolutionHistoryAnalyzer());
     }
     private void ParameterizeSolutionCreator() {
@@ -193 +201 @@
         PMOPopulationDiversityAnalyzer.SolutionParameter.ActualName = ((RandomParameterConfigurationCreator)SolutionCreator).ParameterConfigurationParameter.ActualName;
         PMOPopulationDiversityAnalyzer.StoreHistoryParameter.Value.Value = true;
+      }
+      if (PMOProblemQualitiesAnalyzer != null) {
+        PMOProblemQualitiesAnalyzer.ParameterConfigurationParameter.ActualName = ((RandomParameterConfigurationCreator)SolutionCreator).ParameterConfigurationParameter.ActualName;
+      }
+      if (PMOBestSolutionHistoryAnalyzer != null) {
+        PMOBestSolutionHistoryAnalyzer.ParameterConfigurationParameter.ActualName = ((RandomParameterConfigurationCreator)SolutionCreator).ParameterConfigurationParameter.ActualName;
       }
     }