Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/22/12 11:11:38 (12 years ago)
Author:
jkarder
Message:

#1331:

  • synced branch with trunk
  • added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
  • similarity calculators are now parameterized by the algorithm
  • deleted SolutionPool2TierUpdateMethod
  • deleted KnapsackMultipleGuidesPathRelinker
  • moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
  • added parameter descriptions
  • fixed plugin references
  • fixed count of EvaluatedSolutions
  • fixed check for duplicate solutions
  • minor code improvements
Location:
branches/ScatterSearch (trunk integration)
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/ScatterSearch (trunk integration)

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.DataAnalysis

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r7678 r8086  
    141141    <Compile Include="Interfaces\Regression\IRegressionEnsembleSolution.cs" />
    142142    <Compile Include="Implementation\Regression\RegressionSolutionBase.cs" />
     143    <Compile Include="OnlineCalculators\HoeffdingsDependenceCalculator.cs" />
    143144    <Compile Include="OnlineCalculators\OnlineMaxAbsoluteErrorCalculator.cs" />
    144145    <Compile Include="OnlineCalculators\OnlineMeanErrorCalculator.cs" />
    … …  
    180181    <Compile Include="Implementation\Regression\RegressionSolution.cs" />
    181182    <Compile Include="Plugin.cs" />
    182     <Compile Include="TableFileParser.cs" />
    183183    <Compile Include="Implementation\Classification\ThresholdCalculators\AccuracyMaximizationThresholdCalculator.cs" />
    184184    <Compile Include="Implementation\Classification\ThresholdCalculators\NormalDistributionCutPointsThresholdCalculator.cs" />
    … …  
    190190    <Compile Include="Interfaces\IDataAnalysisProblem.cs" />
    191191    <Compile Include="Properties\AssemblyInfo.cs" />
    192   </ItemGroup>
    193   <ItemGroup>
    194     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    195       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    196       <Name>HeuristicLab.Collections-3.3</Name>
    197       <Private>False</Private>
    198     </ProjectReference>
    199     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    200       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    201       <Name>HeuristicLab.Common.Resources-3.3</Name>
    202       <Private>False</Private>
    203     </ProjectReference>
    204     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    205       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    206       <Name>HeuristicLab.Common-3.3</Name>
    207       <Private>False</Private>
    208     </ProjectReference>
    209     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    210       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    211       <Name>HeuristicLab.Core-3.3</Name>
    212       <Private>False</Private>
    213     </ProjectReference>
    214     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    215       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    216       <Name>HeuristicLab.Data-3.3</Name>
    217       <Private>False</Private>
    218     </ProjectReference>
    219     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    220       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    221       <Name>HeuristicLab.Optimization-3.3</Name>
    222       <Private>False</Private>
    223     </ProjectReference>
    224     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    225       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    226       <Name>HeuristicLab.Parameters-3.3</Name>
    227       <Private>False</Private>
    228     </ProjectReference>
    229     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    230       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    231       <Name>HeuristicLab.Persistence-3.3</Name>
    232       <Private>False</Private>
    233     </ProjectReference>
    234     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    235       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    236       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    237       <Private>False</Private>
    238     </ProjectReference>
    239192  </ItemGroup>
    240193  <ItemGroup>
    … …  
    255208    </BootstrapperPackage>
    256209  </ItemGroup>
    257   <ItemGroup />
     210  <ItemGroup>
     211    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     212      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     213      <Name>HeuristicLab.Collections-3.3</Name>
     214      <Private>False</Private>
     215    </ProjectReference>
     216    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     217      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     218      <Name>HeuristicLab.Common.Resources-3.3</Name>
     219      <Private>False</Private>
     220    </ProjectReference>
     221    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     222      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     223      <Name>HeuristicLab.Common-3.3</Name>
     224      <Private>False</Private>
     225    </ProjectReference>
     226    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     227      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     228      <Name>HeuristicLab.Core-3.3</Name>
     229      <Private>False</Private>
     230    </ProjectReference>
     231    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     232      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     233      <Name>HeuristicLab.Data-3.3</Name>
     234      <Private>False</Private>
     235    </ProjectReference>
     236    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     237      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     238      <Name>HeuristicLab.Optimization-3.3</Name>
     239      <Private>False</Private>
     240    </ProjectReference>
     241    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     242      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     243      <Name>HeuristicLab.Parameters-3.3</Name>
     244      <Private>False</Private>
     245    </ProjectReference>
     246    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     247      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     248      <Name>HeuristicLab.Persistence-3.3</Name>
     249      <Private>False</Private>
     250    </ProjectReference>
     251    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     252      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     253      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     254      <Private>False</Private>
     255    </ProjectReference>
     256    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     257      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     258      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     259      <Private>False</Private>
     260    </ProjectReference>
     261  </ItemGroup>
    258262  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    259263  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.