Changeset 13278 for stable


Ignore:
Timestamp:
11/19/15 11:38:16 (4 years ago)
Author:
gkronber
Message:

#2472: merged r12895:12906 from trunk to stable

Location:
stable
Files:
10 edited
5 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab 3.3.sln

    r13006 r13278  
    431431EndProject
    432432Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.Orienteering-3.3", "HeuristicLab.Problems.Instances.Orienteering\3.3\HeuristicLab.Problems.Instances.Orienteering-3.3.csproj", "{B37BF2DD-752C-456A-9DEF-FF5B41FC3C77}"
     433EndProject
     434Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ArtificialAnt-3.5", "HeuristicLab.Problems.ArtificialAnt\3.5\HeuristicLab.Problems.ArtificialAnt-3.5.csproj", "{FCB5E075-4B97-4CB9-BB36-848E4FF9EA18}"
     435EndProject
     436Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ArtificialAnt.Views-3.5", "HeuristicLab.Problems.ArtificialAnt.Views\3.5\HeuristicLab.Problems.ArtificialAnt.Views-3.5.csproj", "{0ABD192C-926A-47A9-878C-79B6AF5C07C9}"
     437EndProject
     438Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.LawnMower-3.4", "HeuristicLab.Problems.LawnMower\3.4\HeuristicLab.Problems.LawnMower-3.4.csproj", "{9B44B886-729D-49B2-B887-4BDCACB91110}"
     439EndProject
     440Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.LawnMower.Views-3.4", "HeuristicLab.Problems.LawnMower.Views\3.4\HeuristicLab.Problems.LawnMower.Views-3.4.csproj", "{E186E7BD-E90E-4027-9965-D5E0DBEB00E8}"
    433441EndProject
    434442Global
     
    20982106    {B37BF2DD-752C-456A-9DEF-FF5B41FC3C77}.Release|x86.ActiveCfg = Release|x86
    20992107    {B37BF2DD-752C-456A-9DEF-FF5B41FC3C77}.Release|x86.Build.0 = Release|x86
     2108    {FCB5E075-4B97-4CB9-BB36-848E4FF9EA18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2109    {FCB5E075-4B97-4CB9-BB36-848E4FF9EA18}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2110    {FCB5E075-4B97-4CB9-BB36-848E4FF9EA18}.Debug|x64.ActiveCfg = Debug|x64
     2111    {FCB5E075-4B97-4CB9-BB36-848E4FF9EA18}.Debug|x64.Build.0 = Debug|x64
     2112    {FCB5E075-4B97-4CB9-BB36-848E4FF9EA18}.Debug|x86.ActiveCfg = Debug|x86
     2113    {FCB5E075-4B97-4CB9-BB36-848E4FF9EA18}.Debug|x86.Build.0 = Debug|x86
     2114    {FCB5E075-4B97-4CB9-BB36-848E4FF9EA18}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2115    {FCB5E075-4B97-4CB9-BB36-848E4FF9EA18}.Release|Any CPU.Build.0 = Release|Any CPU
     2116    {FCB5E075-4B97-4CB9-BB36-848E4FF9EA18}.Release|x64.ActiveCfg = Release|x64
     2117    {FCB5E075-4B97-4CB9-BB36-848E4FF9EA18}.Release|x64.Build.0 = Release|x64
     2118    {FCB5E075-4B97-4CB9-BB36-848E4FF9EA18}.Release|x86.ActiveCfg = Release|x86
     2119    {FCB5E075-4B97-4CB9-BB36-848E4FF9EA18}.Release|x86.Build.0 = Release|x86
     2120    {0ABD192C-926A-47A9-878C-79B6AF5C07C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2121    {0ABD192C-926A-47A9-878C-79B6AF5C07C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2122    {0ABD192C-926A-47A9-878C-79B6AF5C07C9}.Debug|x64.ActiveCfg = Debug|x64
     2123    {0ABD192C-926A-47A9-878C-79B6AF5C07C9}.Debug|x64.Build.0 = Debug|x64
     2124    {0ABD192C-926A-47A9-878C-79B6AF5C07C9}.Debug|x86.ActiveCfg = Debug|x86
     2125    {0ABD192C-926A-47A9-878C-79B6AF5C07C9}.Debug|x86.Build.0 = Debug|x86
     2126    {0ABD192C-926A-47A9-878C-79B6AF5C07C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2127    {0ABD192C-926A-47A9-878C-79B6AF5C07C9}.Release|Any CPU.Build.0 = Release|Any CPU
     2128    {0ABD192C-926A-47A9-878C-79B6AF5C07C9}.Release|x64.ActiveCfg = Release|x64
     2129    {0ABD192C-926A-47A9-878C-79B6AF5C07C9}.Release|x64.Build.0 = Release|x64
     2130    {0ABD192C-926A-47A9-878C-79B6AF5C07C9}.Release|x86.ActiveCfg = Release|x86
     2131    {0ABD192C-926A-47A9-878C-79B6AF5C07C9}.Release|x86.Build.0 = Release|x86
     2132    {9B44B886-729D-49B2-B887-4BDCACB91110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2133    {9B44B886-729D-49B2-B887-4BDCACB91110}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2134    {9B44B886-729D-49B2-B887-4BDCACB91110}.Debug|x64.ActiveCfg = Debug|x64
     2135    {9B44B886-729D-49B2-B887-4BDCACB91110}.Debug|x64.Build.0 = Debug|x64
     2136    {9B44B886-729D-49B2-B887-4BDCACB91110}.Debug|x86.ActiveCfg = Debug|x86
     2137    {9B44B886-729D-49B2-B887-4BDCACB91110}.Debug|x86.Build.0 = Debug|x86
     2138    {9B44B886-729D-49B2-B887-4BDCACB91110}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2139    {9B44B886-729D-49B2-B887-4BDCACB91110}.Release|Any CPU.Build.0 = Release|Any CPU
     2140    {9B44B886-729D-49B2-B887-4BDCACB91110}.Release|x64.ActiveCfg = Release|x64
     2141    {9B44B886-729D-49B2-B887-4BDCACB91110}.Release|x64.Build.0 = Release|x64
     2142    {9B44B886-729D-49B2-B887-4BDCACB91110}.Release|x86.ActiveCfg = Release|x86
     2143    {9B44B886-729D-49B2-B887-4BDCACB91110}.Release|x86.Build.0 = Release|x86
     2144    {E186E7BD-E90E-4027-9965-D5E0DBEB00E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2145    {E186E7BD-E90E-4027-9965-D5E0DBEB00E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2146    {E186E7BD-E90E-4027-9965-D5E0DBEB00E8}.Debug|x64.ActiveCfg = Debug|x64
     2147    {E186E7BD-E90E-4027-9965-D5E0DBEB00E8}.Debug|x64.Build.0 = Debug|x64
     2148    {E186E7BD-E90E-4027-9965-D5E0DBEB00E8}.Debug|x86.ActiveCfg = Debug|x86
     2149    {E186E7BD-E90E-4027-9965-D5E0DBEB00E8}.Debug|x86.Build.0 = Debug|x86
     2150    {E186E7BD-E90E-4027-9965-D5E0DBEB00E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2151    {E186E7BD-E90E-4027-9965-D5E0DBEB00E8}.Release|Any CPU.Build.0 = Release|Any CPU
     2152    {E186E7BD-E90E-4027-9965-D5E0DBEB00E8}.Release|x64.ActiveCfg = Release|x64
     2153    {E186E7BD-E90E-4027-9965-D5E0DBEB00E8}.Release|x64.Build.0 = Release|x64
     2154    {E186E7BD-E90E-4027-9965-D5E0DBEB00E8}.Release|x86.ActiveCfg = Release|x86
     2155    {E186E7BD-E90E-4027-9965-D5E0DBEB00E8}.Release|x86.Build.0 = Release|x86
    21002156  EndGlobalSection
    21012157  GlobalSection(SolutionProperties) = preSolution
     
    21042160  GlobalSection(NestedProjects) = preSolution
    21052161    {5E516C4F-9935-437F-8B15-ECEF4451744E} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
     2162    {0C67A033-F6D9-4237-B3CA-C033A44706BE} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
     2163    {3083C7AA-5AF4-4C75-BA19-B69B86E2F66A} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
     2164    {9A04599C-D608-4240-8DA6-D41F51C515A3} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
     2165    {71CDE004-C50F-48DF-858E-AB0AAA3537BC} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    21062166  EndGlobalSection
    21072167EndGlobal
  • stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

  • stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj

    r12706 r13278  
    129129    <Compile Include="ArchitectureManipulators\SubroutineDuplicater.cs" />
    130130    <Compile Include="ArchitectureManipulators\SymbolicExpressionTreeArchitectureManipulator.cs" />
     131    <Compile Include="SymbolicExpressionTreeProblem.cs" />
    131132    <Compile Include="Compiler\Instruction.cs" />
    132133    <Compile Include="Compiler\LinearInstruction.cs" />
  • stable/HeuristicLab.Problems.ArtificialAnt

  • stable/HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntProblem.cs

    r12708 r13278  
    3535namespace HeuristicLab.Problems.ArtificialAnt {
    3636  [Item("Artificial Ant Problem", "Represents the Artificial Ant problem.")]
    37   [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 170)]
    3837  [StorableClass]
    3938  public sealed class ArtificialAntProblem : SingleObjectiveHeuristicOptimizationProblem<Evaluator, ISymbolicExpressionTreeCreator>, IStorableContent {
  • stable/HeuristicLab.Problems.LawnMower

  • stable/HeuristicLab.Problems.LawnMower.Views/3.3/HeuristicLab.Problems.LawnMower.Views-3.3.csproj

    r13006 r13278  
    176176    <ProjectReference Include="..\..\HeuristicLab.Problems.LawnMower\3.3\HeuristicLab.Problems.LawnMower-3.3.csproj">
    177177      <Project>{9A04599C-D608-4240-8DA6-D41F51C515A3}</Project>
    178       <Name>HeuristicLab.Problems.LawnMower</Name>
     178      <Name>HeuristicLab.Problems.LawnMower-3.3</Name>
    179179      <Private>False</Private>
    180180    </ProjectReference>
  • stable/HeuristicLab.Problems.LawnMower/3.3/HeuristicLab.Problems.LawnMower-3.3.csproj

    r13006 r13278  
    116116  <ItemGroup>
    117117    <Compile Include="BestSolutionAnalyzer.cs" />
     118    <Compile Include="Symbols\Constant.cs">
     119      <SubType>Code</SubType>
     120    </Compile>
     121    <Compile Include="Symbols\ConstantTreeNode.cs">
     122      <SubType>Code</SubType>
     123    </Compile>
     124    <Compile Include="Symbols\Forward.cs">
     125      <SubType>Code</SubType>
     126    </Compile>
     127    <Compile Include="Symbols\Frog.cs">
     128      <SubType>Code</SubType>
     129    </Compile>
     130    <Compile Include="Symbols\Left.cs">
     131      <SubType>Code</SubType>
     132    </Compile>
     133    <Compile Include="Symbols\Prog.cs">
     134      <SubType>Code</SubType>
     135    </Compile>
     136    <Compile Include="Symbols\Sum.cs">
     137      <SubType>Code</SubType>
     138    </Compile>
    118139    <None Include="HeuristicLab.snk" />
    119140    <None Include="Plugin.cs.frame" />
     
    126147    <Compile Include="Plugin.cs" />
    127148    <Compile Include="Properties\AssemblyInfo.cs" />
    128     <Compile Include="Symbols\Constant.cs" />
    129     <Compile Include="Symbols\ConstantTreeNode.cs" />
    130     <Compile Include="Symbols\Forward.cs" />
    131     <Compile Include="Symbols\Frog.cs" />
    132     <Compile Include="Symbols\Left.cs" />
    133     <Compile Include="Symbols\Prog.cs" />
    134     <Compile Include="Symbols\Sum.cs" />
    135149  </ItemGroup>
    136150  <ItemGroup>
  • stable/HeuristicLab.Problems.LawnMower/3.3/Problem.cs

    r12708 r13278  
    3333namespace HeuristicLab.Problems.LawnMower {
    3434  [StorableClass]
    35   [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 160)]
    3635  [Item("Lawn Mower Problem", "The lawn mower demo problem for genetic programming.")]
    3736  public class Problem : SingleObjectiveHeuristicOptimizationProblem<Evaluator, ISymbolicExpressionTreeCreator> {
Note: See TracChangeset for help on using the changeset viewer.