Changeset 8513 for branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views

Timestamp:

08/21/12 14:10:35 (12 years ago)

Author:

sforsten

Message:

#1758: merged r8023:8509 from trunk to branch to make it useable again

Location:

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views

Files:

• . (modified) (1 prop)
• 3.4 (modified) (1 prop)
• 3.4/InteractiveSymbolicRegressionSolutionSimplifierView.Designer.cs (modified) (1 diff)
• 3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs (modified) (3 diffs)
• 3.4/Plugin.cs.frame (modified) (1 diff)
• 3.4/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• 3.4/SymbolicRegressionSolutionErrorCharacteristicsCurveView.Designer.cs (modified) (1 diff)
• 3.4/SymbolicRegressionSolutionErrorCharacteristicsCurveView.cs (modified) (3 diffs)
• 3.4/SymbolicRegressionSolutionResponseFunctionView.Designer.cs (modified) (1 diff)
• 3.4/SymbolicRegressionSolutionResponseFunctionView.cs (modified) (2 diffs)

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
-*.resx
+*.user

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
-*.resx
+*.user

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs

@@ -66 +66 @@
       var interpreter = Content.Model.Interpreter;
       var dataset = Content.ProblemData.Dataset;
-      var rows = Content.ProblemData.TrainingIndizes;
+      var rows = Content.ProblemData.TrainingIndices;
       string targetVariable = Content.ProblemData.TargetVariable;
       Dictionary<ISymbolicExpressionTreeNode, double> impactValues = new Dictionary<ISymbolicExpressionTreeNode, double>();
@@ -106 +106 @@
       start.AddSubtree((ISymbolicExpressionTreeNode)node.Clone());
       var interpreter = Content.Model.Interpreter;
-      var rows = Content.ProblemData.TrainingIndizes;
+      var rows = Content.ProblemData.TrainingIndices;
       return interpreter.GetSymbolicExpressionTreeValues(tempTree, Content.ProblemData.Dataset, rows).Median();
     }
@@ -122 +122 @@
 
     protected override void btnOptimizeConstants_Click(object sender, EventArgs e) {
-      SymbolicRegressionConstantOptimizationEvaluator.OptimizeConstants(Content.Model.Interpreter, Content.Model.SymbolicExpressionTree, Content.ProblemData, Content.ProblemData.TrainingIndizes, 0.001, 0, 0.0001);
+      SymbolicRegressionConstantOptimizationEvaluator.OptimizeConstants(Content.Model.Interpreter, Content.Model.SymbolicExpressionTree, Content.ProblemData, Content.ProblemData.TrainingIndices, 0.001, 0, 0.0001);
       UpdateModel(Content.Model.SymbolicExpressionTree);
     }

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/Plugin.cs.frame

@@ -26 +26 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views {
-  [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views", "Provides views for symbolic regression problem classes.", "3.4.2.$WCREV$")]
+  [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views", "Provides views for symbolic regression problem classes.", "3.4.3.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.dll",PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Algorithms.DataAnalysis", "3.4")]

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/Properties/AssemblyInfo.cs.frame

@@ -53 +53 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.2.$WCREV$")]
+[assembly: AssemblyFileVersion("3.4.3.$WCREV$")]

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionErrorCharacteristicsCurveView.Designer.cs

@@ -26 +26 @@
       ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit();
       this.SuspendLayout();
-      // 
-      // chart
-      // 
-      this.chart.MouseDown += new System.Windows.Forms.MouseEventHandler(this.chart_MouseDown);
-      // 
+      //
       // SymbolicRegressionSolutionErrorCharacteristicsCurveView
       // 

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionErrorCharacteristicsCurveView.cs

@@ -23 +23 @@
 using System.Linq;
 using System.Windows.Forms;
-using System.Windows.Forms.DataVisualization.Charting;
 using HeuristicLab.Algorithms.DataAnalysis;
 using HeuristicLab.MainForm;
@@ -73 +72 @@
       foreach (var variable in usedVariables) {
         problemData.InputVariables.SetItemCheckedState(
-          problemData.InputVariables.Where(x => x.Value == variable).First(), true);
+          problemData.InputVariables.First(x => x.Value == variable), true);
       }
 
