Free cookie consent management tool by TermsFeed Policy Generator

Changeset 10079 for branches


Ignore:
Timestamp:
10/22/13 19:23:48 (10 years ago)
Author:
gkronber
Message:

#2026 added the royal tree benchmark problem for genetic programming

Location:
branches/HeuristicLab.Problems.GPDL
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.sln

    r10064 r10079  
    4040    Examples\multi-output-multiplier.txt = Examples\multi-output-multiplier.txt
    4141    Examples\Multiplexer.txt = Examples\Multiplexer.txt
     42    Examples\RoyalTree.txt = Examples\RoyalTree.txt
    4243    Examples\symbreg HEAL.txt = Examples\symbreg HEAL.txt
    4344    Examples\symbreg Koza.txt = Examples\symbreg Koza.txt
     
    110111    {E2060931-6700-464B-9E82-50846D7AE4E9} = {3768D612-38EB-47D8-9E79-75D8E5AB00A8}
    111112  EndGlobalSection
    112   GlobalSection(Performance) = preSolution
    113     HasPerformanceSessions = true
    114   EndGlobalSection
    115113EndGlobal
  • branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/Util.cs

    r10067 r10079  
    2626public class Util {
    2727  // simplistic regex for formal parameters, any string of non-whitespace and not comma characters is allowed as a type name
     28  // this has to be changed to allow for e.g., generic types (S<T0, T1>) and for expressions in actual parameters (max(x, 0) + 1))
    2829  private static string refOrOutGroup = @"(?:(?<refOrOut>(out|ref))\s+)"; // "ref " | "out "
    29   private static string typeGroup = @"(?:(?<type>[^ ,\f\n\r\t\v]*)\s+)";
    30   private static string identGroup = @"(?<id>[\w]+)\s*";
     30  private static string typeGroup = @"(?:(?<type>[^,]+)\s+)";
     31  private static string identGroup = @"(?<id>[^,]+)\s*";
    3132  private static Regex formalParameterExpr = new Regex(@"\s*,?\s*" + refOrOutGroup + "?" + typeGroup + "?" + identGroup, RegexOptions.ECMAScript);
    3233  public static IEnumerable<TerminalNode.FieldDefinition> ExtractParameters(string formalParameterSrc) {
Note: See TracChangeset for help on using the changeset viewer.