Changeset 1009 for trunk/test

Timestamp:

Feb 1, 2008, 5:15:44 AM (15 years ago)

Author:

Peter

Message:

merging branch peter-dev into trunk delta 1008:994

Location:

trunk/test

Files:

• matrix_test.cc (modified) (4 diffs)
• score_test.cc (modified) (3 diffs)
• vector_test.cc (modified) (8 diffs)

trunk/test/matrix_test.cc

@@ -36 +36 @@
     : m_(i,j,value) {}
 
-  inline theplu::yat::utility::vector
-  row(const size_t& i) { return theplu::yat::utility::vector(m_,i); }
+  inline theplu::yat::utility::vectorView
+  row(const size_t& i) { return m_.row_vec(i); }
 
   inline const theplu::yat::utility::matrix& matrix(void) const { return m_; }
@@ -258 +258 @@
     for (size_t j=0; j<m5.columns(); ++j)
       m5_sum2+=m5(i,j);
-  utility::vector v5subrow(m5,3);
+  utility::vectorView v5subrow(m5,3);
   double v5subrow_sum=0;
   for (size_t i=0; i<v5subrow.size(); ++i) {
@@ -280 +280 @@
     for (size_t j=0; j<m5.columns(); ++j)
       m5_sum3+=m5(i,j);
-  utility::vector v5subcolumn(m5,0,false);
+  utility::vectorView v5subcolumn = m5.column_vec(0);
   double v5subcolumn_sum=0;
   for (size_t i=0; i<v5subcolumn.size(); ++i) {
@@ -332 +332 @@
   *error << "\tthat class member returns a view" << std::endl;
   matrixwrapper mw(5,2);
-  utility::vector mwrow=mw.row(2);
+  utility::vectorView mwrow=mw.row(2);
   if (mwrow.gsl_vector_p()->data != &(mw.matrix()(2,0))) {
     ok=false;

trunk/test/score_test.cc

@@ -32 +32 @@
 #include "yat/utility/matrix.h"
 #include "yat/utility/vector.h"
+#include "yat/utility/vectorView.h"
 
 #include <cmath>
@@ -92 +93 @@
   const double tol = 0.001;
   for (size_t i=0; i<data.rows(); i++){
-    utility::vector vec(data,i);
+    utility::vectorView vec(data,i);
     if (vec.size()!=target2.size()){
       *error << "vec.size() is " << vec.size() << " and target2.size() is " 
@@ -108 +109 @@
   utility::vector weight(target2.size(),1);
   for (size_t i=0; i<data.rows(); i++){
-    utility::vector vec(data,i);
+    utility::vectorView vec = data.row_vec(i);
     area = auc.score(target2, vec, weight);
     if (area<correct_area(i)-tol || area>correct_area(i)+tol){

trunk/test/vector_test.cc

@@ -29 +29 @@
 #include "yat/utility/utility.h"
 #include "yat/utility/vector.h"
+#include "yat/utility/vectorView.h"
 
 #include <fstream>
@@ -73 +74 @@
   for (size_t i=0; i<vec.size(); i+=2) 
     sum_before+=vec[i];
-  utility::vector vec_view(vec,0,6,2);
+  utility::vectorView vec_view(vec,0,6,2);
   sum_after=utility::sum(vec_view);
   ok &= (sum_after==sum_before);
@@ -87 +88 @@
     *message << "const view implementation" << std::endl;
     const utility::vector vv(10,3.0);
-    utility::vector vview(vv,0,5,1);
+    utility::vectorView vview(vv,0,5,1);
     // const utility::vector vview(vv,0,5,1); // this is the proper line
     utility::vector vv2(5,2.0);
@@ -113 +114 @@
     ok &= (vec_view.size()==vec3.size());
     ok &= (vec3 == vec_view);
-    ok &= (&vec3 != &vec_view);
     ok &= !vec3.isview();
   }
 
+  /* different sizes are allowed in new design
   // checking that assignment operator throws an exception if vectors
   // differ in size
@@ -140 +141 @@
     gsl_set_error_handler(err_handler);
   }
+  */
 
   // checking that assignment operator changes the underlying object when
@@ -146 +148 @@
     *message << "assignment operator on view" << std::endl;
     vec[3]=vec[4]=vec[5]=13;
-    utility::vector vec_view(vec,3,3,1);
+    utility::vectorView vec_view(vec,3,3,1);
     utility::vector vec2(3,123.0);
     vec_view=vec2;
-    if (vec[3]!=vec_view[0] || vec[4]!=vec_view[1] || vec[5]!=vec_view[2])
-      ok=false;
+    if (vec[3]!=vec_view[0] || vec[4]!=vec_view[1] || vec[5]!=vec_view[2]){
+      *message << " failed\n";
+      ok=false;
+    }
   }
 
@@ -159 +163 @@
     *message << "\tcloning normal vector" << std::endl;
     utility::vector vec2(3,123.0);
-    vec2.clone(vec);
+    vec2 = vec;
     if (vec.size()!=vec2.size())
       this_ok=false;
@@ -169 +173 @@
       this_ok=false;
     *message << "\tcloning vector view" << std::endl;
-    utility::vector* vec_view=new utility::vector(vec,3,3,1);
-    utility::vector vec_view2;
-    vec_view2.clone(*vec_view);
+    utility::vectorView* vec_view=new utility::vectorView(vec,3,3,1);
+    utility::vectorView vec_view2(*vec_view);
     if (!vec_view2.isview())
       this_ok=false;