Changeset 10104 for branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests

Timestamp:

11/04/13 10:18:18 (11 years ago)

Author:

ascheibe

Message:

#1886 fixed RealVectorEqualityComparer and added unit tests for caches

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests

Files:

• AlgorithmBehaviorUnitTests.csproj (modified) (2 diffs)
• PermutationCacheTest.cs (modified) (1 diff)
• RealVectorSolutionCacheTest.cs (added)

branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests/AlgorithmBehaviorUnitTests.csproj

@@ -48 +48 @@
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -86 +91 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ConvexHullTest.cs" />
+    <Compile Include="RealVectorSolutionCacheTest.cs" />
   </ItemGroup>
   <ItemGroup>

branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests/PermutationCacheTest.cs

@@ -34 +34 @@
       PermutationEqualityComparer comp = new PermutationEqualityComparer();
       PermutationSolutionCache dict = new PermutationSolutionCache();
-      int realDuplicates = 0;
-      int noDuplicates = 0;
+      int nrOfPermutations = 200;
 
-      Permutation[] permutations = new Permutation[500];
-      for (int i = 0; i < permutations.Length; i += 2) {
+
+      for (int i = 0; i < nrOfPermutations; i++) {
         var p = new Permutation(PermutationTypes.RelativeUndirected, 21, rand);
-        permutations[i] = p;
-        permutations[i + 1] = p;
 
+        //should be added
         PermutationSolutionInformation pi = new PermutationSolutionInformation();
-        pi.Generation = rand.Next(0, 100);
+        pi.Generation = 9;
         pi.ProducedBy = ProducedBy.Mutation;
+        dict.Add(p, pi);
 
+        //should be added
+        pi = new PermutationSolutionInformation();
+        pi.Generation = 10;
+        pi.ProducedBy = ProducedBy.Mutation;
+        dict.Add(p, pi);
+
+        //should be added
+        pi = new PermutationSolutionInformation();
+        pi.Generation = 10;
+        pi.ProducedBy = ProducedBy.Crossover;
+        dict.Add(p, pi);
+
+        //should not be added
+        pi = new PermutationSolutionInformation();
+        pi.Generation = 10;
+        pi.ProducedBy = ProducedBy.Mutation;
         dict.Add(p, pi);
       }
 
-      for (int i = 0; i < permutations.Length; i++) {
-        for (int j = i + 1; j < permutations.Length; j++) {
-          if (comp.Equals(permutations[i], permutations[j])) {
-            realDuplicates++;
-            break;
-          }
-        }
+      foreach (var value in dict.Values()) {
+        Assert.AreEqual(3, value.Count);
       }
 
-      for (int i = 0; i < dict.SolutionDictionary.Keys.Count; i++) {
-        for (int j = i + 1; j < dict.SolutionDictionary.Keys.Count; j++) {
-          if (comp.Equals(dict.SolutionDictionary.Keys.ElementAt(i), dict.SolutionDictionary.Keys.ElementAt(j))) {
-            noDuplicates++;
-            break;
-          }
-        }
+      foreach (var key in dict.Keys()) {
+        int cnt = dict.Keys().Count(x => comp.Equals(key, x));
+        Assert.AreEqual(1, cnt);
       }
-
-      Assert.AreNotEqual(0, realDuplicates);
-      Assert.AreEqual(0, noDuplicates);
-      Assert.AreEqual(250, dict.SolutionDictionary.Keys.Count);
     }
   }