Changeset 1060

Timestamp:

12/23/08 18:40:38 (16 years ago)

Author:

gkronber

Message:

worked on executer which retrieves the next job from the dispatcher and sends it to the grid for execution. #419 (Refactor CEDMA plugins)

Location:

branches/CEDMA-Refactoring-Ticket419

Files:

• HeuristicLab.CEDMA.Core/ProblemInjector.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Server/Dispatcher.cs (modified) (5 diffs)
• HeuristicLab.CEDMA.Server/Executer.cs (added)
• HeuristicLab.CEDMA.Server/Execution.cs (added)
• HeuristicLab.CEDMA.Server/HeuristicLab.CEDMA.Server.csproj (modified) (1 diff)
• HeuristicLab.CEDMA.Server/Server.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Server/ServerForm.cs (modified) (2 diffs)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/ProblemInjector.cs

@@ -35 +35 @@
     }
 
-    private IntData targetVariable;
+    private IntData targetVariable = new IntData();
     public int TargetVariable {
       get { return targetVariable.Data; }
       set { targetVariable.Data = value; }
     }
+
+    public ProblemInjector() : base() { } // for persistence
+
     public ProblemInjector(Problem problem)
       : base() {

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Server/Dispatcher.cs

@@ -34 +34 @@
 using HeuristicLab.GP.StructureIdentification;
 using HeuristicLab.Data;
+using HeuristicLab.Core;
 
 namespace HeuristicLab.CEDMA.Server {
   public class Dispatcher {
-    private List<StandardGP> dispatchQueue;
+    private List<Execution> dispatchQueue;
     public IList<string> DispatchQueue {
       get { return dispatchQueue.Select(t => "StandardGP").ToList(); }
@@ -46 +47 @@
     public Dispatcher(IStore store) {
       this.store = store;
-      this.dispatchQueue = new List<StandardGP>();
+      this.dispatchQueue = new List<Execution>();
     }
 
@@ -52 +53 @@
       Dictionary<Entity, Dictionary<int, int>> numberOfModelsOfTargetVariableOfDataSet = new Dictionary<Entity, Dictionary<int, int>>();
       IList<Statement> datasetStatements = store.Select(new Statement(Ontology.AnyEntity, Ontology.PredicateInstanceOf, Ontology.TypeDataSet));
-      foreach(Statement datasetStatement in datasetStatements) {
+      foreach (Statement datasetStatement in datasetStatements) {
         numberOfModelsOfTargetVariableOfDataSet.Add(datasetStatement.Subject, new Dictionary<int, int>());
         IList<Statement> modelStatements = store.Select(new Statement(datasetStatement.Subject, Ontology.PredicateHasModel, Ontology.AnyEntity));
-        foreach(Statement modelStatement in modelStatements) {
+        foreach (Statement modelStatement in modelStatements) {
           IList<Statement> modelAttributeStatements = store.Select(new Statement((Entity)modelStatement.Property, Ontology.PredicateModelAttribute, Ontology.AnyEntity));
-          foreach(Statement modelAttrStatement in modelAttributeStatements) {
+          foreach (Statement modelAttrStatement in modelAttributeStatements) {
             var targetVariableStatements = store.Select(new Statement((Entity)modelAttrStatement.Property, Ontology.PredicateModelAttributeName, Ontology.AnyEntity))
                .Where(t => (string)((Literal)t.Property).Value == "TargetVariable")
                .SelectMany(t => store.Select(new Statement((Entity)modelAttrStatement.Property, Ontology.PredicateModelAttributeValue, Ontology.AnyEntity)))
                .GroupBy(t => (int)((Literal)t.Property).Value);
-            foreach(var targetVariable in targetVariableStatements) {
+            foreach (var targetVariable in targetVariableStatements) {
               numberOfModelsOfTargetVariableOfDataSet[datasetStatement.Subject].Add(targetVariable.Key, targetVariable.Count());
             }
@@ -68 +69 @@
         }
       }
-      foreach(KeyValuePair<Entity, Dictionary<int, int>> dataSetEntry in numberOfModelsOfTargetVariableOfDataSet) {
+      foreach (KeyValuePair<Entity, Dictionary<int, int>> dataSetEntry in numberOfModelsOfTargetVariableOfDataSet) {
         DataSet dataSet = new DataSet(store, dataSetEntry.Key);
-        foreach(int targetVariable in dataSet.Problem.AllowedTargetVariables)
-          if(!dataSetEntry.Value.ContainsKey(targetVariable) || dataSetEntry.Value[targetVariable] < 10) {
-            QueueJob(CreateStandardGp(dataSet, targetVariable));
+        foreach (int targetVariable in dataSet.Problem.AllowedTargetVariables)
+          if (!dataSetEntry.Value.ContainsKey(targetVariable) || dataSetEntry.Value[targetVariable] < 10) {
+            IEngine engine = CreateEngine(dataSet.Problem, targetVariable);
+            if (engine != null) {
+              QueueJob(new Execution(dataSetEntry.Key, engine, targetVariable));
+            }
           }
       }
     }
 
-    private StandardGP CreateStandardGp(DataSet dataSet, int targetVariable) {
-      ProblemInjector probInjector = new ProblemInjector(dataSet.Problem);
+    private void QueueJob(Execution execution) {
+      dispatchQueue.Add(execution);
+    }
+
+    public Execution GetNextJob() {
+      if (dispatchQueue.Count == 0) FillDispatchQueue();
+      Execution next = dispatchQueue[0];
+      dispatchQueue.RemoveAt(0);
+      return next;
+    }
+
+    internal void Start() {
+      FillDispatchQueue();
+    }
+
+    private IEngine CreateEngine(Problem problem, int targetVariable) {
+      switch (problem.LearningTask) {
+        case LearningTask.Classification: return null;
+        case LearningTask.Regression: {
+            return CreateStandardGp(problem, targetVariable).Engine;
+          }
+        case LearningTask.TimeSeries: return null;
+        case LearningTask.Clustering: return null;
+        default: return null;
+      }
+    }
+
+    private StandardGP CreateStandardGp(Problem problem, int targetVariable) {
+      ProblemInjector probInjector = new ProblemInjector(problem);
       probInjector.TargetVariable = targetVariable;
       StandardGP sgp = new StandardGP();
@@ -88 +119 @@
       return sgp;
     }
-
-    private void QueueJob(StandardGP job) {
-      dispatchQueue.Add(job);
-    }
-
-    private StandardGP GetNextJob() {
-      if(dispatchQueue.Count == 0) FillDispatchQueue();
-      StandardGP next = dispatchQueue[0];
-      dispatchQueue.RemoveAt(0);
-      return next;
-    }
-
-    internal void Start() {
-      FillDispatchQueue();
-    }
   }
 }

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Server/HeuristicLab.CEDMA.Server.csproj

@@ -75 +75 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Execution.cs" />
+    <Compile Include="Executer.cs" />
     <Compile Include="Dispatcher.cs" />
     <Compile Include="Server.cs" />

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Server/Server.cs

@@ -51 +51 @@
 
     public Server(IStore store) {
-      // windows XP returns the external ip on index 0 while windows vista returns the external ip on index 2
+      IPAddress[] addresses = Dns.GetHostAddresses(Dns.GetHostName());
+      // windows XP returns the external ip on index 0 while windows vista returns the external ip as one of the last entries
+      // also if IPv6 protocol is installed we want to find an entry that is IPv4
+      int index = 0;
       if (System.Environment.OSVersion.Version.Major >= 6) {
-        cedmaServiceUrl = "net.tcp://" + Dns.GetHostAddresses(Dns.GetHostName())[2] + ":8002/CEDMA/World";
-      } else {
-        cedmaServiceUrl = "net.tcp://" + Dns.GetHostAddresses(Dns.GetHostName())[0] + ":8002/CEDMA/World";
+        for (index = addresses.Length - 1; index >= 0; index--)
+          if (addresses[index].AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+            break;
       }
+      cedmaServiceUrl = "net.tcp://" + addresses[index] + ":8002/CEDMA";
       this.store = store;
     }

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Server/ServerForm.cs

@@ -45 +45 @@
     private Store store;
     private Dispatcher dispatcher;
+    private Executer executer;
 
     private static readonly string rdfFile = AppDomain.CurrentDomain.BaseDirectory + "rdf_store.db3";
@@ -64 +65 @@
 
     private void connectButton_Click(object sender, EventArgs e) {
-      // new GridExecutor(dispatcher)
+      executer = new Executer(dispatcher, store, gridAddress.Text);
+      executer.Start();
+      connectButton.Enabled = false;
     }
   }