@@ -90 +89 @@
       base.Content_ProblemDataChanged(sender, e);
     }
-
-    private void chart_MouseDown(object sender, MouseEventArgs e) {
-      if (e.Clicks < 2) return;
-      HitTestResult result = chart.HitTest(e.X, e.Y);
-      if (result.ChartElementType != ChartElementType.LegendItem) return;
-      if (result.Series.Name != linearRegressionSolution.Name) return;
-
-      MainFormManager.MainForm.ShowContent((IRegressionSolution)result.Series.Tag);
-    }
   }
 }

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionResponseFunctionView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionResponseFunctionView.cs

@@ -142 +142 @@
       };
 
-      var mainTrainingIndizes = (from row in Content.ProblemData.TrainingIndizes
+      var mainTrainingIndices = (from row in Content.ProblemData.TrainingIndices
                                  where NearMedianValue(row)
                                  select row)
         .ToArray();
-      var mainTestIndizes = (from row in Content.ProblemData.TestIndizes
+      var mainTestIndices = (from row in Content.ProblemData.TestIndices
                              where NearMedianValue(row)
                              select row)
         .ToArray();
 
-      var freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, mainTrainingIndizes).ToArray();
+      var freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, mainTrainingIndices).ToArray();
       var trainingValues = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable,
-                                                                     mainTrainingIndizes).ToArray();
+                                                                     mainTrainingIndices).ToArray();
       Array.Sort(freeVariableValues, trainingValues);
       responseChart.Series["Training Data"].Points.DataBindXY(freeVariableValues, trainingValues);
 
-      freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, mainTestIndizes).ToArray();
+      freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, mainTestIndices).ToArray();
       var testValues = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable,
-                                                                     mainTestIndizes).ToArray();
+                                                                     mainTestIndices).ToArray();
       Array.Sort(freeVariableValues, testValues);
       responseChart.Series["Test Data"].Points.DataBindXY(freeVariableValues, testValues);
 
       // draw scatter plots of remaining values
-      freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, Content.ProblemData.TrainingIndizes).ToArray();
+      freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, Content.ProblemData.TrainingIndices).ToArray();
       trainingValues = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable,
-                                                                     Content.ProblemData.TrainingIndizes).ToArray();
+                                                                     Content.ProblemData.TrainingIndices).ToArray();
       Array.Sort(freeVariableValues, trainingValues);
       responseChart.Series["Training Data (edge)"].Points.DataBindXY(freeVariableValues, trainingValues);
 
-      freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, Content.ProblemData.TestIndizes).ToArray();
+      freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, Content.ProblemData.TestIndices).ToArray();
       testValues = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable,
-                                                                     Content.ProblemData.TestIndizes).ToArray();
+                                                                     Content.ProblemData.TestIndices).ToArray();
       Array.Sort(freeVariableValues, testValues);
       responseChart.Series["Test Data (edge)"].Points.DataBindXY(freeVariableValues, testValues);
@@ -187 +187 @@
       string freeVariable = (string)comboBox.SelectedItem;
 
-      var freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, Content.ProblemData.TrainingIndizes).ToArray();
+      var freeVariableValues = Content.ProblemData.Dataset.GetDoubleValues(freeVariable, Content.ProblemData.TrainingIndices).ToArray();
       var responseValues = Content.Model.Interpreter.GetSymbolicExpressionTreeValues(clonedTree,
                                                                               Content.ProblemData.Dataset,
-                                                                              Content.ProblemData.TrainingIndizes)
+                                                                              Content.ProblemData.TrainingIndices)
                                                                               .ToArray();
       Array.Sort(freeVariableValues, responseValues);

@@ -5 +5 @@
 *.vs10x
 Plugin.cs
-*.resx
+*.user