Changeset 425 for trunk/sources/HeuristicLab.StructureIdentification

Timestamp:

08/03/08 10:51:50 (16 years ago)

Author:

gkronber

Message:

moved creation of default init and manipulation operators from !GPOperatorGroup into the functions (ticket #225 "Simplify GP infrastructure (GPOperatorLibrary and Functions)")

File:

• trunk/sources/HeuristicLab.StructureIdentification/GPOperatorGroup.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.StructureIdentification/GPOperatorGroup.cs

@@ -41 +41 @@
       var localVariableInfos = op.VariableInfos.Where(f => f.Local);
 
-      if(op.GetVariable(GPOperatorLibrary.MANIPULATION) == null) {
-        CombinedOperator manipulationOperator = new CombinedOperator();
-        SequentialProcessor manipulationSequence = new SequentialProcessor();
-        foreach(IVariableInfo variableInfo in localVariableInfos) {
-          IOperator manipulator = GetDefaultManipulationOperator(variableInfo);
-          if (manipulator != null) {
-            manipulationSequence.AddSubOperator(manipulator);
-          }
-        }
-        if(manipulationSequence.SubOperators.Count > 0) {
-          op.AddVariable(new Variable(GPOperatorLibrary.MANIPULATION, manipulationOperator));
-
-          manipulationOperator.OperatorGraph.AddOperator(manipulationSequence);
-          manipulationOperator.OperatorGraph.InitialOperator = manipulationSequence;
-          foreach(IOperator subOp in manipulationSequence.SubOperators) {
-            manipulationOperator.OperatorGraph.AddOperator(subOp);
-          }
-        }
-      }
-
-      if(op.GetVariable(GPOperatorLibrary.INITIALIZATION) == null) {
-        CombinedOperator initOperator = new CombinedOperator();
-        SequentialProcessor initSequence = new SequentialProcessor();
-        foreach(IVariableInfo variableInfo in localVariableInfos) {
-          IOperator initializer = GetDefaultInitOperator(variableInfo);
-          if (initializer != null) {
-            initSequence.AddSubOperator(initializer);
-          }
-        }
-        if(initSequence.SubOperators.Count > 0) {
-          op.AddVariable(new Variable(GPOperatorLibrary.INITIALIZATION, initOperator));
-          initOperator.OperatorGraph.AddOperator(initSequence);
-          initOperator.OperatorGraph.InitialOperator = initSequence;
-          foreach(IOperator subOp in initSequence.SubOperators) {
-            initOperator.OperatorGraph.AddOperator(subOp);
-          }
-        }
-      }
+      //if(op.GetVariable(GPOperatorLibrary.MANIPULATION) == null) {
+      //  CombinedOperator manipulationOperator = new CombinedOperator();
+      //  SequentialProcessor manipulationSequence = new SequentialProcessor();
+      //  foreach(IVariableInfo variableInfo in localVariableInfos) {
+      //    IOperator manipulator = GetDefaultManipulationOperator(variableInfo);
+      //    if (manipulator != null) {
+      //      manipulationSequence.AddSubOperator(manipulator);
+      //    }
+      //  }
+      //  if(manipulationSequence.SubOperators.Count > 0) {
+      //    op.AddVariable(new Variable(GPOperatorLibrary.MANIPULATION, manipulationOperator));
+
+      //    manipulationOperator.OperatorGraph.AddOperator(manipulationSequence);
+      //    manipulationOperator.OperatorGraph.InitialOperator = manipulationSequence;
+      //    foreach(IOperator subOp in manipulationSequence.SubOperators) {
+      //      manipulationOperator.OperatorGraph.AddOperator(subOp);
+      //    }
+      //  }
+      //}
+
+      //if(op.GetVariable(GPOperatorLibrary.INITIALIZATION) == null) {
+      //  CombinedOperator initOperator = new CombinedOperator();
+      //  SequentialProcessor initSequence = new SequentialProcessor();
+      //  foreach(IVariableInfo variableInfo in localVariableInfos) {
+      //    IOperator initializer = GetDefaultInitOperator(variableInfo);
+      //    if (initializer != null) {
+      //      initSequence.AddSubOperator(initializer);
+      //    }
+      //  }
+      //  if(initSequence.SubOperators.Count > 0) {
+      //    op.AddVariable(new Variable(GPOperatorLibrary.INITIALIZATION, initOperator));
+      //    initOperator.OperatorGraph.AddOperator(initSequence);
+      //    initOperator.OperatorGraph.InitialOperator = initSequence;
+      //    foreach(IOperator subOp in initSequence.SubOperators) {
+      //      initOperator.OperatorGraph.AddOperator(subOp);
+      //    }
+      //  }
+      //}
 
       // add a new typeid if necessary
@@ -97 +97 @@
         op.AddVariable(new Variable(GPOperatorLibrary.TICKETS, new DoubleData(1.0)));
       }
