Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/20/11 11:45:18 (13 years ago)
Author:
gkronber
Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:
branches/HeuristicLab.TimeSeries
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TimeSeries

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.ArtificialAnt/3.3/HeuristicLab.Problems.ArtificialAnt-3.3.csproj

    r6866 r7213  
    130130  </ItemGroup>
    131131  <ItemGroup>
    132     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    133       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    134       <Name>HeuristicLab.Collections-3.3</Name>
    135       <Private>False</Private>
    136     </ProjectReference>
    137     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    138       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    139       <Name>HeuristicLab.Common.Resources-3.3</Name>
    140       <Private>False</Private>
    141     </ProjectReference>
    142     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    143       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    144       <Name>HeuristicLab.Common-3.3</Name>
    145       <Private>False</Private>
    146     </ProjectReference>
    147     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    148       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    149       <Name>HeuristicLab.Core-3.3</Name>
    150       <Private>False</Private>
    151     </ProjectReference>
    152     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    153       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    154       <Name>HeuristicLab.Data-3.3</Name>
    155       <Private>False</Private>
    156     </ProjectReference>
    157     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    158       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    159       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    160       <Private>False</Private>
    161     </ProjectReference>
    162     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    163       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    164       <Name>HeuristicLab.Operators-3.3</Name>
    165       <Private>False</Private>
    166     </ProjectReference>
    167     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    168       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    169       <Name>HeuristicLab.Optimization-3.3</Name>
    170       <Private>False</Private>
    171     </ProjectReference>
    172     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    173       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    174       <Name>HeuristicLab.Parameters-3.3</Name>
    175       <Private>False</Private>
    176     </ProjectReference>
    177     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    178       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    179       <Name>HeuristicLab.Persistence-3.3</Name>
    180       <Private>False</Private>
    181     </ProjectReference>
    182     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    183       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    184       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    185       <Private>False</Private>
    186     </ProjectReference>
     132    <Reference Include="HeuristicLab.Collections-3.3">
     133      <HintPath>..\..\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     134      <Private>False</Private>
     135    </Reference>
     136    <Reference Include="HeuristicLab.Common.Resources-3.3">
     137      <HintPath>..\..\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     138      <Private>False</Private>
     139    </Reference>
     140    <Reference Include="HeuristicLab.Common-3.3">
     141      <HintPath>..\..\bin\HeuristicLab.Common-3.3.dll</HintPath>
     142      <Private>False</Private>
     143    </Reference>
     144    <Reference Include="HeuristicLab.Core-3.3">
     145      <HintPath>..\..\bin\HeuristicLab.Core-3.3.dll</HintPath>
     146      <Private>False</Private>
     147    </Reference>
     148    <Reference Include="HeuristicLab.Data-3.3">
     149      <HintPath>..\..\bin\HeuristicLab.Data-3.3.dll</HintPath>
     150      <Private>False</Private>
     151    </Reference>
     152    <Reference Include="HeuristicLab.Operators-3.3">
     153      <HintPath>..\..\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     154      <Private>False</Private>
     155    </Reference>
     156    <Reference Include="HeuristicLab.Optimization-3.3">
     157      <HintPath>..\..\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     158      <Private>False</Private>
     159    </Reference>
     160    <Reference Include="HeuristicLab.Parameters-3.3">
     161      <HintPath>..\..\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     162      <Private>False</Private>
     163    </Reference>
     164    <Reference Include="HeuristicLab.Persistence-3.3">
     165      <HintPath>..\..\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     166      <Private>False</Private>
     167    </Reference>
     168    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     169      <HintPath>..\..\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     170      <Private>False</Private>
     171    </Reference>
    187172  </ItemGroup>
    188173  <ItemGroup>
    … …  
    202187      <Install>true</Install>
    203188    </BootstrapperPackage>
     189  </ItemGroup>
     190  <ItemGroup>
     191    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
     192      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
     193      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     194      <Private>False</Private>
     195    </ProjectReference>
    204196  </ItemGroup>
    205197  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.ArtificialAnt/3.4/Analyzers/BestAntTrailAnalyzer.cs

    r5809 r7213  
    3737  [StorableClass]
    3838  public sealed class BestAntTrailAnalyzer : SingleSuccessorOperator, IAntTrailAnalyzer {
     39    public bool EnabledByDefault {
     40      get { return true; }
     41    }
     42
    3943    public ILookupParameter<BoolMatrix> WorldParameter {
    4044      get { return (ILookupParameter<BoolMatrix>)Parameters["World"]; }

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.ArtificialAnt/3.4/AntTrail.cs

    r5809 r7213  
    3535  [StorableClass]
    3636  public sealed class AntTrail : Item {
    37     public override Image ItemImage {
     37    public static new Image StaticItemImage {
    3838      get { return HeuristicLab.Common.Resources.VSImageLibrary.Image; }
    3939    }
Note: See TracChangeset for help on using the changeset viewer.