Changeset 8545 for branches/OaaS/HeuristicLab.Services.Optimization.Controller/Model

Timestamp:

08/30/12 16:09:34 (13 years ago)

Author:

fschoepp

Message:

#1888:

• Controller is now capable of gathering Hive Jobs
• Hive Jobs will be mapped to independent Job-Class (shared between Controller and Frontend)
• HiveScenarioManager is capable of gathering Hive Jobs + their results
• Job Results will be mapped to string properties
• Frontend renders all Results after opening the job details
• Misc: Frontend now passes User-object to Controller so that it is able to connect to the Hive Service (hardcoded values removed)

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Controller

Files:

• . (modified) (1 prop)
• Model/ControllerModel.cs (modified) (4 diffs)

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

@@ -23 +23 @@
     DecimalVector,
     [EnumMember]
-    Percent
+    Percent,
+    [EnumMember]
+    String
   }
 
@@ -151 +153 @@
 
   [DataContract]
+  public class StringValue : Value {
+    [DataMember]
+    public string Value { get; set; }
+
+    public override bool TrySetFromString(string input) {
+      Value = input;
+      return true;
+    }
+  }
+
+  [DataContract]
   [KnownType(typeof(BoolValue))]
   [KnownType(typeof(DecimalValue))]
@@ -156 +169 @@
   [KnownType(typeof(DecimalVector))]
   [KnownType(typeof(DecimalMatrix))]
+  [KnownType(typeof(StringValue))]
   public class Parameter {        
     // some kind of value type
@@ -211 +225 @@
       set { algorithmParameters = value; }
     }
-
+  }
+
+  [DataContract]
+  public enum JobState {
+    [EnumMember]
+    Waiting,
+    [EnumMember]
+    Calculating,
+    [EnumMember]
+    Aborted,
+    [EnumMember]
+    Failed,
+    [EnumMember]
+    Finished
+  }
+
+  [DataContract]
+  public class Job {
+    [DataMember]
+    public string Id { get; set; }
+
+    [DataMember]
+    public JobState State { get; set; }
+
+    [DataMember]
+    public string Name { get; set; }
+
+    [DataMember]
+    public string Resource { get; set; }    
+  }
+
+  [DataContract]
+  public class Run {
+    [DataMember]
+    public string Id { get; set; }
+
+    [DataMember]
+    public string Name { get; set; }
+
+    [DataMember]
+    public IList<Parameter> Results { get; set; }
+  }
+
+  [DataContract]
+  public class User {
+    [DataMember]
+    public string Username { get; set; }
+    [DataMember]
+    public string Password { get; set; }
   }
 }