Changeset 40 for trunk/sources/HeuristicLab.Constraints/AndConstraint.cs

Timestamp:

03/05/08 02:08:02 (16 years ago)

Author:

swagner

Message:

Worked on ticket #41

• added generic ItemList<T>

File:

• trunk/sources/HeuristicLab.Constraints/AndConstraint.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Constraints/AndConstraint.cs

@@ -29 +29 @@
 namespace HeuristicLab.Constraints {
   public class AndConstraint : ConstraintBase, IViewable {
-    private ItemList clauses;
-    public ItemList Clauses {
+    private ItemList<IConstraint> clauses;
+    public ItemList<IConstraint> Clauses {
       get { return clauses; }
       set {
@@ -45 +45 @@
 
     public AndConstraint() {
-      clauses = new ItemList();
-      clauses.ItemType = typeof(IConstraint);
+      clauses = new ItemList<IConstraint>();
     }
 
@@ -52 +51 @@
       bool result = true;
       for (int i = 0 ; i < clauses.Count ; i++) {
-        result = ((IConstraint)clauses[i]).Check(data);
+        result = clauses[i].Check(data);
         if (!result) return false;
       }
@@ -65 +64 @@
       AndConstraint clone = new AndConstraint();
       clonedObjects.Add(Guid, clone);
-      clone.Clauses = (ItemList)Auxiliary.Clone(Clauses, clonedObjects);
+      clone.Clauses = (ItemList<IConstraint>)Auxiliary.Clone(Clauses, clonedObjects);
       return clone;
     }
@@ -84 +83 @@
     public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
-      clauses = (ItemList)PersistenceManager.Restore(node.SelectSingleNode("Clauses"), restoredObjects);
+      clauses = (ItemList<IConstraint>)PersistenceManager.Restore(node.SelectSingleNode("Clauses"), restoredObjects);
     }
     #endregion persistence