Changeset 2207 for branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Core/3.3

Timestamp:

07/29/09 14:44:07 (15 years ago)

Author:

mkommend

Message:

first stable version of CEDMA with new database backend (ticket #712)

Location:

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Core/3.3

Files:

• HeuristicLab.CEDMA.Core-3.3.csproj (modified) (1 diff)
• Results.cs (modified) (4 diffs)
• TableResultsView.cs (modified) (2 diffs)

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Core/3.3/HeuristicLab.CEDMA.Core-3.3.csproj

@@ -108 +108 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.CEDMA.DB.Interfaces\3.3\HeuristicLab.CEDMA.DB.Interfaces-3.3.csproj">
-      <Project>{4F9BB789-D561-436B-B226-2BF44B7D0804}</Project>
-      <Name>HeuristicLab.CEDMA.DB.Interfaces-3.3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.2\HeuristicLab.Core-3.2.csproj">
       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Core/3.3/Results.cs

@@ -58 +58 @@
     }
 
-    private string[] multiDimensionalOrdinalVariables = new string[] { "VariableImpacts: EvaluationImpact", "VariableImpacts: QualityImpact" };
+    private string[] multiDimensionalOrdinalVariables;
     public string[] MultiDimensionalOrdinalVariables {
       get { return multiDimensionalOrdinalVariables; }
@@ -74 +74 @@
     public Results(IModelingDatabase database) {
       this.database = database;
+      multiDimensionalOrdinalVariables = database.GetAllResultsForInputVariables().Select(x => "VariableImpacts: "+ x.Name).ToArray();
     }
 
@@ -93 +94 @@
         modelEntry.Set("PersistedData", model.Data);
         modelEntry.Set("TargetVariable", model.TargetVariable.Name);
+        Dictionary<HeuristicLab.Modeling.Database.IVariable, ResultsEntry> inputVariableResultsEntries = 
+          new Dictionary<HeuristicLab.Modeling.Database.IVariable, ResultsEntry>();
+
+        foreach (IInputVariableResult inputVariableResult in database.GetInputVariableResults(model)) {
+          if (!inputVariableResultsEntries.ContainsKey(inputVariableResult.Variable)) {
+            inputVariableResultsEntries[inputVariableResult.Variable] = new ResultsEntry();
+            inputVariableResultsEntries[inputVariableResult.Variable].Set("InputVariableName", inputVariableResult.Variable.Name);
+            }
+           inputVariableResultsEntries[inputVariableResult.Variable].Set(inputVariableResult.Result.Name, inputVariableResult.Value);
+        }
+        modelEntry.Set("VariableImpacts", inputVariableResultsEntries.Values);
         entries.Add(modelEntry);
       }
@@ -100 +112 @@
       return entries;
     }
-
-    //private IEnumerable<ResultsEntry> SelectVariableImpacts(string modelUri) {
-    //  var inputVariableNameBindings = store.Query(
-    //      "<" + modelUri + "> <" + Ontology.HasInputVariable + "> ?InputVariable ." +
-    //      "?InputVariable <" + Ontology.Name + "> ?InputName .",
-    //      0, PAGE_SIZE);
-
-    //  var qualityImpactBindings = store.Query(
-    //      "<" + modelUri + "> <" + Ontology.HasInputVariable + "> ?InputVariable ." +
-    //      "?InputVariable <" + Ontology.QualityImpact + "> ?QualityImpact .",
-    //      0, PAGE_SIZE);
-
-    //  var evaluationImpactBindings = store.Query(
-    //       "<" + modelUri + "> <" + Ontology.HasInputVariable + "> ?InputVariable ." +
-    //       "?InputVariable <" + Ontology.EvaluationImpact + "> ?EvaluationImpact .",
-    //       0, PAGE_SIZE);
-    //  Dictionary<object, ResultsEntry> inputVariableAttributes = new Dictionary<object, ResultsEntry>();
-
-    //  foreach (var inputVariableNameBinding in inputVariableNameBindings) {
-    //    object inputVariable = inputVariableNameBinding.Get("InputVariable");
-    //    object name = ((Literal)inputVariableNameBinding.Get("InputName")).Value;
-    //    if (!inputVariableAttributes.ContainsKey(inputVariable)) {
-    //      inputVariableAttributes[inputVariable] = new ResultsEntry();
-    //      inputVariableAttributes[inputVariable].Set("InputVariableName", name);
-    //    }
-    //  }
-
-    //  foreach (var qualityImpactBinding in qualityImpactBindings) {
-    //    double qualityImpact = (double)((Literal)qualityImpactBinding.Get("QualityImpact")).Value;
-    //    object inputVariable = qualityImpactBinding.Get("InputVariable");
-    //    if (!IsAlmost(qualityImpact, 1.0)) {
-    //      if (inputVariableAttributes[inputVariable].Get("QualityImpact") == null)
-    //        inputVariableAttributes[inputVariable].Set("QualityImpact", qualityImpact);
-    //    } else inputVariableAttributes.Remove(inputVariable);
-    //  }
-
-    //  foreach (var evaluationImpactBinding in evaluationImpactBindings) {
-    //    double evaluationImpact = (double)((Literal)evaluationImpactBinding.Get("EvaluationImpact")).Value;
-    //    object inputVariable = evaluationImpactBinding.Get("InputVariable");
-    //    if (!IsAlmost(evaluationImpact, 0.0)) {
-    //      if (inputVariableAttributes.ContainsKey(inputVariable) && inputVariableAttributes[inputVariable].Get("EvaluationImpact") == null)
-    //        inputVariableAttributes[inputVariable].Set("EvaluationImpact", evaluationImpact);
-    //    } else inputVariableAttributes.Remove(inputVariable);
-    //  }
-
-    //  return inputVariableAttributes.Values;
-    //}
 
     private bool IsAlmost(double x, double y) {

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Core/3.3/TableResultsView.cs

@@ -10 +10 @@
 using HeuristicLab.CEDMA.Core;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.CEDMA.DB.Interfaces;
 
 namespace HeuristicLab.CEDMA.Core {
@@ -70 +69 @@
         DataGridView.HitTestInfo hitInfo = dataGridView.HitTest(e.X, e.Y);
         ResultsEntry entry = (ResultsEntry)dataGridView.Rows[hitInfo.RowIndex].Tag;
-        string serializedData =  (string)entry.Get(Ontology.SerializedData.Uri.Replace(Ontology.CedmaNameSpace, ""));
-        var model = (IItem)PersistenceManager.RestoreFromGZip(Convert.FromBase64String(serializedData));
+        var model = (IItem)PersistenceManager.RestoreFromGZip((byte[])entry.Get("PersistedData"));
         PluginManager.ControlManager.ShowControl(model.CreateView());
       }