Free cookie consent management tool by TermsFeed Policy Generator

Changeset 12746


Ignore:
Timestamp:
07/12/15 11:34:29 (9 years ago)
Author:
ascheibe
Message:

#2426 merged r12724 and r12731 into stable

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj

    r12729 r12746  
    149149      <Name>HeuristicLab.Encodings.IntegerVectorEncoding-3.3</Name>
    150150    </ProjectReference>
     151    <ProjectReference Include="..\..\HeuristicLab.Encodings.LinearLinkageEncoding\3.3\HeuristicLab.Encodings.LinearLinkageEncoding-3.3.csproj">
     152      <Project>{be698769-975a-429e-828c-72bb2b6182c8}</Project>
     153      <Name>HeuristicLab.Encodings.LinearLinkageEncoding-3.3</Name>
     154      <Private>False</Private>
     155    </ProjectReference>
    151156    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    152157      <Project>{dbecb8b0-b166-4133-baf1-ed67c3fd7fca}</Project>
    … …  
    156161      <Project>{bb6d334a-4bb6-4674-9883-31a6ebb32cab}</Project>
    157162      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
     163    </ProjectReference>
     164    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     165      <Project>{06d4a186-9319-48a0-bade-a2058d462eea}</Project>
     166      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     167      <Private>False</Private>
    158168    </ProjectReference>
    159169    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">

  • stable/HeuristicLab.Problems.Programmable/3.3/Templates/CompiledMultiObjectiveProblemDefinition.cs

    r11949 r12746  
    77using HeuristicLab.Encodings.BinaryVectorEncoding;
    88using HeuristicLab.Encodings.IntegerVectorEncoding;
     9using HeuristicLab.Encodings.RealVectorEncoding;
    910using HeuristicLab.Encodings.PermutationEncoding;
    10 using HeuristicLab.Encodings.RealVectorEncoding;
     11using HeuristicLab.Encodings.LinearLinkageEncoding;
     12using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    1113using HeuristicLab.Optimization;
    1214using HeuristicLab.Problems.Programmable;
    … …  
    2325      //Encoding = new RealVectorEncoding("r", length: 5, min: -1.0, max: 1.0);
    2426      //Encoding = new PermutationEncoding("p", length: 5, type: PermutationTypes.Absolute);
     27      //Encoding = new LinearLinkageEncoding("l", length: 5);
     28      //Encoding = new SymbolicExpressionTreeEncoding("s", new SimpleSymbolicExpressionGrammar(), 50, 12);
    2529      // The encoding can also be a combination
    2630      //Encoding = new MultiEncoding()
    … …  
    2933      //.Add(new RealVectorEncoding("r", length: 5, min: -1.0, max: 1.0))
    3034      //.Add(new PermutationEncoding("p", length: 5, type: PermutationTypes.Absolute))
     35      //.Add(new LinearLinkageEncoding("l", length: 5))
     36      //.Add(new SymbolicExpressionTreeEncoding("s", new SimpleSymbolicExpressionGrammar(), 50, 12))
    3137      ;
    3238      // Add additional initialization code e.g. private variables that you need for evaluating

  • stable/HeuristicLab.Problems.Programmable/3.3/Templates/CompiledSingleObjectiveProblemDefinition.cs

    r12005 r12746  
    77using HeuristicLab.Encodings.BinaryVectorEncoding;
    88using HeuristicLab.Encodings.IntegerVectorEncoding;
     9using HeuristicLab.Encodings.RealVectorEncoding;
    910using HeuristicLab.Encodings.PermutationEncoding;
    10 using HeuristicLab.Encodings.RealVectorEncoding;
     11using HeuristicLab.Encodings.LinearLinkageEncoding;
     12using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    1113using HeuristicLab.Optimization;
    1214using HeuristicLab.Problems.Programmable;
    … …  
    2325      //Encoding = new RealVectorEncoding("r", length: 5, min: -1.0, max: 1.0);
    2426      //Encoding = new PermutationEncoding("p", length: 5, type: PermutationTypes.Absolute);
     27      //Encoding = new LinearLinkageEncoding("l", length: 5);
     28      //Encoding = new SymbolicExpressionTreeEncoding("s", new SimpleSymbolicExpressionGrammar(), 50, 12);
    2529      // The encoding can also be a combination
    2630      //Encoding = new MultiEncoding()
    … …  
    2933      //.Add(new RealVectorEncoding("r", length: 5, min: -1.0, max: 1.0))
    3034      //.Add(new PermutationEncoding("p", length: 5, type: PermutationTypes.Absolute))
     35      //.Add(new LinearLinkageEncoding("l", length: 5))
     36      //.Add(new SymbolicExpressionTreeEncoding("s", new SimpleSymbolicExpressionGrammar(), 50, 12))
    3137      ;
    3238      // Add additional initialization code e.g. private variables that you need for evaluating
Note: See TracChangeset for help on using the changeset viewer.