Changeset 389 for trunk/sources

Timestamp:

07/22/08 14:06:42 (16 years ago)

Author:

gkronber

Message:

worked on #188

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.Core/Agent.cs (modified) (2 diffs)
• HeuristicLab.CEDMA.Core/AgentListView.Designer.cs (modified) (5 diffs)
• HeuristicLab.CEDMA.Core/AgentListView.cs (modified) (4 diffs)
• HeuristicLab.CEDMA.Core/AgentView.Designer.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Core/AgentView.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Core/ConsoleEditor.cs (modified) (5 diffs)
• HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj (modified) (1 diff)
• HeuristicLab.CEDMA.Core/IAgent.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Core/IResult.cs (added)
• HeuristicLab.CEDMA.DB.Interfaces/IDatabase.cs (modified) (1 diff)
• HeuristicLab.CEDMA.DB.Interfaces/ResultEntry.cs (modified) (1 diff)
• HeuristicLab.CEDMA.DB.Interfaces/RunEntry.cs (modified) (1 diff)
• HeuristicLab.CEDMA.DB/Database.cs (modified) (5 diffs)

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

@@ -34 +34 @@
     public string Name { get; set; }
     public ProcessStatus Status { get; set; }
+    public bool Terminated { get; set; }
     private OperatorGraph operatorGraph;
 
@@ -57 +58 @@
     }
 
-    public void Activate() {
+    public void Start() {
       Status = ProcessStatus.Waiting;
       Save();
     }
+
+    public ICollection<IAgent> SubAgents {
+      get {
+        List<IAgent> runs = new List<IAgent>();
+        // TASK
+        return runs;
+      }
+    }
+
+    public ICollection<IResult> Results {
+      get {
+        List<IResult> results = new List<IResult>();
+        // TASK
+        return results;
+      }
+    } 
 
     #region persistence

trunk/sources/HeuristicLab.CEDMA.Core/AgentListView.Designer.cs

@@ -50 +50 @@
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
       this.agentsGroupBox = new System.Windows.Forms.GroupBox();
-      this.agentsListView = new System.Windows.Forms.ListView();
-      this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
       this.detailsGroupBox = new System.Windows.Forms.GroupBox();
       this.addButton = new System.Windows.Forms.Button();
+      this.agentTreeView = new System.Windows.Forms.TreeView();
       this.splitContainer1.Panel1.SuspendLayout();
       this.splitContainer1.Panel2.SuspendLayout();
@@ -82 +81 @@
       // agentsGroupBox
       // 
-      this.agentsGroupBox.Controls.Add(this.agentsListView);
+      this.agentsGroupBox.Controls.Add(this.agentTreeView);
       this.agentsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
       this.agentsGroupBox.Location = new System.Drawing.Point(0, 0);
@@ -90 +89 @@
       this.agentsGroupBox.TabStop = false;
       this.agentsGroupBox.Text = "&Agents";
-      // 
-      // agentsListView
-      // 
-      this.agentsListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.columnHeader1});
-      this.agentsListView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.agentsListView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
-      this.agentsListView.HideSelection = false;
-      this.agentsListView.Location = new System.Drawing.Point(3, 16);
-      this.agentsListView.Name = "agentsListView";
-      this.agentsListView.Size = new System.Drawing.Size(129, 136);
-      this.agentsListView.Sorting = System.Windows.Forms.SortOrder.Ascending;
-      this.agentsListView.TabIndex = 0;
-      this.agentsListView.UseCompatibleStateImageBehavior = false;
-      this.agentsListView.View = System.Windows.Forms.View.Details;
-      this.agentsListView.SelectedIndexChanged += new System.EventHandler(this.variablesListView_SelectedIndexChanged);
-      this.agentsListView.SizeChanged += new System.EventHandler(this.variablesListView_SizeChanged);
       // 
       // detailsGroupBox
@@ -129 +111 @@
       this.addButton.Click += new System.EventHandler(this.addButton_Click);
       // 
-      // AgentView
+      // agentTreeView
+      // 
+      this.agentTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.agentTreeView.Location = new System.Drawing.Point(3, 16);
+      this.agentTreeView.Name = "agentTreeView";
+      this.agentTreeView.Size = new System.Drawing.Size(129, 136);
+      this.agentTreeView.TabIndex = 0;
+      this.agentTreeView.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.agentTreeView_BeforeExpand);
+      // 
+      // AgentListView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.Controls.Add(this.addButton);
       this.Controls.Add(this.splitContainer1);
-      this.Name = "AgentView";
+      this.Name = "AgentListView";
       this.Size = new System.Drawing.Size(276, 184);
       this.splitContainer1.Panel1.ResumeLayout(false);
