Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 21:55:55 (13 years ago)
Author:
abeham
Message:

#1614

  • updated branch from trunk
Location:
branches/GeneralizedQAP
Files:
4 deleted
12 edited
4 copied

Legend:

Unmodified
Added
Removed

  • branches/GeneralizedQAP

  • branches/GeneralizedQAP/HeuristicLab.Problems.ArtificialAnt/3.3

    • Property svn:ignore

      •  

        old new  
        44HeuristicLabProblemsArtificialAntPlugin.cs
        55*.vs10x
         6Plugin.cs

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

    r5163 r6878  
    1212    <AssemblyName>HeuristicLab.Problems.ArtificialAnt-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    14     <TargetFrameworkProfile></TargetFrameworkProfile>
     14    <TargetFrameworkProfile>
     15    </TargetFrameworkProfile>
    1516    <FileAlignment>512</FileAlignment>
    1617    <SignAssembly>true</SignAssembly>
    … …  
    4041    <DebugType>full</DebugType>
    4142    <Optimize>false</Optimize>
    42     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4344    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4445    <ErrorReport>prompt</ErrorReport>
    … …  
    4950    <DebugType>pdbonly</DebugType>
    5051    <Optimize>true</Optimize>
    51     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5253    <DefineConstants>TRACE</DefineConstants>
    5354    <ErrorReport>prompt</ErrorReport>
    … …  
    5758  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5859    <DebugSymbols>true</DebugSymbols>
    59     <OutputPath>bin\x64\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6061    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6162    <DebugType>full</DebugType>
    … …  
    6566  </PropertyGroup>
    6667  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    67     <OutputPath>bin\x64\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6869    <DefineConstants>TRACE</DefineConstants>
    6970    <Optimize>true</Optimize>
    … …  
    7576  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7677    <DebugSymbols>true</DebugSymbols>
    77     <OutputPath>bin\x86\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7879    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7980    <DebugType>full</DebugType>
    … …  
    8384  </PropertyGroup>
    8485  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    85     <OutputPath>bin\x86\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8687    <DefineConstants>TRACE</DefineConstants>
    8788    <Optimize>true</Optimize>
    … …  
    110111    <Compile Include="Analyzers\IAntTrailAnalyzer.cs" />
    111112    <Compile Include="AntInterpreter.cs" />
    112     <Compile Include="HeuristicLabProblemsArtificialAntPlugin.cs" />
    113113    <Compile Include="Evaluator.cs" />
    114114    <Compile Include="ArtificialAntExpressionGrammar.cs" />
    115115    <Compile Include="ArtificialAntProblem.cs" />
    116116    <Compile Include="AntTrail.cs" />
     117    <Compile Include="Plugin.cs" />
    117118    <Compile Include="Properties\AssemblyInfo.cs" />
    118119    <Compile Include="Symbols\IfFoodAhead.cs" />
    … …  
    125126  <ItemGroup>
    126127    <None Include="HeuristicLab.snk" />
    127     <None Include="HeuristicLabProblemsArtificialAntPlugin.cs.frame" />
    128     <None Include="Properties\AssemblyInfo.frame" />
     128    <None Include="Plugin.cs.frame" />
     129    <None Include="Properties\AssemblyInfo.cs.frame" />
    129130  </ItemGroup>
    130131  <ItemGroup>
    … …  
    132133      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    133134      <Name>HeuristicLab.Collections-3.3</Name>
     135      <Private>False</Private>
    134136    </ProjectReference>
    135137    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    136138      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    137139      <Name>HeuristicLab.Common.Resources-3.3</Name>
     140      <Private>False</Private>
    138141    </ProjectReference>
    139142    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    140143      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    141144      <Name>HeuristicLab.Common-3.3</Name>
     145      <Private>False</Private>
    142146    </ProjectReference>
    143147    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    144148      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    145149      <Name>HeuristicLab.Core-3.3</Name>
     150      <Private>False</Private>
    146151    </ProjectReference>
    147152    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    148153      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    149154      <Name>HeuristicLab.Data-3.3</Name>
     155      <Private>False</Private>
    150156    </ProjectReference>
    151157    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    152158      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    153159      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     160      <Private>False</Private>
    154161    </ProjectReference>
    155162    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    156163      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    157164      <Name>HeuristicLab.Operators-3.3</Name>
     165      <Private>False</Private>
    158166    </ProjectReference>
    159167    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    160168      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    161169      <Name>HeuristicLab.Optimization-3.3</Name>
     170      <Private>False</Private>
    162171    </ProjectReference>
    163172    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    164173      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    165174      <Name>HeuristicLab.Parameters-3.3</Name>
     175      <Private>False</Private>
    166176    </ProjectReference>
    167177    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    168178      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    169179      <Name>HeuristicLab.Persistence-3.3</Name>
     180      <Private>False</Private>
    170181    </ProjectReference>
    171182    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    172183      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    173184      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     185      <Private>False</Private>
    174186    </ProjectReference>
    175187  </ItemGroup>
    … …  
    206218
    207219call PreBuildEvent.cmd
    208 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsArtificialAntPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsArtificialAntPlugin.cs"</PreBuildEvent>
     220</PreBuildEvent>
    209221  </PropertyGroup>
    210222</Project>

  • branches/GeneralizedQAP/HeuristicLab.Problems.ArtificialAnt/3.4

    • Property svn:ignore

      •  

        old new  
        44*.vs10x
        55HeuristicLab.Problems.ArtificialAnt-3.4.csproj.user
         6Plugin.cs

  • branches/GeneralizedQAP/HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntExpressionGrammar.cs

    r5809 r6878  
    5050      var left = new Left();
    5151      var right = new Right();
    52       var defun = new Defun();
    5352      var allSymbols = new List<Symbol>() { ifFoodAhead, prog2, prog3, move, left, right };
    5453      var nonTerminalSymbols = new List<Symbol>() { ifFoodAhead, prog2, prog3 };
    5554
    5655      allSymbols.ForEach(s => AddSymbol(s));
    57       SetSubtreeCount(ifFoodAhead, 2, 3);
     56      SetSubtreeCount(ifFoodAhead, 2, 2);
    5857      SetSubtreeCount(prog2, 2, 2);
    5958      SetSubtreeCount(prog3, 3, 3);

  • branches/GeneralizedQAP/HeuristicLab.Problems.ArtificialAnt/3.4/HeuristicLab.Problems.ArtificialAnt-3.4.csproj

    r5809 r6878  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x64\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
    … …  
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>bin\x64\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
    … …  
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x86\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
    … …  
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>bin\x86\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
    … …  
    111111    <Compile Include="Analyzers\IAntTrailAnalyzer.cs" />
    112112    <Compile Include="AntInterpreter.cs" />
    113     <Compile Include="HeuristicLabProblemsArtificialAntPlugin.cs" />
    114113    <Compile Include="Evaluator.cs" />
    115114    <Compile Include="ArtificialAntExpressionGrammar.cs" />
    116115    <Compile Include="ArtificialAntProblem.cs" />
    117116    <Compile Include="AntTrail.cs" />
     117    <Compile Include="Plugin.cs" />
    118118    <Compile Include="Properties\AssemblyInfo.cs" />
    119119    <Compile Include="Symbols\IfFoodAhead.cs" />
    … …  
    126126  <ItemGroup>
    127127    <None Include="HeuristicLab.snk" />
    128     <None Include="HeuristicLabProblemsArtificialAntPlugin.cs.frame" />
    129     <None Include="Properties\AssemblyInfo.frame" />
     128    <None Include="Plugin.cs.frame" />
     129    <None Include="Properties\AssemblyInfo.cs.frame" />
    130130  </ItemGroup>
    131131  <ItemGroup>
    … …  
    133133      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    134134      <Name>HeuristicLab.Collections-3.3</Name>
     135      <Private>False</Private>
    135136    </ProjectReference>
    136137    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    137138      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    138139      <Name>HeuristicLab.Common.Resources-3.3</Name>
     140      <Private>False</Private>
    139141    </ProjectReference>
    140142    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    141143      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    142144      <Name>HeuristicLab.Common-3.3</Name>
     145      <Private>False</Private>
    143146    </ProjectReference>
    144147    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    145148      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    146149      <Name>HeuristicLab.Core-3.3</Name>
     150      <Private>False</Private>
    147151    </ProjectReference>
    148152    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    149153      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    150154      <Name>HeuristicLab.Data-3.3</Name>
     155      <Private>False</Private>
    151156    </ProjectReference>
    152157    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    153158      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    154159      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     160      <Private>False</Private>
    155161    </ProjectReference>
    156162    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    157163      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    158164      <Name>HeuristicLab.Operators-3.3</Name>
     165      <Private>False</Private>
    159166    </ProjectReference>
    160167    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    161168      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    162169      <Name>HeuristicLab.Optimization-3.3</Name>
     170      <Private>False</Private>
    163171    </ProjectReference>
    164172    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    165173      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    166174      <Name>HeuristicLab.Parameters-3.3</Name>
     175      <Private>False</Private>
    167176    </ProjectReference>
    168177    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    169178      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    170179      <Name>HeuristicLab.Persistence-3.3</Name>
     180      <Private>False</Private>
    171181    </ProjectReference>
    172182    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    173183      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    174184      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     185      <Private>False</Private>
    175186    </ProjectReference>
    176187  </ItemGroup>
    … …  
    207218
    208219call PreBuildEvent.cmd
    209 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsArtificialAntPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsArtificialAntPlugin.cs"</PreBuildEvent>
     220</PreBuildEvent>
    210221  </PropertyGroup>
    211222</Project>

  • branches/GeneralizedQAP/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols/IfFoodAhead.cs

    r5809 r6878  
    2828  [Item("IfFoodAhead", "Represents the if-food-ahead symbol in a artificial ant expression.")]
    2929  public sealed class IfFoodAhead : Symbol {
     30    private const int minimumArity = 2;
     31    private const int maximumArity = 2;
     32
     33    public override int MinimumArity {
     34      get { return minimumArity; }
     35    }
     36    public override int MaximumArity {
     37      get { return maximumArity; }
     38    }
     39
    3040    [StorableConstructor]
    3141    private IfFoodAhead(bool deserializing) : base(deserializing) { }

  • branches/GeneralizedQAP/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols/Left.cs

    r5809 r6878  
    2828  [Item("Left", "Represents the turn-left symbol in a artificial ant expression.")]
    2929  public sealed class Left : Symbol {
     30    private const int minimumArity = 0;
     31    private const int maximumArity = 0;
     32
     33    public override int MinimumArity {
     34      get { return minimumArity; }
     35    }
     36    public override int MaximumArity {
     37      get { return maximumArity; }
     38    }
     39
    3040    [StorableConstructor]
    3141    private Left(bool deserializing) : base(deserializing) { }

  • branches/GeneralizedQAP/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols/Move.cs

    r5809 r6878  
    2828  [Item("Move", "Represents the move-forward symbol in a artificial ant expression.")]
    2929  public sealed class Move : Symbol {
     30    private const int minimumArity = 0;
     31    private const int maximumArity = 0;
     32
     33    public override int MinimumArity {
     34      get { return minimumArity; }
     35    }
     36    public override int MaximumArity {
     37      get { return maximumArity; }
     38    }
     39
    3040    [StorableConstructor]
    3141    private Move(bool deserializing) : base(deserializing) { }

  • branches/GeneralizedQAP/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols/Prog2.cs

    r5809 r6878  
    2929  [Item("Prog2", "Represents the sequence symbol with 2 sub-trees in a artificial ant expression.")]
    3030  public sealed class Prog2 : Symbol {
     31    private const int minimumArity = 2;
     32    private const int maximumArity = 2;
     33
     34    public override int MinimumArity {
     35      get { return minimumArity; }
     36    }
     37    public override int MaximumArity {
     38      get { return maximumArity; }
     39    }
     40
    3141    [StorableConstructor]
    3242    private Prog2(bool deserializing) : base(deserializing) { }

  • branches/GeneralizedQAP/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols/Prog3.cs

    r5809 r6878  
    2828  [Item("Prog3", "Represents the sequence symbol with 3 sub-trees in a artificial ant expression.")]
    2929  public sealed class Prog3 : Symbol {
     30    private const int minimumArity = 3;
     31    private const int maximumArity = 3;
     32
     33    public override int MinimumArity {
     34      get { return minimumArity; }
     35    }
     36    public override int MaximumArity {
     37      get { return maximumArity; }
     38    }
     39
    3040    [StorableConstructor]
    3141    private Prog3(bool deserializing) : base(deserializing) { }

  • branches/GeneralizedQAP/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols/Right.cs

    r5809 r6878  
    2828  [Item("Right", "Represents the turn-right symbol in a artificial ant expression.")]
    2929  public sealed class Right : Symbol {
     30    private const int minimumArity = 0;
     31    private const int maximumArity = 0;
     32
     33    public override int MinimumArity {
     34      get { return minimumArity; }
     35    }
     36    public override int MaximumArity {
     37      get { return maximumArity; }
     38    }
     39
    3040    [StorableConstructor]
    3141    private Right(bool deserializing) : base(deserializing) { }
Note: See TracChangeset for help on using the changeset viewer.