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

Timestamp:

03/20/13 16:56:28 (12 years ago)

Author:

fschoepp

Message:

#1888:

• DAL: Added a Delete method which deletes by experiment id.
• HL DataTables will now be transposed and mapped as double[ROWS][COLUMNS] (transposed)
• JS: Moved all classes into "modules" to prevent namespace pollution (using OAAS_MODEL for model classes, OAAS_VIEW for views and OAAS_CONTROLLER for controllers)
• JS: Moved DatatypeMapper classes into Backbone views
• JS: Models now correctly send DELETE requests
• Added a new job overview page (which also renders run details) using AJAX
• Using moment.min.js to format DateTime as string
• Controllers now inherit from BaseController which provides a RedirectToLoginIfNecessary-method
• Added loading animations to several AJAX bound places (loading experiments / scenarios)
• Added a section to _Layout.cshtml which allows page-specific JavaScript includes (<script> only for a certain page)
• Fixed Build/Edit of experiment menu redirecting to the wrong page
• The Experiment Variation Dialog disables input fields, if the property has not been activated before

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Controller

Files:

• Azure/DAL.cs (modified) (3 diffs)
• HL/HiveScenarioManager.cs (modified) (6 diffs)
• Interfaces/DAL.cs (modified) (1 diff)
• Interfaces/IControllerService.cs (modified) (1 diff)
• Interfaces/IScenarioManager.cs (modified) (1 diff)
• Mockup/MockupScenarioManager.cs (modified) (1 diff)
• Parsers/AlgorithmConverter.cs (modified) (1 diff)
• PlaceholderControllerService.cs (modified) (1 diff)

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Azure/DAL.cs

@@ -162 +162 @@
     }
 
+    public bool Delete(string username, string experimentId) {
+      TableServiceContext serviceContext = TableClient.GetDataServiceContext();
+      TableClient.CreateTableIfNotExist(AzureConstants.EXPERIMENT_TABLE);
+      var entity = (from e in serviceContext.CreateQuery<ExperimentEntity>(AzureConstants.EXPERIMENT_TABLE)
+                    where e.ExperimentId == experimentId
+                    select e).FirstOrDefault();
+
+      if (entity == null)
+        return false;
+
+      if (entity.ExperimentJsonUrl != null) {
+        CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
+        container.CreateIfNotExist();
+        var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
+        blob.DeleteIfExists();
+      }
+
+      serviceContext.DeleteObject(entity);
+      serviceContext.SaveChangesWithRetries();
+      return true;
+    }
+
     public bool DeleteByName(string username, string experiment) {
       TableServiceContext serviceContext = TableClient.GetDataServiceContext();
@@ -209 +231 @@
     //}
 
-    public IEnumerable<Model.Experiment> GetExperiments(string user) {
+    public IEnumerable<Model.Experiment> GetExperiments(string user, bool namesOnly=false) {
       TableServiceContext serviceContext = TableClient.GetDataServiceContext();
       TableClient.CreateTableIfNotExist(AzureConstants.EXPERIMENT_TABLE);
@@ -216 +238 @@
                     select e).ToList();
       var experiments = new List<Experiment>();
-      CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
-      container.CreateIfNotExist();
-      foreach (var entity in entites) {
-        var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
-        experiments.Add(AlgorithmConverter.ConvertJsonToExperiment(blob.DownloadText()));
-      }
-      return experiments;
+      if (namesOnly) {
+        return (from e in entites select new Model.Experiment() { Id = e.ExperimentId, Name = e.RowKey.Split('_')[1] });
+      }
+      else {
+        CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
+        container.CreateIfNotExist();
+        foreach (var entity in entites) {
+          var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
+          experiments.Add(AlgorithmConverter.ConvertJsonToExperiment(blob.DownloadText()));
+        }
+        return experiments;
+      }
     }
 

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

@@ -336 +336 @@
       else if (item is DoubleMatrix) {
         var matrix = item as DoubleMatrix;
-        double[][] matrixValue = new double[matrix.Rows][];
+        /*double[][] matrixValue = new double[matrix.Rows][];
         for (int i = 0; i < matrixValue.Length; ++i) {
           matrixValue[i] = new double[matrix.Columns];
@@ -342 +342 @@
             matrixValue[i][j] = matrix[i, j];
           }
-        }
-        result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.DecimalMatrix() { Name = name, Value = matrixValue };
+        } */
+        double[][] matrixValue = new double[matrix.Columns][];
+        for (int i = 0; i < matrix.Columns; ++i) {
+          matrixValue[i] = new double[matrix.Rows];
+          for (int j = 0; j < matrix.Rows; ++j) {
+            matrixValue[i][j] = matrix[j, i];
+          }
+        }        
+        result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.DecimalMatrix() { Name = name, Value = matrixValue, RowNames = (matrix.ColumnNames.Count() > 0 ? matrix.ColumnNames.ToArray() : null) };
       }
       else if (item is IStringConvertibleArray) {
@@ -369 +376 @@
           var columns = table.Rows.ToList()[i];
           names[i] = columns.Name;
-          results[i] = new double[columns.Values.Count];
+          results[i] = new double[columns.Values.Count];          
           for (int j=0; j < columns.Values.Count; j++) {
             results[i][j] = columns.Values[j];
           }
         }
+        results = transpose(results);
         result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.DecimalMatrix() { Name = name, Value = results, RowNames = names };
       }
