Changeset 418 for trunk/sources

Timestamp:

08/01/08 16:50:58 (16 years ago)

Author:

gkronber

Message:

worked on #211 (Full operator-graphs are stored multiple times in the database even though most of it is static anyway)

• added class OperatorLink that allows to create CombinedOperators in the DatabaseOperatorLibrary which use other operators from the library (not via a copy but via a link)

Location:

trunk/sources/HeuristicLab.CEDMA.Core

Files:

• DatabaseOperatorLibrary.cs (modified) (5 diffs)
• DatabaseOperatorLibraryView.cs (modified) (11 diffs)
• HeuristicLab.CEDMA.Core.csproj (modified) (2 diffs)
• HeuristicLabCedmaCorePlugin.cs (modified) (1 diff)
• OperatorLink.cs (added)

trunk/sources/HeuristicLab.CEDMA.Core/DatabaseOperatorLibrary.cs

@@ -5 +5 @@
 using HeuristicLab.Core;
 using HeuristicLab.CEDMA.DB.Interfaces;
+using HeuristicLab.Operators;
 
 namespace HeuristicLab.CEDMA.Core {
@@ -29 +30 @@
 
     public void Save() {
-      Dictionary<IOperator, long> newKnownOperators = new Dictionary<IOperator,long>();
+      Dictionary<IOperator, long> newKnownOperators = new Dictionary<IOperator, long>();
       foreach(IOperator op in group.Operators) {
         if(knownOperators.ContainsKey(op)) {
           // update
-          long id =knownOperators[op]; 
+          long id = knownOperators[op];
           Database.UpdateOperator(id, op.Name, PersistenceManager.SaveToGZip(op));
           knownOperators.Remove(op);
@@ -47 +48 @@
         Database.DeleteOperator(id);
       }
-      
+
       knownOperators = newKnownOperators;
     }
@@ -62 +63 @@
         group.AddOperator(op);
       }
+
+      // patch all OperatorLinks
+      foreach(IOperator op in group.Operators) {
+        PatchLinks(op);
+      }
+    }
+
+    private void PatchLinks(IOperator op) {
+      if(op is OperatorLink) {
+        OperatorLink link = op as OperatorLink;
+        link.Operator = FindOperator(link.Id);
+      }
+      else if(op is CombinedOperator) {
+        CombinedOperator combinedOp = op as CombinedOperator;
+        foreach(IOperator internalOp in combinedOp.OperatorGraph.Operators) {
+          PatchLinks(internalOp);
+        }
+      }
+    }
+
+    private IOperator FindOperator(long id) {
+      foreach(KeyValuePair<IOperator, long> p in knownOperators) if(p.Value == id) return p.Key;
+      return null;
     }
 
@@ -80 +104 @@
       return new DatabaseOperatorLibraryView(this);
     }
+
+    internal long GetId(IOperator op) {
+      return knownOperators[op];
+    }
   }
 }

trunk/sources/HeuristicLab.CEDMA.Core/DatabaseOperatorLibraryView.cs

@@ -56 +56 @@
 
         int result = string.Compare(tx.Text, ty.Text);
-        if (result == 0)
+        if(result == 0)
           result = tx.Index.CompareTo(ty.Index);
         return result;
@@ -67 +67 @@
       addOperatorButton.Enabled = false;
       removeButton.Enabled = false;
