Changeset 7548 for branches/GeneralizedQAP/UnitTests

Timestamp:

03/05/12 16:30:27 (13 years ago)

Author:

abeham

Message:

#1614: changed according to architects review

Location:

branches/GeneralizedQAP/UnitTests

Files:

• CordeauCrossoverTest.cs (modified) (1 diff)
• CordeauGQAPInstanceProviderTest.cs (modified) (1 diff)
• ElloumiCTAPInstanceProviderTest.cs (modified) (1 diff)
• QAPLIBInstanceProviderTest.cs (modified) (2 diffs)
• TSPLIBInstanceProviderTest.cs (modified) (3 diffs)

branches/GeneralizedQAP/UnitTests/CordeauCrossoverTest.cs

@@ -34 +34 @@
     public void CordeauCrossoverFunctionalityTest() {
       var provider = new CordeauGQAPInstanceProvider();
-      var instance = provider.LoadInstance(provider.GetInstanceDescriptors().First());
+      var instance = provider.LoadData(provider.GetDataDescriptors().First());
       var gqap = new GeneralizedQuadraticAssignmentProblem();
-      gqap.LoadFrom(instance);
+      gqap.Load(instance);
 
       var random = new MersenneTwister();

branches/GeneralizedQAP/UnitTests/CordeauGQAPInstanceProviderTest.cs

@@ -34 +34 @@
       StringBuilder erroneousInstances = new StringBuilder();
       int count = 0;
-      foreach (var id in target.GetInstanceDescriptors()) {
+      foreach (var id in target.GetDataDescriptors()) {
         try {
-          target.LoadInstance(id);
+          target.LoadData(id);
         } catch (Exception ex) {
           erroneousInstances.AppendLine(id.Name + ": " + ex.Message);

branches/GeneralizedQAP/UnitTests/ElloumiCTAPInstanceProviderTest.cs

@@ -34 +34 @@
       StringBuilder erroneousInstances = new StringBuilder();
       int count = 0;
-      foreach (var id in target.GetInstanceDescriptors()) {
+      foreach (var id in target.GetDataDescriptors()) {
         try {
-          target.LoadInstance(id);
+          target.LoadData(id);
         } catch (Exception ex) {
           erroneousInstances.AppendLine(id.Name + ": " + ex.Message);

branches/GeneralizedQAP/UnitTests/QAPLIBInstanceProviderTest.cs

@@ -35 +35 @@
       StringBuilder erroneousInstances = new StringBuilder();
       int count = 0;
-      foreach (var id in target.GetInstanceDescriptors()) {
+      foreach (var id in target.GetDataDescriptors()) {
         try {
-          target.LoadInstance(id);
+          target.LoadData(id);
         } catch (Exception ex) {
           erroneousInstances.AppendLine(id.Name + ": " + ex.Message);
@@ -54 +54 @@
       List<string> nonZeroDiagonalInstances = new List<string>();
       var target = new QAPLIBInstanceProvider();
-      foreach (var id in target.GetInstanceDescriptors()) {
-        var instance = target.LoadInstance(id);
+      foreach (var id in target.GetDataDescriptors()) {
+        var instance = target.LoadData(id);
         for (int i = 0; i < instance.Dimension; i++)
           if (instance.Distances[i, i] != 0 || instance.Weights[i, i] != 0) {

branches/GeneralizedQAP/UnitTests/TSPLIBInstanceProviderTest.cs

@@ -34 +34 @@
       StringBuilder erroneousInstances = new StringBuilder();
       int count = 0;
-      foreach (var id in target.GetInstanceDescriptors()) {
+      foreach (var id in target.GetDataDescriptors()) {
         try {
-          target.LoadInstance(id);
+          target.LoadData(id);
         } catch (Exception ex) {
           erroneousInstances.AppendLine(id.Name + ": " + ex.Message);
@@ -51 +51 @@
       StringBuilder erroneousInstances = new StringBuilder();
       int count = 0;
-      foreach (var id in target.GetInstanceDescriptors()) {
+      foreach (var id in target.GetDataDescriptors()) {
         try {
-          target.LoadInstance(id);
+          target.LoadData(id);
         } catch (Exception ex) {
           erroneousInstances.AppendLine(id.Name + ": " + ex.Message);
@@ -68 +68 @@
       StringBuilder erroneousInstances = new StringBuilder();
       int count = 0;
-      foreach (var id in target.GetInstanceDescriptors()) {
+      foreach (var id in target.GetDataDescriptors()) {
         try {
-          target.LoadInstance(id);
+          target.LoadData(id);
         } catch (Exception ex) {
           erroneousInstances.AppendLine(id.Name + ": " + ex.Message);