Changeset 9350 for branches/OaaS/HeuristicLab.Services.Optimization.Controller

Timestamp:

04/10/13 13:29:24 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Added input parameters to the run class. They will be populated by the back-end and returned to the web pages which renders them.
• Added a ParameterMapper class which converts HL specific model classes to OaaS independent classes. The conversion gets delegated to IParameterHandler which have to be implemented manually and registered for a certain Type before. All parameters which can be converted to IStringConvertible, IStringConvertibleMatrix, IString* will be converted into a OaaS-StringValue instance.
• Added IParameterHandlers for PathTSPTour and PermutationType (required for TSP).
• AlgorithmConverter now makes sure that the id of a run is unique. (All runs of a RunList will be shown now.)
• Web pages are capable of rendering both the results of a run and their input parameters (added a accordion to wrap their content).
• Renamed "Traveling Salesman Problem" to "Genetic Algorithm - TSP".
• Changed js-files to render both input and result parameters of a Run.

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Controller

Files:

• HL/HiveScenarioManager.cs (modified) (6 diffs)
• HeuristicLab.Services.Optimization.ControllerService.csproj (modified) (1 diff)
• Interfaces/DAL.cs (modified) (1 diff)
• Interfaces/Model/ControllerModel.cs (modified) (1 diff)
• Mockup/MockupDAL.cs (modified) (1 diff)
• Parameters (added)
• Parameters/HL (added)
• Parameters/HL/HLParameterHandler.cs (added)
• Parameters/HL/PathTSPParameterHandler.cs (added)
• Parameters/HL/PermutationTypeHandler.cs (added)
• Parameters/ParameterHandler.cs (added)
• Parsers/AlgorithmConverter.cs (modified) (2 diffs)

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

@@ -21 +21 @@
 using System.Data;
 using HeuristicLab.Services.Optimization.ControllerService.General;
+using HeuristicLab.Services.Optimization.ControllerService.Parameters.HL;
 
 namespace HeuristicLab.Services.Optimization.ControllerService {
-  public class ScenarioEntity : TableServiceEntity {
-
+  public class ScenarioEntity : TableServiceEntity {    
     public ScenarioEntity() {
     }
@@ -41 +41 @@
 
   public class HiveScenarioManager : IScenarioManager {
+    private static HLParameterMapper parameterMapper = new HLParameterMapper();
     private static IScenarioMapper tspMapper;
     private static object lockable;
@@ -297 +298 @@
               var value = run.Results[key];              
               Parameter result = MapHiveDataType(key, value);
-              resultValues.Add(result);
+              resultValues.Add(result);              
             }
             taskRun.Results = resultValues;
+            IList<Parameter> inputParameters = new List<Model.Parameter>();
+            foreach (var key in run.Parameters.Keys) {
+              var value = run.Parameters[key];
+              Parameter param = MapHiveDataType(key, value);
+              inputParameters.Add(param);
+            }
+            // crawl the copied experiment of the job
+            //taskRun.Experiment = dal.JobDao.FindByJobId(id);
+            taskRun.InputParameters = inputParameters;
             runs.Add(taskRun);
           }
@@ -310 +320 @@
     
     private Parameter MapHiveDataType(string name, IItem item) {
-      Parameter result = new Parameter();
+
+      if (parameterMapper.IsHandlerAvailable(item)) {
+        return parameterMapper.Map(name, item);
+      }
+
+      var result = new Parameter();
       result.Type = ParameterType.String;
       //TODO: How shall we handle dll specific datatypes?      
@@ -349 +364 @@
             matrixValue[i][j] = matrix[j, i];
           }
-        }        
+        }
+        matrixValue = transpose(matrixValue);
         result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.DecimalMatrix() { Name = name, Value = matrixValue, RowNames = (matrix.ColumnNames.Count() > 0 ? matrix.ColumnNames.ToArray() : null) };
       }
@@ -408 +424 @@
       }
       else {
-        result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.StringValue() { Name = name, Value = "Cannot be displayed as string" };
+        result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.StringValue() { Name = name, Value = item.ItemName != null ? item.ItemName + " (Cannot be displayed properly as string)" : "Cannot be displayed properly as string" };
       }
       // TODO: Add workaround for TSP

branches/OaaS/HeuristicLab.Services.Optimization.Controller/HeuristicLab.Services.Optimization.ControllerService.csproj

@@ -179 +179 @@
     <Compile Include="Mockup\MockupDAL.cs" />
     <Compile Include="Mockup\MockupScenarioManager.cs" />
+    <Compile Include="Parameters\HL\HLParameterHandler.cs" />
+    <Compile Include="Parameters\HL\PathTSPParameterHandler.cs" />
+    <Compile Include="Parameters\HL\PermutationTypeHandler.cs" />
+    <Compile Include="Parameters\ParameterHandler.cs" />
     <Compile Include="Parsers\AlgorithmConverter.cs" />
     <Compile Include="PlaceholderControllerService.cs" />

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

@@ -39 +39 @@
     IScenarioDao ScenarioDao { get; }
     IBlobDao BlobDao { get; }
-    IExperimentDao ExperimentDao { get; }    
+    IExperimentDao ExperimentDao { get; }
   }
 

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

@@ -480 +480 @@
     [DataMember]
     public IList<Parameter> Results { get; set; }
+
+    [DataMember]
+    public IList<Parameter> InputParameters { get; set; }
   }
 

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Mockup/MockupDAL.cs

@@ -253 +253 @@
       }      
     }
-
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Parsers/AlgorithmConverter.cs

@@ -189 +189 @@
       jrun["name"] = run.Name;
       jrun["results"] = ConvertParametersToJson(run.Results);
+      jrun["params"] = ConvertParametersToJson(run.InputParameters);
       return jrun;
     }
@@ -196 +197 @@
       foreach (var run in runs)
         jarray.Add(ConvertRunToJson(run));
+      
+      
+      // if there are multiple different jobs to execute and they have the same id, we must change it here manually
+      var maxId = new Dictionary<string,int>();
+      for (int i = 0; i < jarray.Count; i++) {
+        for (int j = i + 1; j < jarray.Count; j++) {
+          if (jarray[i]["id"].ToString() == jarray[j]["id"].ToString()) {
+            int max;
+            if (!maxId.TryGetValue(jarray[i]["id"].ToString(), out max)) {
+              max = 1;
+              maxId[jarray[i]["id"].ToString()] = max;              
+            }
+            maxId[jarray[i]["id"].ToString()]++;
+            // change j's entry
+            jarray[j]["id"] = jarray[j]["id"].ToString() + " (" + max + ")";
+            jarray[j]["name"] = jarray[j]["name"] + " (" + max + ")";
+          }
+        }
+      }
       return jarray;
     }