Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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/Views/Optimization
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Optimization/AlgorithmParameters.cshtml

    r8506 r9166  
    22
    33@{
    4     ViewBag.Title = "AlgorithmParameters";
     4    ViewBag.Title = "Algorithm Parameters";
    55}
    66
    77<h2>Adjust algorithm parameters:</h2>
    8 @using (Html.BeginForm()) {
     8@using (Html.BeginForm("AlgorithmParameters", "Optimization")) {
    99    @Html.ValidationSummary(true)
    1010    <fieldset>

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Optimization/Index.cshtml

    r9062 r9166  
    22
    33@{
    4     ViewBag.Title = "Index";
     4    ViewBag.Title = "Optimization-as-a-Service";
    55}
    66
    … …  
    3232<ul>
    3333@foreach (var itm in Model.Scenarios) {
    34     <li>@Html.ActionLink(itm.Name, "ProblemParameters", new { scenario=itm.Name })</li>
     34    <li>@Html.ActionLink(itm.Id, "ProblemParameters", new { scenario=itm.Id })</li>
    3535}
    3636</ul>

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Optimization/JobDetails.cshtml

    r9062 r9166  
    2828
    2929<h3>Run details:</h3>
    30 @for (int j=0; j < Model.Runs.Count; j++) {
     30<div class="collapsible">
     31@if (Model.Runs.Count > 1) {
     32    <h3>Analyze runs</h3>
     33    <div>
     34        <div class="resizable ui-widget-content" style="width: 800px; height: 600px;">
     35            <div id="dataTableView" style="width: 96%; height: 96%;">   
     36              <form action="#">
     37                <label for="dataTable">DataTable:</label>
     38                <select name="dataTable" id="dataTable"></select>
     39                <label for="dataRow">DataRow:</label>
     40                <select name="dataRow" id="dataRow"></select>
     41                <div id="dataTableGraph" style="width: 100%; height: 100%;"></div>
     42              </form>
     43            </div>
     44        </div>
     45    </div>
     46}
     47@for (int j = 0; j < Model.Runs.Count; j++) {
    3148    var run = Model.Runs[j];
    32     <p>@run.Name:</p>
     49    <h3>@run.Name</h3>
     50    <div>
    3351    <table>
    3452      <thead>
    … …  
    4058      <tbody>
    4159      @for (var i = 0; i < run.Results.Count; i++) {
    42         var result = run.Results[i];     
     60          var result = run.Results[i];     
    4361        <tr>
    44           <td>@result.Value.Name</td>
     62          <td>@Html.Label(result.Value.Name, result.Value.Name)</td>
    4563          @if (result.Value is HeuristicLab.Services.Optimization.ControllerService.Model.DecimalMatrix) {
    4664              var matrix = (result.Value as HeuristicLab.Services.Optimization.ControllerService.Model.DecimalMatrix);             
    … …  
    6583                  </div>               
    6684              </td>
    67           }
     85          }         
    6886          else {
    69               <td>@((result.Value as HeuristicLab.Services.Optimization.ControllerService.Model.StringValue).Value)</td>
     87              <td>
     88                @Html.DisplayFor(m => result.Value)               
     89              </td>
     90              <!-- Html.Partial(string.Format("~/Views/Shared/DisplayTemplates/{0}.cshtml", result.Value.GetType().Name), result.Value) -->               
     91              <!--td>((result.Value as HeuristicLab.Services.Optimization.ControllerService.Model.StringValue).Value)</td-->
    7092          }
    7193       </tr>
    … …  
    7395      </tbody>
    7496    </table>
     97    </div>
    7598}
     99</div>

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Optimization/ProblemParameters.cshtml

    r8506 r9166  
    1 @model HeuristicLab.Services.Optimization.ControllerService.Model.InputParameters
     1@model HeuristicLab.Services.Optimization.ControllerService.Model.ProblemParameters
    22
    33@{
    4     ViewBag.Title = "ProblemParameters";
     4    ViewBag.Title = "Problem Parameters";
    55}
    66
    77<h2>Adjust problem parameters:</h2>
    88
    9 @using (Html.BeginForm()) {
     9@using (Html.BeginForm("ProblemParameters", "Optimization")) {
    1010    @Html.ValidationSummary(true)
    1111    <fieldset>

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Optimization/ScheduleJob.cshtml

    r8506 r9166  
    22
    33@{
    4     ViewBag.Title = "ScheduleJob";
     4    ViewBag.Title = "Schedule Job";
    55}
    66
    7 <h2>Do you really want to schedule the following job?</h2>
    8 
    9 
    10 <h3>Problem Parameters:</h3>
    11 @Html.DisplayFor(model => Model.InputParameters)
    12 
     7@using (Html.BeginForm()) {   
     8    <fieldset>
     9        <legend>Scheduling parameters</legend>
     10        <div class="editor-label">
     11            <label for="name">Name:</label>
     12        </div>
     13        <div class="editor-field">
     14            <input id="name" name="Name" type="text" value="Web scheduled job" />
     15        </div>
     16        <div class="editor-label">
     17            <label for="repetitions">Repetitions:</label>
     18        </div>
     19        <div class="editor-field">
     20            <input id="repetitions" name="Repetitions" type="text" value="1" />
     21        </div>
     22        <div class="editor-label">
     23            <label for="group">Group:</label>
     24        </div>
     25        <div class="editor-field">
     26            <input id="group" name="Group" type="text" value="TESTAZURE" />
     27        </div>
     28        <div class="editor-field">
     29            <input type="submit" value="Schedule job!" />
     30        </div>
     31    </fieldset>
     32}
     33@if (Model.FirstAlgorithm.Problem != null) {
     34    <h3>Problem Parameters:</h3>
     35    @Html.DisplayFor(model => Model.FirstAlgorithm.Problem.Parameters)
     36}
     37   
    1338<h3>Algorithm Parameters:</h3>
    14 @Html.DisplayFor(model => Model.AlgorithmParameters)
    15 
    16 @using (Html.BeginForm()) {   
    17     <p>
    18         <input type="submit" value="Schedule job!" />
    19     </p>
    20 }
     39@Html.DisplayFor(model => Model.FirstAlgorithm.Parameters)
Note: See TracChangeset for help on using the changeset viewer.