Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/02/12 15:05:26 (13 years ago)
Author:
bburlacu
Message:

#1763: Rebranched the TreeSimplifier project to fix merging errors. Added functionality to insert symbols into the tree, fixed bug when deleting tree nodes.

Location:
branches/HeuristicLab.TreeSimplifier
Files:
3 added
4 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TreeSimplifier

    • Property svn:ignore set to
      *.suo
      _ReSharper.HeuristicLab.TreeSimplifier
      bin

  • branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

    • Property svn:ignore

      •  

        old new  
         1*.user
        12bin
        2 *.user
        3 HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs
        43obj
        5 *.vs10x
        6 Plugin.cs

  • branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r8168 r8388  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\Trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     52    <OutputPath>..\..\..\..\Trunk\sources\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    9393  </PropertyGroup>
    9494  <ItemGroup>
    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>
    97       <Private>False</Private>
     95    <Reference Include="ALGLIB-3.5.0">
     96      <HintPath>..\..\..\..\Trunk\sources\bin\ALGLIB-3.5.0.dll</HintPath>
     97    </Reference>
     98    <Reference Include="HeuristicLab.Analysis-3.3">
     99      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     100    </Reference>
     101    <Reference Include="HeuristicLab.Collections-3.3">
     102      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     103    </Reference>
     104    <Reference Include="HeuristicLab.Common-3.3">
     105      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     106    </Reference>
     107    <Reference Include="HeuristicLab.Common.Resources-3.3">
     108      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Core-3.3">
     111      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Data-3.3">
     114      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
     117      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Operators-3.3">
     120      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     121    </Reference>
     122    <Reference Include="HeuristicLab.Optimization-3.3">
     123      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     124    </Reference>
     125    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
     126      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     127    </Reference>
     128    <Reference Include="HeuristicLab.Parameters-3.3">
     129      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     130    </Reference>
     131    <Reference Include="HeuristicLab.Persistence-3.3">
     132      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     133    </Reference>
     134    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     135      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     136    </Reference>
     137    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
     138      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     139    </Reference>
     140    <Reference Include="HeuristicLab.Problems.Instances-3.3">
     141      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     142    </Reference>
     143    <Reference Include="HeuristicLab.Random-3.3">
     144      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
    98145    </Reference>
    99146    <Reference Include="System" />
    … …  
    162209    <Compile Include="SymbolicDataAnalysisExpressionTreeSimplifier.cs" />
    163210    <Compile Include="SymbolicDataAnalysisProblem.cs" />
     211    <Compile Include="SymbolicDataAnalysisSolutionValuesCalculator.cs" />
    164212    <Compile Include="Symbols\Addition.cs" />
    165213    <Compile Include="Symbols\And.cs" />
    … …  
    244292    </BootstrapperPackage>
    245293  </ItemGroup>
    246   <ItemGroup>
    247     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    248       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    249       <Name>HeuristicLab.Analysis-3.3</Name>
    250       <Private>False</Private>
    251     </ProjectReference>
    252     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    253       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    254       <Name>HeuristicLab.Collections-3.3</Name>
    255       <Private>False</Private>
    256     </ProjectReference>
    257     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    258       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    259       <Name>HeuristicLab.Common.Resources-3.3</Name>
    260       <Private>False</Private>
    261     </ProjectReference>
    262     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    263       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    264       <Name>HeuristicLab.Common-3.3</Name>
    265       <Private>False</Private>
    266     </ProjectReference>
    267     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    268       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    269       <Name>HeuristicLab.Core-3.3</Name>
    270       <Private>False</Private>
    271     </ProjectReference>
    272     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    273       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    274       <Name>HeuristicLab.Data-3.3</Name>
    275       <Private>False</Private>
    276     </ProjectReference>
    277     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    278       <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    279       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    280       <Private>False</Private>
    281     </ProjectReference>
    282     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    283       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    284       <Name>HeuristicLab.Operators-3.3</Name>
    285       <Private>False</Private>
    286     </ProjectReference>
    287     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    288       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    289       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    290       <Private>False</Private>
    291     </ProjectReference>
    292     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    293       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    294       <Name>HeuristicLab.Optimization-3.3</Name>
    295     </ProjectReference>
    296     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    297       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    298       <Name>HeuristicLab.Parameters-3.3</Name>
    299       <Private>False</Private>
    300     </ProjectReference>
    301     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    302       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    303       <Name>HeuristicLab.Persistence-3.3</Name>
    304       <Private>False</Private>
    305     </ProjectReference>
    306     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    307       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    308       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    309       <Private>False</Private>
    310     </ProjectReference>
    311     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    312       <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    313       <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    314       <Private>False</Private>
    315     </ProjectReference>
    316     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    317       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    318       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    319       <Private>False</Private>
    320     </ProjectReference>
    321     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    322       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    323       <Name>HeuristicLab.Random-3.3</Name>
    324       <Private>False</Private>
    325     </ProjectReference>
    326   </ItemGroup>
    327294  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    328295  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Properties

    • Property svn:ignore
      --- 
+++
Note: See TracChangeset for help on using the changeset viewer.