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

Timestamp:

02/01/10 08:52:32 (15 years ago)

Author:

gkronber

Message:

Created a specialized view for function library injectors which allows full configuration of the function library. #748 (FunctionLibraryView is empty)

Location:

trunk/sources/HeuristicLab.GP/3.3

Files:

• BaseClasses/FunctionLibraryInjectorBase.cs (modified) (2 diffs)
• FunctionLibraryEditor.Designer.cs (modified) (8 diffs)
• FunctionLibraryEditor.cs (modified) (5 diffs)
• FunctionLibraryInjectorView.Designer.cs (added)
• FunctionLibraryInjectorView.cs (added)
• FunctionLibraryInjectorView.resx (added)
• FunctionView.cs (modified) (1 diff)
• HeuristicLab.GP-3.3.csproj (modified) (2 diffs)

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

@@ -36 +36 @@
     }
 
+    private FunctionLibrary functionLibrary;
+    public FunctionLibrary FunctionLibrary {
+      get {
+        return functionLibrary;
+      }
+      set {
+        this.functionLibrary = value;
+        FireChanged();
+      }
+    }
+
     public FunctionLibraryInjectorBase()
       : base() {
       AddVariableInfo(new VariableInfo(FUNCTIONLIBRARY, "Preconfigured default function library", typeof(FunctionLibrary), VariableKind.New));
+      // create the default function library
+      functionLibrary = CreateFunctionLibrary();
     }
 
     public override IOperation Apply(IScope scope) {
-      scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName(FUNCTIONLIBRARY), CreateFunctionLibrary()));
+      scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName(FUNCTIONLIBRARY), functionLibrary));
       return null;
     }
@@ -59 +72 @@
       }
     }
+
+    public override IView CreateView() {
+      return new FunctionLibraryInjectorView(this);
+    }
   }
 }

trunk/sources/HeuristicLab.GP/3.3/FunctionLibraryEditor.Designer.cs

@@ -63 +63 @@
       this.mutationListView = new System.Windows.Forms.ListView();
       this.mutationVariableView = new HeuristicLab.Core.VariableView();
+      this.testTabPage = new System.Windows.Forms.TabPage();
+      this.outputTextBox = new System.Windows.Forms.TextBox();
       this.tabControl.SuspendLayout();
       this.functionsTabPage.SuspendLayout();
@@ -78 +80 @@
       this.mutationSplitContainer.Panel2.SuspendLayout();
       this.mutationSplitContainer.SuspendLayout();
+      this.testTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -85 +88 @@
       this.tabControl.Controls.Add(this.initializationTabPage);
       this.tabControl.Controls.Add(this.mutationTabPage);
+      this.tabControl.Controls.Add(this.testTabPage);
       this.tabControl.Dock = System.Windows.Forms.DockStyle.Fill;
       this.tabControl.Location = new System.Drawing.Point(0, 0);
@@ -91 +95 @@
       this.tabControl.Size = new System.Drawing.Size(677, 561);
       this.tabControl.TabIndex = 1;
+      this.tabControl.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabControl_Selected);
       // 
       // functionsTabPage
@@ -146 +151 @@
       this.functionsListView.View = System.Windows.Forms.View.List;
       this.functionsListView.SelectedIndexChanged += new System.EventHandler(this.functionsListView_SelectedIndexChanged);
+      this.functionsListView.KeyUp += new System.Windows.Forms.KeyEventHandler(this.functionsListView_KeyUp);
       this.functionsListView.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.functionsListView_ItemDrag);
       // 
@@ -299 +305 @@
       this.mutationVariableView.TabIndex = 0;
       this.mutationVariableView.Variable = null;
+      // 
+      // testTabPage
+      // 
+      this.testTabPage.Controls.Add(this.outputTextBox);
+      this.testTabPage.Location = new System.Drawing.Point(4, 22);
+      this.testTabPage.Name = "testTabPage";
+      this.testTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.testTabPage.Size = new System.Drawing.Size(669, 535);
+      this.testTabPage.TabIndex = 3;
+      this.testTabPage.Text = "Test function library";
+      this.testTabPage.UseVisualStyleBackColor = true;
+      // 
+      // outputTextBox
+      // 
+      this.outputTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.outputTextBox.Location = new System.Drawing.Point(3, 3);
+      this.outputTextBox.Multiline = true;
+      this.outputTextBox.Name = "outputTextBox";
+      this.outputTextBox.Size = new System.Drawing.Size(663, 529);
+      this.outputTextBox.TabIndex = 0;
       // 
       // FunctionLibraryEditor