@@ -148 +139 @@
     private System.Windows.Forms.SplitContainer splitContainer1;
     private System.Windows.Forms.GroupBox agentsGroupBox;
-    private System.Windows.Forms.ListView agentsListView;
-    private System.Windows.Forms.ColumnHeader columnHeader1;
     private System.Windows.Forms.GroupBox detailsGroupBox;
     private System.Windows.Forms.Button addButton;
+    private TreeView agentTreeView;
   }
 }

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

@@ -56 +56 @@
       if(AgentList == null) {
         Caption = "Agents View";
-        agentsListView.Enabled = false;
+        agentTreeView.Enabled = false;
       } else {
-        agentsListView.Enabled = true;
-        agentsListView.Items.Clear();
+        agentTreeView.Enabled = true;
+        agentTreeView.Nodes.Clear();
         foreach(IAgent agent in AgentList) {
-          ListViewItem item = new ListViewItem();
-          item.Text = agent.Name;
-          item.Tag = agent;
-          agentsListView.Items.Add(item);
+          TreeNode node = new TreeNode();
+          node.Text = agent.Name;
+          node.Tag = agent;
+          agentTreeView.Nodes.Add(node);
         }
       }
@@ -74 +74 @@
       detailsGroupBox.Controls.Clear();
       detailsGroupBox.Enabled = false;
-      if(agentsListView.SelectedItems.Count == 1) {
-        IAgent agent = (IAgent)agentsListView.SelectedItems[0].Tag;
+      if(agentTreeView.SelectedNode!=null) {
+        IAgent agent = (IAgent)agentTreeView.SelectedNode.Tag;
         Control control = (Control)new AgentView(agent);
         detailsGroupBox.Controls.Add(control);
@@ -83 +83 @@
     }
 
-    #region Size Changed Events
-    private void variablesListView_SizeChanged(object sender, EventArgs e) {
-      if(agentsListView.Columns.Count > 0)
-        agentsListView.Columns[0].Width = Math.Max(0, agentsListView.Width - 25);
-    }
-    #endregion
-
     #region Button Events
     private void addButton_Click(object sender, EventArgs e) {
@@ -96 +89 @@
     }
     #endregion
+
+    private void agentTreeView_BeforeExpand(object sender, TreeViewCancelEventArgs e) {
+    }
   }
 }

trunk/sources/HeuristicLab.CEDMA.Core/AgentView.Designer.cs

@@ -80 +80 @@
       this.activateButton.Size = new System.Drawing.Size(75, 23);
       this.activateButton.TabIndex = 2;
-      this.activateButton.Text = "&Activate";
+      this.activateButton.Text = "&Start";
       this.activateButton.UseVisualStyleBackColor = true;
       this.activateButton.Click += new System.EventHandler(this.activateButton_Click);

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

@@ -68 +68 @@
 
     private void activateButton_Click(object sender, EventArgs e) {
-      Agent.Activate();
+      Agent.Start();
       activateButton.Enabled = false;
     }

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

@@ -33 +33 @@
     private System.Windows.Forms.Label uriLabel;
     private System.Windows.Forms.TabControl tabControl;
-    private System.Windows.Forms.TabPage overviewPage;
     private System.Windows.Forms.TabPage agentsPage;
-    private System.Windows.Forms.TabPage resultsPage;
     private Button connectButton;
     private ComboBox comboBox1;
@@ -51 +49 @@
       this.uriLabel = new System.Windows.Forms.Label();
       this.tabControl = new System.Windows.Forms.TabControl();
-      this.overviewPage = new System.Windows.Forms.TabPage();
       this.agentsPage = new System.Windows.Forms.TabPage();
-      this.resultsPage = new System.Windows.Forms.TabPage();
       this.connectButton = new System.Windows.Forms.Button();
       this.comboBox1 = new System.Windows.Forms.ComboBox();
@@ -82 +78 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.tabControl.Controls.Add(this.overviewPage);
       this.tabControl.Controls.Add(this.agentsPage);
-      this.tabControl.Controls.Add(this.resultsPage);
       this.tabControl.Enabled = false;
       this.tabControl.Location = new System.Drawing.Point(6, 56);
@@ -91 +85 @@
       this.tabControl.Size = new System.Drawing.Size(506, 407);
       this.tabControl.TabIndex = 2;
-      // 
-      // overviewPage
-      // 
-      this.overviewPage.Location = new System.Drawing.Point(4, 22);
-      this.overviewPage.Name = "overviewPage";
-      this.overviewPage.Padding = new System.Windows.Forms.Padding(3);
-      this.overviewPage.Size = new System.Drawing.Size(498, 381);
-      this.overviewPage.TabIndex = 0;
-      this.overviewPage.Text = "Overview";
-      this.overviewPage.UseVisualStyleBackColor = true;
       // 
       // agentsPage
