Changeset 394

Timestamp:

07/23/08 00:28:11 (16 years ago)

Author:

gkronber

Message:

• implemented operator to store a whole scope as an result item into the cedma-db.
• worked on AgentListView to display results as sub-nodes of agents.

(ticket #191)

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.Core/Agent.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Core/AgentListView.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Core/Result.cs (modified) (4 diffs)
• HeuristicLab.CEDMA.DB/Database.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Operators/HeuristicLab.CEDMA.Operators.csproj (modified) (1 diff)
• HeuristicLab.CEDMA.Operators/OnGridProcessor.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Operators/ScopeResultWriter.cs (added)

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

@@ -83 +83 @@
         foreach(ResultEntry entry in Database.GetResults(Id)) {
           Result result = (Result)DbPersistenceManager.Restore(entry.RawData);
+          result.Database = Database;
+          result.Id = entry.Id;
+          result.Summary = entry.Summary;
+          result.Description = entry.Description;
+          results.Add(result);
         }
         return results;

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

@@ -79 +79 @@
     private void agentTreeView_BeforeExpand(object sender, TreeViewCancelEventArgs e) {
       e.Node.Nodes.Clear();
-      IAgent agent = (IAgent)e.Node.Tag;
-      foreach(IAgent subAgent in agent.SubAgents) {
-        TreeNode node = new TreeNode();
-        node.Text = subAgent.Name;
-        node.Tag = subAgent;
-        node.Nodes.Add("dummy");
-        e.Node.Nodes.Add(node);
-      }
-      foreach(IResult result in agent.Results) {
-        TreeNode node = new TreeNode();
-        node.Text = result.Summary;
-        node.Tag = result;
-        node.Nodes.Add("dummy");
-        e.Node.Nodes.Add(node);
+      if(e.Node.Tag is IAgent) {
+        IAgent agent = (IAgent)e.Node.Tag;
+        foreach(IAgent subAgent in agent.SubAgents) {
+          TreeNode node = new TreeNode();
+          node.Text = subAgent.Name;
+          node.Tag = subAgent;
+          node.Nodes.Add("dummy");
+          e.Node.Nodes.Add(node);
+        }
+        foreach(IResult result in agent.Results) {
+          TreeNode node = new TreeNode();
+          node.Text = result.Summary;
+          node.Tag = result;
+          node.Nodes.Add("dummy");
+          e.Node.Nodes.Add(node);
+        }
+      } else if(e.Node.Tag is IResult) {
+        IResult result = (IResult)e.Node.Tag;
+        foreach(IResult subResult in result.SubResults) {
+          TreeNode node = new TreeNode();
+          node.Text = subResult.Summary;
+          node.Tag = subResult;
+          node.Nodes.Add("dummy");
+          e.Node.Nodes.Add(node);
+        }
       }
     }

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

@@ -34 +34 @@
     public string Summary { get; set; }
     public string Description { get; set; }
-    public IItem result;
+    public IItem Item { get; set; }
     public Result()
       : base() {
@@ -51 +51 @@
         foreach(ResultEntry entry in Database.GetSubResults(Id)) {
           Result result = (Result)DbPersistenceManager.Restore(entry.RawData);
+          result.Database = Database;
+          result.Id = entry.Id;
+          result.Summary = entry.Summary;
+          result.Description = entry.Description;
+          results.Add(result);
         }
         return results;
@@ -59 +64 @@
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-      node.AppendChild(PersistenceManager.Persist("Result", result, document, persistedObjects));
+      node.AppendChild(PersistenceManager.Persist("Item", Item, document, persistedObjects));
       return node;
     }
@@ -65 +70 @@
     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
-      result = (IItem)PersistenceManager.Restore(node.SelectSingleNode("Result"), restoredObjects);
+      Item = (IItem)PersistenceManager.Restore(node.SelectSingleNode("Item"), restoredObjects);
     }
     #endregion
 
-    // TASK: create class ResultView
-    //public override IView CreateView() {
-    //  return new ResultView(this);
-    //}
+    public override IView CreateView() {
+      return Item.CreateView();
+    }
   }
 }

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

@@ -323 +323 @@
           cnn.Open();
           using(DbCommand c = cnn.CreateCommand()) {
-            c.CommandText = "Select id, ParentAgentId, name, status, ControllerAgent, rawdata from Agent";
+            c.CommandText = "Select id, name, status, ControllerAgent, rawdata from Agent where ParentAgentId isnull";
             using(DbDataReader r = c.ExecuteReader()) {
               while(r.Read()) {
                 AgentEntry agent = new AgentEntry();
+                agent.ParentAgentId = null;
                 agent.Id = r.GetInt32(0);
-                agent.ParentAgentId = r.IsDBNull(1) ? null : new Nullable<long>(r.GetInt32(1));
-                agent.Name = r.IsDBNull(2)?"-":r.GetString(2);
-                agent.Status = (ProcessStatus)Enum.Parse(typeof(ProcessStatus), r.GetString(3));
-                agent.ControllerAgent = r.GetBoolean(4);
-                agent.RawData = (byte[])r.GetValue(5);
+                agent.Name = r.IsDBNull(1)?"-":r.GetString(1);
+                agent.Status = (ProcessStatus)Enum.Parse(typeof(ProcessStatus), r.GetString(2));
+                agent.ControllerAgent = r.GetBoolean(3);
+                agent.RawData = (byte[])r.GetValue(4);
                 agents.Add(agent);
               }

trunk/sources/HeuristicLab.CEDMA.Operators/HeuristicLab.CEDMA.Operators.csproj

@@ -54 +54 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ScopeResultWriter.cs" />
     <Compile Include="HeuristicLabCedmaOperatorsPlugin.cs" />
     <Compile Include="OnGridProcessor.cs" />

trunk/sources/HeuristicLab.CEDMA.Operators/OnGridProcessor.cs

@@ -44 +44 @@
 
     public override IOperation Apply(IScope scope) {
-      
       IOperatorGraph operatorGraph = scope.GetVariableValue<IOperatorGraph>("OperatorGraph", false);
       string serverUrl = scope.GetVariableValue<StringData>("CedmaServerUri", true).Data;