Changeset 417

Timestamp:

08/01/08 14:43:10 (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)

• created a new type of operator library that is connected to the CEDMA db and a view for it

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.Core/Console.cs (modified) (3 diffs)
• HeuristicLab.CEDMA.Core/ConsoleEditor.cs (modified) (12 diffs)
• HeuristicLab.CEDMA.Core/DatabaseOperatorLibrary.cs (modified) (3 diffs)
• HeuristicLab.CEDMA.Core/DatabaseOperatorLibraryView.Designer.cs (added)
• HeuristicLab.CEDMA.Core/DatabaseOperatorLibraryView.cs (added)
• HeuristicLab.CEDMA.Core/DatabaseOperatorLibraryView.resx (added)
• HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj (modified) (2 diffs)
• HeuristicLab.CEDMA.DB.Interfaces/IDatabase.cs (modified) (1 diff)
• HeuristicLab.CEDMA.DB.Interfaces/OperatorEntry.cs (modified) (1 diff)
• HeuristicLab.CEDMA.DB/Database.cs (modified) (6 diffs)

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

@@ -33 +33 @@
   public class Console : ItemBase, IEditable {
     private AgentList agentList;
+    private DatabaseOperatorLibrary operatorLibary;
     private ChannelFactory<IDatabase> factory;
     private IDatabase database;
@@ -44 +45 @@
     }
 
+    public IOperatorLibrary OperatorLibrary {
+      get { return operatorLibary; }
+    }
+
     public Console()
       : base() {
       agentList = new AgentList();
+      operatorLibary = new DatabaseOperatorLibrary();
     }
 
@@ -82 +88 @@
       database = factory.CreateChannel(new EndpointAddress(serverUri));
       agentList.Database = database;
+      operatorLibary.Database = database;
     }
     #endregion

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

@@ -27 +27 @@
 using System.Windows.Forms;
 using System.ServiceModel;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.CEDMA.Core {
@@ -40 +41 @@
     private Timer refreshTimer;
     private System.ComponentModel.IContainer components;
+    private Button opLibButton;
+    private Label label1;
     private Console console;
 
@@ -58 +61 @@
       this.newButton = new System.Windows.Forms.Button();
       this.refreshTimer = new System.Windows.Forms.Timer(this.components);
+      this.opLibButton = new System.Windows.Forms.Button();
+      this.label1 = new System.Windows.Forms.Label();
       this.tabControl.SuspendLayout();
       this.SuspendLayout();
@@ -63 +68 @@
       // uriTextBox
       // 
-      this.uriTextBox.Location = new System.Drawing.Point(91, 3);
+      this.uriTextBox.Location = new System.Drawing.Point(94, 3);
       this.uriTextBox.Name = "uriTextBox";
       this.uriTextBox.Size = new System.Drawing.Size(205, 20);
@@ -84 +89 @@
       this.tabControl.Controls.Add(this.agentsPage);
       this.tabControl.Enabled = false;
-      this.tabControl.Location = new System.Drawing.Point(6, 56);
+      this.tabControl.Location = new System.Drawing.Point(6, 85);
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(506, 407);
+      this.tabControl.Size = new System.Drawing.Size(506, 378);
       this.tabControl.TabIndex = 2;
       // 
@@ -95 +100 @@
       this.agentsPage.Name = "agentsPage";
       this.agentsPage.Padding = new System.Windows.Forms.Padding(3);
-      this.agentsPage.Size = new System.Drawing.Size(498, 381);
+      this.agentsPage.Size = new System.Drawing.Size(498, 352);
       this.agentsPage.TabIndex = 1;
       this.agentsPage.Text = "Agents";
@@ -102 +107 @@
       // connectButton
       // 
-      this.connectButton.Location = new System.Drawing.Point(302, 1);
+      this.connectButton.Location = new System.Drawing.Point(305, 1);
       this.connectButton.Name = "connectButton";
       this.connectButton.Size = new System.Drawing.Size(75, 23);
@@ -114 +119 @@
       this.comboBox1.Enabled = false;
       this.comboBox1.FormattingEnabled = true;
-      this.comboBox1.Location = new System.Drawing.Point(91, 29);
+      this.comboBox1.Location = new System.Drawing.Point(94, 29);
       this.comboBox1.Name = "comboBox1";
       this.comboBox1.Size = new System.Drawing.Size(121, 21);
@@ -132 +137 @@
       // 
       this.newButton.Enabled = false;
-      this.newButton.Location = new System.Drawing.Point(218, 27);
+      this.newButton.Location = new System.Drawing.Point(221, 27);
       this.newButton.Name = "newButton";
       this.newButton.Size = new System.Drawing.Size(75, 23);
@@ -144 +149 @@
       this.refreshTimer.Tick += new System.EventHandler(this.refreshTimer_Tick);
       // 
+      // opLibButton
+      // 
+      this.opLibButton.Enabled = false;
+      this.opLibButton.Location = new System.Drawing.Point(94, 56);
+      this.opLibButton.Name = "opLibButton";
+      this.opLibButton.Size = new System.Drawing.Size(75, 23);
+      this.opLibButton.TabIndex = 7;
+      this.opLibButton.Text = "&Open";
+      this.opLibButton.UseVisualStyleBackColor = true;
+      this.opLibButton.Click += new System.EventHandler(this.opLibButton_Click);
+      // 
+      // label1
+      // 
+      this.label1.AutoSize = true;
+      this.label1.Location = new System.Drawing.Point(3, 61);
+      this.label1.Name = "label1";
+      this.label1.Size = new System.Drawing.Size(85, 13);
+      this.label1.TabIndex = 8;
+      this.label1.Text = "Operator Library:";
+      // 
       // ConsoleEditor
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.Controls.Add(this.label1);
+      this.Controls.Add(this.opLibButton);
       this.Controls.Add(this.newButton);
       this.Controls.Add(this.projectLabel);
@@ -171 +198 @@
         agentsPage.Controls[0].Dock = DockStyle.Fill;
         refreshTimer.Enabled = true;
+        opLibButton.Enabled = true;
+        opLibButton.Enabled = true;
       } catch(CommunicationException ex) {
         // TASK create helper class for error reporting
@@ -182 +211 @@
       refreshTimer.Enabled = true;
     }
