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

Timestamp:

01/15/13 15:50:53 (11 years ago)

Author:

fschoepp

Message:

#1888:

• Model: OptimizationScenario may be a tree of algorithms (and problems)
• Model: Renamed InputParameters to ProblemParameters (as they are the parameters of a problem)
• Model: Added JobExecutionDetails which contain Repetitions + Group (resource to use)
• ScenarioParser parses the new XML scenario files
• Website + Model: You are now able to add/remove rows from a table (no JavaScript involved yet)
• Website + Controller: Added repetitions (enables batch jobs) and group (resource to use) to OaaS which will be used by the controller to schedule the job
• Website: Updated templates to use new model structure
• Website + Scenarios: Added the new algorithm Benchmark Algorithm
• Controller: Added a singleton to make the (Azure/Mockup)-DAL exchangeable
• Controller: Added mockup classes for DAL + IScenarioManager
• Website/Result Page: Line Diagrams will be added via JavaScript, crawling their data using AJAX
• Website: Most configuration parameters can be set in the ServiceDefinition directly
• Added a mockup for the Membership classes: These can be used if no network connection is available or if other parts of the app shall be tested
• Scenarios: Updated TSP mappings to new xsd

File:

• branches/OaaS/HeuristicLab.Services.Optimization.Controller/PlaceholderControllerService.cs (modified) (4 diffs)

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

@@ -51 +51 @@
       this.scenarios = new List<Model.OptimizationScenario>() { tsp };*/      
       //hiveManager.DispatchScenario(tsp);
+      //hiveManager = new MockupScenarioManager();
       hiveManager = new HiveScenarioManager();
       scenarios = parser.Scenarios;
@@ -63 +64 @@
     public Model.OptimizationScenario GetOptimizationScenarioByName(string name) {
       var scen = (from e in scenarios
-                  where e.Name == name
+                  where e.Id == name
                   select e).FirstOrDefault();      
       return scen;
     }
 
-    public void ScheduleOptimizationScenario(Model.User user, Model.OptimizationScenario scenario) {
-      hiveManager.DispatchScenario(user, scenario);
+    public void ScheduleOptimizationScenario(Model.User user, Model.OptimizationScenario scenario, JobExecutionDetails details) {
+      hiveManager.DispatchScenario(user, scenario, details);
     }
 
@@ -97 +98 @@
         return false;
       }      
-      var added = hiveManager.AddScenario(user, scenario.Name, scenarioXml, scenarioMapper);
+      var added = hiveManager.AddScenario(user, scenario.Id, scenarioXml, scenarioMapper);
       if (added) 
         scenarios.Add(scenario);
@@ -114 +115 @@
     public IEnumerable<string> GetOptimizationScenarioNames() {
       return (from e in scenarios
-              select e.Name).AsEnumerable();      
+              select e.Id).AsEnumerable();      
     }
   }