Changeset 429 for trunk/sources

Timestamp:

08/03/08 23:00:48 (16 years ago)

Author:

gkronber

Message:

fixed compilation problems introduced with r428 (ticket #225)

Location:

trunk/sources

Files:

• HeuristicLab.Functions/FunctionBase.cs (modified) (1 diff)
• HeuristicLab.StructureIdentification/GPOperatorGroup.cs (modified) (2 diffs)
• HeuristicLab.StructureIdentification/GPOperatorLibraryEditor.cs (modified) (7 diffs)
• HeuristicLab.StructureIdentification/Manipulation/FullTreeShaker.cs (modified) (3 diffs)
• HeuristicLab.StructureIdentification/Manipulation/OnePointShaker.cs (modified) (2 diffs)
• HeuristicLab.StructureIdentification/TreeGardener.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Functions/FunctionBase.cs

@@ -34 +34 @@
   /// </summary>
   public abstract class FunctionBase : OperatorBase, IFunction {
-    protected const string INITIALIZATION = "Initialization";
-    protected const string MANIPULATION = "Manipulation";
+    public const string INITIALIZATION = "Initialization";
+    public const string MANIPULATION = "Manipulation";
 
 

trunk/sources/HeuristicLab.StructureIdentification/GPOperatorGroup.cs

@@ -40 +40 @@
 
       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);
-      //    }
-      //  }
-      //}
 
       // add a new typeid if necessary
@@ -243 +204 @@
     }
 
-
-    //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) {
       throw new NotSupportedException();

trunk/sources/HeuristicLab.StructureIdentification/GPOperatorLibraryEditor.cs

@@ -33 +33 @@
 using HeuristicLab.Operators;
 using HeuristicLab.Random;