+
+    private void opLibButton_Click(object sender, EventArgs e) {
+      IOperatorLibrary opLib = console.OperatorLibrary;
+      if(opLib != null) {
+        IView view = opLib.CreateView();
+        if(view != null)
+          PluginManager.ControlManager.ShowControl(view);
+      }
+    }
   }
 }

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

@@ -4 +4 @@
 using System.Text;
 using HeuristicLab.Core;
+using HeuristicLab.CEDMA.DB.Interfaces;
 
 namespace HeuristicLab.CEDMA.Core {
@@ -13 +14 @@
     }
 
-    private string dbUri;
-
-    public DatabaseOperatorLibrary(string dbUri)
-      : base() {
-      this.dbUri = dbUri;
-      group = new OperatorGroup();
+    private IDatabase database;
+    public IDatabase Database {
+      get { return database; }
+      set { this.database = value; }
     }
 
+    private Dictionary<IOperator, long> knownOperators;
+
+    public DatabaseOperatorLibrary()
+      : base() {
+      group = new OperatorGroup();
+      knownOperators = new Dictionary<IOperator, long>();
+    }
+
+    public void Save() {
+      Dictionary<IOperator, long> newKnownOperators = new Dictionary<IOperator,long>();
+      foreach(IOperator op in group.Operators) {
+        if(knownOperators.ContainsKey(op)) {
+          // update
+          long id =knownOperators[op]; 
+          Database.UpdateOperator(id, op.Name, PersistenceManager.SaveToGZip(op));
+          knownOperators.Remove(op);
+          newKnownOperators.Add(op, id);
+        } else {
+          // create new
+          long id = Database.InsertOperator(op.Name, PersistenceManager.SaveToGZip(op));
+          newKnownOperators.Add(op, id);
+        }
+      }
+      // delete operators from the table that are not present in the group anymore (remaining entries)
+      foreach(long id in knownOperators.Values) {
+        Database.DeleteOperator(id);
+      }
+      
+      knownOperators = newKnownOperators;
+    }
+
+    public void Restore() {
+      foreach(IOperator op in knownOperators.Keys) {
+        group.RemoveOperator(op);
+      }
+      knownOperators.Clear();
+      if(database == null) return;
+      foreach(OperatorEntry e in Database.GetOperators()) {
+        IOperator op = (IOperator)PersistenceManager.RestoreFromGZip(e.RawData);
+        knownOperators.Add(op, e.Id);
+        group.AddOperator(op);
+      }
+    }
 
     public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
@@ -35 +77 @@
 
     public override IView CreateView() {
-      // return new DatabaseOperatorLibraryView(this);
-      return null;
+      Restore();
+      return new DatabaseOperatorLibraryView(this);
     }
   }

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

@@ -63 +63 @@
     </Compile>
     <Compile Include="DatabaseOperatorLibrary.cs" />
