Changeset 2370 for trunk/sources/HeuristicLab.Modeling/3.2/AnalyzerModel.cs

Timestamp:

09/18/09 22:20:34 (15 years ago)

Author:

gkronber

Message:

Added enumerable type for model results and changed analyzer model, the database backend and the model analysis operators to use the enumerable type instead of hard-coded strings. #755 (Hard-coded strings for variable names of data-modeling results)

File:

• trunk/sources/HeuristicLab.Modeling/3.2/AnalyzerModel.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Modeling/3.2/AnalyzerModel.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.DataAnalysis;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Modeling {
@@ -63 +64 @@
     }
 
-    private Dictionary<string, double> results = new Dictionary<string, double>();
-    public IEnumerable<KeyValuePair<string, double>> Results {
+    private Dictionary<ModelingResult, double> results = new Dictionary<ModelingResult, double>();
+    public IEnumerable<KeyValuePair<ModelingResult, double>> Results {
       get { return results; }
     }
 
-    public void SetResult(string name, double value) {
-      results.Add(name, value);
+    public void ExtractResult(IScope scope, ModelingResult result) {
+      SetResult(result, scope.GetVariableValue<DoubleData>(result.ToString(), false).Data);
     }
 
-    public double GetResult(string name) {
-      return results[name];
+
+    public void SetResult(ModelingResult result, double value) {
+      results.Add(result, value);
+    }
+
+    public double GetResult(ModelingResult result) {
+      return results[result];
     }
 
@@ -89 +95 @@
     }
 
-    public double GetVariableQualityImpact(string variableName) {
-      if (variableQualityImpacts.ContainsKey(variableName)) return variableQualityImpacts[variableName];
-      else throw new ArgumentException("Impact of variable " + variableName + " is not available.");
+    private Dictionary<string, Dictionary<ModelingResult, double>> variableResults = new Dictionary<string, Dictionary<ModelingResult, double>>();
+    public double GetVariableResult(ModelingResult result, string variableName) {
+      if (variableResults.ContainsKey(variableName)) {
+        if (variableResults[variableName].ContainsKey(result)) {
+          return variableResults[variableName][result];
+        } else throw new ArgumentException("No value for modeling result: " + result + ".");
+      } else throw new ArgumentException("No variable result for variable " + variableName + ".");
     }
 
-    public double GetVariableEvaluationImpact(string variableName) {
-      if (variableEvaluationImpacts.ContainsKey(variableName)) return variableEvaluationImpacts[variableName];
-      else throw new ArgumentException("Impact of variable " + variableName + " is not available.");
+    public void SetVariableResult(ModelingResult result, string variableName, double value) {
+      if (!variableResults.ContainsKey(variableName)) {
+        variableResults.Add(variableName, new Dictionary<ModelingResult, double>());
+      }
+      variableResults[variableName][result] = value;
+    }
+
+    public IEnumerable<KeyValuePair<ModelingResult, double>> GetVariableResults(string variableName) {
+      return variableResults[variableName];
     }
 
@@ -103 +119 @@
     #endregion
 
-    private Dictionary<string, double> variableQualityImpacts = new Dictionary<string, double>();
-    public void SetVariableQualityImpact(string variableName, double impact) {
-      variableQualityImpacts[variableName] = impact;
-    }
-
-    public void SetVariableQualityImpact(int variableIndex, double impact) {
-      variableQualityImpacts[dataset.GetVariableName(variableIndex)] = impact;
-    }
-
-    private Dictionary<string, double> variableEvaluationImpacts = new Dictionary<string, double>();
-    public void SetVariableEvaluationImpact(string variableName, double impact) {
-      variableEvaluationImpacts[variableName] = impact;
-    }
-
-    public void SetVariableEvaluationImpact(int variableIndex, double impact) {
-      variableEvaluationImpacts[dataset.GetVariableName(variableIndex)] = impact;
-    }
   }
 }