Context Navigation

Changeset 9862

Timestamp:

08/07/13 11:53:06 (11 years ago)

Author:

gkronber

Message:

#1270: merged r9647:9649, r9794:9795, r9821 from trunk to stable branch

Location:

stable

Files:

stable
- Property svn:mergeinfo changed
  /trunk/sources merged: 9647-9649,9794,9821
stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding merged: 9648-9649,9821
stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (added) merged: 9821

-                      r9456
+                      r9862
   [Content(typeof(ISymbolicExpressionTree), false)]
   public partial class SymbolicExpressionView : AsynchronousContentView {
+    List<ISymbolicExpressionTreeStringFormatter> treeFormattersList = new List<ISymbolicExpressionTreeStringFormatter>();
+    private readonly List<ISymbolicExpressionTreeStringFormatter> treeFormattersList = new List<ISymbolicExpressionTreeStringFormatter>();
     public new ISymbolicExpressionTree Content {
 …
+      }
       if (formattersComboBox.Items.Count > 0)
         formattersComboBox.SelectedIndex = 0;
+        formattersComboBox.SelectedIndex = treeFormattersList.FindIndex(0, treeFormattersList.Count, (f) => f.Name.Contains("Default"));
       else
         formattersComboBox.SelectedIndex = -1;

-                      r9649
+                      r9862
 #endregion
+using System.Collections.Generic;
 using System.Text;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Common;
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Formatters {
+namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
   [Item("GraphViz String Formatter", "Formatter for symbolic expression trees for visualization with GraphViz.")]
   public sealed class SymbolicExpressionTreeGraphvizFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {

r9456	r9862
28	28	namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
29	29
30		[Item("~~SymbolicExpressionTreeString~~Formatter", "The default string formatter for symbolic expression trees.")]
	30	[Item("Default String Formatter", "The default string formatter for symbolic expression trees.")]
31	31	[StorableClass]
32	32	public class SymbolicExpressionTreeStringFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {

r9564	r9862
132	132	</Compile>
133	133	<Compile Include="Creators\RampedHalfAndHalfTreeCreator.cs" />
	134	<Compile Include="Formatters\SymbolicExpressionTreeGraphvizFormatter.cs" />
134	135	<Compile Include="Interfaces\IReadOnlySymbol.cs" />
135	136	<Compile Include="Interfaces\ISymbolicExpressionGrammar.cs" />

stable/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic (added) merged: 9647,9649,9794,9821

r9288	r9862
139	139	<Compile Include="Crossovers\SymbolicDataAnalysisExpressionProbabilisticFunctionalCrossover.cs" />
140	140	<Compile Include="Crossovers\SymbolicDataAnalysisExpressionSemanticSimilarityCrossover.cs" />
	141	<Compile Include="Formatters\SymbolicDataAnalysisExpressionSmalltalkFormatter.cs" />
141	142	<Compile Include="Interfaces\ISymbolicDataAnalysisExpressionCrossover.cs" />
142	143	<Compile Include="Interfaces\ISymbolicDataAnalysisImpactValuesCalculator.cs" />

Note: See TracChangeset for help on using the changeset viewer.