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

Timestamp:

03/11/13 14:40:04 (11 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/HL/HiveScenarioManager.cs (modified) (7 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Controller/HL/HiveScenarioManager.cs

@@ -97 +97 @@
         foreach (var child in entry.Children) {
           // This is a template experiment; 
-          if (child.Name == null) {
-            var parent = new HeuristicLab.Optimization.Experiment(child.Name);
+          if (child.IsExperiment) {
+            var parent = new HeuristicLab.Optimization.Experiment();
             entry.Parent.Optimizers.Add(parent);
             stack.Push(new StackEntry() { Parent = parent, Children = child.ChildAlgorithms });          
@@ -104 +104 @@
           // This entity is mapable
           else {           
-            IScenarioMapper mapper = GetMapper(child.Name);
-            if (mapper == null) { // TODO: We should really be able to difference Experiment/Algorithm types; this is a workaround
-              var parent = new HeuristicLab.Optimization.Experiment(child.Name);
-              entry.Parent.Optimizers.Add(parent);
-              stack.Push(new StackEntry() { Parent = parent, Children = child.ChildAlgorithms });          
-            }
-            else {
-              var optScen = new OptimizationScenario() { Id = child.Name };
-              optScen.Algorithm.Add(child);
-              IAlgorithm algo;
-              mapper.MapScenario(optScen, out algo);
-              entry.Parent.Optimizers.Add(algo);
-            }
+            IScenarioMapper mapper = GetMapper(child.Id);
+            var optScen = new OptimizationScenario() { Id = child.Id };
+            optScen.Algorithm.Add(child);
+            IAlgorithm algo;
+            mapper.MapScenario(optScen, out algo);
+            entry.Parent.Optimizers.Add(algo);
           }  
         }
@@ -166 +159 @@
     private IScenarioMapper GetMapper(string scenarioId) {
       var id = scenarioId;
-      if (!mappers.ContainsKey(id)) {
+      IScenarioMapper mapper = null;      
+      if (!mappers.TryGetValue(id, out mapper)) {
         lock (lockable) {
           if (mappers.ContainsKey(id))
@@ -173 +167 @@
           var mapperString = GetMapperFromBlobStore(id);
           if (mapperString == null) return null;
-          var mapper = CompileMapper(mapperString);
+          mapper = CompileMapper(mapperString);
 
           mappers[id] = mapper;
@@ -179 +173 @@
         } // lock        
        } // if
-      return null;
+      return mapper;
      }  
 
@@ -471 +465 @@
     }
 
-    public bool SaveExperiment(User user, Model.Experiment experiment) {
-      return dal.ExperimentDao.Add(user.Username, experiment);
-    }
-
-    public IEnumerable<string> GetExperiments(User user) {
+    public string SaveExperiment(User user, Model.Experiment experiment) {
+      if (experiment.Id != null) {
+        dal.ExperimentDao.Update(user.Username, experiment);
+      }
+      else {
+        dal.ExperimentDao.Add(user.Username, experiment);
+      }
+      return experiment.Id;
+    }
+
+    public IEnumerable<string> GetExperimentNames(User user) {
       return (from exp in dal.ExperimentDao.GetExperiments(user.Username)
               select exp.Name);
@@ -564 +564 @@
     }
 
-
-
+    public IEnumerable<Model.Experiment> GetExperiments(User user) {
+      return dal.ExperimentDao.GetExperiments(user.Username);
+    }
+
+    public Model.Experiment GetExperimentById(User user, string nodeId) {
+      return dal.ExperimentDao.GetExperimentById(user, nodeId);
+    }
   }
 }