Changeset 564

Timestamp:

08/19/09 11:17:56 (15 years ago)

Author:

vbarta

Message:

reserving vector space in rectangular_support::get_vec

Location:

library

Files:

• bdm/stat/discrete.h (modified) (1 diff)
• tests/rectangular_support_test.cpp (modified) (2 diffs)

library/bdm/stat/discrete.h

@@ -69 +69 @@
                         //! return vector at position given by vector of indeces
                         vec get_vec(const ivec &inds){
-                                vec v;
+                                vec v ( dim );
                                 for ( int j = 0; j < dim; j++ ) {
                                         it_assert_debug(inds(j)<gridsizes(j), "Index out of bounds");

library/tests/rectangular_support_test.cpp

@@ -2 +2 @@
 #include "mat_checks.h"
 #include "UnitTest++.h"
+
+const double epsilon = 0.00001;
 
 using namespace bdm;
@@ -8 +10 @@
         rectangular_support rs;
         CHECK_EQUAL ( rs.first_vec(), vec ( 0 ) );
+
+        Array<vec> range ( 2 );
+        range ( 0 ) = vec ( "0 1" );
+        range ( 1 ) = vec ( "-1 1" );
+        ivec gridsize ( 2 );
+        gridsize ( 0 ) = 10;
+        gridsize ( 1 ) = 20;
+        rs.set_parameters ( range, gridsize );
+        CHECK_EQUAL ( 200, rs.points() );
+
+        vec v = rs.get_vec ( ivec ( "1 2") );
+        CHECK_CLOSE (vec ( "0.15 -0.75" ), v, epsilon );
 }