+    <Compile Include="DatabaseOperatorLibraryView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DatabaseOperatorLibraryView.Designer.cs">
+      <DependentUpon>DatabaseOperatorLibraryView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Result.cs" />
     <Compile Include="IResult.cs" />
@@ -113 +119 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="DatabaseOperatorLibraryView.resx">
+      <DependentUpon>DatabaseOperatorLibraryView.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

trunk/sources/HeuristicLab.CEDMA.DB.Interfaces/IDatabase.cs

@@ -49 +49 @@
 
     [OperationContract]
-    long InsertOperator(string name, string rawData);
+    long InsertOperator(string name, byte[] rawData);
+
+    [OperationContract]
+    void UpdateOperator(long id, string name, byte[] rawData);
+
+    [OperationContract]
+    void DeleteOperator(long id);
 
     // should be replaced by more powerful querying interface (LINQ provider?)

trunk/sources/HeuristicLab.CEDMA.DB.Interfaces/OperatorEntry.cs

@@ -35 +35 @@
     public string Name { get; set; }
     [DataMember]
-    public string RawData { get; set; }
+    public byte[] RawData { get; set; }
   }
 }

trunk/sources/HeuristicLab.CEDMA.DB/Database.cs

@@ -65 +65 @@
             }
             using(DbCommand cmd = cnn.CreateCommand()) {
-              cmd.CommandText = "CREATE TABLE Operator (ID integer primary key autoincrement, Name text, RawData text)";
+              cmd.CommandText = "CREATE TABLE Operator (ID integer primary key autoincrement, Name text, RawData Blob)";
               cmd.Transaction = t;
               cmd.ExecuteNonQuery();
@@ -200 +200 @@
     }
 
-    public long InsertOperator(string name, string rawData) {
+    public long InsertOperator(string name, byte[] rawData) {
       rwLock.EnterWriteLock();
       try {
@@ -230 +230 @@
     #endregion
 
-    #region update agent/run
+    #region update agent, run, operator
     public void UpdateAgent(long id, string name) {
       rwLock.EnterWriteLock();
@@ -312 +312 @@
     }
 
+    public void UpdateOperator(long id, string name, byte[] rawData) {
+      rwLock.EnterWriteLock();
+      try {
+        using(SQLiteConnection cnn = new SQLiteConnection(connectionString)) {
+          cnn.Open();
+          using(SQLiteTransaction t = cnn.BeginTransaction()) {
+            using(SQLiteCommand c = cnn.CreateCommand()) {
+              c.Transaction = t;
+              c.CommandText = "Update Operator set Name=@Name, RawData=@RawData where id=@Id";
+              DbParameter rawDataParam = c.CreateParameter();
+              DbParameter nameParam = c.CreateParameter();
+              DbParameter idParam = c.CreateParameter();
+              rawDataParam.ParameterName = "@RawData";
+              rawDataParam.Value = rawData;
+              idParam.ParameterName = "@Id";
+              idParam.Value = id;
+              nameParam.ParameterName = "@Name";
+              nameParam.Value = name;
+              c.Parameters.Add(rawDataParam);
+              c.Parameters.Add(nameParam);
+              c.Parameters.Add(idParam);
+              c.ExecuteNonQuery();
+            }
+            t.Commit();
+          }
+        }
+      } finally {
+        rwLock.ExitWriteLock();
+      }
+    }
+
     #endregion
 
-    #region get agent/result/sub-result
+    #region get agent/result/sub-result/operator
 
     public ICollection<AgentEntry> GetAgents(ProcessStatus status) {
@@ -481 +512 @@
                 op.Id = r.GetInt32(0);
                 op.Name = r.IsDBNull(1) ? "-" : r.GetString(1);
-                op.RawData = r.GetString(2);
+                op.RawData = (byte[])r.GetValue(2);
                 operators.Add(op);
               }
@@ -491 +522 @@
       }
       return operators;
+    }
+    #endregion
+
+    #region delete operator
+    public void DeleteOperator(long id) {
+      rwLock.EnterWriteLock();
+      try {
+        using(DbConnection cnn = new SQLiteConnection(connectionString)) {
+          cnn.Open();
+          using(DbTransaction t = cnn.BeginTransaction()) {
+            using(DbCommand c = cnn.CreateCommand()) {
+              c.Transaction = t;
+              c.CommandText = "Delete from Operator where id=@Id";
+              DbParameter idParam = c.CreateParameter();
+              idParam.ParameterName = "@Id";
+              idParam.Value = id;
+              c.Parameters.Add(idParam);
+              c.ExecuteNonQuery();
+            }
+            t.Commit();
+          }
+        }
+      } finally {
+        rwLock.ExitWriteLock();
+      }
     }
     #endregion