Changeset 8545 for branches/OaaS/HeuristicLab.Services.Optimization.Controller

Timestamp:

08/30/12 16:09:34 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Controller is now capable of gathering Hive Jobs
• Hive Jobs will be mapped to independent Job-Class (shared between Controller and Frontend)
• HiveScenarioManager is capable of gathering Hive Jobs + their results
• Job Results will be mapped to string properties
• Frontend renders all Results after opening the job details
• Misc: Frontend now passes User-object to Controller so that it is able to connect to the Hive Service (hardcoded values removed)

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Controller

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Optimization.ControllerService.csproj (modified) (2 diffs)
• HiveScenarioManager.cs (modified) (5 diffs)
• Interfaces/IControllerService.cs (modified) (1 diff)
• Interfaces/IScenarioManager.cs (modified) (1 diff)
• Model/ControllerModel.cs (modified) (4 diffs)
• PlaceholderControllerService.cs (modified) (1 diff)

branches/OaaS/HeuristicLab.Services.Optimization.Controller/HeuristicLab.Services.Optimization.ControllerService.csproj

@@ -95 +95 @@
       <HintPath>..\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.ParallelEngine-3.3">
+      <HintPath>..\bin\HeuristicLab.ParallelEngine-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -108 +111 @@
     <Reference Include="HeuristicLab.Problems.TravelingSalesman-3.3">
       <HintPath>..\bin\HeuristicLab.Problems.TravelingSalesman-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.VehicleRouting-3.3">
+      <HintPath>..\bin\HeuristicLab.Problems.VehicleRouting-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.VehicleRouting-3.4">
+      <HintPath>..\bin\HeuristicLab.Problems.VehicleRouting-3.4.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">

branches/OaaS/HeuristicLab.Services.Optimization.Controller/HiveScenarioManager.cs

@@ -14 +14 @@
 using HeuristicLab.Clients.Hive;
 using System.Threading;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Services.Optimization.ControllerService {
@@ -110 +111 @@
     }
 