-
-      //RecalculateAllowedSuboperators();
-      //RecalculateMinimalTreeBounds();
-
       OnOperatorAdded(op);
     }
@@ -248 +244 @@
 
 
-    private IOperator GetDefaultManipulationOperator(IVariableInfo variableInfo) {
-      IOperator shaker;
-      if(variableInfo.DataType == typeof(ConstrainedDoubleData) ||
-        variableInfo.DataType == typeof(ConstrainedIntData) ||
-        variableInfo.DataType == typeof(DoubleData) ||
-        variableInfo.DataType == typeof(IntData)) {
-        shaker = new NormalRandomAdder();
-      } else {
-        return null;
-      }
-      shaker.GetVariableInfo("Value").ActualName = variableInfo.FormalName;
-      shaker.Name = variableInfo.FormalName + " manipulation";
-      return shaker;
-    }
-
-    private IOperator GetDefaultInitOperator(IVariableInfo variableInfo) {
-      IOperator shaker;
-      if(variableInfo.DataType == typeof(ConstrainedDoubleData) ||
-        variableInfo.DataType == typeof(ConstrainedIntData) ||
-        variableInfo.DataType == typeof(DoubleData) ||
-        variableInfo.DataType == typeof(IntData)) {
-        shaker = new UniformRandomizer();
-      } else {
-        return null;
-      }
-      shaker.GetVariableInfo("Value").ActualName = variableInfo.FormalName;
-      shaker.Name = variableInfo.FormalName + " initialization";
-      return shaker;
-    }
+    //private IOperator GetDefaultManipulationOperator(IVariableInfo variableInfo) {
+    //  IOperator shaker;
+    //  if(variableInfo.DataType == typeof(ConstrainedDoubleData) ||
+    //    variableInfo.DataType == typeof(ConstrainedIntData) ||
+    //    variableInfo.DataType == typeof(DoubleData) ||
+    //    variableInfo.DataType == typeof(IntData)) {
+    //    shaker = new NormalRandomAdder();
+    //  } else {
+    //    return null;
+    //  }
+    //  shaker.GetVariableInfo("Value").ActualName = variableInfo.FormalName;
+    //  shaker.Name = variableInfo.FormalName + " manipulation";
+    //  return shaker;
+    //}
+
+    //private IOperator GetDefaultInitOperator(IVariableInfo variableInfo) {
+    //  IOperator shaker;
+    //  if(variableInfo.DataType == typeof(ConstrainedDoubleData) ||
+    //    variableInfo.DataType == typeof(ConstrainedIntData) ||
+    //    variableInfo.DataType == typeof(DoubleData) ||
+    //    variableInfo.DataType == typeof(IntData)) {
+    //    shaker = new UniformRandomizer();
+    //  } else {
+    //    return null;
+    //  }
+    //  shaker.GetVariableInfo("Value").ActualName = variableInfo.FormalName;
+    //  shaker.Name = variableInfo.FormalName + " initialization";
+    //  return shaker;
+    //}
 
     public override void AddSubGroup(IOperatorGroup group) {
@@ -284 +280 @@
     public override void RemoveOperator(IOperator op) {
       base.RemoveOperator(op);
-      op.RemoveVariable(GPOperatorLibrary.MANIPULATION);
-      op.RemoveVariable(GPOperatorLibrary.INITIALIZATION);
       op.RemoveVariable(GPOperatorLibrary.TYPE_ID);
       op.RemoveVariable(GPOperatorLibrary.MIN_TREE_SIZE);