Changeset 435

Timestamp:

08/04/08 00:35:55 (16 years ago)

Author:

gkronber

Message:

• code could be improved after removing the 'TypeId' variable and directly comparing instances of IOperator
• added firing change events in the SubOperatorTypeConstraints (ticket #163)

Location:

trunk/sources/HeuristicLab.Constraints

Files:

• AllSubOperatorsTypeConstraint.cs (modified) (3 diffs)
• SubOperatorsTypeConstraint.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Constraints/AllSubOperatorsTypeConstraint.cs

@@ -49 +49 @@
     public void AddOperator(IOperator op) {
       groupConstraint.AddOperator(op);
+      FireChanged();
     }
 
     public void RemoveOperator(IOperator op) {
       groupConstraint.RemoveOperator(op);
+      FireChanged();
     }
 
     public override bool Check(IItem data) {
       IOperator op = data as IOperator;
-      if (data == null) return false;
+      if(data == null) return false;
 
-      for (int i = 0; i < op.SubOperators.Count; i++ ) {
+      for(int i = 0; i < op.SubOperators.Count; i++) {
         groupConstraint.SubOperatorIndex.Data = i;
-        if(groupConstraint.Check(data)==false) {
+        if(groupConstraint.Check(data) == false) {
           return false;
         }
@@ -84 +86 @@
 
     #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 subOperatorsNode = PersistenceManager.Persist("SubOperatorsGroupConstraint", groupConstraint, document, persistedObjects);
@@ -92 +94 @@
     }
 
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
+    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
       groupConstraint = (SubOperatorTypeConstraint)PersistenceManager.Restore(node.SelectSingleNode("SubOperatorsGroupConstraint"), restoredObjects);

trunk/sources/HeuristicLab.Constraints/SubOperatorsTypeConstraint.cs

@@ -52 +52 @@
     }
 
+    public SubOperatorTypeConstraint(int index) : base() {
+      subOperatorIndex = new IntData(index);
+      subOperators = new List<IOperator>();
+    }
+
     public void AddOperator(IOperator op) {
-      // check if already in the list of allowed functions
-      foreach(IOperator existingOp in subOperators) {
-        if(existingOp == op) {
-          return;
-        }
+      if(!subOperators.Contains(op)) {
+        subOperators.Add(op);
+        FireChanged();
       }
-
-      subOperators.Add(op);
     }
 
     public void RemoveOperator(IOperator op) {
-      IOperator matchingOperator = null;
-      foreach(IOperator existingOp in subOperators) {
-        if(existingOp == op) {
-          matchingOperator = existingOp;
-          break;
-        }
-      }
-
-      if(matchingOperator != null) {
-        subOperators.Remove(matchingOperator);
+      if(subOperators.Contains(op)) {
+        subOperators.Remove(op);
+        FireChanged();
       }
     }
@@ -84 +78 @@
         return false;
       }
-
-      return subOperators.Exists(delegate(IOperator curOp) { return curOp == op.SubOperators[subOperatorIndex.Data]; });
+      return subOperators.Contains(op.SubOperators[subOperatorIndex.Data]);
     }