Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/16/12 16:28:49 (13 years ago)
Author:
gkronber
Message:

merged r7609:7840 from trunk into time series branch

Location:
branches/HeuristicLab.TimeSeries
Files:
4 deleted
5 edited
3 copied

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TimeSeries

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

    r7460 r7842  
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="ALGLIB-3.4.0, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    96       <HintPath>..\..\bin\ALGLIB-3.4.0.dll</HintPath>
     95    <Reference Include="ALGLIB-3.5.0, Version=3.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     96      <HintPath>..\..\bin\ALGLIB-3.5.0.dll</HintPath>
    9797      <Private>False</Private>
    9898    </Reference>
    … …  
    114114    <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveValidationBestSolutionAnalyzer.cs" />
    115115    <Compile Include="Plugin.cs" />
    116     <Compile Include="SingleObjective\SymbolicRegressionConstantOptimizationEvaluator.cs" />
     116    <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveValidationParetoBestSolutionAnalyzer.cs" />
     117    <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveTrainingParetoBestSolutionAnalyzer.cs" />
     118    <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveMaxAbsoluteErrorEvaluator.cs" />
     119    <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveMeanAbsoluteErrorEvaluator.cs" />
     120    <Compile Include="SingleObjective\Evaluators\SymbolicRegressionConstantOptimizationEvaluator.cs" />
    117121    <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveOverfittingAnalyzer.cs" />
    118122    <Compile Include="SymbolicRegressionModel.cs" />
    … …  
    130134    <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveMeanSquaredErrorTreeSizeEvaluator.cs" />
    131135    <Compile Include="MultiObjective\SymbolicRegressionMultiObjectivePearsonRSquaredTreeSizeEvaluator.cs" />
    132     <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveEvaluator.cs" />
    133     <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator.cs" />
    134     <Compile Include="SingleObjective\SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs" />
     136    <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveEvaluator.cs" />
     137    <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator.cs" />
     138    <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs" />
    135139    <Compile Include="SymbolicRegressionSolution.cs" />
    136140    <None Include="HeuristicLab.snk" />
    … …  
    138142    <None Include="Properties\AssemblyInfo.cs.frame" />
    139143    <Compile Include="Properties\AssemblyInfo.cs" />
    140   </ItemGroup>
    141   <ItemGroup>
    142     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    143       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    144       <Name>HeuristicLab.Analysis-3.3</Name>
    145       <Private>False</Private>
    146     </ProjectReference>
    147     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    148       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    149       <Name>HeuristicLab.Collections-3.3</Name>
    150       <Private>False</Private>
    151     </ProjectReference>
    152     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    153       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    154       <Name>HeuristicLab.Common-3.3</Name>
    155       <Private>False</Private>
    156     </ProjectReference>
    157     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    158       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    159       <Name>HeuristicLab.Core-3.3</Name>
    160       <Private>False</Private>
    161     </ProjectReference>
    162     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    163       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    164       <Name>HeuristicLab.Data-3.3</Name>
    165       <Private>False</Private>
    166     </ProjectReference>
    167     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    168       <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    169       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    170       <Private>False</Private>
    171     </ProjectReference>
    172     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    173       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    174       <Name>HeuristicLab.Operators-3.3</Name>
    175       <Private>False</Private>
    176     </ProjectReference>
    177     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    178       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    179       <Name>HeuristicLab.Optimization-3.3</Name>
    180       <Private>False</Private>
    181     </ProjectReference>
    182     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    183       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    184       <Name>HeuristicLab.Parameters-3.3</Name>
    185       <Private>False</Private>
    186     </ProjectReference>
    187     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    188       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    189       <Name>HeuristicLab.Persistence-3.3</Name>
    190       <Private>False</Private>
    191     </ProjectReference>
    192     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    193       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    194       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    195       <Private>False</Private>
    196     </ProjectReference>
    197     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    198       <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    199       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
    200       <Private>False</Private>
    201     </ProjectReference>
    202     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    203       <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    204       <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    205       <Private>False</Private>
    206     </ProjectReference>
    207144  </ItemGroup>
    208145  <ItemGroup>
    … …  
    222159      <Install>true</Install>
    223160    </BootstrapperPackage>
     161  </ItemGroup>
     162  <ItemGroup>
     163    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     164      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     165      <Name>HeuristicLab.Analysis-3.3</Name>
     166      <Private>False</Private>
     167    </ProjectReference>
     168    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     169      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     170      <Name>HeuristicLab.Collections-3.3</Name>
     171      <Private>False</Private>
     172    </ProjectReference>
     173    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     174      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     175      <Name>HeuristicLab.Common-3.3</Name>
     176      <Private>False</Private>
     177    </ProjectReference>
     178    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     179      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     180      <Name>HeuristicLab.Core-3.3</Name>
     181      <Private>False</Private>
     182    </ProjectReference>
     183    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     184      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     185      <Name>HeuristicLab.Data-3.3</Name>
     186      <Private>False</Private>
     187    </ProjectReference>
     188    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     189      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     190      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     191      <Private>False</Private>
     192    </ProjectReference>
     193    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     194      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     195      <Name>HeuristicLab.Operators-3.3</Name>
     196      <Private>False</Private>
     197    </ProjectReference>
     198    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     199      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     200      <Name>HeuristicLab.Optimization-3.3</Name>
     201      <Private>False</Private>
     202    </ProjectReference>
     203    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     204      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     205      <Name>HeuristicLab.Parameters-3.3</Name>
     206      <Private>False</Private>
     207    </ProjectReference>
     208    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     209      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     210      <Name>HeuristicLab.Persistence-3.3</Name>
     211      <Private>False</Private>
     212    </ProjectReference>
     213    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     214      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     215      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     216      <Private>False</Private>
     217    </ProjectReference>
     218    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
     219      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
     220      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     221      <Private>False</Private>
     222    </ProjectReference>
     223    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     224      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
     225      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     226      <Private>False</Private>
     227    </ProjectReference>
     228    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     229      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     230      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     231      <Private>False</Private>
     232    </ProjectReference>
    224233  </ItemGroup>
    225234  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs

    r7268 r7842  
    111111      }
    112112    }
    113 
    114     public override void ImportProblemDataFromFile(string fileName) {
    115       RegressionProblemData problemData = RegressionProblemData.ImportFromFile(fileName);
    116       ProblemData = problemData;
    117     }
    118113  }
    119114}

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/Plugin.cs.frame

    r7460 r7842  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression","Provides classes to perform symbolic regression (single- or multiobjective).", "3.4.2.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "3.4")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.5")]
    3131  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3232  [PluginDependency("HeuristicLab.Common", "3.3")]

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

    r7268 r7842  
    7878      Operators.Add(new SymbolicRegressionSingleObjectiveValidationBestSolutionAnalyzer());
    7979      Operators.Add(new SymbolicRegressionSingleObjectiveOverfittingAnalyzer());
     80      Operators.Add(new SymbolicRegressionSingleObjectiveTrainingParetoBestSolutionAnalyzer());
     81      Operators.Add(new SymbolicRegressionSingleObjectiveValidationParetoBestSolutionAnalyzer());
     82
    8083      ParameterizeOperators();
    8184    }
    … …  
    108111      }
    109112    }
    110 
    111     public override void ImportProblemDataFromFile(string fileName) {
    112       RegressionProblemData problemData = RegressionProblemData.ImportFromFile(fileName);
    113       ProblemData = problemData;
    114     }
    115113  }
    116114}
Note: See TracChangeset for help on using the changeset viewer.