Changeset 430 for trunk/sources/HeuristicLab.StructureIdentification

Timestamp:

08/03/08 23:14:08 (16 years ago)

Author:

gkronber

Message:

removed 'TypeIds' for functions (also a relic of an old design) (ticket #225)

Location:

trunk/sources/HeuristicLab.StructureIdentification

Files:

• GPOperatorGroup.cs (modified) (12 diffs)
• GPOperatorLibrary.cs (modified) (1 diff)

trunk/sources/HeuristicLab.StructureIdentification/GPOperatorGroup.cs

@@ -41 +41 @@
       var localVariableInfos = op.VariableInfos.Where(f => f.Local);
 
-      // add a new typeid if necessary
-      if(op.GetVariable(GPOperatorLibrary.TYPE_ID) == null) {
-        op.AddVariable(new Variable(GPOperatorLibrary.TYPE_ID, new StringData(Guid.NewGuid().ToString())));
-      }
-
       if(op.GetVariable(GPOperatorLibrary.MIN_TREE_HEIGHT) == null) {
         op.AddVariable(new Variable(GPOperatorLibrary.MIN_TREE_HEIGHT, new IntData(-1)));
@@ -62 +57 @@
 
 
-    private Dictionary<string, int> minTreeHeight = new Dictionary<string, int>();
-    private Dictionary<string, int> minTreeSize = new Dictionary<string, int>();
+    private Dictionary<IOperator, int> minTreeHeight = new Dictionary<IOperator, int>();
+    private Dictionary<IOperator, int> minTreeSize = new Dictionary<IOperator, int>();
     private SubOperatorsConstraintAnalyser constraintAnalyser = new SubOperatorsConstraintAnalyser();
 
@@ -101 +96 @@
 
     private int RecalculateMinimalTreeSize(IOperator op) {
-      string typeId = GetTypeId(op);
       // check for memoized value
-      if(minTreeSize.ContainsKey(typeId)) {
-        return minTreeSize[typeId];
+      if(minTreeSize.ContainsKey(op)) {
+        return minTreeSize[op];
       }
 
@@ -112 +106 @@
       // no suboperators possible => minimalTreeSize == 1 (the current node)
       if(minArity == 0 && maxArity == 0) {
-        minTreeSize[typeId] = 1;
+        minTreeSize[op] = 1;
         return 1;
       }
@@ -121 +115 @@
 
       // mark the currently processed operator to prevent infinite recursions and stack overflow
-      minTreeSize[typeId] = 9999;
+      minTreeSize[op] = 9999;
       for(int i = 0; i < minArity; i++) {
         // calculate the minTreeSize of all allowed sub-operators 
@@ -136 +130 @@
       }
 
-      minTreeSize[typeId] = subTreeSizeSum + 1;
+      minTreeSize[op] = subTreeSizeSum + 1;
       return subTreeSizeSum + 1;
     }
@@ -142 +136 @@
 
     private int RecalculateMinimalTreeHeight(IOperator op) {
-      string typeId = GetTypeId(op);
       // check for memoized value
-      if(minTreeHeight.ContainsKey(typeId)) {
-        return minTreeHeight[typeId];
+      if(minTreeHeight.ContainsKey(op)) {
+        return minTreeHeight[op];
       }
 
@@ -153 +146 @@
       // no suboperators possible => minimalTreeHeight == 1
       if(minArity == 0 && maxArity == 0) {
-        minTreeHeight[typeId] = 1;
+        minTreeHeight[op] = 1;
         return 1;
       }
@@ -162 +155 @@
 
       // mark the currently processed operator to prevent infinite recursions leading to stack overflow
-      minTreeHeight[typeId] = 9999;
+      minTreeHeight[op] = 9999;
       for(int i = 0; i < minArity; i++) {
         // calculate the minTreeHeight of all possible sub-operators.
@@ -182 +175 @@
       }
 
-      minTreeHeight[typeId] = maxSubTreeHeight + 1;
+      minTreeHeight[op] = maxSubTreeHeight + 1;
       return maxSubTreeHeight + 1;
     }
@@ -200 +193 @@
     }
 
-    private string GetTypeId(IOperator op) {
-      return ((StringData)op.GetVariable(GPOperatorLibrary.TYPE_ID).Value).Data;
-    }
-
     public override void AddSubGroup(IOperatorGroup group) {
       throw new NotSupportedException();
@@ -210 +199 @@
     public override void RemoveOperator(IOperator op) {
       base.RemoveOperator(op);
-      op.RemoveVariable(GPOperatorLibrary.TYPE_ID);
       op.RemoveVariable(GPOperatorLibrary.MIN_TREE_SIZE);
       op.RemoveVariable(GPOperatorLibrary.MIN_TREE_HEIGHT);

trunk/sources/HeuristicLab.StructureIdentification/GPOperatorLibrary.cs

@@ -30 +30 @@
   public class GPOperatorLibrary : ItemBase, IOperatorLibrary, IEditable  {
     // constants for variable names
-    internal const string TYPE_ID = "TypeId";
     internal const string MIN_TREE_HEIGHT = "MinTreeHeight";
     internal const string MIN_TREE_SIZE = "MinTreeSize";