Changeset 18116


Ignore:
Timestamp:
12/14/21 14:31:10 (7 months ago)
Author:
chaider
Message:

#3140

  • Added description for <num> and constants in NLR structure definition
  • Set constant symbol as disabled in all grammars
Location:
branches/3140_NumberSymbol
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/3140_NumberSymbol/HeuristicLab.Algorithms.DataAnalysis/3.4/NonlinearRegression/NonlinearRegression.cs

    r18114 r18116  
    123123      : base() {
    124124      Problem = new RegressionProblem();
    125       Parameters.Add(new FixedValueParameter<StringValue>(ModelStructureParameterName, "The expression for which the <num> parameters should be fit.", new StringValue("<num> * x*x + 0.0")));
     125      Parameters.Add(new FixedValueParameter<StringValue>(ModelStructureParameterName,
     126        "The expression for which the <num> parameters should be fit.\n " +
     127        "Defined constants will not be modified.\n " +
     128        "Modifiable numbers are specified with <num>. To specify a default value within this number symbol, a default value can be declared by e.g. <num=1.0>.",
     129        new StringValue("<num> * x*x + 0.0")));
    126130      Parameters.Add(new FixedValueParameter<IntValue>(IterationsParameterName, "The maximum number of iterations for parameter optimization.", new IntValue(200)));
    127131      Parameters.Add(new FixedValueParameter<IntValue>(RestartsParameterName, "The number of independent random restarts (>0)", new IntValue(10)));
  • branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/LinearScalingGrammar.cs

    r18115 r18116  
    130130      Symbols.First(s => s is CubeRoot).Enabled = false;
    131131      Symbols.First(s => s is Absolute).Enabled = false;
     132      Symbols.First(s => s is Constant).Enabled = false;
    132133    }
    133134  }
  • branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs

    r18115 r18116  
    250250      Symbols.First(s => s.Name == ConditionalSymbolsName).Enabled = false;
    251251      Symbols.First(s => s.Name == TimeSeriesSymbolsName).Enabled = false;
     252      Symbols.First(s => s is Constant).Enabled = false;
    252253    }
    253254
     
    263264      Symbols.First(s => s.Name == PowerFunctionsName).Enabled = false;
    264265      Symbols.First(s => s.Name == TimeSeriesSymbolsName).Enabled = false;
     266      Symbols.First(s => s is Constant).Enabled = false;
    265267    }
    266268
     
    279281      Symbols.First(s => s is Integral).Enabled = false;
    280282      Symbols.First(s => s is TimeLag).Enabled = false;
     283      Symbols.First(s => s is Constant).Enabled = false;
    281284    }
    282285  }
  • branches/3140_NumberSymbol/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/ExternalEvaluationExpressionGrammar.cs

    r18115 r18116  
    2121
    2222using System.Collections.Generic;
     23using System.Linq;
    2324using HEAL.Attic;
    2425using HeuristicLab.Common;
     
    103104          }
    104105      }
     106
     107      Symbols.First(s => s is Constant).Enabled = false;
    105108    }
    106109  }
Note: See TracChangeset for help on using the changeset viewer.