Changeset 3617

Timestamp:

05/05/10 01:53:45 (14 years ago)

Author:

mkommend

Message:

refactored cloning of constraints (ticket #996)

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
• RunCollectionConstraints (added)
• RunCollectionConstraints/RunCollectionComparisonConstraint.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionComparisonConstraint.cs) (2 diffs)
• RunCollectionConstraints/RunCollectionConstraintCollection.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraintCollection.cs)
• RunCollectionConstraints/RunCollectionEqualityConstraint.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionEqualityConstraint.cs) (3 diffs)
• RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionTypeCompatiblityConstraint.cs) (2 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -87 +87 @@
     <Compile Include="Algorithm.cs" />
     <Compile Include="BatchRun.cs" />
+    <Compile Include="RunCollectionConstraints\RunCollectionComparisonConstraint.cs" />
+    <Compile Include="RunCollectionConstraints\RunCollectionConstraintCollection.cs" />
+    <Compile Include="RunCollectionConstraints\RunCollectionTypeCompatiblityConstraint.cs" />
+    <Compile Include="RunCollectionConstraints\RunCollectionEqualityConstraint.cs" />
     <Compile Include="Interfaces\IAnalyzer.cs" />
-    <Compile Include="RunCollectionComparisonConstraint.cs" />
-    <Compile Include="RunCollectionConstraintCollection.cs" />
-    <Compile Include="RunCollectionTypeCompatiblityConstraint.cs" />
-    <Compile Include="RunCollectionEqualityConstraint.cs" />
     <Compile Include="Interfaces\ISingleObjectiveReplacer.cs" />
     <Compile Include="Interfaces\IMigrator.cs" />

trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Data;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Optimization {
@@ -123 +124 @@
       return s;
     }
+
+    public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
+      RunCollectionComparisonConstraint clone = (RunCollectionComparisonConstraint)base.Clone(cloner);
+      clone.ConstrainedValue = null;
+
+      IItem constraintDataItem = this.ConstraintData as IItem;
+      ICloneable constraintDataCloneable = this.ConstraintData as ICloneable;
+      if (constraintDataItem != null)
+        clone.ConstraintData = (IStringConvertibleValue)cloner.Clone(constraintDataItem);
+      else if (constraintDataCloneable != null)
+        clone.ConstraintData = (IStringConvertibleValue)constraintDataCloneable.Clone();
+      else
+        clone.ConstraintData = this.ConstraintData;
+
+      clone.ConstraintOperation = this.ConstraintOperation;
+      clone.constraintColumn = this.constraintColumn;
+
+      return clone;
+    }
   }
 }

trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionEqualityConstraint.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Data;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Optimization {
@@ -52 +53 @@
 
     public new string ConstraintData {
-      get { return (string) base.ConstraintData;}
-      set { base.ConstraintData = value;}
+      get { return (string)base.ConstraintData; }
+      set { base.ConstraintData = value; }
     }
 
@@ -121 +122 @@
       return s;
     }
+
+    public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
+      RunCollectionEqualityConstraint clone = (RunCollectionEqualityConstraint)base.Clone(cloner);
+      clone.ConstrainedValue = null;
+      clone.ConstraintData = this.ConstraintData;
+      clone.ConstraintOperation = this.ConstraintOperation;
+      clone.constraintColumn = this.constraintColumn;
+
+      return clone;
+    }
   }
 }

trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Data;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Optimization {
@@ -113 +114 @@
       return s;
     }
+
+    public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
+      RunCollectionTypeCompatibilityConstraint clone = (RunCollectionTypeCompatibilityConstraint)base.Clone(cloner);
+      clone.ConstrainedValue = null;
+      clone.ConstraintData = this.ConstraintData;
+      clone.ConstraintOperation = this.ConstraintOperation;
+      clone.constraintColumn = this.constraintColumn;
+
+      return clone;
+    }
   }
 }