@@ -437 +445 @@
     }
 
+    private double[][] transpose(double[][] arr) {
+      var width = arr.Length;
+      var height = arr[0].Length;
+
+      var res = new double[height][];
+      for (var i = 0; i < height; i++) 
+        res[i] = new double[width];
+
+      for (var i = 0; i < width; i++) {
+        for (var j = 0; j < height; j++) {
+          res[j][i] = arr[i][j];
+        }
+      }
+      return res;
+    }
+
     private string GetMapperFromBlobStore(string scenarioName) {
       var scenarioDao = dal.ScenarioDao;
@@ -482 +506 @@
 
     public bool DeleteExperiment(User user, string experiment) {
-      return dal.ExperimentDao.DeleteByName(user.Username, experiment);
+      return dal.ExperimentDao.Delete(user.Username, experiment);
     }
 
@@ -564 +588 @@
     }
 
-    public IEnumerable<Model.Experiment> GetExperiments(User user) {
-      return dal.ExperimentDao.GetExperiments(user.Username);
+    public IEnumerable<Model.Experiment> GetExperiments(User user, bool namesOnly=false) {
+      return dal.ExperimentDao.GetExperiments(user.Username, namesOnly);
     }
 

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

@@ -22 +22 @@
     bool Update(string username, Experiment experiment);
     bool DeleteByName(string username, string experiment);
+    bool Delete(string username, string experimentId);
     Experiment FindByName(string username, string experiment);
-    IEnumerable<Experiment> GetExperiments(string user);
+    IEnumerable<Experiment> GetExperiments(string user, bool namesOnly = false);
     Experiment GetExperimentByName(string username, string scenario);
 

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

@@ -50 +50 @@
 
     [OperationContract]
-    IEnumerable<Experiment> GetExperiments(User user);
+    IEnumerable<Experiment> GetExperiments(User user, bool namesOnly = false);
 
     [OperationContract]

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

@@ -17 +17 @@
     string SaveExperiment(User user, Experiment experiment);
     IEnumerable<string> GetExperimentNames(User user);
-    IEnumerable<Model.Experiment> GetExperiments(User user);
+    IEnumerable<Model.Experiment> GetExperiments(User user, bool namesOnly = false);
     Experiment GetExperimentByName(User user, string scenario);
     Experiment GetExperimentById(User user, string nodeId);

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Mockup/MockupScenarioManager.cs

@@ -279 +279 @@
     }
 
-    public IEnumerable<Model.Experiment> GetExperiments(User user) {
+    public IEnumerable<Model.Experiment> GetExperiments(User user, bool namesOnly = false) {
       throw new NotImplementedException();
     }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Parsers/AlgorithmConverter.cs

@@ -184 +184 @@
     }
 
+    public static JObject ConvertRunToJson(Run run) {
+      var jrun = new JObject();
+      jrun["id"] = run.Id;
+      jrun["name"] = run.Name;
+      jrun["results"] = ConvertParametersToJson(run.Results);
+      return jrun;
+    }
+
+    public static JArray ConvertRunsToJson(IList<Run> runs) {
+       var jarray = new JArray();
+      foreach (var run in runs)
+        jarray.Add(ConvertRunToJson(run));
+      return jarray;
+    }
+
     public static Experiment ConvertJsonToExperiment(string json) {
       var experiment = new Experiment();

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

@@ -185 +185 @@
 
 
-    public IEnumerable<Experiment> GetExperiments(User user) {
-      return hiveManager.GetExperiments(user);
+    public IEnumerable<Experiment> GetExperiments(User user, bool namesOnly=false) {
+      return hiveManager.GetExperiments(user, namesOnly);
     }