Changeset 2174 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/FunctionLibraryInjector.cs

Timestamp:

07/20/09 20:14:47 (15 years ago)

Author:

gkronber

Message:

Implemented #302 (Show variable names instead of var<index> in GP function trees).

• Added a new operator that chooses a random value from a list of possible values.
• Changed mutation operator for variables and differentials
• Changed internal linear representation of function trees to support different types for local data.

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/FunctionLibraryInjector.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/FunctionLibraryInjector.cs

@@ -32 +32 @@
 namespace HeuristicLab.GP.StructureIdentification {
   public class FunctionLibraryInjector : OperatorBase {
-    private const string NUMBEROFINPUTVARIABLES = "NumberOfInputVariables";
     private const string FUNCTIONLIBRARY = "FunctionLibrary";
     private const string TARGETVARIABLE = "TargetVariable";
@@ -70 +69 @@
     public FunctionLibraryInjector()
       : base() {
-      AddVariableInfo(new VariableInfo(NUMBEROFINPUTVARIABLES, "The number of available input variables", typeof(IntData), VariableKind.In));
       AddVariableInfo(new VariableInfo(TARGETVARIABLE, "The target variable", typeof(IntData), VariableKind.In));
       AddVariableInfo(new VariableInfo(MINTIMEOFFSET, "Minimal time offset for all features", typeof(IntData), VariableKind.In));
@@ -111 +109 @@
       StructId.Variable variable;
       GPOperatorLibrary operatorLibrary;
-      int nInputVariables = GetVariableValue<IntData>(NUMBEROFINPUTVARIABLES, scope, true).Data;
       int targetVariable = GetVariableValue<IntData>(TARGETVARIABLE, scope, true).Data;
 
@@ -225 +222 @@
       ConditionalAddOperator(XOR_ALLOWED, operatorLibrary, xor);
 
-      variable.SetConstraints(1, nInputVariables, minTimeOffset, maxTimeOffset);
-      differential.SetConstraints(1, nInputVariables, minTimeOffset, maxTimeOffset);
+      variable.SetConstraints(minTimeOffset, maxTimeOffset);
+      differential.SetConstraints(minTimeOffset, maxTimeOffset);
 
       scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName(FUNCTIONLIBRARY), operatorLibrary));