Changeset 2235 for trunk/sources/HeuristicLab.GP/3.3

Timestamp:

08/05/09 11:17:08 (15 years ago)

Author:

gkronber

Message:

Fixed #323 (The default representation of FunctionTreeView should show coefficients and time-offsets of variables and values of constants).

Location:

trunk/sources/HeuristicLab.GP/3.3

Files:

• BaseClasses/FunctionTreeBase.cs (modified) (1 diff)
• DefaultFunctionTreeNameGenerator.cs (deleted)
• FunctionTreeView.cs (modified) (4 diffs)
• GeneticProgrammingModel.cs (modified) (2 diffs)
• HeuristicLab.GP-3.3.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.GP/3.3/BaseClasses/FunctionTreeBase.cs

@@ -94 +94 @@
     }
 
+    public virtual string ToString() {
+      return Function.Name;
+    }
+
     #endregion
 

trunk/sources/HeuristicLab.GP/3.3/FunctionTreeView.cs

@@ -30 +30 @@
     private IFunctionTree functionTree;
     private IFunctionTree selectedBranch;
-    private IFunctionTreeNameGenerator nameGenerator;
-    private IFunctionTreeNameGenerator[] allNameGenerators;
-    private MenuItem representationsMenu;
+    //private IFunctionTreeNameGenerator nameGenerator;
+    //private IFunctionTreeNameGenerator[] allNameGenerators;
+    //private MenuItem representationsMenu;
 
     public FunctionTreeView() {
-      nameGenerator = new DefaultFunctionTreeNameGenerator();
+      //nameGenerator = new DefaultFunctionTreeNameGenerator();
       InitializeComponent();
 
       DiscoveryService discoveryService = new DiscoveryService();
-      allNameGenerators = discoveryService.GetInstances<IFunctionTreeNameGenerator>();
-      representationsMenu = new MenuItem();
-      representationsMenu.Text = "Tree representation";
-      representationsMenu.Name = "Tree representation";
-      foreach (IFunctionTreeNameGenerator generator in allNameGenerators) {
-        MenuItem mi = new MenuItem(generator.Name, MakeNameGeneratorDelegate(generator), Shortcut.None);
-        if (generator is DefaultFunctionTreeNameGenerator) mi.Checked = true;
-        else mi.Checked = false;
-        mi.Tag = generator;
-        representationsMenu.MenuItems.Add(mi);
-      }
+      //allNameGenerators = discoveryService.GetInstances<IFunctionTreeNameGenerator>();
+      //representationsMenu = new MenuItem();
+      //representationsMenu.Text = "Tree representation";
+      //representationsMenu.Name = "Tree representation";
+      //foreach (IFunctionTreeNameGenerator generator in allNameGenerators) {
+      //  MenuItem mi = new MenuItem(generator.Name, MakeNameGeneratorDelegate(generator), Shortcut.None);
+      //  if (generator is DefaultFunctionTreeNameGenerator) mi.Checked = true;
+      //  else mi.Checked = false;
+      //  mi.Tag = generator;
+      //  representationsMenu.MenuItems.Add(mi);
+      //}
     }
 
@@ -61 +61 @@
       funTreeView.Nodes.Clear();
       TreeNode rootNode = new TreeNode();
-      rootNode.Name = functionTree.Function.Name;
-      rootNode.Text = nameGenerator.GetName(functionTree);
+      rootNode.Name = functionTree.ToString(); // functionTree.Function.Name;
+      rootNode.Text = functionTree.ToString(); // nameGenerator.GetName(functionTree);
       rootNode.Tag = functionTree;
       treeNodeContextMenu.MenuItems.Clear();
-      treeNodeContextMenu.MenuItems.Add(representationsMenu);
+      //treeNodeContextMenu.MenuItems.Add(representationsMenu);
       DiscoveryService discoveryService = new DiscoveryService();
       IFunctionTreeSerializer[] exporters = discoveryService.GetInstances<IFunctionTreeSerializer>();
@@ -91 +91 @@
     }
 
-    private EventHandler MakeNameGeneratorDelegate(IFunctionTreeNameGenerator generator) {
-      return delegate(object source, EventArgs args) {
-        IFunctionTreeNameGenerator g = (IFunctionTreeNameGenerator)((MenuItem)source).Tag;
-        this.nameGenerator = g;
-        foreach (MenuItem otherMenuItem in representationsMenu.MenuItems) otherMenuItem.Checked = false;
-        ((MenuItem)source).Checked = true;
-        UpdateControls();
-      };
-    }
+    //private EventHandler MakeNameGeneratorDelegate(IFunctionTreeNameGenerator generator) {
+    //  return delegate(object source, EventArgs args) {
+    //    IFunctionTreeNameGenerator g = (IFunctionTreeNameGenerator)((MenuItem)source).Tag;
+    //    this.nameGenerator = g;
+    //    foreach (MenuItem otherMenuItem in representationsMenu.MenuItems) otherMenuItem.Checked = false;
+    //    ((MenuItem)source).Checked = true;
+    //    UpdateControls();
+    //  };
+    //}
 
     private EventHandler MakeExporterDelegate(IFunctionTreeSerializer exporter) {
@@ -111 +111 @@
     private void CreateTree(TreeNode rootNode, IFunctionTree functionTree) {
       TreeNode node = new TreeNode();
-      node.Name = functionTree.Function.Name;
-      node.Text = nameGenerator.GetName(functionTree);
+      node.Name = functionTree.ToString();
+      node.Text = functionTree.ToString();
       node.Tag = functionTree;
       node.ContextMenu = treeNodeContextMenu;

trunk/sources/HeuristicLab.GP/3.3/GeneticProgrammingModel.cs

@@ -47 +47 @@
     }
 
-    public GeneticProgrammingModel(IFunctionTree tree) : base() {
+    public GeneticProgrammingModel(IFunctionTree tree)
+      : base() {
       FunctionTree = tree;
     }
@@ -87 +88 @@
       IFunction f = (IFunction)PersistenceManager.Restore(fNode, restoredObjects);
       IFunctionTree tree = f.GetTreeNode();
-      if(fNode.ChildNodes.Count>0) tree.Populate(fNode.ChildNodes[0], restoredObjects);
+      if (fNode.ChildNodes.Count > 0) tree.Populate(fNode.ChildNodes[0], restoredObjects);
       nodeIndex++;
       for (int i = 0; i < subTrees; i++) {

trunk/sources/HeuristicLab.GP/3.3/HeuristicLab.GP-3.3.csproj

@@ -103 +103 @@
     </Compile>
     <Compile Include="GeneticProgrammingModel.cs" />
-    <Compile Include="DefaultFunctionTreeNameGenerator.cs" />
     <Compile Include="UnknownFunctionException.cs" />
     <Compile Include="HeuristicLabGPPlugin.cs" />