Changeset 2081 for trunk/sources/HeuristicLab.CEDMA.Core/3.3

Timestamp:

06/22/09 17:49:10 (15 years ago)

Author:

gkronber

Message:

Added new types to CEDMA ontology to discriminate between attributes of problems (data sets), models and input variables. And changed class Results to read only model attributes. In preparation for the display of variable impacts of each model. #286 (Variable-usage diagrams for the CEDMA frontend)

File:

• trunk/sources/HeuristicLab.CEDMA.Core/3.3/Results.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.Core/3.3/Results.cs

@@ -87 +87 @@
       entries = new List<ResultsEntry>();
       do {
-        var allBindings = store.Query("?Dataset <" + Ontology.HasModel + "> ?Model ." + Environment.NewLine +
+        var allBindings = store.Query("?Model <" + Ontology.InstanceOf + "> <" + Ontology.TypeModel + "> ." + Environment.NewLine +
           "?Model ?Attribute ?Value .", page, PAGE_SIZE);
         var allModelBindings = allBindings.GroupBy(x => (Entity)x.Get("Model"));
@@ -125 +125 @@
     private void LoadModelAttributes() {
       this.ordinalVariables =
-        store.Query("?ModelAttribute <" + Ontology.InstanceOf + "> <" + Ontology.TypeOrdinalAttribute + "> .", 0, 100)
-        .Select(s => ((Entity)s.Get("ModelAttribute")).Uri.Replace(Ontology.CedmaNameSpace, ""))
-        .ToArray();
+        store
+          .Query(
+            "?ModelAttribute <" + Ontology.InstanceOf + "> <" + Ontology.TypeModelAttribute + "> ." + Environment.NewLine +
+            "?ModelAttribute <" + Ontology.InstanceOf + "> <" + Ontology.TypeOrdinalAttribute + "> .", 0, 100)
+          .Select(s => ((Entity)s.Get("ModelAttribute")).Uri.Replace(Ontology.CedmaNameSpace, ""))
+          .Distinct()
+          .ToArray();
       this.categoricalVariables =
-        store.Query("?ModelAttribute <" + Ontology.InstanceOf + "> <" + Ontology.TypeCategoricalAttribute + "> .", 0, 100)
-        .Select(s => ((Entity)s.Get("ModelAttribute")).Uri.Replace(Ontology.CedmaNameSpace, ""))
-        .ToArray();
+        store
+          .Query(
+            "?ModelAttribute <" + Ontology.InstanceOf + "> <" + Ontology.TypeModelAttribute + "> ." + Environment.NewLine +
+            "?ModelAttribute <" + Ontology.InstanceOf + "> <" + Ontology.TypeCategoricalAttribute + "> .", 0, 100)
+          .Select(s => ((Entity)s.Get("ModelAttribute")).Uri.Replace(Ontology.CedmaNameSpace, ""))
+          .Distinct()
+          .ToArray();
     }