Changeset 9305 for branches/OaaS/HeuristicLab.Services.Optimization.Controller/Azure

Timestamp:

03/11/13 14:40:04 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Added an Update / GetExperiment... methods to the controller for updating and querying experiments.
• The AlgorithmConverter class now properly converts from/to JSON format.
• Integrated backbone js as MVC provider for JavaScript + jquery.
• Added experiment.model.js + experiment.view.js + experiment.controller.js containing the MVC impl. for the Experiment pages.
• Added new methods to the ExperimentController usable by the backbone js model implementation.
• Added the experiment dialog from HL 3.3.7 (variate experiment parameters). It's capable of variating the algorithm parameters.

File:

• branches/OaaS/HeuristicLab.Services.Optimization.Controller/Azure/DAL.cs (modified) (5 diffs)

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

@@ -101 +101 @@
     }
 
-    public ExperimentEntity(string user, string experimentName, string experimentUrl) {
+    public ExperimentEntity(string user, string experimentName, string experimentId, string experimentUrl) {
       PartitionKey = "ScenarioPartition";
       RowKey = user + "_" + experimentName;      
       User = user;
+      ExperimentId = experimentId;
       ExperimentJsonUrl = experimentUrl;
     }
+
+    public string ExperimentId { get; set; }
 
     public string User { get; set; }
@@ -122 +125 @@
         return false;
 
-      // TODO: Save the whole experiment, not just the algorithm names!!!
       CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
       container.CreateIfNotExist();
       // For now we store it as JSON element in the blob store
-      // TODO: Make sure, that all required properties are part of the experiment!!
-      var experimentJson = AlgorithmConverter.ConvertJson(experiment);
+      var experimentJson = AlgorithmConverter.ConvertExperimentToJson(experiment);
       Guid experimentJsonGuid = Guid.NewGuid();
       var experimentJsonId = experiment.Name + "_" + experimentJsonGuid.ToString();
+      experimentJson["nodeId"] = experimentJsonId.ToString();
       var blob = container.GetBlobReference(experimentJsonId);      
-      blob.UploadText(experimentJson);
+      blob.UploadText(experimentJson.ToString());
+      experiment.Id = experimentJsonId;
 
       TableServiceContext serviceContext = TableClient.GetDataServiceContext();      
       TableClient.CreateTableIfNotExist(AzureConstants.EXPERIMENT_TABLE);
-      var entity = new ExperimentEntity(username, experiment.Name, blob.Uri.ToString());
+      var entity = new ExperimentEntity(username, experiment.Name, experiment.Id, blob.Uri.ToString());
       serviceContext.AddObject(AzureConstants.EXPERIMENT_TABLE, entity);
       serviceContext.SaveChangesWithRetries();
+      return true;
+    }
+
+    public bool Update(string username, Experiment experiment) {
+      TableServiceContext serviceContext = TableClient.GetDataServiceContext();
+      TableClient.CreateTableIfNotExist(AzureConstants.EXPERIMENT_TABLE);
+      var entity = (from e in serviceContext.CreateQuery<ExperimentEntity>(AzureConstants.EXPERIMENT_TABLE)
+                    where e.ExperimentId == experiment.Id
+                    select e).FirstOrDefault();
+      if (entity == null) {
+        return false;
+      }
+
+      CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
+      container.CreateIfNotExist();
+      var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
+      var experimentJson = AlgorithmConverter.ConvertExperimentToJson(experiment).ToString();
+      blob.UploadText(experimentJson);
       return true;
     }
@@ -177 +198 @@
       container.CreateIfNotExist();
       var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
-      return AlgorithmConverter.ConvertExperimentSimple(blob.DownloadText());
+      return AlgorithmConverter.ConvertJsonToExperiment(blob.DownloadText());
     }
 
@@ -199 +220 @@
       foreach (var entity in entites) {
         var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
-        experiments.Add(AlgorithmConverter.ConvertExperimentSimple(blob.DownloadText()));
+        experiments.Add(AlgorithmConverter.ConvertJsonToExperiment(blob.DownloadText()));
       }
       return experiments;
@@ -218 +239 @@
       container.CreateIfNotExist();
       var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
-      var exp = AlgorithmConverter.ConvertExperimentSimple(blob.DownloadText());
+      var exp = AlgorithmConverter.ConvertJsonToExperiment(blob.DownloadText());
       return exp;
     }
+
+
+    public Experiment GetExperimentById(User user, string nodeId) {
+      TableServiceContext serviceContext = TableClient.GetDataServiceContext();
+      TableClient.CreateTableIfNotExist(AzureConstants.EXPERIMENT_TABLE);
+      var entity = (from e in serviceContext.CreateQuery<ExperimentEntity>(AzureConstants.EXPERIMENT_TABLE)
+                    where e.ExperimentId == nodeId
+                    select e).FirstOrDefault();
+      if (entity == null || entity.ExperimentJsonUrl == null) {
+        return null;
+      }
+
+      if (entity.User != user.Username)
+        return null;
+
+      CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
+      container.CreateIfNotExist();
+      var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
+      return AlgorithmConverter.ConvertJsonToExperiment(blob.DownloadText());
+    }
+
   }