Changeset 419 for trunk/sources/HeuristicLab.CEDMA.Server

Timestamp:

08/01/08 17:59:19 (16 years ago)

Author:

gkronber

Message:

worked on #211 need to patch the operator-graph of an agent before execution (replacing the OperatorLinks with their targets).

work in progress...

Location:

trunk/sources/HeuristicLab.CEDMA.Server

Files:

• HeuristicLab.CEDMA.Server.csproj (modified) (2 diffs)
• RunScheduler.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/HeuristicLab.CEDMA.Server.csproj

@@ -71 +71 @@
   </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>
@@ -90 +94 @@
       <Project>{545CE756-98D8-423B-AC2E-6E7D70926E5C}</Project>
       <Name>HeuristicLab.Grid</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.Server/RunScheduler.cs

@@ -31 +31 @@
 using System.Diagnostics;
 using HeuristicLab.Data;
+using HeuristicLab.CEDMA.Core;
+using HeuristicLab.Operators;
 
 namespace HeuristicLab.CEDMA.Server {
@@ -73 +75 @@
         scope.AddVariable(new Variable("CedmaServerUri", new StringData(serverUri)));
         IOperatorGraph opGraph = (IOperatorGraph)PersistenceManager.RestoreFromGZip(entry.RawData);
-        AtomicOperation op = new AtomicOperation(opGraph.InitialOperator, scope);
+
+        foreach(IOperator op in opGraph.Operators) {
+          PatchLinks(op);
+        }
+
+        AtomicOperation operation = new AtomicOperation(opGraph.InitialOperator, scope);
         WaitHandle wHandle;
         lock(remoteCommLock) {
-          wHandle = jobManager.BeginExecuteOperation(op.Scope, op);
+          wHandle = jobManager.BeginExecuteOperation(operation.Scope, operation);
           database.UpdateAgent(entry.Id, ProcessStatus.Active);
         }
@@ -82 +89 @@
         Job job = new Job();
         job.AgentId = entry.Id;
-        job.Operation = op;
+        job.Operation = operation;
         job.WaitHandle = wHandle;
 
@@ -90 +97 @@
         }
       }
+    }
+
+    private void PatchLinks(IOperator op) {
+      if(op is OperatorLink) {
+        OperatorLink link = op as OperatorLink;
+        OperatorEntry targetEntry = database.GetOperator(link.Id);
+        IOperator target = (IOperator)PersistenceManager.RestoreFromGZip(targetEntry.RawData);
+        ReplaceOperatorInGraph(link, target);
+      } else if(op is CombinedOperator) {
+        CombinedOperator combinedOp = op as CombinedOperator;
+        foreach(IOperator internalOp in combinedOp.OperatorGraph.Operators) {
+          PatchLinks(internalOp);
+        }
+      }
+    }
+
+    private void ReplaceOperatorInGraph(OperatorLink link, IOperator target) {
+      throw new NotImplementedException();
     }