Changeset 4484 for branches/DataAnalysis

Timestamp:

09/24/10 10:28:08 (14 years ago)

Author:

gkronber

Message:

Minor bug fixes in data analysis exploration branch. #1142

Location:

branches/DataAnalysis

Files:

• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/FixedValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemDataCorrelationsView.cs (modified) (1 diff)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/FixedValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs

@@ -322 +322 @@
 
       SymbolicRegressionSolution bestTrainingSolution = new SymbolicRegressionSolution((DataAnalysisProblemData)ProblemData.Clone(),
-        new SymbolicRegressionModel(SymbolicExpressionTreeInterpreter, scaledBestTrainingTree),
+        new SymbolicRegressionModel((ISymbolicExpressionTreeInterpreter)SymbolicExpressionTreeInterpreter.Clone(), scaledBestTrainingTree),
         lowerEstimationLimit, upperEstimationLimit);
       bestTrainingSolution.Name = "Best solution (training)";

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemDataCorrelationsView.cs

@@ -46 +46 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      StringBuilder s = new StringBuilder();
-      Dataset ds = Content.Dataset;
-      for (int i=0;i<ds.Columns - 1;i++) {
-        for (int j = i + 1; j < ds.Columns;j++ ) {
-          string a = ds.GetVariableName(i);
-          string b = ds.GetVariableName(j);
-          double[] var0 = ds.GetEnumeratedVariableValues(a).ToArray();
-          double[] var1 = ds.GetEnumeratedVariableValues(b).ToArray();
-          double r = alglib.correlation.spearmanrankcorrelation(var0, var1, var0.Length);
-          double bothtails, temp;
-          bothtails = temp = 0.0;
-          alglib.correlationtests.spearmanrankcorrelationsignificance(r, var0.Length, ref bothtails, ref temp, ref temp);
-          if(bothtails < 0.001 && r > 0.85) s.AppendLine(a + " -- " + b + " [len=\"" + 1.0/(r*r) + "\"];");
+      if (Content != null) {
+        StringBuilder s = new StringBuilder();
+        Dataset ds = Content.Dataset;
+        for (int i = 0; i < ds.Columns - 1; i++) {
+          for (int j = i + 1; j < ds.Columns; j++) {
+            string a = ds.GetVariableName(i);
+            string b = ds.GetVariableName(j);
+            double[] var0 = ds.GetEnumeratedVariableValues(a).ToArray();
+            double[] var1 = ds.GetEnumeratedVariableValues(b).ToArray();
+            double r = alglib.correlation.spearmanrankcorrelation(var0, var1, var0.Length);
+            double bothtails, temp;
+            bothtails = temp = 0.0;
+            alglib.correlationtests.spearmanrankcorrelationsignificance(r, var0.Length, ref bothtails, ref temp, ref temp);
+            if (bothtails < 0.001 && r > 0.85) s.AppendLine(a + " -- " + b + " [len=\"" + 1.0 / (r * r) + "\"];");
+          }
         }
+
+        textBox.Text = s.ToString();
       }
-
-      textBox.Text = s.ToString();
     }
   }