Changeset 9062 for branches/OaaS/HeuristicLab.Services.Optimization.Controller/HL/HiveScenarioManager.cs

Timestamp:

12/17/12 09:37:16 (11 years ago)

Author:

fschoepp

Message:

#1888:
Backend changes:

• Simplified job state detection (only one hive call will be made to detect all states now, instead of one additional call per job)
• Reorganized classes (moved model classes into Model folder)

Website changes:

• Website now heavily uses JavaScript to achieve better user experience
• JavaScript degrades gracefully, except for plots
• Tables: Added jquery-datatable-plugin to extend tables (pagination + search functionality)
• OaaS-Website now uses the design of the HL websites (found in WebApplication branch)
• Added jqplot to render zoomable line plots for HL-Datatables
• Styling.js: Plots will be generated by using an ajax call; additional jquery-styling occurs within this file.
• Added jquery-ui-1.9.2 which is capable of handling/rendering tabs, accordions and resizers.

File:

• branches/OaaS/HeuristicLab.Services.Optimization.Controller/HL/HiveScenarioManager.cs (modified) (8 diffs)

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

@@ -19 +19 @@
 using Microsoft.WindowsAzure.StorageClient;
 using HeuristicLab.Services.Optimization.ControllerService.Azure;
+using System.Data;
 
 namespace HeuristicLab.Services.Optimization.ControllerService {
@@ -112 +113 @@
           var mapper = CompileMapper(mapperString);
 
-          /*@"using System;
-              using System.Collections.Generic;
-              using System.Linq;
-              using System.Text;
-              using HeuristicLab.Data;
-              using HeuristicLab.Services.Optimization.ControllerService.Model; 
-              using HeuristicLab.Optimization;
-              using HeuristicLab.Services.Optimization.ControllerService;
-              using HeuristicLab.Algorithms.GeneticAlgorithm;
-              using HeuristicLab.Problems.TravelingSalesman;
-              public class TSPScenarioMapper : IScenarioMapper {
-                public void MapScenario(OptimizationScenario scenario, IAlgorithm algorithm) {
-                  Console.WriteLine(""Mapping scenario!"");
-                  var ga = algorithm as GeneticAlgorithm;
-                  var problem = algorithm.Problem as TravelingSalesmanProblem;
-                  
-                  problem.BestKnownQuality = HLMapper.ConvertToDoubleValue(scenario.InputParameters.FindByName(""BestKnownQuality""));
-                  problem.BestKnownSolution = HLMapper.ConvertToPermutation(scenario.InputParameters.FindByName(""BestKnownSolution""));
-                  problem.Coordinates = HLMapper.ConvertToDoubleMatrix(scenario.InputParameters.FindByName(""Coordinates""));
-                  var evalParam = HLMapper.GetStringValue(scenario.InputParameters.FindByName(""EvaluatorParameter""));
-                  if (evalParam == ""HeuristicLab.Problems.TravelingSalesman.TSPRoundedEuclideanPathEvaluator"") {
-                    problem.EvaluatorParameter.Value = new TSPRoundedEuclideanPathEvaluator();
-                  }
-                  else if (evalParam == ""HeuristicLab.Problems.TravelingSalesman.TSPGeoPathEvaluator"") {
-                    problem.EvaluatorParameter.Value = new TSPGeoPathEvaluator();
-                  }
-                  else {
-                    problem.EvaluatorParameter.Value = new TSPEuclideanPathEvaluator();
-                  }
-                  problem.UseDistanceMatrix = HLMapper.ConvertToBoolValue(scenario.InputParameters.FindByName(""UseDistanceMatrix""));
-                  Console.WriteLine(""Mapping algorithm..."");
-                  ga.Mutator = HLMapper.FindInItemSet<HeuristicLab.Optimization.IManipulator>(ga.MutatorParameter.ValidValues, scenario.AlgorithmParameters.FindByName(""Mutator""));
-                  ga.CrossoverParameter.Value = HLMapper.FindOperator<HeuristicLab.Optimization.ICrossover>(problem, scenario.AlgorithmParameters.FindByName(""CrossoverParameter""));
-                  ga.Elites = HLMapper.ConvertToIntValue(scenario.AlgorithmParameters.FindByName(""Elites""));
-                  ga.MaximumGenerations = HLMapper.ConvertToIntValue(scenario.AlgorithmParameters.FindByName(""MaximumGenerations""));
-                  ga.MutationProbability = HLMapper.ConvertToPercentValue(scenario.AlgorithmParameters.FindByName(""MutationProbability""));                
-                  ga.PopulationSize = HLMapper.ConvertToIntValue(scenario.AlgorithmParameters.FindByName(""PopulationSize""));
-                  ga.Seed = HLMapper.ConvertToIntValue(scenario.AlgorithmParameters.FindByName(""Seed""));
-                  ga.Selector = HLMapper.FindInItemSet<HeuristicLab.Optimization.ISelector>(ga.SelectorParameter.ValidValues, scenario.AlgorithmParameters.FindByName(""Selector""));
-                  ga.SetSeedRandomly = HLMapper.ConvertToBoolValue(scenario.AlgorithmParameters.FindByName(""SetSeedRandomly""));
-                }
-              }"*/
-            mappers[scenario.Name] = mapper;
-            return mapper;
+          mappers[scenario.Name] = mapper;
+          return mapper;
         } // lock        
        } // if
