Changeset 430 for trunk/sources

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

Files:

• HeuristicLab.Constraints/AllSubOperatorsTypeConstraintView.cs (modified) (3 diffs)
• HeuristicLab.Constraints/SubOperatorsConstraintAnalyser.cs (modified) (2 diffs)
• HeuristicLab.Constraints/SubOperatorsTypeConstraint.cs (modified) (7 diffs)
• HeuristicLab.StructureIdentification/GPOperatorGroup.cs (modified) (12 diffs)
• HeuristicLab.StructureIdentification/GPOperatorLibrary.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Constraints/AllSubOperatorsTypeConstraintView.cs

@@ -87 +87 @@
     #endregion
 
-    #region Drag Events   
-
+    #region Drag Events
     private void listView_DragDrop(object sender, DragEventArgs e) {
       if(e.Effect != DragDropEffects.None) {
@@ -105 +104 @@
     }
 
-
     private void listView_DragEnter(object sender, DragEventArgs e) {
       this.FindForm().BringToFront();
@@ -117 +115 @@
       }
     }
-
 
     private void listView_DragOver(object sender, DragEventArgs e) {

trunk/sources/HeuristicLab.Constraints/SubOperatorsConstraintAnalyser.cs

@@ -91 +91 @@
     private static bool InSet(IOperator op, ICollection<IOperator> set) {
       foreach(IOperator element in set) {
-        if(element==op ||
-          ((StringData)element.GetVariable("TypeId").Value).Data ==
-          ((StringData)op.GetVariable("TypeId").Value).Data) {
+        if(element == op)
           return true;
-        }
       }
-
       return false;
     }
@@ -132 +128 @@
         }
       }
-      
+
       public override void Visit(OrConstraint constraint) {
         base.Visit(constraint);

trunk/sources/HeuristicLab.Constraints/SubOperatorsTypeConstraint.cs

@@ -55 +55 @@
       // check if already in the list of allowed functions
       foreach(IOperator existingOp in subOperators) {
-        if (IsOperatorTypeEqual(existingOp, op)) {
+        if(existingOp == op) {
           return;
         }
@@ -66 +66 @@
       IOperator matchingOperator = null;
       foreach(IOperator existingOp in subOperators) {
-        if(IsOperatorTypeEqual(existingOp, op)) {
+        if(existingOp == op) {
           matchingOperator = existingOp;
           break;
@@ -72 +72 @@
       }
 
-      if (matchingOperator != null) {
+      if(matchingOperator != null) {
         subOperators.Remove(matchingOperator);
       }
@@ -79 +79 @@
     public override bool Check(IItem data) {
       IOperator op = data as IOperator;
-      if (data == null) return false;
+      if(data == null) return false;
 
       if(op.SubOperators.Count <= subOperatorIndex.Data) {
         return false;
       }
-      
-      return subOperators.Exists(delegate(IOperator curOp) { return IsOperatorTypeEqual(curOp, op.SubOperators[subOperatorIndex.Data]); });
+
+      return subOperators.Exists(delegate(IOperator curOp) { return curOp == op.SubOperators[subOperatorIndex.Data]; });
     }
 
@@ -108 +108 @@
 
     #region persistence
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid,IStorable> persistedObjects) {
+    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
       XmlNode indexNode = PersistenceManager.Persist("SubOperatorIndex", subOperatorIndex, document, persistedObjects);
@@ -121 +121 @@
     }
 
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
+    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
       subOperatorIndex = (IntData)PersistenceManager.Restore(node.SelectSingleNode("SubOperatorIndex"), restoredObjects);
@@ -131 +131 @@
     #endregion persistence
 
-
-    private bool IsOperatorTypeEqual(IOperator f, IOperator g) {
-      return ((StringData)f.GetVariable("TypeId").Value).Data == ((StringData)g.GetVariable("TypeId").Value).Data;
-    }
   }
 }

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";