Changeset 9305 for branches/OaaS/HeuristicLab.Services.Optimization.Controller/PlaceholderControllerService.cs

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/PlaceholderControllerService.cs (modified) (3 diffs)

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

@@ -121 +121 @@
 
 
-    public bool SaveExperiment(User user, Experiment experiment) {      
+    public string SaveExperiment(User user, Experiment experiment) {      
       // make sure all algorithms store their choices aswell
       var scenarioMap = new Dictionary<string, OptimizationScenario>();
@@ -146 +146 @@
 
       // finally store the experiment
-      var success = hiveManager.SaveExperiment(user, experiment);
+      var id = hiveManager.SaveExperiment(user, experiment);
       // if it has been stored, and jobdetails are present, run the job!
-      if (success && experiment.JobDetails != null) {
-        return ScheduleExperiment(user, experiment.Name, experiment.JobDetails);
+      if (id != null && experiment.JobDetails != null) {
+        ScheduleExperiment(user, experiment.Id, experiment.JobDetails);
       }
-      return success;
+      return id;
     }
 
 
-    public IEnumerable<string> GetExperiments(User user) {
-      return hiveManager.GetExperiments(user);
+    public IEnumerable<string> GetExperimentNames(User user) {
+      return hiveManager.GetExperimentNames(user);
     }
 
@@ -179 +179 @@
 
 
-    public bool ScheduleExperiment(User user, string experiment, JobExecutionDetails details) {
-      var exp = hiveManager.GetExperimentByName(user, experiment);
+    public bool ScheduleExperiment(User user, string experimentId, JobExecutionDetails details) {
+      var exp = hiveManager.GetExperimentById(user, experimentId);
       return hiveManager.DispatchExperiment(user, exp, details);
+    }
+
+
+    public IEnumerable<Experiment> GetExperiments(User user) {
+      return hiveManager.GetExperiments(user);
+    }
+
+    public Experiment GetExperimentById(User u, string nodeId) {
+      return hiveManager.GetExperimentById(u, nodeId);
     }
   }