@@ -322 +348 @@
       this.mutationSplitContainer.Panel2.ResumeLayout(false);
       this.mutationSplitContainer.ResumeLayout(false);
+      this.testTabPage.ResumeLayout(false);
+      this.testTabPage.PerformLayout();
       this.ResumeLayout(false);
 
@@ -346 +374 @@
     private System.Windows.Forms.GroupBox availableFunctionsGroupBox;
     private System.Windows.Forms.GroupBox functionDetailsGroupBox;
+    private System.Windows.Forms.TabPage testTabPage;
+    private System.Windows.Forms.TextBox outputTextBox;
   }
 }

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

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.GP.Interfaces;
+using System.Text;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.GP {
@@ -35 +37 @@
     }
 
-    public FunctionLibraryEditor(FunctionLibrary library)
+    public FunctionLibraryEditor()
       : base() {
       InitializeComponent();
+    }
+
+    public FunctionLibraryEditor(FunctionLibrary library)
+      : this() {
       FunctionLibrary = library;
     }
@@ -48 +54 @@
     protected override void UpdateControls() {
       base.UpdateControls();
+      mutationListView.Items.Clear();
+      initListView.Items.Clear();
       functionsListView.Clear();
       functionsComboBox.Items.Clear();
@@ -92 +100 @@
       // delete from the end of the list
       List<int> removeIndices = functionsListView.SelectedIndices.OfType<int>().OrderBy(x => 1.0 / x).ToList();
-      foreach (int selectedIndex in removeIndices) {
-        FunctionLibrary.RemoveFunction((IFunction)functionsListView.Items[selectedIndex].Tag);        
+      try {
+        Cursor = Cursors.WaitCursor;
+        foreach (int selectedIndex in removeIndices) {
+          FunctionLibrary.RemoveFunction((IFunction)functionsListView.Items[selectedIndex].Tag);
+        }
+      }
+      finally {
+        Cursor = Cursors.Default;
       }
     }
@@ -131 +145 @@
       }
     }
+
+    private void functionsListView_KeyUp(object sender, KeyEventArgs e) {
+      if (e.KeyCode == Keys.Delete && functionsListView.SelectedItems.Count > 0) {
+        List<IFunction> removedFunctions = new List<IFunction>(from x in functionsListView.SelectedItems.OfType<ListViewItem>()
+                                                               select (IFunction)x.Tag);
+        try {
+          Cursor = Cursors.WaitCursor;
+          foreach (var fun in removedFunctions) {
+            FunctionLibrary.RemoveFunction(fun);
+          }
+        }
+        finally {
+          Cursor = Cursors.Default;
+        }
+      }
+    }
+
+    private void tabControl_Selected(object sender, TabControlEventArgs e) {
+      if (e.TabPage == testTabPage) {
+        outputTextBox.Text = TestFunctionLibrary();
+      }
+    }
+
+    private string TestFunctionLibrary() {
+      int n = 1000;
+      IFunctionTree[] randomTrees = CreateRandomTrees(n, 1, 100);
+
+      StringBuilder builder = new StringBuilder();
+      builder.AppendLine(CalculateFunctionFrequencies(randomTrees));
+      return builder.ToString();
+    }
+
+    private string CalculateFunctionFrequencies(IFunctionTree[] randomTrees) {
+      Dictionary<IFunction, int> occurances = new Dictionary<IFunction, int>();
+      double n = 0.0;
+      for (int i = 0; i < randomTrees.Length; i++) {
+        foreach (var node in FunctionTreeIterator.IteratePrefix(randomTrees[i])) {
+          if (node.SubTrees.Count > 0) {
+            if (!occurances.ContainsKey(node.Function))
+              occurances[node.Function] = 0;
+            occurances[node.Function]++;
+            n++;
+          }
+        }
+      }
+      StringBuilder strBuilder = new StringBuilder();
+      foreach (var function in occurances.Keys) {
+        strBuilder.Append(Environment.NewLine);
+        strBuilder.Append(function.Name); strBuilder.Append(": ");
+        strBuilder.AppendFormat("{0:#0.00%}", occurances[function] / n);
+      }
+      return strBuilder.ToString();
+    }
+
+    private IFunctionTree[] CreateRandomTrees(int popSize, int minSize, int maxSize) {
+      int maxHeight = 10;
+      int maxTries = 100;
+      IFunctionTree[] randomTrees = new IFunctionTree[popSize];
+      MersenneTwister twister = new MersenneTwister();
+      for (int i = 0; i < randomTrees.Length; i++) {
+        int treeSize = twister.Next(minSize, maxSize);
+        IFunctionTree root;
+        int tries = 0;
+        TreeGardener gardener = new TreeGardener(twister, FunctionLibrary);
+        do {
+          root = gardener.PTC2(treeSize, maxSize);
+          if (tries++ >= maxTries) {
+            // try a different size
+            treeSize = twister.Next(minSize, maxSize);
+            tries = 0;
+          }
+        } while (root.GetSize() > maxSize || root.GetHeight() > maxHeight);
+        randomTrees[i] = root;
+      }
+      return randomTrees;
+    }
+
   }
 }

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

