Changeset 6760 for branches/PersistenceSpeedUp/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4
- Timestamp:
- 09/14/11 13:59:25 (13 years ago)
- Location:
- branches/PersistenceSpeedUp
- Files:
-
- 7 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/PersistenceSpeedUp
- Property svn:ignore
-
old new 12 12 *.psess 13 13 *.vsp 14 *.docstates
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/PersistenceSpeedUp/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.csproj
r5830 r6760 117 117 <DependentUpon>InteractiveSymbolicRegressionSolutionSimplifierView.cs</DependentUpon> 118 118 </Compile> 119 <Compile Include="SymbolicRegressionSolutionErrorCharacteristicsCurveView.cs"> 120 <SubType>UserControl</SubType> 121 </Compile> 122 <Compile Include="SymbolicRegressionSolutionErrorCharacteristicsCurveView.Designer.cs"> 123 <DependentUpon>SymbolicRegressionSolutionErrorCharacteristicsCurveView.cs</DependentUpon> 124 </Compile> 119 125 <Compile Include="SymbolicRegressionSolutionView.cs"> 120 126 <SubType>UserControl</SubType> … … 129 135 </ItemGroup> 130 136 <ItemGroup> 137 <ProjectReference Include="..\..\HeuristicLab.Algorithms.DataAnalysis\3.4\HeuristicLab.Algorithms.DataAnalysis-3.4.csproj"> 138 <Project>{2E782078-FA81-4B70-B56F-74CE38DAC6C8}</Project> 139 <Name>HeuristicLab.Algorithms.DataAnalysis-3.4</Name> 140 </ProjectReference> 131 141 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj"> 132 142 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project> … … 165 175 <Name>HeuristicLab.MainForm-3.3</Name> 166 176 </ProjectReference> 177 <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj"> 178 <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project> 179 <Name>HeuristicLab.Operators-3.3</Name> 180 </ProjectReference> 167 181 <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj"> 168 182 <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project> … … 204 218 <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project> 205 219 <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name> 220 </ProjectReference> 221 <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj"> 222 <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project> 223 <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name> 206 224 </ProjectReference> 207 225 </ItemGroup> -
branches/PersistenceSpeedUp/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/HeuristicLabProblemsDataAnalysisSymbolicRegressionViewsPlugin.cs.frame
r5860 r6760 26 26 27 27 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views { 28 [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views", "Provides views for symbolic regression problem classes.", "3.4. 0.$WCREV$")]28 [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views", "Provides views for symbolic regression problem classes.", "3.4.1.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.dll",PluginFileType.Assembly)] 30 [PluginDependency("HeuristicLab.Algorithms.DataAnalysis", "3.4")] 31 [PluginDependency("HeuristicLab.Collections", "3.3")] 30 32 [PluginDependency("HeuristicLab.Common", "3.3")] 31 33 [PluginDependency("HeuristicLab.Core", "3.3")] 32 34 [PluginDependency("HeuristicLab.Core.Views", "3.3")] 35 [PluginDependency("HeuristicLab.Data","3.3")] 33 36 [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")] 34 37 [PluginDependency("HeuristicLab.MainForm", "3.3")] … … 40 43 [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Views", "3.4")] 41 44 [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views", "3.4")] 45 [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")] 42 46 public class HeuristicLabProblemsDataAnalysisSymbolicRegressionViewsPlugin : PluginBase { 43 47 } -
branches/PersistenceSpeedUp/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.Designer.cs
r5809 r6760 53 53 this.Name = "InteractiveSymbolicRegressionSolutionSimplifierView"; 54 54 this.Size = new System.Drawing.Size(564, 348); 55 this.btnOptimizeConstants.Enabled = true; 55 56 this.ResumeLayout(false); 56 57 } -
branches/PersistenceSpeedUp/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs
r5993 r6760 22 22 using System; 23 23 using System.Collections.Generic; 24 using System.Drawing;25 24 using System.Linq; 26 using System.Windows.Forms;27 25 using HeuristicLab.Common; 28 using HeuristicLab. MainForm.WindowsForms;26 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 29 27 using HeuristicLab.Problems.DataAnalysis.Symbolic.Views; 30 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;31 28 32 29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views { … … 75 72 var originalOutput = interpreter.GetSymbolicExpressionTreeValues(tree, dataset, rows) 76 73 .ToArray(); 77 var targetValues = dataset.Get EnumeratedVariableValues(targetVariable, rows);74 var targetValues = dataset.GetDoubleValues(targetVariable, rows); 78 75 OnlineCalculatorError errorState; 79 76 double originalR2 = OnlinePearsonsRSquaredCalculator.Calculate(targetValues, originalOutput, out errorState); … … 123 120 } 124 121 } 122 123 protected override void btnOptimizeConstants_Click(object sender, EventArgs e) { 124 SymbolicRegressionConstantOptimizationEvaluator.OptimizeConstants(Content.Model.Interpreter, Content.Model.SymbolicExpressionTree, Content.ProblemData, Content.ProblemData.TrainingIndizes, 0.001, 0, 0.0001); 125 UpdateModel(Content.Model.SymbolicExpressionTree); 126 } 125 127 } 126 128 } -
branches/PersistenceSpeedUp/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/Properties/AssemblyInfo.frame
r5860 r6760 53 53 // by using the '*' as shown below: 54 54 [assembly: AssemblyVersion("3.4.0.0")] 55 [assembly: AssemblyFileVersion("3.4. 0.$WCREV$")]55 [assembly: AssemblyFileVersion("3.4.1.$WCREV$")] -
branches/PersistenceSpeedUp/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs
r5834 r6760 26 26 27 27 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views { 28 [Content(typeof(SymbolicRegressionSolution), true)]28 [Content(typeof(SymbolicRegressionSolution), false)] 29 29 [View("SymbolicRegressionSolution View")] 30 30 public partial class SymbolicRegressionSolutionView : RegressionSolutionView {
Note: See TracChangeset
for help on using the changeset viewer.