+using HeuristicLab.Functions;
 
 namespace HeuristicLab.StructureIdentification {
@@ -54 +55 @@
 
       foreach(IOperator op in library.Group.Operators) {
-        if(op.GetVariable(GPOperatorLibrary.MANIPULATION) != null) {
+        if(op.GetVariable(FunctionBase.MANIPULATION) != null) {
           ListViewItem item = new ListViewItem();
           item.Text = op.Name;
@@ -61 +62 @@
           mutationListView.Items.Add(item);
         }
-        if(op.GetVariable(GPOperatorLibrary.INITIALIZATION) != null) {
+        if(op.GetVariable(FunctionBase.INITIALIZATION) != null) {
           ListViewItem item = new ListViewItem();
           item.Name = op.Name;
@@ -74 +75 @@
     private void GPOperatorLibraryView_OperatorAdded(object sender, EventArgs e) {
       IOperator op = ((OperatorEventArgs)e).op;
-      if (op.GetVariable(GPOperatorLibrary.MANIPULATION) != null) {
+      if(op.GetVariable(FunctionBase.MANIPULATION) != null) {
         ListViewItem operatorMutationItem = new ListViewItem();
         operatorMutationItem.Name = op.Name;
@@ -82 +83 @@
       }
 
-      if (op.GetVariable(GPOperatorLibrary.INITIALIZATION) != null) {
+      if(op.GetVariable(FunctionBase.INITIALIZATION) != null) {
         ListViewItem operatorInitItem = new ListViewItem();
         operatorInitItem.Name = op.Name;
@@ -133 +134 @@
     private void mutationListView_SelectedIndexChanged(object sender, EventArgs e) {
       if(mutationListView.SelectedItems.Count>0 && mutationListView.SelectedItems[0].Tag != null) {
-        IVariable variable = ((IOperator)mutationListView.SelectedItems[0].Tag).GetVariable(GPOperatorLibrary.MANIPULATION);
+        IVariable variable = ((IOperator)mutationListView.SelectedItems[0].Tag).GetVariable(FunctionBase.MANIPULATION);
         mutationVariableView.Enabled = true;
         mutationVariableView.Variable = variable;
@@ -143 +144 @@
     private void initListView_SelectedIndexChanged(object sender, EventArgs e) {
       if(initListView.SelectedItems.Count>0 && initListView.SelectedItems[0].Tag != null) {
-        IVariable variable = ((IOperator)initListView.SelectedItems[0].Tag).GetVariable(GPOperatorLibrary.INITIALIZATION);
+        IVariable variable = ((IOperator)initListView.SelectedItems[0].Tag).GetVariable(FunctionBase.INITIALIZATION);
         initVariableView.Enabled = true;
         initVariableView.Variable = variable;

trunk/sources/HeuristicLab.StructureIdentification/Manipulation/FullTreeShaker.cs

@@ -34 +34 @@
   public class FullTreeShaker : DelegatingOperator {
     public override string Description {
-      get { return "Manipulates all tree nodes for which a '"+GPOperatorLibrary.MANIPULATION+"' variable is defined."; }
+      get { return "Manipulates all tree nodes for which a '" + FunctionBase.MANIPULATION + "' variable is defined."; }
     }
 
@@ -57 +57 @@
 
       TreeGardener gardener = new TreeGardener(mt, library);
-      var parametricBranches = gardener.GetAllSubTrees(tree).Where(branch => branch.Function.GetVariable(GPOperatorLibrary.MANIPULATION) != null);
+      var parametricBranches = gardener.GetAllSubTrees(tree).Where(branch => branch.Function.GetVariable(FunctionBase.MANIPULATION) != null);
       foreach(IFunctionTree subTree in parametricBranches) {
-        IOperator mutation =(IOperator)subTree.Function.GetVariable(GPOperatorLibrary.MANIPULATION).Value;
+        IOperator mutation = (IOperator)subTree.Function.GetVariable(FunctionBase.MANIPULATION).Value;
 
         // store all local variables into a temporary scope
@@ -73 +73 @@
       // save all existing sub-scopes in a backup scope
       Scope backupScope = new Scope("backup");
-      foreach (Scope subScope in scope.SubScopes) {
+      foreach(Scope subScope in scope.SubScopes) {
         backupScope.AddSubScope(subScope);
       }

trunk/sources/HeuristicLab.StructureIdentification/Manipulation/OnePointShaker.cs

@@ -34 +34 @@
   public class OnePointShaker : DelegatingOperator {
     public override string Description {
-      get { return "Selects a random node of all tree-nodes that have a '"+GPOperatorLibrary.MANIPULATION+"' variable defined and manipulates the selected node."; }
+      get { return "Selects a random node of all tree-nodes that have a '"+FunctionBase.MANIPULATION+"' variable defined and manipulates the selected node."; }
     }
 
@@ -52 +52 @@
 
       // get all nodes for which a manipulation is defined
-      var parametricBranches = gardener.GetAllSubTrees(tree).Where(branch => branch.Function.GetVariable(GPOperatorLibrary.MANIPULATION) != null);
+      var parametricBranches = gardener.GetAllSubTrees(tree).Where(branch => branch.Function.GetVariable(FunctionBase.MANIPULATION) != null);
       IFunctionTree selectedBranch = parametricBranches.ElementAt(mt.Next(parametricBranches.Count()));
-      IOperator mutation = (IOperator)selectedBranch.Function.GetVariable(GPOperatorLibrary.MANIPULATION).Value;
+      IOperator mutation = (IOperator)selectedBranch.Function.GetVariable(FunctionBase.MANIPULATION).Value;
       CompositeOperation next = new CompositeOperation();
 

trunk/sources/HeuristicLab.StructureIdentification/TreeGardener.cs

@@ -216 +216 @@
       Scope tempScope = new Scope("Temp. initialization scope");
 
-      var parametricTrees = trees.Where(t => t.Function.GetVariable(GPOperatorLibrary.INITIALIZATION) != null);
+      var parametricTrees = trees.Where(t => t.Function.GetVariable(FunctionBase.INITIALIZATION) != null);
       foreach(IFunctionTree tree in parametricTrees) {
         // enqueue an initialization operation for each operator with local variables 
-        IOperator initialization = (IOperator)tree.Function.GetVariable(GPOperatorLibrary.INITIALIZATION).Value;
+        IOperator initialization = (IOperator)tree.Function.GetVariable(FunctionBase.INITIALIZATION).Value;
         Scope initScope = new Scope();
         // copy the local variables into a temporary scope used for initialization