@@ -111 +95 @@
       this.agentsPage.Text = "Agents";
       this.agentsPage.UseVisualStyleBackColor = true;
-      // 
-      // resultsPage
-      // 
-      this.resultsPage.Location = new System.Drawing.Point(4, 22);
-      this.resultsPage.Name = "resultsPage";
-      this.resultsPage.Padding = new System.Windows.Forms.Padding(3);
-      this.resultsPage.Size = new System.Drawing.Size(498, 381);
-      this.resultsPage.TabIndex = 2;
-      this.resultsPage.Text = "Results";
-      this.resultsPage.UseVisualStyleBackColor = true;
       // 
       // connectButton

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

@@ -62 +62 @@
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="IResult.cs" />
     <Compile Include="DbPersistenceManager.cs" />
     <Compile Include="HeuristicLabCedmaCorePlugin.cs" />

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

@@ -32 +32 @@
     ProcessStatus Status { get; }
     IOperatorGraph OperatorGraph { get; }
-    void Activate();
+    ICollection<IAgent> SubAgents { get; }
+    ICollection<IResult> Results { get; }
+    bool Terminated { get; }
+    
+    void Start();
   }
 }

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

@@ -66 +66 @@
 
     [OperationContract]
-    ICollection<RunEntry> GetRuns();
+    ICollection<RunEntry> GetRuns(long agentId);
 
     [OperationContract]

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

@@ -37 +37 @@
     public long ResultId { get; set; }
     [DataMember]
+    public string Summary { get; set; }
+    [DataMember]
+    public string Description { get; set; }
+    [DataMember]
     public DateTime CreationTime { get; set; }
     [DataMember]

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

@@ -37 +37 @@
     public DateTime CreationTime { get; set; }
     [DataMember]
-    public DateTime? StartTime { get; set; }
-    [DataMember]
-    public DateTime? FinishedTime { get; set; }
-    [DataMember]
     public ProcessStatus Status { get; set; }
     [DataMember]

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

@@ -432 +432 @@
     }
 
-    public ICollection<RunEntry> GetRuns() {
+    public ICollection<RunEntry> GetRuns(long agentId) {
       List<RunEntry> runs = new List<RunEntry>();
       rwLock.EnterReadLock();
@@ -439 +439 @@
           cnn.Open();
           using(DbCommand c = cnn.CreateCommand()) {
-            c.CommandText = "Select Id, AgentId, CreationTime, StartTime, FinishedTime, Status, Rawdata from Run";
+            c.CommandText = "Select Id, AgentId, CreationTime, Status, Rawdata from Run where AgentId=@AgentId";
+            DbParameter agentParameter = c.CreateParameter();
+            agentParameter.ParameterName = "@AgentId";
+            agentParameter.Value = agentId;
+            c.Parameters.Add(agentParameter);
+
             using(DbDataReader r = c.ExecuteReader()) {
               while(r.Read()) {
@@ -446 +451 @@
                 run.AgentId = r.GetInt32(1);
                 run.CreationTime = r.GetDateTime(2);
-                run.StartTime = r.GetDateTime(3);
-                run.FinishedTime = r.GetDateTime(4);
-                run.Status = (ProcessStatus)Enum.Parse(typeof(ProcessStatus), r.GetString(5));
-                run.RawData = (byte[])r.GetValue(6);
+                run.Status = (ProcessStatus)Enum.Parse(typeof(ProcessStatus), r.GetString(3));
+                run.RawData = (byte[])r.GetValue(4);
                 runs.Add(run);
               }
@@ -468 +471 @@
           cnn.Open();
           using(DbCommand c = cnn.CreateCommand()) {
-            c.CommandText = "Select Id, AgentId, CreationTime, StartTime, FinishedTime, Status, Rawdata from Run where Status=@Status";
+            c.CommandText = "Select Id, AgentId, CreationTime, Status, Rawdata from Run where Status=@Status";
             DbParameter statusParameter = c.CreateParameter();
             statusParameter.ParameterName = "@Status";
@@ -480 +483 @@
                 run.AgentId = r.GetInt32(1);
                 run.CreationTime = r.GetDateTime(2);
-                run.StartTime = r.IsDBNull(3) ? null : new Nullable<DateTime>(r.GetDateTime(3));
-                run.FinishedTime = r.IsDBNull(4) ? null : new Nullable<DateTime>(r.GetDateTime(4));
-                run.Status = (ProcessStatus)Enum.Parse(typeof(ProcessStatus), r.GetString(5));
-                run.RawData = (byte[])r.GetValue(6);
+                run.Status = (ProcessStatus)Enum.Parse(typeof(ProcessStatus), r.GetString(3));
+                run.RawData = (byte[])r.GetValue(4);
                 runs.Add(run);
               }