Changeset 403 for trunk/sources/HeuristicLab.CEDMA.Operators

Timestamp:

07/29/08 18:05:18 (17 years ago)

Author:

gkronber

Message:

• fixed ticket #201 (Fix plugin dependencies for CEDMA plugins)
• deleted classes DbPersistenceManager because the common code was moved to the PersistenceManager in HeuristicLab.Core.

Location:

trunk/sources/HeuristicLab.CEDMA.Operators

Files:

• HeuristicLab.CEDMA.Operators.csproj (modified) (1 diff)
• HeuristicLabCedmaOperatorsPlugin.cs (modified) (1 diff)
• OnGridProcessor.cs (modified) (3 diffs)
• ScopeResultWriter.cs (modified) (3 diffs)

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

@@ -63 +63 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HeuristicLab.CEDMA.Core\HeuristicLab.CEDMA.Core.csproj">
-      <Project>{C27DDF6C-84DF-45EF-B82F-57A28DD51166}</Project>
-      <Name>HeuristicLab.CEDMA.Core</Name>
-    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.CEDMA.DB.Interfaces\HeuristicLab.CEDMA.DB.Interfaces.csproj">
       <Project>{4F9BB789-D561-436B-B226-2BF44B7D0804}</Project>

trunk/sources/HeuristicLab.CEDMA.Operators/HeuristicLabCedmaOperatorsPlugin.cs ¶

@@ -29 +29 @@
   [PluginFile(Filename = "HeuristicLab.CEDMA.Operators.dll", Filetype = PluginFileType.Assembly)]
   [Dependency(Dependency = "HeuristicLab.CEDMA.DB.Interfaces")]
+  [Dependency(Dependency = "HeuristicLab.Core")]
+  [Dependency(Dependency = "HeuristicLab.Data")]
   public class HeuristicLabCedmaOperatorsPlugin : PluginBase {
   }

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

@@ -28 +28 @@
 using HeuristicLab.CEDMA.DB.Interfaces;
 using System.ServiceModel;
-using HeuristicLab.CEDMA.Core;
 
 namespace HeuristicLab.CEDMA.Operators {
@@ -48 +47 @@
       long agentId = scope.GetVariableValue<IntData>("AgentId", true).Data;
 
-      Agent agent = new Agent();
-      foreach(IOperator op in operatorGraph.Operators) {
-        agent.OperatorGraph.AddOperator(op);
-      }
-      agent.OperatorGraph.InitialOperator = operatorGraph.InitialOperator;
-
       NetTcpBinding binding = new NetTcpBinding();
       binding.MaxReceivedMessageSize = 10000000; // 10Mbytes
@@ -61 +54 @@
       using(ChannelFactory<IDatabase> factory = new ChannelFactory<IDatabase>(binding)) {
         IDatabase database = factory.CreateChannel(new EndpointAddress(serverUrl));
-        long id = database.InsertAgent(agentId, null, DbPersistenceManager.Save(agent));
+        long id = database.InsertAgent(agentId, null, PersistenceManager.SaveToGZip(operatorGraph));
         database.UpdateAgent(id, ProcessStatus.Waiting);
       }

trunk/sources/HeuristicLab.CEDMA.Operators/ScopeResultWriter.cs ¶

@@ -28 +28 @@
 using HeuristicLab.CEDMA.DB.Interfaces;
 using System.ServiceModel;
-using HeuristicLab.CEDMA.Core;
 
 namespace HeuristicLab.CEDMA.Operators {
@@ -45 +44 @@
       string serverUrl = scope.GetVariableValue<StringData>("CedmaServerUri", true).Data;
       long agentId = scope.GetVariableValue<IntData>("AgentId", true).Data;
-      Result result = new Result();
-      result.Item = scope;
 
       NetTcpBinding binding = new NetTcpBinding();
@@ -55 +52 @@
       using(ChannelFactory<IDatabase> factory = new ChannelFactory<IDatabase>(binding)) {
         IDatabase database = factory.CreateChannel(new EndpointAddress(serverUrl));
-        database.InsertResult(agentId, scope.Name, "Scope", DbPersistenceManager.Save(result));
+        database.InsertResult(agentId, scope.Name, "Scope", PersistenceManager.SaveToGZip(scope));
       }
       return null;