Changeset 8086 for branches/ScatterSearch (trunk integration)/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs

Timestamp:

06/22/12 11:11:38 (12 years ago)

Author:

jkarder

Message:

#1331:

• synced branch with trunk
• added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
• similarity calculators are now parameterized by the algorithm
• deleted SolutionPool2TierUpdateMethod
• deleted KnapsackMultipleGuidesPathRelinker
• moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
• added parameter descriptions
• fixed plugin references
• fixed count of EvaluatedSolutions
• fixed check for duplicate solutions
• minor code improvements

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.Tests (modified) (2 props)
• HeuristicLab.Tests/HeuristicLab-3.3 (modified) (4 props)
• HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs (modified) (2 diffs)

branches/ScatterSearch (trunk integration)

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

branches/ScatterSearch (trunk integration)/HeuristicLab.Tests

@@ -3 +3 @@
 HeuristicLab.Tests.csproj.user
 *.vs10x
+_ReSharper.HeuristicLab 3.3 Tests

@@ -3 +3 @@
 HeuristicLab.Tests.csproj.user
 *.vs10x
+_ReSharper.HeuristicLab 3.3 Tests

branches/ScatterSearch (trunk integration)/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs

@@ -122 +122 @@
         catch { continue; } // no default constructor
 
-        var clone = (IDeepCloneable)item.Clone(new Cloner());
+        IDeepCloneable clone = null;
+        try {
+          clone = (IDeepCloneable)item.Clone(new Cloner());
+        }
+        catch (Exception e) {
+          TestContext.WriteLine(Environment.NewLine + deepCloneableType.FullName + ":");
+          TestContext.WriteLine("ERROR! " + e.GetType().Name + @" was thrown during cloning.
+All IDeepCloneable items with a default constructor should be cloneable when using that constructor!");
+          success = false;
+          continue;
+        }
         var intersections = CheckTotalInequality(item, clone).Where(x => x.GetType().FullName.StartsWith("HeuristicLab"));
         if (!intersections.Any()) continue;
@@ -136 +146 @@
       var clonedObjects = new HashSet<object>(clone.GetObjectGraphObjects(excludeStaticMembers: true).Where(x => !x.GetType().IsValueType), new ReferenceEqualityComparer());
 
-      return originalObjects.Intersect(clonedObjects);
+      return originalObjects.Intersect(clonedObjects, new ReferenceEqualityComparer());
     }
 

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -3 +3 @@
 HeuristicLab.Tests.csproj.user
 *.vs10x
+_ReSharper.HeuristicLab 3.3 Tests