-    public void DispatchScenario(Model.OptimizationScenario scenario) {
+    public void DispatchScenario(Model.User user, Model.OptimizationScenario scenario) {
       Experiment experiment = new Experiment();
       var problem = new TravelingSalesmanProblem();
@@ -124 +125 @@
 
       experiment.Optimizers.Add(algo);
-      SendExperimentToHive(experiment);
-    }
-
-    private void SendExperimentToHive(Experiment exp) {
+      SendExperimentToHive(user, experiment);
+    }
+
+    private void SendExperimentToHive(Model.User user, Experiment exp) {
       var job = new RefreshableJob();
       job.IsAllowedPrivileged = true;      
@@ -134 +135 @@
       job.RefreshAutomatically = false;
       job.HiveTasks.Add(new OptimizerHiveTask(exp));
-      HiveServiceLocator.Instance.Username = "fschoeppl";
-      HiveServiceLocator.Instance.Password = "fschoeppl";
+      HiveServiceLocator.Instance.Username = user.Username;
+      HiveServiceLocator.Instance.Password = user.Password;
       HiveServiceLocator.Instance.EndpointConfigurationName = "WSHttpBinding_IHiveService";
       
@@ -144 +145 @@
       job.StopResultPolling();
     }
+
+
+    public IList<Model.Job> GetJobs(User user) {
+      HiveServiceLocator.Instance.Username = user.Username;
+      HiveServiceLocator.Instance.Password = user.Password;
+      HiveServiceLocator.Instance.EndpointConfigurationName = "WSHttpBinding_IHiveService";
+      var jobsLoaded = HiveServiceLocator.Instance.CallHiveService<IEnumerable<HeuristicLab.Clients.Hive.Job>>(s => s.GetJobs());
+      IList<Model.Job> jobs = new List<Model.Job>();
+      
+      foreach (var job in jobsLoaded) {
+        jobs.Add(ConvertJob(user, job));
+      }
+      return jobs;
+    }
+
+    private Model.Job ConvertJob(User user, HeuristicLab.Clients.Hive.Job job) 
+    {
+      var waitingJobs = job.JobCount - job.CalculatingCount - job.FinishedCount;
+      Model.JobState? state = null;
+      var jobTasks = HiveServiceLocator.Instance.CallHiveService<IEnumerable<HeuristicLab.Clients.Hive.LightweightTask>>(s => s.GetLightweightJobTasks(job.Id));
+      
+      foreach (var task in jobTasks) {        
+        switch (task.State) {
+          case TaskState.Aborted:
+            state = JobState.Aborted;
+            break;
+          case TaskState.Failed:
+            state = JobState.Failed;
+            break;
+        }
+      }
+      if (!state.HasValue) {
+        if (job.CalculatingCount > 0)
+          state = JobState.Calculating;
+        else if (waitingJobs > 0)
+          state = JobState.Waiting;
+        else
+          state = JobState.Finished;
+      }
+      return new Model.Job() { Id = job.Id.ToString(), Name = job.Name, Resource = job.ResourceNames, State = state.Value };
+    }
+
+
+    public Model.Job GetJob(User user, string id) {
+      HiveServiceLocator.Instance.Username = user.Username;
+      HiveServiceLocator.Instance.Password = user.Password;
+      HiveServiceLocator.Instance.EndpointConfigurationName = "WSHttpBinding_IHiveService";
+      var guid = Guid.Parse(id);
+      return ConvertJob(user, HiveServiceLocator.Instance.CallHiveService<HeuristicLab.Clients.Hive.Job>(s => s.GetJob(guid)));
+    }
+
+
+    public void DeleteJob(User user, string id) {
+      HiveServiceLocator.Instance.Username = user.Username;
+      HiveServiceLocator.Instance.Password = user.Password;
+      HiveServiceLocator.Instance.EndpointConfigurationName = "WSHttpBinding_IHiveService";
+      var guid = Guid.Parse(id);
+      HiveServiceLocator.Instance.CallHiveService(s => s.DeleteJob(guid));      
+    }
+
+    public IList<Model.Run> GetJobResults(User user, string id) {
+      HiveServiceLocator.Instance.Username = user.Username;
+      HiveServiceLocator.Instance.Password = user.Password;
+      HiveServiceLocator.Instance.EndpointConfigurationName = "WSHttpBinding_IHiveService";
+      var guid = Guid.Parse(id);
+      var jobTasks = HiveServiceLocator.Instance.CallHiveService<IEnumerable<HeuristicLab.Clients.Hive.LightweightTask>>(s => s.GetLightweightJobTasks(guid));
+
+      IList<Guid> taskIds = new List<Guid>();
+      foreach (var task in jobTasks) {
+        taskIds.Add(task.Id);
+      }
+      TaskDownloader downloader = new TaskDownloader(taskIds);
+      downloader.StartAsync();
+      while (!downloader.IsFinished) {        
+        Thread.Sleep(500);
+
+        if (downloader.IsFaulted) {
+          throw downloader.Exception;
+        }
+      }
+      IDictionary<Guid, HiveTask> hiveTasks = downloader.Results;
+      IList<Model.Run> runs = new List<Model.Run>();
+      foreach (var keyTask in hiveTasks.Keys) {
+        var oht = hiveTasks[keyTask] as OptimizerHiveTask;
+        if (oht != null) {
+          foreach (var run in oht.ItemTask.Item.Runs) {
+            Model.Run taskRun = new Model.Run();
+            taskRun.Id = taskRun.Name = run.Name;
+            IList<Parameter> resultValues = new List<Model.Parameter>();
+            foreach (var key in run.Results.Keys) {
+              var value = run.Results[key];              
+              Parameter result = MapHiveDataType(key, value);
+              resultValues.Add(result);
+            }
+            taskRun.Results = resultValues;
+            runs.Add(taskRun);
+          }
+        }
+      }
+      return runs;
+    }
+    private Parameter MapHiveDataType(string name, IItem item) {
+      Parameter result = new Parameter();
+      result.Type = ParameterType.String;
+      if (item is IStringConvertibleValue) {
+        var value = (item as IStringConvertibleValue).GetValue();
+        result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.StringValue() { Name = name, Value = value };
+      }
+      else if (item is IStringConvertibleValueTuple) {
+        var value1 = (item as IStringConvertibleValueTuple).Item1.GetValue();
+        var value2 = (item as IStringConvertibleValueTuple).Item2.GetValue();
+        result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.StringValue() { Name = name, Value = "{" + value1 + ", " + value2 + "}" };
+      }
+      else if (item is IStringConvertibleArray) {
+        StringBuilder sb = new StringBuilder();
+        var array = item as IStringConvertibleArray;
+        if (array.Length == 0) {
+          sb.Append("[ ]");
+        } else {
+          sb.Append("[");
+          for (int i=0; i < array.Length - 1; i++) {
+            sb.Append(array.GetValue(i)).Append(", ");          
+          }
+          sb.Append(array.GetValue(array.Length - 1));
+          sb.Append(" ]");
+        }
+        var value = sb.ToString();
+        result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.StringValue() { Name = name, Value = value };
+      }
+      else if (item is IStringConvertibleMatrix) {
+        StringBuilder sb = new StringBuilder();
+        var matrix = item as IStringConvertibleMatrix;
+        if (matrix.Rows == 0 || matrix.Columns == 0) {
+          sb.Append("[ ]");
+        }
+        else {
+          sb.Append("[ ");
+          for (int r = 0; r < matrix.Rows; r++) {
+            sb.Append("( ");
+            for (int c = 0; c < matrix.Columns - 1; c++) {
+              sb.Append(matrix.GetValue(r, c)).Append(", ");
+            }
+            sb.Append(matrix.GetValue(r, matrix.Columns - 1)).Append(r < matrix.Rows - 1 ? " ), " : " )");
+          }
+          sb.Append(" ]");
+        }
+        var value = sb.ToString();
+        result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.StringValue() { Name = name, Value = value };
+      }
+      else {
+        result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.StringValue() { Name = name, Value = "Cannot be displayed as string" };
+      }
+      return result;
+    }
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Interfaces/IControllerService.cs

@@ -17 +17 @@
 
     [OperationContract]
-    void ScheduleOptimizationScenario(OptimizationScenario scenario);
+    void ScheduleOptimizationScenario(User user, OptimizationScenario scenario);
+
+    [OperationContract]
+    IEnumerable<Job> GetJobs(User user);
+
+    [OperationContract]
+    Job GetJob(User user, string id);
+
+    [OperationContract]
+    void DeleteJob(User user, string id);
+
+    [OperationContract]
+    IList<Model.Run> GetJobResults(User user, string id);
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Interfaces/IScenarioManager.cs

@@ -7 +7 @@
 namespace HeuristicLab.Services.Optimization.ControllerService.Interfaces {
   public interface IScenarioManager {
-    void DispatchScenario(OptimizationScenario scenario);
+    void DispatchScenario(User user, OptimizationScenario scenario);
+    IList<Job> GetJobs(User user);
+    Job GetJob(User user, string id);
+    void DeleteJob(User user, string id);
+    IList<Model.Run> GetJobResults(User user, string id);
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Model/ControllerModel.cs

@@ -23 +23 @@
     DecimalVector,
     [EnumMember]
-    Percent
+    Percent,
+    [EnumMember]
+    String
   }
 
@@ -151 +153 @@
 
   [DataContract]
+  public class StringValue : Value {
+    [DataMember]
+    public string Value { get; set; }
+
+    public override bool TrySetFromString(string input) {
+      Value = input;
+      return true;
+    }
+  }
+
+  [DataContract]
   [KnownType(typeof(BoolValue))]
   [KnownType(typeof(DecimalValue))]
@@ -156 +169 @@
   [KnownType(typeof(DecimalVector))]
   [KnownType(typeof(DecimalMatrix))]
+  [KnownType(typeof(StringValue))]
   public class Parameter {        
     // some kind of value type
@@ -211 +225 @@
       set { algorithmParameters = value; }
     }
-
+  }
+
+  [DataContract]
+  public enum JobState {
+    [EnumMember]
+    Waiting,
+    [EnumMember]
+    Calculating,
+    [EnumMember]
+    Aborted,
+    [EnumMember]
+    Failed,
+    [EnumMember]
+    Finished
+  }
+
+  [DataContract]
+  public class Job {
+    [DataMember]
+    public string Id { get; set; }
+
+    [DataMember]
+    public JobState State { get; set; }
+
+    [DataMember]
+    public string Name { get; set; }
+
+    [DataMember]
+    public string Resource { get; set; }    
+  }
+
+  [DataContract]
+  public class Run {
+    [DataMember]
+    public string Id { get; set; }
+
+    [DataMember]
+    public string Name { get; set; }
+
+    [DataMember]
+    public IList<Parameter> Results { get; set; }
+  }
+
+  [DataContract]
+  public class User {
+    [DataMember]
+    public string Username { get; set; }
+    [DataMember]
+    public string Password { get; set; }
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/PlaceholderControllerService.cs

@@ -61 +61 @@
     }
 
-    public void ScheduleOptimizationScenario(Model.OptimizationScenario scenario) {
-      hiveManager.DispatchScenario(scenario);
+    public void ScheduleOptimizationScenario(Model.User user, Model.OptimizationScenario scenario) {
+      hiveManager.DispatchScenario(user, scenario);
     }
 
-    
+    public IEnumerable<Model.Job> GetJobs(Model.User user) {
+      return hiveManager.GetJobs(user);
+    }
+
+
+    public Model.Job GetJob(Model.User user, string id) {
+      return hiveManager.GetJob(user, id);
+    }
+
+
+    public void DeleteJob(Model.User user, string id) {
+      hiveManager.DeleteJob(user, id);
+    }
+
+
+    public IList<Model.Run> GetJobResults(Model.User user, string id) {
+      return hiveManager.GetJobResults(user, id);
+    }
   }
 }