Changeset 1119

Timestamp:

Feb 21, 2008, 11:27:48 PM (16 years ago)

Author:

Peter

Message:

add view_test into TESTS

Location:

trunk/test

Files:

• Makefile.am (modified) (1 diff)
• view_test.cc (modified) (2 diffs)

trunk/test/Makefile.am

@@ -40 +40 @@
   statistics_test subset_generator_test svd_test svm_test target_test \
   ttest_test \
-  utility_test vector_test
+  utility_test vector_test view_test 
 
 check_PROGRAMS = $(TESTS)
 
 # tests that fail are only built not included in check
-check_PROGRAMS += view_test 
+#check_PROGRAMS += 
 
 LDADD = @top_builddir@/$(YAT_LIB_LOCATION)/$(YAT_LIB)

trunk/test/view_test.cc

@@ -28 +28 @@
 #include "yat/utility/VectorConstView.h"
 
+#include <fstream>
 #include <iostream>
 #include <string>
 
-using namespace theplu::yat::utility;
-
-
-void f(const VectorBase& aa, VectorMutable& bb) {
-  std::cout << "f aa: " << aa << std::endl;
-  std::cout << "f bb: " << bb << std::endl;
-}
-
 int main(const int argc,const char* argv[])
 {  
+  using namespace theplu::yat::utility;
+  std::ostream* message;
+  if (argc>1 && argv[1]==std::string("-v"))
+    message = &std::cerr;
+  else {
+    message = new std::ofstream("/dev/null");
+    if (argc>1)
+      std::cout << "vector_test -v : for printing extra "  << "information\n";
+  }
+  *message << "testing vector" << std::endl;
+  bool ok = true;
 
   matrix data1;
@@ -53 +57 @@
   VectorView b=data2.column_view(0);
 
-  std::cout << "First\n";
-  f(a,b);
+  data1.column_const_view(0);
+  if (b.size()!=3){
+    ok =false;
+    *message << "ERROR: expected size to be 3 - found " << b.size() << std::endl;
+  }
+  if ( !(b(0)==1 && b(1)==(1) && b(2)==1) )
+    ok = false;
+  
 
-  std::cout << "Second\n";
-  f(a,b);
+  if (ok)
+    *message << "test is ok" << std::endl;
+  else
+    *message << "view test failed" << std::endl;
 
-  std::cout << "Third\n";
-  f(data1.column_const_view(0),b);
+  if (message!=&std::cerr)
+    delete message;
 
-  std::cout << "Fourth\n";
-  f(a,b);
-
-  std::cout << "data 2:\n" << data2 << std::endl;
+  return (ok ? 0 : -1);
 }