Changeset 784

Timestamp:

Mar 6, 2007, 5:02:30 PM (17 years ago)

Author:

Jari Häkkinen

Message:

References #155. Removed potential null pointer usage. Some unwanted asserts removed.

Location:

trunk

Files:

• test/vector_test.cc (modified) (1 diff)
• yat/utility/vector.cc (modified) (5 diffs)

trunk/test/vector_test.cc

@@ -173 +173 @@
     ok=false;
 
+  // test of const view implementation (make sure no zero pointer used.
+  const utility::vector vv(10,3.0);
+  const utility::vector vview(vv,0,5,1);
+  utility::vector vv2(5,2.0);
+  vv2.mul(vview); // should work without an abort due to zero pointer in mul
+  vv2.div(vview); // should work without an abort due to zero pointer in mul
+
   return (ok ? 0 : -1);
 }

trunk/yat/utility/vector.cc

@@ -212 +212 @@
   void vector::div(const vector& other)
   {
-    assert(v_); assert(other.v_);
-    int status=gsl_vector_div(v_,other.v_);
+    assert(v_);
+    int status=gsl_vector_div(v_,other.gsl_vector_p());
     if (status)
       throw utility::GSL_error(std::string("vector::div",status));
@@ -239 +239 @@
   void vector::mul(const vector& other)
   {
-    assert(v_); assert(other.v_);
-    int status=gsl_vector_mul(v_,other.v_);
+    assert(v_);
+    int status=gsl_vector_mul(v_,other.gsl_vector_p());
     if (status)
       throw utility::GSL_error(std::string("vector::mul",status));
@@ -255 +255 @@
   void vector::set(const vector& vec)
   {
-    assert(v_); assert(vec.v_);
-    if (gsl_vector_memcpy(v_,vec.v_))
+    assert(v_);
+    if (gsl_vector_memcpy(v_,vec.gsl_vector_p()))
       throw utility::GSL_error("vector::set dimension mis-match");
   }
@@ -357 +357 @@
   {
     assert(v_);
-    int status=gsl_vector_add(v_, other.v_);
+    int status=gsl_vector_add(v_, other.gsl_vector_p());
     if (status)
       throw utility::GSL_error(std::string("vector::add", status));
@@ -375 +375 @@
   {
     assert(v_);
-    int status=gsl_vector_sub(v_, other.v_);
+    int status=gsl_vector_sub(v_, other.gsl_vector_p());
     if (status)
       throw utility::GSL_error(std::string("vector::sub", status));