Changeset 3839 for trunk/sources


Ignore:
Timestamp:
05/18/10 11:34:32 (11 years ago)
Author:
mkommend
Message:

implemented first version of LR (ticket #1012)

Location:
trunk/sources
Files:
119 added
5 edited

Legend:

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

    r3835 r3839  
    248248EndProject
    249249Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.TestFunctions-3.3.Tests", "HeuristicLab.Problems.TestFunctions\3.3\Tests\HeuristicLab.Problems.TestFunctions-3.3.Tests.csproj", "{71D904D9-233B-44B2-ABB2-1525691228C5}"
     250EndProject
     251Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.ALGLIB", "HeuristicLab.ALGLIB", "{F0D06B07-1CB3-418E-88ED-CAE8DAACC7E0}"
     252EndProject
     253Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.ALGLIB-2.5.0", "HeuristicLab.ALGLIB-2.5.0", "{F1A195C9-98CD-47C6-9B74-3344EB258C5D}"
     254EndProject
     255Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ALGLIB-2.5.0", "HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\ALGLIB-2.5.0\ALGLIB-2.5.0.csproj", "{29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}"
     256EndProject
     257Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ALGLIB-2.5.0", "HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\HeuristicLab.ALGLIB-2.5.0\HeuristicLab.ALGLIB-2.5.0.csproj", "{01BBCB5A-144A-4A7E-908E-079849E2F7CF}"
    250258EndProject
    251259Global
     
    13721380    {71D904D9-233B-44B2-ABB2-1525691228C5}.Services|x64.ActiveCfg = Release|Any CPU
    13731381    {71D904D9-233B-44B2-ABB2-1525691228C5}.Services|x86.ActiveCfg = Release|Any CPU
     1382    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1383    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1384    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Debug|x64.ActiveCfg = Debug|x64
     1385    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Debug|x64.Build.0 = Debug|x64
     1386    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Debug|x86.ActiveCfg = Debug|x86
     1387    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Debug|x86.Build.0 = Debug|x86
     1388    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1389    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Release|Any CPU.Build.0 = Release|Any CPU
     1390    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Release|x64.ActiveCfg = Release|x64
     1391    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Release|x64.Build.0 = Release|x64
     1392    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Release|x86.ActiveCfg = Release|x86
     1393    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Release|x86.Build.0 = Release|x86
     1394    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Services|Any CPU.ActiveCfg = Release|Any CPU
     1395    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Services|Any CPU.Build.0 = Release|Any CPU
     1396    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Services|x64.ActiveCfg = Release|Any CPU
     1397    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Services|x86.ActiveCfg = Release|Any CPU
     1398    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1399    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1400    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Debug|x64.ActiveCfg = Debug|x64
     1401    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Debug|x64.Build.0 = Debug|x64
     1402    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Debug|x86.ActiveCfg = Debug|x86
     1403    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Debug|x86.Build.0 = Debug|x86
     1404    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1405    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Release|Any CPU.Build.0 = Release|Any CPU
     1406    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Release|x64.ActiveCfg = Release|x64
     1407    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Release|x64.Build.0 = Release|x64
     1408    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Release|x86.ActiveCfg = Release|x86
     1409    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Release|x86.Build.0 = Release|x86
     1410    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Services|Any CPU.ActiveCfg = Release|Any CPU
     1411    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Services|Any CPU.Build.0 = Release|Any CPU
     1412    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Services|x64.ActiveCfg = Release|Any CPU
     1413    {01BBCB5A-144A-4A7E-908E-079849E2F7CF}.Services|x86.ActiveCfg = Release|Any CPU
    13741414  EndGlobalSection
    13751415  GlobalSection(SolutionProperties) = preSolution
     
    13811421    {27D3A83C-DEEA-49DA-955E-65D3D703B2F1} = {07BCBC57-3E15-4582-B306-C046E516C49C}
    13821422    {F94E41E4-F25F-4302-8486-0BEF121CF5C8} = {07BCBC57-3E15-4582-B306-C046E516C49C}
     1423    {F0D06B07-1CB3-418E-88ED-CAE8DAACC7E0} = {07BCBC57-3E15-4582-B306-C046E516C49C}
    13831424    {99AD3658-DB36-4E26-B4CC-6FEAACC5C88C} = {7F485A48-A80F-4454-9A9B-7B126B43861C}
    13841425    {678E2145-8152-4E19-9646-07D439D00301} = {99AD3658-DB36-4E26-B4CC-6FEAACC5C88C}
     
    13891430    {BB994448-2B21-4564-BB2E-38D8FFF8CF18} = {0A3CE05D-4FCD-40A4-9001-D57627554BBC}
    13901431    {4ABA047D-46DD-4608-9E4A-41C5F92FDBB1} = {F94E41E4-F25F-4302-8486-0BEF121CF5C8}
     1432    {F1A195C9-98CD-47C6-9B74-3344EB258C5D} = {F0D06B07-1CB3-418E-88ED-CAE8DAACC7E0}
     1433    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E} = {F1A195C9-98CD-47C6-9B74-3344EB258C5D}
     1434    {01BBCB5A-144A-4A7E-908E-079849E2F7CF} = {F1A195C9-98CD-47C6-9B74-3344EB258C5D}
    13911435  EndGlobalSection
    13921436EndGlobal
  • trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeTopLevelNode.cs

    r3742 r3839  
    5454    protected SymbolicExpressionTreeTopLevelNode(SymbolicExpressionTreeTopLevelNode original)
    5555      : base(original) {
    56       grammar = (ISymbolicExpressionGrammar)original.Grammar.Clone();
     56      if (original.Grammar != null)
     57        grammar = (ISymbolicExpressionGrammar)original.Grammar.Clone();
    5758    }
    5859
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj

    r3832 r3839  
    8585    <None Include="Properties\AssemblyInfo.frame" />
    8686    <Compile Include="HeuristicLabProblemsDataAnalysisRegressionPlugin.cs" />
     87    <Compile Include="LinearRegression\LinearRegressionSolutionCreator.cs" />
    8788    <Compile Include="Properties\AssemblyInfo.cs" />
    8889    <Compile Include="Symbolic\Analyzers\BestSymbolicRegressionSolutionAnalyzer.cs" />
     
    140141      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    141142      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     143    </ProjectReference>
     144    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\ALGLIB-2.5.0\ALGLIB-2.5.0.csproj">
     145      <Project>{29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}</Project>
     146      <Name>ALGLIB-2.5.0</Name>
     147    </ProjectReference>
     148    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\HeuristicLab.ALGLIB-2.5.0\HeuristicLab.ALGLIB-2.5.0.csproj">
     149      <Project>{01BBCB5A-144A-4A7E-908E-079849E2F7CF}</Project>
     150      <Name>HeuristicLab.ALGLIB-2.5.0</Name>
    142151    </ProjectReference>
    143152    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Dataset.cs

    r3493 r3839  
    8989      }
    9090    }
     91    public double this[string variableName, int rowIndex] {
     92      get {
     93        int columnIndex = GetVariableIndex(variableName);
     94        return data[rowIndex, columnIndex];
     95      }
     96      set {
     97        int columnIndex = GetVariableIndex(variableName);
     98        if (!value.Equals(data[rowIndex, columnIndex])) {
     99          data[rowIndex, columnIndex] = value;
     100          OnDataChanged(new EventArgs<int, int>(rowIndex, columnIndex));
     101          OnItemChanged(rowIndex, columnIndex);
     102        }
     103      }
     104    }
    91105    // access to full columns
    92106    public double[] this[string variableName] {
  • trunk/sources/HeuristicLab/3.3/Files.txt

    r3837 r3839  
    22; List of project directories and file names separated by ':' that are part of the installation
    33
    4 HeuristicLab.PluginInfrastructure\3.3:ICSharpCode.SharpZipLib.dll
    5 HeuristicLab.PluginInfrastructure\3.3:ICSharpCode.SharpZipLib License.txt
     4HeuristicLab.PluginInfrastructure:ICSharpCode.SharpZipLib.dll
     5HeuristicLab.PluginInfrastructure:ICSharpCode.SharpZipLib License.txt
    66HeuristicLab.Algorithms.EvolutionStrategy\3.3:HeuristicLab.Algorithms.EvolutionStrategy-3.3.dll
    77HeuristicLab.Algorithms.GeneticAlgorithm\3.3:HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll
    88HeuristicLab.Algorithms.LocalSearch\3.3:HeuristicLab.Algorithms.LocalSearch-3.3.dll
     9HeuristicLab.Algorithms.MultipopulationAlgorithm\3.3:HeuristicLab.Algorithms.MultipopulationAlgorithm-3.3.dll
    910HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm\3.3:HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll
    1011HeuristicLab.Algorithms.ParticleSwarmOptimization\3.3:HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.dll
     
    5859HeuristicLab.Selection\3.3:HeuristicLab.Selection-3.3.dll
    5960HeuristicLab.SequentialEngine\3.3:HeuristicLab.SequentialEngine-3.3.dll
     61HeuristicLab.TestFunctions\3.3:HeuristicLab.TestFunctions-3.3.dll
    6062HeuristicLab.Tracing\3.3:HeuristicLab.Tracing-3.3.dll
    6163HeuristicLab.Tracing\3.3:HeuristicLab.log4net.xml
    6264
    6365;External Libraries
     66HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\ALGLIB-2.5.0:ALGLIB-2.5.0.dll
     67HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\HeuristicLab.ALGLIB-2.5.0:HeuristicLab.ALGLIb-2.5.0.dll
     68HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\HeuristicLab.ALGLIB-2.5.0:ALGLIB License-2.5.0.txt
     69
    6470HeuristicLab.ExtLibs\HeuristicLab.log4net\1.2.10.0:HeuristicLab.log4net-1.2.10.0.dll
    6571HeuristicLab.ExtLibs\HeuristicLab.log4net\1.2.10.0:log4net.dll
Note: See TracChangeset for help on using the changeset viewer.