Changeset 1151

Timestamp:

01/15/09 20:04:46 (16 years ago)

Author:

gkronber

Message:

worked on #419 (Refactor CEDMA plugins):

• increased number of sessions for the grid service from 20 to 100
• implemented results query
• fixed a bug in the Dispatcher

Location:

branches/CEDMA-Refactoring-Ticket419

Files:

• HeuristicLab.CEDMA.Charting/BubbleChart.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Core/Results.cs (modified) (2 diffs)
• HeuristicLab.CEDMA.DB.Interfaces/Entity.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Server/Dispatcher.cs (modified) (2 diffs)
• HeuristicLab.Grid/ServerForm.cs (modified) (1 diff)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Charting/BubbleChart.cs

@@ -116 +116 @@
       double minSize = 1;
       try {
-        if (sizeDimension != null && Results.OrdinalVariables.Contains(sizeDimension)) {
+        if (sizeDimension != null && results.OrdinalVariables.Contains(sizeDimension)) {
           var sizes = records
             .Select(x => Convert.ToDouble(x.Get(sizeDimension)))

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/Results.cs

@@ -37 +37 @@
 namespace HeuristicLab.CEDMA.Core {
   public class Results : ItemBase {
-    public static string[] CategoricalVariables {
-      get { return new string[] { "TargetVariable" }; }
+    private string[] categoricalVariables = null;
+    public string[] CategoricalVariables {
+      get {
+        if (categoricalVariables == null) {
+          LoadModelAttributes();
+        }
+        return categoricalVariables;
+      }
     }
 
-    public static string[] OrdinalVariables {
-      get { return new string[] { "ValidationMeanAbsolutePercentageError" }; }
+    private string[] ordinalVariables = null;
+    public string[] OrdinalVariables {
+      get {
+        if (ordinalVariables == null) {
+          LoadModelAttributes();
+        }
+        return ordinalVariables;
+      }
     }
 
@@ -73 +85 @@
     private IEnumerable<ResultsEntry> SelectRows() {
       if (store == null) yield break;
+      entries = new List<ResultsEntry>();
+      var results = store.Query("<"+dataSetEntity + "> <" + Ontology.PredicateHasModel + "> ?Model ." + Environment.NewLine +
+        "?Model ?Attribute ?Value .")
+        .GroupBy(x=>(Entity)x.Get("Model"));
+      foreach (var modelBindings in results) {
+        ResultsEntry entry = new ResultsEntry(modelBindings.Key.Uri);
+        foreach (var binding in modelBindings) {
+          if (binding.Get("Value") is Literal) {
+            string name = ((Entity)binding.Get("Attribute")).Uri.Replace(Ontology.CedmaNameSpace, "");
+            if (entry.Get(name) == null) {
+              object value = ((Literal)binding.Get("Value")).Value;
+              entry.Set(name, value);
+            }
+          }
+        }
+        entries.Add(entry);
+        yield return entry;
+      }
 
-      //var models = store.Select(new Statement(dataSetEntity, Ontology.PredicateHasModel, Ontology.AnyEntity));
-
-      ////var results = store.Select(new Statement(dataSetEntity, Ontology.PredicateHasModel, Ontology.AnyEntity))
-      ////   .SelectMany(x => store.Select(new SelectFilter(
-      ////     new Entity[] { (Entity)x.Property },
-      ////     new Entity[] { Ontology.PredicateModelAttribute },
-      ////     new Resource[] { Ontology.AnyEntity })))
-      ////   .SelectMany(x =>
-      ////     store.Select(
-      ////        new SelectFilter(
-      ////        new Entity[] { (Entity)x.Property },
-      ////        new Entity[] { Ontology.PredicateModelAttributeName },
-      ////        new Entity[] { Ontology.AnyEntity })).Select(y =>
-      ////          new {
-      ////            Model = x.Subject,
-      ////            Attribute = (Entity)x.Property,
-      ////            AttributeName = (Literal)y.Property
-      ////          }))
-      ////   .SelectMany(x =>
-      ////     store.Select(
-      ////       new Statement(x.Attribute, Ontology.PredicateModelAttributeValue, Ontology.AnyEntity))
-      ////       .Select(y =>
-      ////         new {
-      ////           Model = x.Model.Uri,
-      ////           AttributeName = x.AttributeName.Value,
-      ////           AttributeValue = ((Literal)y.Property).Value
-      ////         })).GroupBy(x => x.Model);
-
-      //entries = new List<ResultsEntry>();
-      //foreach (var model in models) {
-      //  var attributes = store.Select(new Statement((Entity)model.Property, Ontology.PredicateModelAttribute, Ontology.AnyEntity));
-
-      //  foreach (var attr in attributes) {
-      //    var namesAndValues = store
-      //      .Select(new SelectFilter(new Entity[] { (Entity)attr.Property },
-      //        new Entity[] { Ontology.PredicateModelAttributeName, Ontology.PredicateModelAttributeValue },
-      //        new Entity[] { Ontology.AnyEntity }));
-      //  }
-      //}
-
-      //foreach (var row in results) {
-      //  ResultsEntry entry = new ResultsEntry(row.First().Model);
-      //  foreach (var attr in row) {
-      //    entry.Set((string)attr.AttributeName, attr.AttributeValue);
-      //  }
-      //  entries.Add(entry);
-      //  yield return entry;
-      //}
-
-      //FireChanged();
-      //cached = true;
+      FireChanged();
+      cached = true;
     }
 
     internal IEnumerable<string> SelectModelAttributes() {
-      if (store == null) yield break;
+      return CategoricalVariables.Concat(OrdinalVariables);
+    }
 
-      //var attributeNames =
-      //  store.Select(new Statement(Ontology.AnyEntity, Ontology.PredicateModelAttributeName, Ontology.AnyEntity))
-      //  .Select(s => (string)((Literal)s.Property).Value)        
-      //  .Distinct();
-      //foreach (var name in attributeNames) {
-      //  yield return name;
-      //}
+    private void LoadModelAttributes() {
+      this.ordinalVariables =
+        store.Query("?ModelAttribute <" + Ontology.PredicateInstanceOf + "> <" + Ontology.TypeOrdinalAttribute + "> .")
+        .Select(s => ((Entity)s.Get("ModelAttribute")).Uri.Replace(Ontology.CedmaNameSpace, ""))
+        .ToArray();
+      this.categoricalVariables =
+        store.Query("?ModelAttribute <" + Ontology.PredicateInstanceOf + "> <" + Ontology.TypeCategoricalAttribute + "> .")
+        .Select(s => ((Entity)s.Get("ModelAttribute")).Uri.Replace(Ontology.CedmaNameSpace, ""))
+        .ToArray();
     }
   }

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.DB.Interfaces/Entity.cs

@@ -35 +35 @@
     }
 
+    public override string ToString() {
+      return Uri;
+    }
+
     public override bool Equals(object obj) {
       if(this == obj) return true;

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Server/Dispatcher.cs

@@ -69 +69 @@
       var modelMAPE = new HeuristicLab.CEDMA.DB.Interfaces.Variable("ModelMAPE");
 
-      //var query = new Statement[] {
-      //  new Statement(dataSetEntity, Ontology.PredicateHasModel, modelVar),
-      //  new Statement(modelVar, Ontology.TargetVariable, targetVar),
-      //  new Statement(modelVar, Ontology.ValidationMeanAbsolutePercentageError, modelMAPE)
-      //};
-
       var query = "<" + dataSetEntity.Uri + "> <" + Ontology.PredicateHasModel.Uri + "> ?Model ." + Environment.NewLine +
         "?Model <" + Ontology.TargetVariable.Uri + "> ?TargetVariable ." + Environment.NewLine +
@@ -100 +94 @@
       int nConfigurations = utilization.Length;
       for (int j = nConfigurations - 1; j > nConfigurations * 0.8; j--) {
-        int targetVariable = dataSet.Problem.AllowedTargetVariables[j];
+        int targetVariable = dataSet.Problem.AllowedTargetVariables[idx[j]];
         IEngine engine = CreateEngine(dataSet.Problem, targetVariable);
         if (engine != null) {

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.Grid/ServerForm.cs

@@ -66 +66 @@
       internalHost = new ServiceHost(jobStore, new Uri(internalAddressTextBox.Text));
       ServiceThrottlingBehavior throttlingBehavior = new ServiceThrottlingBehavior();
-      throttlingBehavior.MaxConcurrentSessions = 20;
+      throttlingBehavior.MaxConcurrentSessions = 100;
       internalHost.Description.Behaviors.Add(throttlingBehavior);
       try {