@@ -165 +165 @@
         if (e.Data.GetDataPresent("IFunction")) {
           IFunction fun = (IFunction)e.Data.GetData("IFunction");
+          try {
+            Cursor = Cursors.WaitCursor;
+            if (selectedSlot == ALL_SLOTS) {
+              for (int slot = 0; slot < function.MaxSubTrees; slot++)
+                function.AddAllowedSubFunction(fun, slot);
+            } else {
+              int slot = int.Parse(selectedSlot);
+              function.AddAllowedSubFunction(fun, slot);
+            }
+          }
+          finally {
+            Cursor = Cursors.Default;
+          }
+        }
+      }
+    }
+
+    private void subFunctionsListBox_KeyUp(object sender, KeyEventArgs e) {
+      try {
+        Cursor = Cursors.WaitCursor;
+        if (subFunctionsListBox.SelectedItems.Count > 0 && e.KeyCode == Keys.Delete) {
           if (selectedSlot == ALL_SLOTS) {
-            for (int slot = 0; slot < function.MaxSubTrees; slot++)
-              function.AddAllowedSubFunction(fun, slot);
+            for (int slot = 0; slot < function.MaxSubTrees; slot++) {
+              foreach (var subFun in subFunctionsListBox.SelectedItems) {
+                function.RemoveAllowedSubFunction((IFunction)subFun, slot);
+              }
+            }
           } else {
             int slot = int.Parse(selectedSlot);
-            function.AddAllowedSubFunction(fun, slot);
-          }
-        }
-      }
-    }
-
-    private void subFunctionsListBox_KeyUp(object sender, KeyEventArgs e) {
-      if (subFunctionsListBox.SelectedItems.Count > 0 && e.KeyCode == Keys.Delete) {
-
-        if (selectedSlot == ALL_SLOTS) {
-          for (int slot = 0; slot < function.MaxSubTrees; slot++) {
             foreach (var subFun in subFunctionsListBox.SelectedItems) {
               function.RemoveAllowedSubFunction((IFunction)subFun, slot);
             }
           }
-        } else {
-          int slot = int.Parse(selectedSlot);
-          foreach (var subFun in subFunctionsListBox.SelectedItems) {
-            function.RemoveAllowedSubFunction((IFunction)subFun, slot);
-          }
+
         }
-
+      }
+      finally {
+        Cursor = Cursors.Default;
       }
     }

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

@@ -89 +89 @@
     <Compile Include="BaseClasses\Terminal.cs" />
     <Compile Include="BaseClasses\UnaryFunction.cs" />
+    <Compile Include="FunctionLibraryInjectorView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="FunctionLibraryInjectorView.Designer.cs">
+      <DependentUpon>FunctionLibraryInjectorView.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionView.cs">
       <SubType>UserControl</SubType>
@@ -138 +144 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="FunctionLibraryInjectorView.resx">
+      <DependentUpon>FunctionLibraryInjectorView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionView.resx">
       <DependentUpon>FunctionView.cs</DependentUpon>