Changeset 2216 for branches/GP-Refactoring-713/sources/HeuristicLab.GP.Boolean/3.3/Symbols/Variable.cs

Timestamp:

07/30/09 19:41:58 (15 years ago)

Author:

gkronber

Message:

GP Refactoring #713

• cleaned code
• reintegrated GP.Boolean and GP.SantaFe
• worked on serialization of function trees

Location:

branches/GP-Refactoring-713/sources/HeuristicLab.GP.Boolean/3.3/Symbols

Files:

• . (added)
• Variable.cs (moved) (moved from branches/GP-Refactoring-713/sources/HeuristicLab.GP.Boolean/3.3/Variable.cs) (3 diffs)

branches/GP-Refactoring-713/sources/HeuristicLab.GP.Boolean/3.3/Symbols/Variable.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using System.Xml;
-using HeuristicLab.Constraints;
-using HeuristicLab.DataAnalysis;
 using HeuristicLab.Operators;
 using HeuristicLab.Random;
 
 namespace HeuristicLab.GP.Boolean {
-  public sealed class Variable : FunctionBase {
-    public const string INDEX = "Variable";
-
-    private int minIndex;
-    private int maxIndex;
-
-    public override string Description {
-      get { return ""; }
-    }
+  public sealed class Variable : Terminal {
+    public const string VARIABLENAME = "Variable";
 
     public Variable()
       : base() {
-      AddVariableInfo(new VariableInfo(INDEX, "Index of the variable in the dataset representing this feature", typeof(ConstrainedIntData), VariableKind.None));
-      GetVariableInfo(INDEX).Local = true;
-      AddVariableInfo(new VariableInfo(INITIALIZATION, "Initialization operator for variables", typeof(CombinedOperator), VariableKind.None));
-      GetVariableInfo(INITIALIZATION).Local = false;
-      AddVariableInfo(new VariableInfo(MANIPULATION, "Manipulation operator for variables", typeof(CombinedOperator), VariableKind.None));
-      GetVariableInfo(MANIPULATION).Local = false;
-
-      MinArity = 0; MaxArity = 0;
-
-      ConstrainedIntData variable = new ConstrainedIntData();
-      AddVariable(new HeuristicLab.Core.Variable(INDEX, variable));
-      minIndex = 0; maxIndex = 100;
-
       SetupInitialization();
       SetupManipulation();
+    }
 
+    public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {
+      return new VariableFunctionTree(this);
     }
 
@@ -65 +46 @@
       CombinedOperator combinedOp = new CombinedOperator();
       SequentialProcessor seq = new SequentialProcessor();
-      UniformRandomizer indexRandomizer = new UniformRandomizer();
-      indexRandomizer.Min = minIndex;
-      indexRandomizer.Max = maxIndex + 1; // uniform randomizer generates numbers in the range [min, max[
-      indexRandomizer.GetVariableInfo("Value").ActualName = INDEX;
-      indexRandomizer.Name = "Index Randomizer";
+      UniformItemChooser variableRandomizer = new UniformItemChooser();
+      variableRandomizer.GetVariableInfo("Value").ActualName = VARIABLENAME;
+      variableRandomizer.GetVariableInfo("Values").ActualName = "InputVariables";
+      variableRandomizer.Name = "Variable randomizer";
 
       combinedOp.OperatorGraph.AddOperator(seq);
-      combinedOp.OperatorGraph.AddOperator(indexRandomizer);
+      combinedOp.OperatorGraph.AddOperator(variableRandomizer);
       combinedOp.OperatorGraph.InitialOperator = seq;
-      seq.AddSubOperator(indexRandomizer);
+      seq.AddSubOperator(variableRandomizer);
       Initializer = combinedOp;
     }
@@ -82 +62 @@
       CombinedOperator combinedOp = new CombinedOperator();
       SequentialProcessor seq = new SequentialProcessor();
-      UniformRandomizer indexRandomizer = new UniformRandomizer();
-      indexRandomizer.Min = minIndex;
-      indexRandomizer.Max = maxIndex + 1;
-      indexRandomizer.GetVariableInfo("Value").ActualName = INDEX;
-      indexRandomizer.Name = "Index Randomizer";
+      UniformItemChooser variableRandomizer = new UniformItemChooser();
+      variableRandomizer.GetVariableInfo("Value").ActualName = VARIABLENAME;
+      variableRandomizer.GetVariableInfo("Values").ActualName = "InputVariables";
+      variableRandomizer.Name = "Variable randomizer";
 
       combinedOp.OperatorGraph.AddOperator(seq);
-      combinedOp.OperatorGraph.AddOperator(indexRandomizer);
+      combinedOp.OperatorGraph.AddOperator(variableRandomizer);
       combinedOp.OperatorGraph.InitialOperator = seq;
-      seq.AddSubOperator(indexRandomizer);
+      seq.AddSubOperator(variableRandomizer);
       Manipulator = combinedOp;
-    }
-
-    public void SetConstraints(int[] allowedIndexes) {
-      //ConstrainedIntData index = GetVariableValue<ConstrainedIntData>(INDEX, null, false);
-      Array.Sort(allowedIndexes);
-      minIndex = allowedIndexes[0]; maxIndex = allowedIndexes[allowedIndexes.Length - 1];
-      List<IConstraint> constraints = new List<IConstraint>();
-      int start = allowedIndexes[0];
-      int prev = start;
-      for(int i = 1; i < allowedIndexes.Length; i++) {
-        if(allowedIndexes[i] != prev + 1) {
-          IntBoundedConstraint lastRange = new IntBoundedConstraint();
-          lastRange.LowerBound = start;
-          lastRange.LowerBoundEnabled = true;
-          lastRange.LowerBoundIncluded = true;
-          lastRange.UpperBound = prev;
-          lastRange.UpperBoundEnabled = true;
-          lastRange.UpperBoundIncluded = true;
-          constraints.Add(lastRange);
-          start = allowedIndexes[i];
-          prev = start;
-        }
-        prev = allowedIndexes[i];
-      }
-      IntBoundedConstraint range = new IntBoundedConstraint();
-      range.LowerBound = start;
-      range.LowerBoundEnabled = true;
-      range.LowerBoundIncluded = true;
-      range.UpperBound = prev;
-      range.UpperBoundEnabled = true;
-      range.UpperBoundIncluded = true;
-      constraints.Add(range);
-      if(constraints.Count > 1) {
-        OrConstraint or = new OrConstraint();
-        foreach(IConstraint c in constraints) or.Clauses.Add(c);
-        index.AddConstraint(or);
-      } else {
-        index.AddConstraint(constraints[0]);
-      }
-
-      SetupInitialization();
-      SetupManipulation();
     }
   }