Changeset 6978

Timestamp:

11/09/11 17:15:58 (12 years ago)

Author:

bburlacu

Message:

#1661: Added SymbolicExpressionTreeLengthAnalyzer. Added new scalingFactory visual property for table data rows (for dynamically adjusting the histogram scale depending on the number of bins) + scaling logic inside the tree length analyzer, adjusted DataTableView.

Location:

trunk/sources

Files:

• HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs (modified) (4 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionTreeLengthAnalyzer.cs (added)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -576 +576 @@
       }
 
-      double current = minValue, intervalCenter = intervalWidth / 2.0;
+      var area = chart.ChartAreas[0];
+      double current = 0.0;
+      if (!Double.IsNaN(Content.VisualProperties.XAxisMinimumFixedValue) && !Content.VisualProperties.XAxisMinimumAuto)
+        current = Content.VisualProperties.XAxisMinimumFixedValue;
+      else current = minValue;
+
+      area.AxisX.Interval = intervalWidth / row.VisualProperties.ScaleFactor;
+      area.AxisX.IntervalOffset = intervalWidth / row.VisualProperties.ScaleFactor;
+
+      series.SetCustomProperty("PointWidth", intervalWidth.ToString());
+
       int frequency = 0;
-      series.Points.AddXY(current - intervalCenter, 0); // so that the first column is not visually truncated
       foreach (double v in row.Values.Where(x => !IsInvalidValue(x)).OrderBy(x => x)) {
         while (v > current + intervalWidth) {
-          series.Points.AddXY(current + intervalCenter, frequency);
+          series.Points.AddXY(current + intervalWidth, frequency);
           current += intervalWidth;
           frequency = 0;
@@ -587 +596 @@
         frequency++;
       }
-      series.Points.AddXY(current + intervalCenter, frequency);
-      series.Points.AddXY(current + 3 * intervalCenter, 0); // so that the last column is not visually truncated
+      series.Points.AddXY(current + intervalWidth, frequency);
     }
 

trunk/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs

@@ -142 +142 @@
       }
     }
+    private double scaleFactor;
+    public double ScaleFactor {
+      get { return scaleFactor; }
+      set {
+        if (scaleFactor != value) {
+          scaleFactor = value;
+          OnPropertyChanged("ScaleFactor");
+        }
+      }
+    }
     private string displayName;
     public string DisplayName {
@@ -203 +213 @@
       get { return exactBins; }
       set { exactBins = value; }
+    }
+    [Storable(Name = "ScaleFactor")]
+    private double StorableScaleFactor {
+      get { return scaleFactor; }
+      set { scaleFactor = value; }
     }
     [Storable(Name = "DisplayName")]
@@ -224 +239 @@
       this.bins = original.bins;
       this.exactBins = original.exactBins;
+      this.scaleFactor = original.scaleFactor;
       this.displayName = original.displayName;
     }
@@ -236 +252 @@
       bins = 10;
       exactBins = false;
+      scaleFactor = 1.0;
       displayName = String.Empty;
     }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj

@@ -111 +111 @@
     <Compile Include="Analyzers\MinAverageMaxSymbolicExpressionTreeLengthAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicExpressionSymbolFrequencyAnalyzer.cs" />
+    <Compile Include="Analyzers\SymbolicExpressionTreeLengthAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicExpressionTreeLengthCalculator.cs" />
     <Compile Include="ArchitectureManipulators\ArgumentCreater.cs" />

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

@@ -36 +36 @@
   [StorableClass]
   public abstract class SymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<U, V>, IDataAnalysisProblem<T>, ISymbolicDataAnalysisProblem, IStorableContent
-    where T : class,IDataAnalysisProblemData
+    where T : class, IDataAnalysisProblemData
     where U : class, ISymbolicDataAnalysisEvaluator<T>
     where V : class, ISymbolicDataAnalysisSolutionCreator {
@@ -202 +202 @@
       Operators.Add(new SymbolicDataAnalysisVariableFrequencyAnalyzer());
       Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer());
+      Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
       ParameterizeOperators();
     }