Changeset 9227 for branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers

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.Web/Controllers

Files:

• ExperimentController.cs (modified) (4 diffs)
• OptimizationController.cs (modified) (1 diff)

branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers/ExperimentController.cs

@@ -8 +8 @@
 using HeuristicLab.Services.Optimization.ControllerService.Model;
 using System.Web.Security;
+using Mvc3TestApplication.Binders;
+using HeuristicLab.Services.Optimization.ControllerService.Parsers;
 
 namespace HeuristicLab.Services.Optimization.Web.Controllers
@@ -41 +43 @@
           foreach (var scenario in scenarios)
             model.Scenarios.Add(scenario);
+
+          Session["experiment"] = new Experiment();
+
           return View(model);
         }
+
+        public ActionResult New() {
+          return Index();
+        }
+
+        public Experiment Experiment { get { return Session["experiment"] as Experiment; } set { Session["experiment"] = value;} }
 
         [HttpPost]
@@ -63 +74 @@
             if (currentNode.title == "Experiment")
               continue;
-            experiment.Scenarios.Add(new OptimizationScenario() { Id = currentNode.title });
+            experiment.Algorithm.Add(new Algorithm() { Name = currentNode.title });
           }
 
@@ -94 +105 @@
           return RedirectToAction("Edit");
         }
+
+        [HttpPost]
+        public JsonResult SaveExperiment([ExperimentJson] Experiment experiment) {
+          return Json(
+            new { 
+              Success = ControllerService.withControllerService<bool>(service => {
+                User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
+                return service.SaveExperiment(u, experiment);
+              })
+            });
+        }
+
+        private JsonResult ComplexExperimentCase(string scenario) {
+          // complex case, find children of experiment
+          var model = new GetParametersModel() { Type = "Complex" };
+          model.Subnames = new List<string>();
+
+          var experiment = ControllerService.withControllerService<Experiment>(service => {
+            User user = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
+            return service.GetExperimentByName(user, scenario);
+          });
+
+          // TODO: Make a tree out of subnames!!
+          if (experiment != null)
+            foreach (var algo in experiment.Algorithm)
+              model.Subnames.Add(algo.Name);
+
+          return Json(model, JsonRequestBehavior.AllowGet);
+        }
+
+        [HttpGet]
+        public JsonResult GetParameters(string scenario, string context, int index) {
+          if (context == "Experiment" || context == null) {
+            var optimizationScenario = ControllerService.withControllerService<OptimizationScenario>(service => {
+              return service.GetOptimizationScenarioByName(scenario);
+            });
+
+            if (optimizationScenario != null) {
+              var model = new GetParametersModel() { Type = "Basic" };
+              model.Algorithm = optimizationScenario.FirstAlgorithm;
+              model.Algorithm.Mapper = optimizationScenario.Id;
+              var json = Json(model, JsonRequestBehavior.AllowGet);
+              return json;
+            }
+            else {
+              // complex case, find children of experiment
+              var model = new GetParametersModel() { Type = "Complex" };
+              model.Subnames = new List<string>();
+
+              var experiment = ControllerService.withControllerService<Experiment>(service => {
+                User user = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
+                return service.GetExperimentByName(user, scenario);
+              });
+
+              // TODO: Make a tree out of subnames!!
+              if (experiment != null)
+                foreach (var algo in experiment.Algorithm)
+                  model.Subnames.Add(algo.Name);
+
+              return Json(model, JsonRequestBehavior.AllowGet);
+            }
+          }
+          else {
+            var experiment = ControllerService.withControllerService<Experiment>(service => {
+              User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
+              return service.GetExperimentByName(u, context);
+            });
+
+            // if child algorithm is a complex algorithm, return as such
+            if (experiment.Algorithm[index].ChildAlgorithms.Count > 0) {
+              var model = new GetParametersModel() { Type = "Complex" };
+              model.Subnames = new List<string>();
+              foreach (var algo in experiment.Algorithm[index].ChildAlgorithms)
+                model.Subnames.Add(algo.Name);
+              return Json(model, JsonRequestBehavior.AllowGet);
+            }
+            else {
+              // otherwise we have the algorithms just below it
+              var model = new GetParametersModel() { Type = "Basic" };
+              model.Algorithm = experiment.Algorithm[index];
+              model.Algorithm.Mapper = experiment.Algorithm[index].Name;
+              var json = Json(model, JsonRequestBehavior.AllowGet);
+              return json;
+            }
+          }
+        }
     }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers/OptimizationController.cs

@@ -57 +57 @@
 
         public ActionResult JobDetails(string jobId) {
-          Job job = ControllerService.withControllerService<Job>((service) => {
+          var model = ControllerService.withControllerService<JobDetailsModel>((service) => {
             User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
-            return service.GetJob(u, jobId);
+            var job = service.GetJob(u, jobId);
+            var runs = service.GetJobResults(u, jobId);
+            return new JobDetailsModel() { Job = job, Runs = runs };
           });
-          var runs = ControllerService.withControllerService<IList<Run>>((service) => {
-            User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
-            return service.GetJobResults(u, jobId);
-          });
-          JobDetailsModel jdm = new JobDetailsModel() { Job = job, Runs = runs };
-          Session["jobDetails"] = jdm;
-          return View(jdm);
-        }
+          Session["jobDetails"] = model;
+          return View(model);
+       } 
 
         [HttpPost]