Changeset 3373


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

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

Location:
trunk/sources
Files:
8 added
9 deleted
14 edited
1 copied
8 moved

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r3363 r3373  
    5555    {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD} = {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}
    5656    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1} = {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}
     57    {799B0B38-E384-4A17-A73C-F211EB854592} = {799B0B38-E384-4A17-A73C-F211EB854592}
    5758    {678E2145-8152-4E19-9646-07D439D00301} = {678E2145-8152-4E19-9646-07D439D00301}
    5859    {BB994448-2B21-4564-BB2E-38D8FFF8CF18} = {BB994448-2B21-4564-BB2E-38D8FFF8CF18}
     
    241242EndProject
    242243Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3", "HeuristicLab.Algorithms.ParticleSwarmOptimization\3.3\HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj", "{2C429157-9C34-4DD3-9D5F-B444B751E39A}"
     244EndProject
     245Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Views-3.3", "HeuristicLab.Problems.DataAnalysis.Views\3.3\HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj", "{799B0B38-E384-4A17-A73C-F211EB854592}"
    243246EndProject
    244247Global
     
    12261229    {125D3006-67F5-48CB-913E-73C0548F17FA}.Release|x86.Build.0 = Release|x86
    12271230    {125D3006-67F5-48CB-913E-73C0548F17FA}.Services|Any CPU.ActiveCfg = Release|Any CPU
    1228     {125D3006-67F5-48CB-913E-73C0548F17FA}.Services|x64.ActiveCfg = Release|x86
     1231    {125D3006-67F5-48CB-913E-73C0548F17FA}.Services|x64.ActiveCfg = Release|x64
    12291232    {125D3006-67F5-48CB-913E-73C0548F17FA}.Services|x86.ActiveCfg = Release|x86
    12301233    {F5C0ECAC-EDBA-4024-872A-1F74AFCB20B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     
    13051308    {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    13061309    {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1307     {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|x64.ActiveCfg = Debug|Any CPU
    1308     {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|x86.ActiveCfg = Debug|Any CPU
     1310    {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|x64.ActiveCfg = Debug|x64
     1311    {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|x64.Build.0 = Debug|x64
     1312    {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|x86.ActiveCfg = Debug|x86
     1313    {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|x86.Build.0 = Debug|x86
    13091314    {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
    13101315    {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|Any CPU.Build.0 = Release|Any CPU
    1311     {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x64.ActiveCfg = Release|Any CPU
    1312     {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x86.ActiveCfg = Release|Any CPU
     1316    {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x64.ActiveCfg = Release|x64
     1317    {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x64.Build.0 = Release|x64
     1318    {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x86.ActiveCfg = Release|x86
     1319    {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x86.Build.0 = Release|x86
    13131320    {8824925E-3E00-4543-8293-7DDACE4737F8}.Services|Any CPU.ActiveCfg = Release|Any CPU
    1314     {8824925E-3E00-4543-8293-7DDACE4737F8}.Services|Any CPU.Build.0 = Release|Any CPU
    1315     {8824925E-3E00-4543-8293-7DDACE4737F8}.Services|x64.ActiveCfg = Release|Any CPU
    1316     {8824925E-3E00-4543-8293-7DDACE4737F8}.Services|x86.ActiveCfg = Release|Any CPU
     1321    {8824925E-3E00-4543-8293-7DDACE4737F8}.Services|x64.ActiveCfg = Release|x64
     1322    {8824925E-3E00-4543-8293-7DDACE4737F8}.Services|x86.ActiveCfg = Release|x86
    13171323    {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    13181324    {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    13231329    {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
    13241330    {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|Any CPU.Build.0 = Release|Any CPU
    1325     {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|x64.ActiveCfg = Release|Any CPU
    1326     {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|x86.ActiveCfg = Release|Any CPU
     1331    {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|x64.ActiveCfg = Release|x64
     1332    {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|x64.Build.0 = Release|x64
     1333    {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|x86.ActiveCfg = Release|x86
     1334    {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Release|x86.Build.0 = Release|x86
    13271335    {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Services|Any CPU.ActiveCfg = Release|Any CPU
    1328     {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Services|Any CPU.Build.0 = Release|Any CPU
    1329     {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Services|x64.ActiveCfg = Release|Any CPU
    1330     {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Services|x86.ActiveCfg = Release|Any CPU
     1336    {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Services|x64.ActiveCfg = Release|x64
     1337    {7CBAA733-47EA-4675-BB5E-827A0D5DC5DD}.Services|x86.ActiveCfg = Release|x86
    13311338    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    13321339    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    13411348    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|x86.ActiveCfg = Release|x86
    13421349    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|x86.Build.0 = Release|x86
    1343     {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|Any CPU.ActiveCfg = Release|x64
     1350    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|Any CPU.ActiveCfg = Release|Any CPU
    13441351    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|x64.ActiveCfg = Release|x64
    1345     {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|x64.Build.0 = Release|x64
    1346     {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|x86.ActiveCfg = Release|x64
     1352    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Services|x86.ActiveCfg = Release|x86
     1353    {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1354    {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1355    {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x64.ActiveCfg = Debug|x64
     1356    {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x64.Build.0 = Debug|x64
     1357    {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x86.ActiveCfg = Debug|x86
     1358    {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x86.Build.0 = Debug|x86
     1359    {799B0B38-E384-4A17-A73C-F211EB854592}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1360    {799B0B38-E384-4A17-A73C-F211EB854592}.Release|Any CPU.Build.0 = Release|Any CPU
     1361    {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x64.ActiveCfg = Release|x64
     1362    {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x64.Build.0 = Release|x64
     1363    {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x86.ActiveCfg = Release|x86
     1364    {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x86.Build.0 = Release|x86
     1365    {799B0B38-E384-4A17-A73C-F211EB854592}.Services|Any CPU.ActiveCfg = Release|Any CPU
     1366    {799B0B38-E384-4A17-A73C-F211EB854592}.Services|x64.ActiveCfg = Release|x64
     1367    {799B0B38-E384-4A17-A73C-F211EB854592}.Services|x86.ActiveCfg = Release|x86
    13471368  EndGlobalSection
    13481369  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab 3.3/Files.txt

    r3363 r3373  
    4646HeuristicLab.Problems.DataAnalysis\3.3:HeuristicLab.Problems.DataAnalysis-3.3.dll
    4747HeuristicLab.Problems.DataAnalysis.Regression\3.3:HeuristicLab.Problems.DataAnalysis.Regression-3.3.dll
     48HeuristicLab.Problems.DataAnalysis.Views\3.3:HeuristicLab.Problems.DataAnalysis.Views-3.3.dll
    4849HeuristicLab.Problems.Knapsack\3.3:HeuristicLab.Problems.Knapsack-3.3.dll
    4950HeuristicLab.Problems.Knapsack.Views\3.3:HeuristicLab.Problems.Knapsack.Views-3.3.dll
  • trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.Tests.csproj

    r3368 r3373  
    3030    <ErrorReport>prompt</ErrorReport>
    3131    <WarningLevel>4</WarningLevel>
     32  </PropertyGroup>
     33  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     34    <DebugSymbols>true</DebugSymbols>
     35    <OutputPath>bin\x64\Debug\</OutputPath>
     36    <DefineConstants>DEBUG;TRACE</DefineConstants>
     37    <DebugType>full</DebugType>
     38    <PlatformTarget>x64</PlatformTarget>
     39    <ErrorReport>prompt</ErrorReport>
     40  </PropertyGroup>
     41  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     42    <OutputPath>bin\x64\Release\</OutputPath>
     43    <DefineConstants>TRACE</DefineConstants>
     44    <Optimize>true</Optimize>
     45    <DebugType>pdbonly</DebugType>
     46    <PlatformTarget>x64</PlatformTarget>
     47    <ErrorReport>prompt</ErrorReport>
     48  </PropertyGroup>
     49  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     50    <DebugSymbols>true</DebugSymbols>
     51    <OutputPath>bin\x86\Debug\</OutputPath>
     52    <DefineConstants>DEBUG;TRACE</DefineConstants>
     53    <DebugType>full</DebugType>
     54    <PlatformTarget>x86</PlatformTarget>
     55    <ErrorReport>prompt</ErrorReport>
     56  </PropertyGroup>
     57  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     58    <OutputPath>bin\x86\Release\</OutputPath>
     59    <DefineConstants>TRACE</DefineConstants>
     60    <Optimize>true</Optimize>
     61    <DebugType>pdbonly</DebugType>
     62    <PlatformTarget>x86</PlatformTarget>
     63    <ErrorReport>prompt</ErrorReport>
    3264  </PropertyGroup>
    3365  <ItemGroup>
  • 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      }
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemDataView.Designer.cs

    r3368 r3373  
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.DataAnalysis.Regression {
    23   partial class RegressionProblemDataView {
     22namespace HeuristicLab.Problems.DataAnalysis {
     23  partial class DataAnalysisProblemDataView {
    2424    /// <summary>
    2525    /// Required designer variable.
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemDataView.cs

    r3368 r3373  
    2626using HeuristicLab.MainForm;
    2727
    28 namespace HeuristicLab.Problems.DataAnalysis.Regression {
    29   [View("Regression Problem Data View")]
    30   [Content(typeof(RegressionProblemData), true)]
    31   public partial class RegressionProblemDataView : NamedItemView {
     28namespace HeuristicLab.Problems.DataAnalysis {
     29  [View("Data-Analysis Data View")]
     30  [Content(typeof(DataAnalysisProblemData), true)]
     31  public partial class DataAnalysisProblemDataView : NamedItemView {
    3232    private OpenFileDialog openFileDialog;
    3333
    34     public new RegressionProblemData Content {
    35       get { return (RegressionProblemData)base.Content; }
     34    public new DataAnalysisProblemData Content {
     35      get { return (DataAnalysisProblemData)base.Content; }
    3636      set { base.Content = value; }
    3737    }
    3838
    39     public RegressionProblemDataView() {
     39    public DataAnalysisProblemDataView() {
    4040      InitializeComponent();
    4141    }
    4242
    43     public RegressionProblemDataView(RegressionProblemData content)
     43    public DataAnalysisProblemDataView(DataAnalysisProblemData content)
    4444      : this() {
    4545      Content = content;
     
    6767        importButton.Enabled = false;
    6868      } else {
    69         //parameterCollectionView.Content = ((IParameterizedNamedItem)Content).Parameters;
    70         //parameterCollectionView.Enabled = true;
    7169        importButton.Enabled = true;
    7270        this.datasetView.Content = this.Content.Dataset;
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemView.Designer.cs

    r3368 r3373  
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.DataAnalysis.Regression {
    23   partial class RegressionProblemView {
     22namespace HeuristicLab.Problems.DataAnalysis {
     23  partial class DataAnalysisProblemView {
    2424    /// <summary>
    2525    /// Required designer variable.
     
    3333    protected override void Dispose(bool disposing) {
    3434      if (disposing) {
    35         if (openFileDialog != null) openFileDialog.Dispose();
    3635        if (components != null) components.Dispose();
    3736      }
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemView.cs

    r3368 r3373  
    2626using HeuristicLab.MainForm;
    2727
    28 namespace HeuristicLab.Problems.DataAnalysis.Regression {
    29   [View("Regression Problem View")]
    30   [Content(typeof(RegressionProblem), true)]
    31   public partial class RegressionProblemView : NamedItemView {
    32     private OpenFileDialog openFileDialog;
    33 
    34     public new RegressionProblem Content {
    35       get { return (RegressionProblem)base.Content; }
     28namespace HeuristicLab.Problems.DataAnalysis {
     29  [View("Data-Analysis Problem View")]
     30  [Content(typeof(DataAnalysisProblem), true)]
     31  public partial class DataAnalysisProblemView : NamedItemView {
     32    public new DataAnalysisProblem Content {
     33      get { return (DataAnalysisProblem)base.Content; }
    3634      set { base.Content = value; }
    3735    }
    3836
    39     public RegressionProblemView() {
     37    public DataAnalysisProblemView() {
    4038      InitializeComponent();
    4139    }
    4240
    43     public RegressionProblemView(RegressionProblem content)
     41    public DataAnalysisProblemView(DataAnalysisProblem content)
    4442      : this() {
    4543      Content = content;
     
    5856      }
    5957    }
    60 
    61     private void importButton_Click(object sender, System.EventArgs e) {
    62       if (openFileDialog == null) openFileDialog = new OpenFileDialog();
    63 
    64       if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
    65         try {
    66           Content.ImportFromFile(openFileDialog.FileName);
    67         }
    68         catch (Exception ex) {
    69           Auxiliary.ShowErrorMessageBox(ex);
    70         }
    71       }
    72     }
    7358  }
    7459}
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/CsvFileParser.cs

    r3368 r3373  
    2828using System.Text;
    2929
    30 namespace HeuristicLab.Problems.DataAnalysis.Regression {
     30namespace HeuristicLab.Problems.DataAnalysis {
    3131  public class CsvFileParser {
    3232    private const string VARIABLENAMES = "VARIABLENAMES";
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblem.cs

    r3368 r3373  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Optimization;
    3029using HeuristicLab.Problems.DataAnalysis;
    3130using System.Drawing;
    3231using System.IO;
    3332
    34 namespace HeuristicLab.Problems.DataAnalysis.Regression {
    35   [Item("RegressionProblem", "Represents a regression problem.")]
     33namespace HeuristicLab.Problems.DataAnalysis {
     34  [Item("DataAnalysisProblem", "Represents a data analysis problem.")]
    3635  [Creatable("Problems")]
    3736  [StorableClass]
    38   public class RegressionProblem : ParameterizedNamedItem {
    39     private const string RegressionProblemDataParameterName = "RegressionProblemData";
     37  public class DataAnalysisProblem : ParameterizedNamedItem {
     38    private const string DataAnalysisProblemDataParameterName = "DataAnalysisProblemData";
    4039    public override Image ItemImage {
    4140      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
     
    4342
    4443    #region Parameter Properties
    45     public ValueParameter<RegressionProblemData> RegressionProblemDataParameter {
    46       get { return (ValueParameter<RegressionProblemData>)Parameters[RegressionProblemDataParameterName]; }
     44    public ValueParameter<DataAnalysisProblemData> DataAnalysisProblemDataParameter {
     45      get { return (ValueParameter<DataAnalysisProblemData>)Parameters[DataAnalysisProblemDataParameterName]; }
    4746    }
    4847    #endregion
    4948    #region properties
    50     public RegressionProblemData RegressionProblemData {
    51       get { return RegressionProblemDataParameter.Value; }
    52       set { RegressionProblemDataParameter.Value = value; }
     49    public DataAnalysisProblemData DataAnalysisProblemData {
     50      get { return DataAnalysisProblemDataParameter.Value; }
     51      set { DataAnalysisProblemDataParameter.Value = value; }
    5352    }
    5453    #endregion
    5554
    56     public RegressionProblem()
     55    public DataAnalysisProblem()
    5756      : base() {
    58       Parameters.Add(new ValueParameter<RegressionProblemData>(RegressionProblemDataParameterName, "The data set, target variable and input variables of the regression problem.", new RegressionProblemData()));
     57      Parameters.Add(new ValueParameter<DataAnalysisProblemData>(DataAnalysisProblemDataParameterName, "The data set, target variable and input variables of the data analysis problem.", new DataAnalysisProblemData()));
    5958    }
    6059
    6160    [StorableConstructor]
    62     private RegressionProblem(bool deserializing) : base() { }
     61    private DataAnalysisProblem(bool deserializing) : base() { }
    6362  }
    6463}
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblemData.cs

    r3368 r3373  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Optimization;
    3029using HeuristicLab.Problems.DataAnalysis;
    3130using System.Drawing;
    3231using System.IO;
    3332
    34 namespace HeuristicLab.Problems.DataAnalysis.Regression {
    35   [Item("RegressionProblemData", "Represents an item containing all data defining a regression problem.")]
     33namespace HeuristicLab.Problems.DataAnalysis {
     34  [Item("DataAnalysisProblemData", "Represents an item containing all data defining a data analysis problem.")]
    3635  [StorableClass]
    37   public class RegressionProblemData : NamedItem {
     36  public class DataAnalysisProblemData : NamedItem {
    3837    #region properties
    3938    private Dataset dataset;
     
    109108    #endregion
    110109
    111     public RegressionProblemData()
     110    public DataAnalysisProblemData()
    112111      : base() {
    113112      dataset = new Dataset();
     
    123122
    124123    [StorableConstructor]
    125     private RegressionProblemData(bool deserializing) : base() { }
     124    private DataAnalysisProblemData(bool deserializing) : base() { }
    126125
    127126    #region events
     
    142141      var csvFileParser = new CsvFileParser();
    143142      csvFileParser.Parse(fileName);
    144       Name = "Regression Problem (imported from " + Path.GetFileName(fileName) + ")";
     143      Name = "Data imported from " + Path.GetFileName(fileName);
    145144      Dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
    146145      Dataset.Name = Path.GetFileName(fileName);
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataFormatException.cs

    r3368 r3373  
    2525using System.Text;
    2626
    27 namespace HeuristicLab.Problems.DataAnalysis.Regression {
     27namespace HeuristicLab.Problems.DataAnalysis {
    2828  public class DataFormatException : Exception {
    2929    private int line;
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj

    r3257 r3373  
    7070      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    7171    </Reference>
     72    <Reference Include="System.Drawing" />
    7273    <Reference Include="System.Xml.Linq">
    7374      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    8384    <None Include="HeuristicLabProblemsDataAnalysisPlugin.cs.frame" />
    8485    <None Include="Properties\AssemblyInfo.frame" />
     86    <Compile Include="CsvFileParser.cs" />
     87    <Compile Include="DataAnalysisProblem.cs" />
     88    <Compile Include="DataAnalysisProblemData.cs" />
     89    <Compile Include="DataFormatException.cs" />
    8590    <Compile Include="Dataset.cs" />
    8691    <Compile Include="Evaluators\SimpleEvaluator.cs" />
     
    8994    <Compile Include="MatrixExtensions.cs" />
    9095    <Compile Include="Properties\AssemblyInfo.cs" />
     96    <Compile Include="Symbolic\ArithmeticExpressionGrammar.cs" />
     97    <Compile Include="Symbolic\SimpleArithmeticExpressionEvaluator.cs" />
     98    <Compile Include="Symbolic\Symbols\Constant.cs" />
     99    <Compile Include="Symbolic\Symbols\ConstantTreeNode.cs" />
     100    <Compile Include="Symbolic\Symbols\Variable.cs" />
     101    <Compile Include="Symbolic\Symbols\VariableTreeNode.cs" />
    91102  </ItemGroup>
    92103  <ItemGroup>
     
    94105      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    95106      <Name>HeuristicLab.Collections-3.3</Name>
     107    </ProjectReference>
     108    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj">
     109      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     110      <Name>HeuristicLab.Common.Resources-3.2</Name>
    96111    </ProjectReference>
    97112    <ProjectReference Include="..\..\HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj">
     
    127142      <Name>HeuristicLab.PluginInfrastructure</Name>
    128143    </ProjectReference>
     144    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     145      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     146      <Name>HeuristicLab.Random-3.3</Name>
     147    </ProjectReference>
    129148  </ItemGroup>
    130149  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/ArithmeticExpressionGrammar.cs

    r3338 r3373  
    2020#endregion
    2121
    22 
    2322using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2423using System.Collections.Generic;
     
    2827using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2928using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.GeneralSymbols;
    30 using HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols;
    3129using HeuristicLab.Data;
    32 namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic {
     30using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
     31namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    3332  [StorableClass]
    3433  [Item("ArithmeticExpressionGrammar", "Represents a grammar for functional expressions using only arithmetic operations.")]
     
    4544
    4645    [Storable]
    47     private HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols.Variable variableSymbol;
     46    private HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable variableSymbol;
    4847
    4948    public ArithmeticExpressionGrammar()
     
    5857      var div = new Division();
    5958      var constant = new Constant();
    60       variableSymbol = new HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols.Variable();
     59      variableSymbol = new HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable();
    6160
    6261      var allSymbols = new List<Symbol>() { add, sub, mul, div, constant, variableSymbol };
    6362      var functionSymbols = new List<Symbol>() { add, sub, mul, div };
     63
    6464      foreach (var symb in allSymbols)
    6565        AddSymbol(symb);
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionEvaluator.cs

    r3294 r3373  
    2727using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2828using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.GeneralSymbols;
    29 using HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols;
     29using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
    3030
    31 namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic {
     31namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    3232  [StorableClass]
    3333  [Item("SimpleArithmeticExpressionEvaluator", "Default evaluator for arithmetic symbolic expression trees.")]
     
    8282          }
    8383        case CodeSymbol.Dynamic: {
    84             if (currentInstr.dynamicNode is VariableTreeNode) {
    85               var variableTreeNode = currentInstr.dynamicNode as VariableTreeNode;
     84            var variableTreeNode = currentInstr.dynamicNode as VariableTreeNode;
     85            if (variableTreeNode != null) {
    8686              return dataset[row, dataset.GetVariableIndex(variableTreeNode.VariableName)] * variableTreeNode.Weight;
    87             } else if (currentInstr.dynamicNode is ConstantTreeNode) {
    88               return ((ConstantTreeNode)currentInstr.dynamicNode).Value;
     87            }
     88            var constTreeNode = currentInstr.dynamicNode as ConstantTreeNode;
     89            if (constTreeNode != null) {
     90              return constTreeNode.Value;
    8991            } else throw new NotSupportedException();
    9092          }
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Constant.cs

    r3294 r3373  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Operators;
    25 using HeuristicLab.Random;
    2625using HeuristicLab.Data;
    2726using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2827using HeuristicLab.Parameters;
    29 namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols {
     28namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
    3029  [StorableClass]
    3130  [Item("Constant", "Represents a constant value.")]
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/ConstantTreeNode.cs

    r3294 r3373  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Random;
    29 namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols {
     29namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
    3030  [StorableClass]
    3131  public sealed class ConstantTreeNode : SymbolicExpressionTreeTerminalNode {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Variable.cs

    r3294 r3373  
    2929using System.Collections.Generic;
    3030using System;
    31 namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols {
     31namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
    3232  [StorableClass]
    3333  [Item("Variable", "Represents a variable value.")]
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/VariableTreeNode.cs

    r3294 r3373  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Random;
    29 namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols {
     29namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
    3030  [StorableClass]
    3131  public sealed class VariableTreeNode : SymbolicExpressionTreeTerminalNode {
  • trunk/sources/HeuristicLab.ThreadParallelEngine/3.3/HeuristicLab.ThreadParallelEngine-3.3.csproj

    r2546 r3373  
    8787    <Compile Include="ThreadParallelEngine.cs" />
    8888    <Compile Include="ThreadParallelEngineView.cs">
    89       <SubType>UserControl</SubType>
    9089    </Compile>
    9190    <Compile Include="ThreadParallelEngineView.Designer.cs">
Note: See TracChangeset for help on using the changeset viewer.