Changeset 2846

Timestamp:

Sep 22, 2012, 11:30:55 AM (11 years ago)

Author:

Peter

Message:

Merged r2845 into 0.9.x branch and marked alignment.test as XFAIL. refs #724.

Location:

branches/0.9-stable

Files:

• . (modified) (1 prop)
• test/Makefile.am (modified) (1 diff)
• test/alignment.cc (modified) (1 diff)

branches/0.9-stable/test/Makefile.am

@@ -68 +68 @@
 
 # tests not passing through yet
-XFAIL_TESTS =
+XFAIL_TESTS = test/alignment.test
 
 DISTRIBUTED_TESTS = \

branches/0.9-stable/test/alignment.cc

@@ -101 +101 @@
   s >> peaksets;
 
+  utility::Matrix nm_score(peaksets.size(), peaksets.size(), 0);
+  utility::Matrix correct(nm_score);
   for (size_t i=0; i<peaksets.size()-1; i++) 
     for (size_t j=i+1; j<peaksets.size(); j++) {
       utility::Matrix dot_m;
       std::vector<std::pair<size_t,size_t> > path;
-      score(peaksets[i], peaksets[j], 1.0, dot_m, path);
+      nm_score(i,j) = score(peaksets[i], peaksets[j], 1.0, dot_m, path);
+      if (i==2 && j==3) {
+        for (size_t r=0; r<dot_m.rows(); ++r)
+          for (size_t c=0; c<dot_m.columns(); ++c)
+            if (dot_m(r,c) > 1e-5)
+              std::cerr << r << " " << c << " " << dot_m(r,c) << "\n";
+      }
     }
+  correct(0,1) = 4.947983;
+  correct(0,2) = 3.496081;
+  correct(0,3) = 4.960331;
+  correct(1,2) = 2.486868;
+  correct(1,3) = 11.407001;
+  correct(2,3) = 2.503420;
+
+  suite.add(suite.equal_range_fix(nm_score.begin(), nm_score.end(),
+                                  correct.begin(), 1e-6));
 
   std::string a("AGGUUGUCCGUGGUGAGUUCGCA");