-      if (OperatorLibrary == null) {
+      if(OperatorLibrary == null) {
         Caption = "Operator Library";
         operatorsGroupBox.Enabled = false;
@@ -98 +98 @@
     }
     private void RemoveTreeNode(TreeNode node) {
-      if (node.Tag is IOperatorGroup) {
+      if(node.Tag is IOperatorGroup) {
         IOperatorGroup group = node.Tag as IOperatorGroup;
         IOperatorGroup parent = node.Parent.Tag as IOperatorGroup;
         parent.RemoveSubGroup(group);
-      } else if (node.Tag is IOperator) {
+      } else if(node.Tag is IOperator) {
         IOperator op = node.Tag as IOperator;
         IOperatorGroup group = node.Parent.Tag as IOperatorGroup;
@@ -116 +116 @@
       operatorsTreeView.Focus();
 
-      if (operatorsTreeView.SelectedNode != null) {
-        if (operatorsTreeView.SelectedNode.Parent != null)
+      if(operatorsTreeView.SelectedNode != null) {
+        if(operatorsTreeView.SelectedNode.Parent != null)
           removeButton.Enabled = true;
-        if (operatorsTreeView.SelectedNode.Tag is IOperatorGroup) {
+        if(operatorsTreeView.SelectedNode.Tag is IOperatorGroup) {
           addOperatorButton.Enabled = true;
         }
@@ -133 +133 @@
 
       string name = e.Label;
-      if (name != null) {
-        if (e.Node.Tag is IOperatorGroup)
+      if(name != null) {
+        if(e.Node.Tag is IOperatorGroup)
           ((IOperatorGroup)e.Node.Tag).Name = name;
-        else if (e.Node.Tag is IOperator)
+        else if(e.Node.Tag is IOperator)
           ((IOperator)e.Node.Tag).Name = name;
       }
     }
     private void operatorsTreeView_DoubleClick(object sender, EventArgs e) {
-      if (operatorsTreeView.SelectedNode != null) {
+      if(operatorsTreeView.SelectedNode != null) {
         IOperator op = operatorsTreeView.SelectedNode.Tag as IOperator;
-        if (op != null) {
+        if(op != null) {
           IView view = op.CreateView();
-          if (view != null)
+          if(view != null)
             PluginManager.ControlManager.ShowControl(view);
         }
@@ -154 +154 @@
     #region Button Events
     private void addOperatorButton_Click(object sender, EventArgs e) {
-      if (chooseOperatorDialog == null) chooseOperatorDialog = new ChooseOperatorDialog();
-      if (chooseOperatorDialog.ShowDialog(this) == DialogResult.OK) {
+      if(chooseOperatorDialog == null) chooseOperatorDialog = new ChooseOperatorDialog();
+      if(chooseOperatorDialog.ShowDialog(this) == DialogResult.OK) {
         TreeNode node = operatorsTreeView.SelectedNode;
         IOperatorGroup group = node.Tag as IOperatorGroup;
@@ -173 +173 @@
     private void operatorsTreeView_KeyDown(object sender, KeyEventArgs e) {
       TreeNode node = operatorsTreeView.SelectedNode;
-      if ((e.KeyCode == Keys.Delete) && (node != null) && (node.Parent != null))
+      if((e.KeyCode == Keys.Delete) && (node != null) && (node.Parent != null))
         RemoveTreeNode(operatorsTreeView.SelectedNode);
-      if ((e.KeyCode == Keys.F2) && (node != null))
+      if((e.KeyCode == Keys.F2) && (node != null))
         node.BeginEdit();
     }
@@ -183 +183 @@
     #region Mouse Events
     private void operatorsTreeView_MouseDown(object sender, MouseEventArgs e) {
-      if (e.Button != MouseButtons.Right) return;
+      if(e.Button != MouseButtons.Right) return;
       TreeNode clickedNode = operatorsTreeView.GetNodeAt(e.X, e.Y);
-      if (clickedNode != null) {
+      if(clickedNode != null) {
         operatorsTreeView.SelectedNode = clickedNode;
         operatorsTreeView.Refresh();
@@ -196 +196 @@
       TreeNode node = (TreeNode)e.Item;
       IOperator op = node.Tag as IOperator;
-      if (op != null) {
+      if(op != null) {
+        long opId = ((DatabaseOperatorLibrary)OperatorLibrary).GetId(op);
+        OperatorLink link = new OperatorLink(opId, op);
         DataObject data = new DataObject();
-        data.SetData("IOperator", op);
+        data.SetData("IOperator", link);
         data.SetData("DragSource", operatorsTreeView);
         DoDragDrop(data, DragDropEffects.Copy);
@@ -205 +207 @@
     private void operatorsTreeView_DragEnter(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
-      if (e.Data.GetDataPresent("IOperator")) {
+      if(e.Data.GetDataPresent("IOperator")) {
         Point p = operatorsTreeView.PointToClient(new Point(e.X, e.Y));
         TreeNode node = operatorsTreeView.GetNodeAt(p);
-        if ((node != null) && (node.Tag is IOperatorGroup))
+        if((node != null) && (node.Tag is IOperatorGroup))
           e.Effect = DragDropEffects.Copy;
       }
@@ -214 +216 @@
     private void operatorsTreeView_DragOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
-      if (e.Data.GetDataPresent("IOperator")) {
+      if(e.Data.GetDataPresent("IOperator")) {
         Point p = operatorsTreeView.PointToClient(new Point(e.X, e.Y));
         TreeNode node = operatorsTreeView.GetNodeAt(p);
-        if ((node != null) && (node.Tag is IOperatorGroup))
+        if((node != null) && (node.Tag is IOperatorGroup))
           e.Effect = DragDropEffects.Copy;
       }
     }
     private void operatorsTreeView_DragDrop(object sender, DragEventArgs e) {
-      if (e.Effect != DragDropEffects.None) {
-        if (e.Data.GetDataPresent("IOperator")) {
+      if(e.Effect != DragDropEffects.None) {
+        if(e.Data.GetDataPresent("IOperator")) {
           IOperator op = (IOperator)e.Data.GetData("IOperator");
           Point p = operatorsTreeView.PointToClient(new Point(e.X, e.Y));
           TreeNode node = operatorsTreeView.GetNodeAt(p);
-          if (node != null) {
+          if(node != null) {
             op = (IOperator)op.Clone();
 
-            while (op.SubOperators.Count > 0)
+            while(op.SubOperators.Count > 0)
               op.RemoveSubOperator(0);
 

trunk/sources/HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj

@@ -69 +69 @@
       <DependentUpon>DatabaseOperatorLibraryView.cs</DependentUpon>
     </Compile>
+    <Compile Include="OperatorLink.cs" />
     <Compile Include="Result.cs" />
     <Compile Include="IResult.cs" />
@@ -100 +101 @@
       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
       <Name>HeuristicLab.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Operators\HeuristicLab.Operators.csproj">
+      <Project>{A9983BA2-B3B2-475E-8E2C-62050B71D1C5}</Project>
+      <Name>HeuristicLab.Operators</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">

trunk/sources/HeuristicLab.CEDMA.Core/HeuristicLabCedmaCorePlugin.cs

@@ -30 +30 @@
   [Dependency(Dependency = "HeuristicLab.Core")]
   [Dependency(Dependency = "HeuristicLab.CEDMA.DB.Interfaces")]
+  [Dependency(Dependency = "HeuristicLab.Operators")]
   public class HeuristicLabCedmaCorePlugin : PluginBase {
   }