Changeset 9821


Ignore:
Timestamp:
07/31/13 10:17:37 (9 years ago)
Author:
gkronber
Message:

#1270 made changes as suggested in the review comments

  • initially select default string formatter in the symbolic expression view
  • renamed smalltalk formatter and fixed the namespace
  • fixed namespace of GraphViz formatter
  • removed unused usings
Location:
trunk/sources
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionView.cs

    r9456 r9821  
    3131  [Content(typeof(ISymbolicExpressionTree), false)]
    3232  public partial class SymbolicExpressionView : AsynchronousContentView {
    33 
    34     List<ISymbolicExpressionTreeStringFormatter> treeFormattersList = new List<ISymbolicExpressionTreeStringFormatter>();
     33    private readonly List<ISymbolicExpressionTreeStringFormatter> treeFormattersList = new List<ISymbolicExpressionTreeStringFormatter>();
    3534
    3635    public new ISymbolicExpressionTree Content {
     
    4847      }
    4948      if (formattersComboBox.Items.Count > 0)
    50         formattersComboBox.SelectedIndex = 0;
     49        formattersComboBox.SelectedIndex = treeFormattersList.FindIndex(0, treeFormattersList.Count, (f) => f.Name.Contains("Default"));
    5150      else
    5251        formattersComboBox.SelectedIndex = -1;
  • trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters/SymbolicExpressionTreeGraphvizFormatter.cs

    r9649 r9821  
    2020#endregion
    2121
     22using System.Collections.Generic;
    2223using System.Text;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using System.Collections.Generic;
     24using HeuristicLab.Common;
    2625using HeuristicLab.Core;
    27 using HeuristicLab.Common;
    2826
    29 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Formatters {
     27namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3028  [Item("GraphViz String Formatter", "Formatter for symbolic expression trees for visualization with GraphViz.")]
    3129  public sealed class SymbolicExpressionTreeGraphvizFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionSmalltalkFormatter.cs

    r9820 r9821  
    2222using System.Globalization;
    2323using System.Text;
     24using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    25 using HeuristicLab.Common;
    26 using HeuristicLab.Problems.DataAnalysis.Symbolic;
    27 using Variable = HeuristicLab.Problems.DataAnalysis.Symbolic.Variable;
     26using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2827
    29 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Formatters {
     28namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    3029
    3130  [Item("Smalltalk String Formatter", "String formatter for string representations of symbolic expression trees in Smalltalk syntax.")]
    32   public class SymbolicExpressionTreeSmalltalkStringFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
     31  public class SymbolicDataAnalysisExpressionSmalltalkFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
    3332
    34     protected SymbolicExpressionTreeSmalltalkStringFormatter(SymbolicExpressionTreeSmalltalkStringFormatter original, Cloner cloner) : base(original, cloner) { }
    35     public SymbolicExpressionTreeSmalltalkStringFormatter()
     33    protected SymbolicDataAnalysisExpressionSmalltalkFormatter(SymbolicDataAnalysisExpressionSmalltalkFormatter original, Cloner cloner) : base(original, cloner) { }
     34    public SymbolicDataAnalysisExpressionSmalltalkFormatter()
    3635      : base() {
    37       Name = "Smalltalk String Formatter";
     36      Name = ItemName;
     37      Description = ItemDescription;
    3838    }
    3939
     
    180180
    181181    public override IDeepCloneable Clone(Cloner cloner) {
    182       return new SymbolicExpressionTreeSmalltalkStringFormatter(this, cloner);
     182      return new SymbolicDataAnalysisExpressionSmalltalkFormatter(this, cloner);
    183183    }
    184184  }
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r9649 r9821  
    140140    <Compile Include="Crossovers\SymbolicDataAnalysisExpressionSemanticSimilarityCrossover.cs" />
    141141    <Compile Include="Formatters\SymbolicDataAnalysisExpressionExcelFormatter.cs" />
    142     <Compile Include="Formatters\SymbolicExpressionTreeSmalltalkStringFormatter.cs" />
     142    <Compile Include="Formatters\SymbolicDataAnalysisExpressionSmalltalkFormatter.cs" />
    143143    <Compile Include="Interfaces\ISymbolicDataAnalysisExpressionCrossover.cs" />
    144144    <Compile Include="Interfaces\ISymbolicDataAnalysisImpactValuesCalculator.cs" />
Note: See TracChangeset for help on using the changeset viewer.