Changeset 2283 for trunk

Timestamp:

08/13/09 14:16:40 (15 years ago)

Author:

mkommend

Message:

added implementation for HeuristicLab.SparseMatrix and SparseMatrixRow (ticket #701)

Location:

trunk/sources/HeuristicLab.SparseMatrix/3.2

Files:

• HeuristicLab.SparseMatrix-3.2.csproj (modified) (2 diffs)
• HeuristicLabSparseMatrixPlugin.cs (modified) (1 diff)
• SparseMatrix.cs (copied) (copied from trunk/sources/HeuristicLab.CEDMA.Core/3.3/Results.cs) (1 diff)
• SparseMatrixRow.cs (added)

trunk/sources/HeuristicLab.SparseMatrix/3.2/HeuristicLab.SparseMatrix-3.2.csproj

@@ -82 +82 @@
     <Compile Include="HeuristicLabSparseMatrixPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SparseMatrix.cs" />
+    <Compile Include="SparseMatrixRow.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -88 +90 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Core\3.2\HeuristicLab.Core-3.2.csproj">
+      <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
+      <Name>HeuristicLab.Core-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>

trunk/sources/HeuristicLab.SparseMatrix/3.2/HeuristicLabSparseMatrixPlugin.cs

@@ -29 +29 @@
   [ClassInfo(Name = "HeuristicLab.SparseMatrix-3.2")]
   [PluginFile(Filename = "HeuristicLab.SparseMatrix-3.2.dll", Filetype = PluginFileType.Assembly)]
+  [Dependency(Dependency = "HeuristicLab.Core-3.2")]  
   public class HeuristicLabSparseMatrixPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.SparseMatrix/3.2/SparseMatrix.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.ObjectModel;
 using HeuristicLab.Core;
-using System.Collections;
-using System.Xml;
-using System.Runtime.Serialization;
-using System.IO;
-using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Data;
-using HeuristicLab.DataAnalysis;
-using System.Drawing;
-using HeuristicLab.Modeling.Database;
 
-namespace HeuristicLab.CEDMA.Core {
-  public class Results : ItemBase {
-    private string[] categoricalVariables = null;
-    public string[] CategoricalVariables {
-      get {
-        if (categoricalVariables == null) {
-          LoadModelAttributes();
-        }
-        return categoricalVariables;
-      }
+namespace HeuristicLab.SparseMatrix {   
+  public class SparseMatrix : ItemBase {
+    public SparseMatrix() {
+      this.rows = new List<SparseMatrixRow>();
     }
 
-    private string[] ordinalVariables = null;
-    public string[] OrdinalVariables {
-      get {
-        if (ordinalVariables == null) {
-          LoadModelAttributes();
-        }
-        return ordinalVariables;
-      }
+    public SparseMatrix(IEnumerable<SparseMatrixRow> rows)
+      : this() {
+      this.rows.AddRange(rows);
     }
 
-    private string[] multiDimensionalOrdinalVariables;
-    public string[] MultiDimensionalOrdinalVariables {
-      get { return multiDimensionalOrdinalVariables; }
+    private List<SparseMatrixRow> rows;
+    public ReadOnlyCollection<SparseMatrixRow> GetRows() {
+      return rows.AsReadOnly();
     }
 
-    private string[] multiDimensionalCategoricalVariables = new string[] { "VariableImpacts: InputVariableName" };
-    public string[] MultiDimensionalCategoricalVariables {
-      get { return multiDimensionalCategoricalVariables; }
+    public void AddRow(SparseMatrixRow row) {
+      this.rows.Add(row);
     }
 
-    private IModelingDatabase database;
-
-    private Dictionary<string, Dictionary<object, double>> categoricalValueIndices = new Dictionary<string, Dictionary<object, double>>();
-
-    public Results(IModelingDatabase database) {
-      this.database = database;
-      multiDimensionalOrdinalVariables = database.GetAllResultsForInputVariables().Select(x => "VariableImpacts: " + x.Name).ToArray();
+    public void RemoveRow(SparseMatrixRow row) {
+      this.rows.Remove(row);
     }
-
-    private List<ResultsEntry> entries = null;
-    private bool cached = false;
-    public IEnumerable<ResultsEntry> GetEntries() {
-      if (!cached)
-        return SelectRows();
-      return entries.AsEnumerable();
-    }
-
-    private IEnumerable<ResultsEntry> SelectRows() {
-      database.Connect();      
-      entries = new List<ResultsEntry>();
-      foreach (var model in database.GetAllModels()) {
-        ResultsEntry modelEntry = new ResultsEntry();
-        foreach (var modelResult in database.GetModelResults(model)) {
-          modelEntry.Set(modelResult.Result.Name, modelResult.Value);
-        }
-        modelEntry.Set("PersistedData", database.GetModelData(model));
-        modelEntry.Set("TargetVariable", model.TargetVariable.Name);
-        modelEntry.Set("Algorithm", model.Algorithm.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);
-      }
-      database.Disconnect();
-      FireChanged();
-      cached = true;
-      return entries;
-    }
-
-    private bool IsAlmost(double x, double y) {
-      return Math.Abs(x - y) < 1.0E-12;
-    }
-
-    internal IEnumerable<string> SelectModelAttributes() {
-      return CategoricalVariables.Concat(OrdinalVariables);
-    }
-
-    private void LoadModelAttributes() {
-      ordinalVariables = database.GetAllResults().Select(r => r.Name).ToArray();
-      categoricalVariables = new string[] { "TargetVariable", "Algorithm" };
-    }
-
-    public double IndexOfCategoricalValue(string variable, object value) {
-      if (value == null) return double.NaN;
-      Dictionary<object, double> valueToIndexMap;
-      if (categoricalValueIndices.ContainsKey(variable)) {
-        valueToIndexMap = categoricalValueIndices[variable];
-      } else {
-        valueToIndexMap = new Dictionary<object, double>();
-        categoricalValueIndices[variable] = valueToIndexMap;
-      }
-      if (!valueToIndexMap.ContainsKey(value)) {
-        if (valueToIndexMap.Values.Count == 0) valueToIndexMap[value] = 1.0;
-        else valueToIndexMap[value] = 1.0 + valueToIndexMap.Values.Max();
-      }
-      return valueToIndexMap[value];
-    }
+    
   }
 }