Changeset 18132 for trunk/HeuristicLab.Problems.GrammaticalEvolution

Timestamp:

12/15/21 11:50:57 (3 years ago)

Author:

gkronber

Message:

#3140: merged r18091:18131 from branch to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.GrammaticalEvolution (modified) (1 prop)
• HeuristicLab.Problems.GrammaticalEvolution/3.4/Mappers/PIGEMapper.cs (modified) (2 diffs)
• HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicExpressionGrammar.cs (modified) (1 diff)

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

@@ -42 +42 @@
   ///   integer vector and rule may be one value from a "content" integer vector.
   ///   
-  ///   Order:   NT   = nont % Num. NT      ... determines, which non-terminal to expand next
-  ///   Content: Rule = rule % Num. Rules   ... rule determination as with standard GE mappers
+  ///   Order:   NT   = nont % Number. NT      ... determines, which non-terminal to expand next
+  ///   Content: Rule = rule % Number. Rules   ... rule determination as with standard GE mappers
   /// 
   /// Four mutation and crossover strategies possible:
@@ -155 +155 @@
           current.AddSubtree(GetRandomTerminalNode(current, grammar, random));
         } else {
-          // Order:   NT   = nont % Num. NT
+          // Order:   NT   = nont % Number. NT
           int nt = NontVector[genotypeIndex] % nonTerminals.Count;
           ISymbolicExpressionTreeNode current = nonTerminals[nt];
           nonTerminals.RemoveAt(nt);
 
-          // Content: Rule = rule % Num. Rules
+          // Content: Rule = rule % Number. Rules
           ISymbolicExpressionTreeNode newNode = GetNewChildNode(current, genotype, grammar, genotypeIndex, random);
           int arity = SampleArity(random, newNode, grammar);

trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicExpressionGrammar.cs

@@ -81 +81 @@
           var constVal = rand.NextDouble() * 20.0 - 10.0;
           constant.Name = string.Format("{0:0.000}", constVal);
-          constant.MinValue = constVal;
-          constant.MaxValue = constVal;
-          constant.ManipulatorSigma = 0.0;
-          constant.ManipulatorMu = 0.0;
-          constant.MultiplicativeManipulatorSigma = 0.0;
         } 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.
         constants.Add(constant);