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

Timestamp:

04/24/13 13:40:43 (11 years ago)

Author:

fschoepp

Message:

#1888:

• Added visual extensions (dynamic JavaScript) which will be used to render additional result parameters specific to scenarios (e. g. create a graphical representation of a TSP).
• Added relationship between jobs and experiments (otherwise, it's not possible to get the job's experiment).
• Updated Admin page to allow removal/addition of visual extensions.
• Added back-end logic to store/retrieve/delete visual extensions.
• Added visual extension functionality to the JavaScript views/controllers (job.*.js).
• Added tsp.js which is a visual extension for the "Genetic Algorithm - TSP" scenario. It adds a graphical representation of the TSP (just like the C# version does) to the results.

Location:

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

Files:

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

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

@@ -30 +30 @@
   }
 
+  public interface IJobDao {
+    bool Add(string username, Experiment experiment, string jobId);
+    bool Delete(string username, string jobId);
+    Experiment FindByJobId(string username, string jobId);
+  }
+
   public interface IBlobDao {
     bool Add(StringEntry entry);
@@ -41 +47 @@
     bool DeleteById(string algorithmId);
     string FindById(string algorithmId);
+    bool Exists(string algorithmId);
   }
 
@@ -48 +55 @@
     IExperimentDao ExperimentDao { get; }
     IVisualExtensionDao VisualExtensionDao { get; }
+    IJobDao JobDao { get; }
   }
 

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

@@ -68 +68 @@
 
     [OperationContract]
-    string GetVisualExtension(string algorithmId);
+    VisualExtension GetVisualExtension(string algorithmId);
 
     [OperationContract]
@@ -75 +75 @@
     [OperationContract]
     bool DeleteVisualExtension(string algorithmId);
+
+    [OperationContract]
+    bool ExistsVisualExtension(string algorithmId);
   }
 }

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

@@ -30 +30 @@
 
     string GetVisualExtension(string algorithmId);
+
+    bool AddVisualExtension(string algorithmId, string script);
+
+    bool DeleteVisualExtension(string algorithmId);
+
+    bool ExistsVisualExtension(string algorithmId);
   }
 }

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

@@ -467 +467 @@
       set { tasks = value; }
     }
-
+  }
+
+  [DataContract]
+  public class VisualExtension {
+    [DataMember]
+    public string ScenarioId { get; set; }
+
+    [DataMember]
+    public string ScenarioJs { get; set; }
   }
 
@@ -484 +492 @@
     public IList<Parameter> InputParameters { get; set; }
 
+    [DataMember]
     public string AlgorithmName { get; set; }
   }