Changeset 40 for trunk/sources/HeuristicLab.Constraints

Timestamp:

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

Author:

swagner

Message:

Worked on ticket #41

• added generic ItemList<T>

Location:

trunk/sources/HeuristicLab.Constraints

Files:

• AndConstraint.cs (modified) (5 diffs)
• AndConstraintView.Designer.cs (modified) (2 diffs)
• ItemTypeConstraint.cs (modified) (1 diff)
• OrConstraint.cs (modified) (5 diffs)
• OrConstraintView.Designer.cs (modified) (2 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

trunk/sources/HeuristicLab.Constraints/AndConstraintView.Designer.cs

@@ -46 +46 @@
     /// </summary>
     private void InitializeComponent() {
-      this.clausesItemListView = new HeuristicLab.Data.ItemListView();
+      this.clausesItemListView = new HeuristicLab.Data.ItemListView<HeuristicLab.Core.IConstraint>();
       this.SuspendLayout();
       // 
@@ -73 +73 @@
     #endregion
 
-    private HeuristicLab.Data.ItemListView clausesItemListView;
+    private HeuristicLab.Data.ItemListView<HeuristicLab.Core.IConstraint> clausesItemListView;
 
   }

trunk/sources/HeuristicLab.Constraints/ItemTypeConstraint.cs

@@ -81 +81 @@
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
       XmlAttribute itemTypeAttribute = document.CreateAttribute("ItemType");
-      string typeString = Type.AssemblyQualifiedName;
-      string[] tokens = typeString.Split(new string[] { ", " }, StringSplitOptions.None);
-      typeString = tokens[0] + ", " + tokens[1];
-      itemTypeAttribute.Value = typeString;
+      itemTypeAttribute.Value = PersistenceManager.BuildTypeString(Type);
       node.Attributes.Append(itemTypeAttribute);
       return node;

trunk/sources/HeuristicLab.Constraints/OrConstraint.cs

@@ -29 +29 @@
 namespace HeuristicLab.Constraints {
   public class OrConstraint : ConstraintBase, IViewable {
-    private ItemList clauses;
-    public ItemList Clauses {
+    private ItemList<IConstraint> clauses;
+    public ItemList<IConstraint> Clauses {
       get { return clauses; }
       set {
@@ -45 +45 @@
 
     public OrConstraint() {
-      clauses = new ItemList();
-      clauses.ItemType = typeof(IConstraint);
+      clauses = new ItemList<IConstraint>();
     }
 
@@ -52 +51 @@
       bool result = false;
       for (int i = 0 ; i < clauses.Count ; i++) {
-        result = ((IConstraint)clauses[i]).Check(data);
+        result = clauses[i].Check(data);
         if (result) return true;
       }
@@ -65 +64 @@
       OrConstraint clone = new OrConstraint();
       clonedObjects.Add(Guid, clone);
-      clone.Clauses = (ItemList)Auxiliary.Clone(Clauses, clonedObjects);
+      clone.Clauses = (ItemList<IConstraint>)Auxiliary.Clone(Clauses, clonedObjects);
       return clone;
     }
@@ -85 +84 @@
     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

trunk/sources/HeuristicLab.Constraints/OrConstraintView.Designer.cs

@@ -46 +46 @@
     /// </summary>
     private void InitializeComponent() {
-      this.clausesItemListView = new HeuristicLab.Data.ItemListView();
+      this.clausesItemListView = new HeuristicLab.Data.ItemListView<HeuristicLab.Core.IConstraint>();
       this.SuspendLayout();
       // 
@@ -73 +73 @@
     #endregion
 
-    private HeuristicLab.Data.ItemListView clausesItemListView;
+    private HeuristicLab.Data.ItemListView<HeuristicLab.Core.IConstraint> clausesItemListView;
   }
 }