Changeset 2038 for trunk/sources/HeuristicLab.DataAnalysis

Timestamp:

06/10/09 10:46:56 (16 years ago)

Author:

gkronber

Message:

• Renamed VariableImpactCalculator to VariableQualityImpactCalculator and calculate the ratio of new quality value to old quality value to get an idea how the quality value is influenced by each variable.
• Changes in Dataset to improve the speed of SetValue (only set a dirty flag instead of reallocating the caches)

#644 (Variable impact of CEDMA models should be calculated and stored in the result DB)

File:

• trunk/sources/HeuristicLab.DataAnalysis/3.2/Dataset.cs (modified) (10 diffs)

trunk/sources/HeuristicLab.DataAnalysis/3.2/Dataset.cs

@@ -39 +39 @@
     private double[] scalingFactor;
     private double[] scalingOffset;
+    private bool cachedValuesInvalidated = true;
+
+    private bool fireChangeEvents = true;
+    public bool FireChangeEvents {
+      get { return fireChangeEvents; }
+      set { fireChangeEvents = value; }
+    }
 
     public string Name {
@@ -74 +81 @@
       if (v != samples[columns * i + j]) {
         samples[columns * i + j] = v;
-        CreateDictionaries();
-        FireChanged();
+        cachedValuesInvalidated = true;
+        if (fireChangeEvents) FireChanged();
       }
     }
@@ -89 +96 @@
         }
         samples = value;
-        CreateDictionaries();
-        FireChanged();
+        cachedValuesInvalidated = true;
+        if (fireChangeEvents) FireChanged();
       }
     }
@@ -104 +111 @@
       scalingOffset = new double[] { 0.0 };
       scalingFactor = new double[] { 1.0 };
-    }
-
-    private void CreateDictionaries() {
-      // keep a means and ranges dictionary for each column (possible target variable) of the dataset.
-      cachedMeans = new Dictionary<int, Dictionary<int, double>>[columns];
-      cachedRanges = new Dictionary<int, Dictionary<int, double>>[columns];
-      for (int i = 0; i < columns; i++) {
-        cachedMeans[i] = new Dictionary<int, Dictionary<int, double>>();
-        cachedRanges[i] = new Dictionary<int, Dictionary<int, double>>();
-      }
+      cachedValuesInvalidated = true;
+      fireChangeEvents = true;
     }
 
@@ -206 +205 @@
         }
       }
-      CreateDictionaries();
     }
 
@@ -270 +268 @@
 
     public double GetMean(int column, int from, int to) {
+      if (cachedValuesInvalidated) CreateDictionaries();
       if (!cachedMeans[column].ContainsKey(from) || !cachedMeans[column][from].ContainsKey(to)) {
         double[] values = new double[to - from];
@@ -289 +288 @@
 
     public double GetRange(int column, int from, int to) {
+      if (cachedValuesInvalidated) CreateDictionaries();
       if (!cachedRanges[column].ContainsKey(from) || !cachedRanges[column][from].ContainsKey(to)) {
         double[] values = new double[to - from];
@@ -329 +329 @@
         else ScaleVariable(column, 1.0 / range, -min);
       }
-      CreateDictionaries();
-      FireChanged();
+      cachedValuesInvalidated = true;
+      if (fireChangeEvents) FireChanged();
     }
 
@@ -340 +340 @@
         samples[i * columns + column] = (origValue + offset) * factor;
       }
-      CreateDictionaries();
-      FireChanged();
+      cachedValuesInvalidated = true;
+      if (fireChangeEvents) FireChanged();
     }
 
@@ -353 +353 @@
         scalingOffset[column] = 0.0;
       }
+      cachedValuesInvalidated = true;
+      if (fireChangeEvents) FireChanged();
+    }
+
+    private void CreateDictionaries() {
+      // keep a means and ranges dictionary for each column (possible target variable) of the dataset.
+      cachedMeans = new Dictionary<int, Dictionary<int, double>>[columns];
+      cachedRanges = new Dictionary<int, Dictionary<int, double>>[columns];
+      for (int i = 0; i < columns; i++) {
+        cachedMeans[i] = new Dictionary<int, Dictionary<int, double>>();
+        cachedRanges[i] = new Dictionary<int, Dictionary<int, double>>();
+      }
     }
   }