Changeset 9166 for branches/OaaS/HeuristicLab.Services.Optimization.Web/Models

Timestamp:

01/15/13 15:50:53 (12 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

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Web/Models

Files:

• ChartModels.cs (modified) (1 diff)
• OptimizationModels.cs (modified) (3 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Web/Models/ChartModels.cs

@@ -18 +18 @@
     }    
   }
+
+  public class RowNameContainer {
+    private IList<string> rowNames = new List<string>();
+
+    public IList<string> RowNames {
+      get { return rowNames; }
+      set { rowNames = value; }
+    }
+  }
+
+  public class DatatableContainer {
+    public string[] Datatables { get; set; }
+  }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Web/Models/OptimizationModels.cs

@@ -7 +7 @@
 
 namespace HeuristicLab.Services.Optimization.Web.Models {
+  public class ScheduleJobModel {
+    public int Repetitions { get; set; }
+    public string Name { get; set; }
+    public string Group { get; set; }
+  }
 
   public class OptimizationModel {
@@ -41 +46 @@
           realValue += value.AttemptedValue;
         }
-        var param = (from par in scenario.InputParameters.Items where par.Value.Name == realKey select par).FirstOrDefault();
+        var param = (from par in scenario.FirstAlgorithm.Problem.Parameters.Items where par.Value.Name == realKey select par).FirstOrDefault();
         if (param != null && !param.Value.TrySetFromString(realValue)) {
           bindingContext.ModelState.AddModelError(bindingContext.ModelName, new Exception(string.Format("Unable to parse {0} into destination type {1}", value, param.Type)));
         }
       }
-      return scenario.InputParameters;
+      return scenario.FirstAlgorithm.Problem.Parameters;
     }
   }
@@ -55 +60 @@
       foreach (var key in controllerContext.RequestContext.HttpContext.Request.Form.AllKeys) {
         var value = bindingContext.ValueProvider.GetValue(key);
-        var param = (from par in scenario.AlgorithmParameters.Items where par.Value.Name == key select par).FirstOrDefault();
+        var param = (from par in scenario.FirstAlgorithm.Parameters.Items where par.Value.Name == key select par).FirstOrDefault();
         if (param != null && !param.Value.TrySetFromString(value.AttemptedValue)) {
           bindingContext.ModelState.AddModelError(bindingContext.ModelName, new Exception(string.Format("Unable to parse {0} into destination type {1}", value, param.Type)));
         }
       }
-      return scenario.AlgorithmParameters;
+      return scenario.FirstAlgorithm.Parameters;
     }
   }