@@ -202 +161 @@
       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));
+      if (job.CalculatingCount > 0)
+        state = JobState.Calculating;
+      else if (job.JobCount == job.FinishedCount)
+        state = JobState.Finished;
+      else
+        state = JobState.Waiting;
+      /*var jobTasks = HiveServiceLocator.Instance.CallHiveService<IEnumerable<HeuristicLab.Clients.Hive.LightweightTask>>(s => s.GetLightweightJobTasks(job.Id));
       
       foreach (var task in jobTasks) {        
@@ -220 +185 @@
           state = JobState.Waiting;
         else
-          state = JobState.Finished;
-      }
-      return new Model.Job() { Id = job.Id.ToString(), Name = job.Name, Resource = job.ResourceNames, State = state.Value };
+          state = JobState.Finished;        
+      }*/
+      return new Model.Job() { Id = job.Id.ToString(), Name = job.Name, Resource = job.ResourceNames, State = state.Value, DateCreated = job.DateCreated };
     }
 
@@ -286 +251 @@
 
     //TODO: We might need images / +++
+    
     private Parameter MapHiveDataType(string name, IItem item) {
       Parameter result = new Parameter();
       result.Type = ParameterType.String;
+      //TODO: How shall we handle dll specific datatypes?      
+      //if (item is PathTSPTour) {
+      //  var tour = item as PathTSPTour;           
+      //}
+      //else 
       if (item is IStringConvertibleValue) {
         var value = (item as IStringConvertibleValue).GetValue();
@@ -297 +268 @@
         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 DoubleArray) {
+        var array = item as DoubleArray;
+        double[] arrayValue = new double[array.Length];
+        for (int i = 0; i < arrayValue.Length; ++i) {
+          arrayValue[i] = array[i];
+        }
+        result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.DecimalVector() { Name = name, Value = arrayValue };
+      }
+      else if (item is DoubleMatrix) {
+        var matrix = item as DoubleMatrix;
+        double[][] matrixValue = new double[matrix.Rows][];
+        for (int i = 0; i < matrixValue.Length; ++i) {
+          matrixValue[i] = new double[matrix.Columns];
+          for (int j = 0; j < matrixValue[i].Length; ++j) {
+            matrixValue[i][j] = matrix[i, j];
+          }
+        }
+        result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.DecimalMatrix() { Name = name, Value = matrixValue };
       }
       else if (item is IStringConvertibleArray) {
@@ -303 +293 @@
         if (array.Length == 0) {
           sb.Append("[ ]");
-        } else {
+        }
+        else {
           sb.Append("[");
-          for (int i=0; i < array.Length - 1; i++) {
-            sb.Append(array.GetValue(i)).Append(", ");          
+          for (int i = 0; i < array.Length - 1; i++) {
+            sb.Append(array.GetValue(i)).Append(", ");
           }
           sb.Append(array.GetValue(array.Length - 1));
@@ -314 +305 @@
         result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.StringValue() { Name = name, Value = value };
       }
+      else if (item is HeuristicLab.Analysis.DataTable) {
+        var table = item as HeuristicLab.Analysis.DataTable;
+        string[] names = new string[table.Rows.Count];
+        double[][] results = new double[table.Rows.Count][];
+        for (int i = 0; i < table.Rows.Count; i++ ) {
+          var columns = table.Rows.ToList()[i];
+          names[i] = columns.Name;
+          results[i] = new double[columns.Values.Count];
+          for (int j=0; j < columns.Values.Count; j++) {
+            results[i][j] = columns.Values[j];
+          }
+        }
+        result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.DecimalMatrix() { Name = name, Value = results, RowNames = names };
+      }
       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++) {
+              matrix.GetValue(r, c);
               sb.Append(matrix.GetValue(r, c)).Append(", ");
             }