Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/16/10 15:22:57 (14 years ago)
Author:
gkronber
Message:

Refactored HeuristicLab.Problems.DataAnalysis namespace. #938 (Data types and operators for regression problems)

Location:
trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3
Files:
4 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj

    r3368 r3373  
    7171    </Reference>
    7272    <Reference Include="System.Drawing" />
    73     <Reference Include="System.Windows.Forms" />
    7473    <Reference Include="System.Xml.Linq">
    7574      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    … …  
    8584    <None Include="HeuristicLabProblemsDataAnalysisRegressionPlugin.cs.frame" />
    8685    <None Include="Properties\AssemblyInfo.frame" />
    87     <Compile Include="RegressionProblemDataView.cs">
    88       <SubType>UserControl</SubType>
    89     </Compile>
    90     <Compile Include="RegressionProblemDataView.Designer.cs">
    91       <DependentUpon>RegressionProblemDataView.cs</DependentUpon>
    92     </Compile>
    93     <Compile Include="RegressionProblemData.cs" />
    94     <Compile Include="CsvFileParser.cs" />
    95     <Compile Include="DataFormatException.cs" />
    96     <Compile Include="Symbolic\ArithmeticExpressionGrammar.cs" />
    97     <Compile Include="Symbolic\SimpleArithmeticExpressionEvaluator.cs" />
    98     <Compile Include="Symbolic\SymbolicRegressionMeanSquaredErrorEvaluator.cs" />
    99     <Compile Include="Symbolic\SymbolicRegressionEvaluator.cs" />
    100     <Compile Include="Symbolic\ISymbolicRegressionEvaluator.cs" />
    101     <Compile Include="Symbolic\SymbolicRegressionProblem.cs" />
    102     <Compile Include="RegressionProblem.cs" />
    10386    <Compile Include="HeuristicLabProblemsDataAnalysisRegressionPlugin.cs" />
    10487    <Compile Include="Properties\AssemblyInfo.cs" />
    105     <Compile Include="Symbolic\Symbols\Constant.cs" />
    106     <Compile Include="Symbolic\Symbols\ConstantTreeNode.cs" />
    107     <Compile Include="Symbolic\Symbols\Variable.cs" />
    108     <Compile Include="Symbolic\Symbols\VariableTreeNode.cs" />
     88    <Compile Include="Symbolic\ISymbolicRegressionEvaluator.cs">
     89      <SubType>Code</SubType>
     90    </Compile>
     91    <Compile Include="Symbolic\SymbolicRegressionEvaluator.cs">
     92      <SubType>Code</SubType>
     93    </Compile>
     94    <Compile Include="Symbolic\SymbolicRegressionMeanSquaredErrorEvaluator.cs">
     95      <SubType>Code</SubType>
     96    </Compile>
     97    <Compile Include="Symbolic\SymbolicRegressionProblem.cs">
     98      <SubType>Code</SubType>
     99    </Compile>
    109100  </ItemGroup>
    110101  <ItemGroup>
    … …  
    121112      <Name>HeuristicLab.Common-3.2</Name>
    122113    </ProjectReference>
    123     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    124       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    125       <Name>HeuristicLab.Core.Views-3.3</Name>
    126     </ProjectReference>
    127114    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    128115      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    129116      <Name>HeuristicLab.Core-3.3</Name>
    130     </ProjectReference>
    131     <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    132       <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    133       <Name>HeuristicLab.Data.Views-3.3</Name>
    134117    </ProjectReference>
    135118    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    … …  
    141124      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    142125    </ProjectReference>
    143     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.2\HeuristicLab.MainForm.WindowsForms-3.2.csproj">
    144       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    145       <Name>HeuristicLab.MainForm.WindowsForms-3.2</Name>
    146     </ProjectReference>
    147     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.2\HeuristicLab.MainForm-3.2.csproj">
    148       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    149       <Name>HeuristicLab.MainForm-3.2</Name>
    150     </ProjectReference>
    151126    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    152127      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    153128      <Name>HeuristicLab.Operators-3.3</Name>
    154129    </ProjectReference>
    155     <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    156       <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    157       <Name>HeuristicLab.Optimization.Views-3.3</Name>
    158     </ProjectReference>
    159130    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    160131      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    161132      <Name>HeuristicLab.Optimization-3.3</Name>
    162     </ProjectReference>
    163     <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj">
    164       <Project>{AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}</Project>
    165       <Name>HeuristicLab.Parameters.Views-3.3</Name>
    166133    </ProjectReference>
    167134    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/ISymbolicRegressionEvaluator.cs

    r3294 r3373  
    3737  public interface ISymbolicRegressionEvaluator : ISingleObjectiveEvaluator {
    3838    ILookupParameter<SymbolicExpressionTree> FunctionTreeParameter { get; }
    39     ILookupParameter<RegressionProblemData> RegressionProblemDataParameter { get; }
     39    ILookupParameter<DataAnalysisProblemData> RegressionProblemDataParameter { get; }
    4040    ILookupParameter<DoubleValue> NumberOfEvaluatedNodesParameter { get; }
    4141  }

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblem.cs

    r3294 r3373  
    3333using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    3434using HeuristicLab.Problems.DataAnalysis.Regression;
     35using HeuristicLab.Problems.DataAnalysis.Symbolic;
    3536
    3637namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic {
    … …  
    3839  [Creatable("Problems")]
    3940  [StorableClass]
    40   public sealed class SymbolicRegressionProblem : RegressionProblem, ISingleObjectiveProblem {
     41  public sealed class SymbolicRegressionProblem : DataAnalysisProblem, ISingleObjectiveProblem {
    4142
    4243    #region Parameter Properties
    … …  
    155156      creator.SymbolicExpressionTreeParameter.ActualName = "SymbolicRegressionModel";
    156157      evaluator.QualityParameter.ActualName = "TrainingMeanSquaredError";
    157       RegressionProblemDataParameter.ValueChanged += new EventHandler(RegressionProblemDataParameter_ValueChanged);
    158       RegressionProblemData.InputVariablesChanged += new EventHandler(RegressionProblemData_InputVariablesChanged);
     158      DataAnalysisProblemDataParameter.ValueChanged += new EventHandler(DataAnalysisProblemDataParameter_ValueChanged);
     159      DataAnalysisProblemData.InputVariablesChanged += new EventHandler(DataAnalysisProblemData_InputVariablesChanged);
    159160      ParameterizeSolutionCreator();
    160161      ParameterizeEvaluator();
    … …  
    164165    }
    165166
    166     void RegressionProblemDataParameter_ValueChanged(object sender, EventArgs e) {
    167       RegressionProblemData.InputVariablesChanged += new EventHandler(RegressionProblemData_InputVariablesChanged);
    168     }
    169 
    170     void RegressionProblemData_InputVariablesChanged(object sender, EventArgs e) {
    171       FunctionTreeGrammar.VariableNames = RegressionProblemData.InputVariables.Select(x => x.Value);
     167    void DataAnalysisProblemDataParameter_ValueChanged(object sender, EventArgs e) {
     168      DataAnalysisProblemData.InputVariablesChanged += new EventHandler(DataAnalysisProblemData_InputVariablesChanged);
     169    }
     170
     171    void DataAnalysisProblemData_InputVariablesChanged(object sender, EventArgs e) {
     172      FunctionTreeGrammar.VariableNames = DataAnalysisProblemData.InputVariables.Select(x => x.Value);
    172173    }
    173174
    … …  
    263264    private void ParameterizeEvaluator() {
    264265      Evaluator.FunctionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
    265       Evaluator.RegressionProblemDataParameter.ActualName = RegressionProblemDataParameter.Name;
     266      Evaluator.RegressionProblemDataParameter.ActualName = DataAnalysisProblemDataParameter.Name;
    266267    }
    267268    private void ParameterizeVisualizer() {
    … …  
    289290      foreach (ISymbolicRegressionEvaluator op in Operators.OfType<ISymbolicRegressionEvaluator>()) {
    290291        op.FunctionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
    291         op.RegressionProblemDataParameter.ActualName = RegressionProblemDataParameter.Name;
     292        op.RegressionProblemDataParameter.ActualName = DataAnalysisProblemDataParameter.Name;
    292293        op.NumberOfEvaluatedNodesParameter.ActualName = NumberOfEvaluatedNodesParameter.Name;
    293294      }
Note: See TracChangeset for help on using the changeset viewer.