Changeset 6978
- Timestamp:
- 11/09/11 17:15:58 (13 years ago)
- Location:
- trunk/sources
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs
r6676 r6978 576 576 } 577 577 578 double current = minValue, intervalCenter = intervalWidth / 2.0; 578 var area = chart.ChartAreas[0]; 579 double current = 0.0; 580 if (!Double.IsNaN(Content.VisualProperties.XAxisMinimumFixedValue) && !Content.VisualProperties.XAxisMinimumAuto) 581 current = Content.VisualProperties.XAxisMinimumFixedValue; 582 else current = minValue; 583 584 area.AxisX.Interval = intervalWidth / row.VisualProperties.ScaleFactor; 585 area.AxisX.IntervalOffset = intervalWidth / row.VisualProperties.ScaleFactor; 586 587 series.SetCustomProperty("PointWidth", intervalWidth.ToString()); 588 579 589 int frequency = 0; 580 series.Points.AddXY(current - intervalCenter, 0); // so that the first column is not visually truncated581 590 foreach (double v in row.Values.Where(x => !IsInvalidValue(x)).OrderBy(x => x)) { 582 591 while (v > current + intervalWidth) { 583 series.Points.AddXY(current + interval Center, frequency);592 series.Points.AddXY(current + intervalWidth, frequency); 584 593 current += intervalWidth; 585 594 frequency = 0; … … 587 596 frequency++; 588 597 } 589 series.Points.AddXY(current + intervalCenter, frequency); 590 series.Points.AddXY(current + 3 * intervalCenter, 0); // so that the last column is not visually truncated 598 series.Points.AddXY(current + intervalWidth, frequency); 591 599 } 592 600 -
trunk/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs
r6676 r6978 142 142 } 143 143 } 144 private double scaleFactor; 145 public double ScaleFactor { 146 get { return scaleFactor; } 147 set { 148 if (scaleFactor != value) { 149 scaleFactor = value; 150 OnPropertyChanged("ScaleFactor"); 151 } 152 } 153 } 144 154 private string displayName; 145 155 public string DisplayName { … … 203 213 get { return exactBins; } 204 214 set { exactBins = value; } 215 } 216 [Storable(Name = "ScaleFactor")] 217 private double StorableScaleFactor { 218 get { return scaleFactor; } 219 set { scaleFactor = value; } 205 220 } 206 221 [Storable(Name = "DisplayName")] … … 224 239 this.bins = original.bins; 225 240 this.exactBins = original.exactBins; 241 this.scaleFactor = original.scaleFactor; 226 242 this.displayName = original.displayName; 227 243 } … … 236 252 bins = 10; 237 253 exactBins = false; 254 scaleFactor = 1.0; 238 255 displayName = String.Empty; 239 256 } -
trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj
r6887 r6978 111 111 <Compile Include="Analyzers\MinAverageMaxSymbolicExpressionTreeLengthAnalyzer.cs" /> 112 112 <Compile Include="Analyzers\SymbolicExpressionSymbolFrequencyAnalyzer.cs" /> 113 <Compile Include="Analyzers\SymbolicExpressionTreeLengthAnalyzer.cs" /> 113 114 <Compile Include="Analyzers\SymbolicExpressionTreeLengthCalculator.cs" /> 114 115 <Compile Include="ArchitectureManipulators\ArgumentCreater.cs" /> -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs
r6803 r6978 36 36 [StorableClass] 37 37 public abstract class SymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<U, V>, IDataAnalysisProblem<T>, ISymbolicDataAnalysisProblem, IStorableContent 38 where T : class, IDataAnalysisProblemData38 where T : class, IDataAnalysisProblemData 39 39 where U : class, ISymbolicDataAnalysisEvaluator<T> 40 40 where V : class, ISymbolicDataAnalysisSolutionCreator { … … 202 202 Operators.Add(new SymbolicDataAnalysisVariableFrequencyAnalyzer()); 203 203 Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer()); 204 Operators.Add(new SymbolicExpressionTreeLengthAnalyzer()); 204 205 ParameterizeOperators(); 205 206 }
Note: See TracChangeset
for help on using the changeset viewer.