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

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.

File:

• branches/OaaS/HeuristicLab.Services.Optimization.Controller/Parsers/AlgorithmConverter.cs (modified) (2 diffs)

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;
     }