Changeset 8086 for branches/ScatterSearch (trunk integration)/HeuristicLab.Tests/HeuristicLab.Problems.Instances-3.3

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.Problems.Instances-3.3/CordeauGQAPInstanceProviderTest.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.Instances-3.3/ElloumiCTAPInstanceProviderTest.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Problems.Instances-3.3/QAPLIBInstanceProviderTest.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.Instances-3.3/TSPLIBInstanceProviderTest.cs (modified) (4 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.Problems.Instances-3.3/CordeauGQAPInstanceProviderTest.cs

@@ -25 +25 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace UnitTests {
+namespace HeuristicLab.Problems.Instances_33.Tests {
   [TestClass()]
   public class CordeauGQAPInstanceProviderTest {
@@ -37 +37 @@
         try {
           target.LoadData(id);
-        } catch (Exception ex) {
+        }
+        catch (Exception ex) {
           erroneousInstances.AppendLine(id.Name + ": " + ex.Message);
         }

branches/ScatterSearch (trunk integration)/HeuristicLab.Tests/HeuristicLab.Problems.Instances-3.3/ElloumiCTAPInstanceProviderTest.cs

@@ -25 +25 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace UnitTests {
+namespace HeuristicLab.Problems.Instances_33.Tests {
   [TestClass()]
   public class ElloumiCTAPInstanceProviderTest {

branches/ScatterSearch (trunk integration)/HeuristicLab.Tests/HeuristicLab.Problems.Instances-3.3/QAPLIBInstanceProviderTest.cs

@@ -25 +25 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace UnitTests {
+namespace HeuristicLab.Problems.Instances_33.Tests {
   [TestClass()]
   public class QAPLIBInstanceProviderTest {
@@ -37 +37 @@
         try {
           target.LoadData(id);
-        } catch (Exception ex) {
+        }
+        catch (Exception ex) {
           erroneousInstances.AppendLine(id.Name + ": " + ex.Message);
         }

branches/ScatterSearch (trunk integration)/HeuristicLab.Tests/HeuristicLab.Problems.Instances-3.3/TSPLIBInstanceProviderTest.cs

@@ -20 +20 @@
 #endregion
 
+
 using System;
 using System.Text;
 using HeuristicLab.Problems.Instances.TSPLIB;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests {
+namespace HeuristicLab.Problems.Instances_33.Tests {
   [TestClass()]
   public class TSPLIBInstanceProviderTest {
@@ -37 +37 @@
         try {
           target.LoadData(id);
-        } catch (Exception ex) {
+        }
+        catch (Exception ex) {
           erroneousInstances.AppendLine(id.Name + ": " + ex.Message);
         }
@@ -54 +55 @@
         try {
           target.LoadData(id);
-        } catch (Exception ex) {
+        }
+        catch (Exception ex) {
           erroneousInstances.AppendLine(id.Name + ": " + ex.Message);
         }
@@ -71 +73 @@
         try {
           target.LoadData(id);
-        } catch (Exception ex) {
+        }
+        catch (Exception ex) {
           erroneousInstances.AppendLine(id.Name + ": " + ex.Message);
         }

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

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