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

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.

Location:

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

Files:

• DAL.cs (modified) (1 diff)
• IControllerService.cs (modified) (2 diffs)
• IScenarioManager.cs (modified) (2 diffs)
• Model/ControllerModel.cs (modified) (3 diffs)

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

@@ -20 +20 @@
   public interface IExperimentDao {
     bool Add(string username, Experiment experiment);
+    bool Update(string username, Experiment experiment);
     bool DeleteByName(string username, string experiment);
     Experiment FindByName(string username, string experiment);
     IEnumerable<Experiment> GetExperiments(string user);
     Experiment GetExperimentByName(string username, string scenario);
+
+    Experiment GetExperimentById(User user, string nodeId);
   }
 

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

@@ -44 +44 @@
 
     [OperationContract]
-    bool SaveExperiment(User user, Experiment experiment);
+    string SaveExperiment(User user, Experiment experiment);
 
     [OperationContract]
-    IEnumerable<string> GetExperiments(User user);
+    IEnumerable<string> GetExperimentNames(User user);
+
+    [OperationContract]
+    IEnumerable<Experiment> GetExperiments(User user);
 
     [OperationContract]
@@ -60 +63 @@
     [OperationContract]
     Experiment GetExperimentByName(User user, string scenario);
+
+    [OperationContract]
+    Experiment GetExperimentById(User u, string nodeId);
   }
 }

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

@@ -15 +15 @@
     bool DeleteScenario(User user, string scenarioName);
 
-    bool SaveExperiment(User user, Experiment experiment);
-    IEnumerable<string> GetExperiments(User user);
+    string SaveExperiment(User user, Experiment experiment);
+    IEnumerable<string> GetExperimentNames(User user);
+    IEnumerable<Model.Experiment> GetExperiments(User user);
+    Experiment GetExperimentByName(User user, string scenario);
+    Experiment GetExperimentById(User user, string nodeId);
+
     bool DeleteExperiment(User user, string experiment);
 
@@ -22 +26 @@
     Job GetTasks(User u, string jobId);
 
-    Experiment GetExperimentByName(User user, string scenario);
+    
     bool DispatchExperiment(User user, Experiment exp, JobExecutionDetails details);
   }

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

@@ -277 +277 @@
 
     [DataMember]
+    public string Id { get; set; }
+
+    [DataMember]
     public AlgorithmParameters Parameters { get; set; }
 
@@ -293 +296 @@
     [DataMember]
     public string Name { get; set; }
+
+    [DataMember]
+    public bool IsExperiment { get; set; }
   }
 
@@ -315 +321 @@
     [DataMember]
     public IList<Algorithm> Algorithm { get; set; }
+
+    [DataMember]
+    public string Id { get; set; }
 
     public Experiment() {