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

Timestamp:

02/19/13 08:46:01 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Experiments will be saved as JSON elements within the blob store.
• Added simple model and JSON converters.
• Backend stores and runs experiments.
• Updated interfaces to save/read experiments.
• Added a binding to automatically map incoming JSON ajax requests to experiment models.
• Added the javascript DatatypeMapper to map parameter inputs to the right html elements and vice versa.
• Added smartwizard to generate Wizards for creating new experiments (New.cshtml).

Location:

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

Files:

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

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

@@ -23 +23 @@
     Experiment FindByName(string username, string experiment);
     IEnumerable<Experiment> GetExperiments(string user);
+    Experiment GetExperimentByName(string username, string scenario);
   }
 

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

@@ -21 +21 @@
     [OperationContract]
     bool ScheduleOptimizationScenario(User user, OptimizationScenario scenario, JobExecutionDetails details);
+
+    [OperationContract]
+    bool ScheduleExperiment(User user, string experiment, JobExecutionDetails details);
 
     [OperationContract]
@@ -54 +57 @@
     [OperationContract]
     Task GetTaskData(User u, string jobId, string taskId);
+
+    [OperationContract]
+    Experiment GetExperimentByName(User user, string scenario);
   }
 }

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

@@ -21 +21 @@
     Task GetTaskData(User u, string jobId, string taskId);
     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

@@ -274 +274 @@
   [DataContract]
   public class Algorithm {
-    public Algorithm() { Parameters = new AlgorithmParameters(); }
+    public Algorithm() { Parameters = new AlgorithmParameters(); ChildAlgorithms = new List<Algorithm>(); }
 
     [DataMember]
@@ -290 +290 @@
     [DataMember]
     public string Mapper { get; set; }
+
+    [DataMember]
+    public string Name { get; set; }
   }
 
@@ -296 +299 @@
     [DataMember]
     public string Id { get; set; }
-   
+
+    public OptimizationScenario() { Algorithm = new List<Algorithm>(); }
+
     [DataMember]
     public IList<Algorithm> Algorithm { get; set; }
@@ -309 +314 @@
 
     [DataMember]
-    public IList<OptimizationScenario> Scenarios { get; set; }
+    public IList<Algorithm> Algorithm { get; set; }
 
     public Experiment() {
-      Scenarios = new List<OptimizationScenario>();
-    }
+      Algorithm = new List<Algorithm>();
+    }
+
+    [DataMember]
+    public JobExecutionDetails JobDetails { get; set; }
   }