Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/15/21 11:50:57 (3 years ago)
Author:
gkronber
Message:

#3140: merged r18091:18131 from branch to trunk

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Problems.GrammaticalEvolution

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/Mappers/PIGEMapper.cs

    r17180 r18132  
    4242  ///   integer vector and rule may be one value from a "content" integer vector.
    4343  ///   
    44   ///   Order:   NT   = nont % Num. NT      ... determines, which non-terminal to expand next
    45   ///   Content: Rule = rule % Num. Rules   ... rule determination as with standard GE mappers
     44  ///   Order:   NT   = nont % Number. NT      ... determines, which non-terminal to expand next
     45  ///   Content: Rule = rule % Number. Rules   ... rule determination as with standard GE mappers
    4646  ///
    4747  /// Four mutation and crossover strategies possible:
     
    155155          current.AddSubtree(GetRandomTerminalNode(current, grammar, random));
    156156        } else {
    157           // Order:   NT   = nont % Num. NT
     157          // Order:   NT   = nont % Number. NT
    158158          int nt = NontVector[genotypeIndex] % nonTerminals.Count;
    159159          ISymbolicExpressionTreeNode current = nonTerminals[nt];
    160160          nonTerminals.RemoveAt(nt);
    161161
    162           // Content: Rule = rule % Num. Rules
     162          // Content: Rule = rule % Number. Rules
    163163          ISymbolicExpressionTreeNode newNode = GetNewChildNode(current, genotype, grammar, genotypeIndex, random);
    164164          int arity = SampleArity(random, newNode, grammar);
  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicExpressionGrammar.cs

    r17413 r18132  
    8181          var constVal = rand.NextDouble() * 20.0 - 10.0;
    8282          constant.Name = string.Format("{0:0.000}", constVal);
    83           constant.MinValue = constVal;
    84           constant.MaxValue = constVal;
    85           constant.ManipulatorSigma = 0.0;
    86           constant.ManipulatorMu = 0.0;
    87           constant.MultiplicativeManipulatorSigma = 0.0;
    8883        } while (constants.Any(c => c.Name == constant.Name)); // unlikely, but it could happen that the same constant value is sampled twice. so we resample if necessary.
    8984        constants.Add(constant);
Note: See TracChangeset for help on using the changeset viewer.