Changeset 624

Timestamp:

09/18/09 00:17:02 (15 years ago)

Author:

smidl

Message:

RV accepts size=-1 as 'already existing size'

Location:

library/bdm/base

Files:

• bdmbase.cpp (modified) (1 diff)
• bdmbase.h (modified) (2 diffs)

library/bdm/base/bdmbase.cpp

@@ -49 +49 @@
                 NAMES ( id ) = name;
                 SIZES ( id ) = size;
+                bdm_assert(size>0, "RV "+ name +" does not exists. Default size (-1) can not be assigned ");
         } else {
                 id = iter->second;
-                bdm_assert_debug ( SIZES ( id ) == size, "RV " + name + " of different size already exists" );
+                if (size>0){
+                        bdm_assert ( SIZES ( id ) == size, "RV " + name + " of different size already exists" );
+                }
         }
         return id;

library/bdm/base/bdmbase.h

@@ -273 +273 @@
 
         \code
-        rv = {
-            class = "RV"; // class name
-          // UNIQUE IDENTIFIER same names = same variable
-          names = ( "a", "b", "c", ...);   // which will be used e.g. in loggers
-
-          //optional arguments
-          sizes = [1, 2, 3, ...];         // (optional) default = ones()
-          times = [-1, -2, 0, ...];       // time shifts with respect to current time (optional) default = zeros()
-        }
+        class = 'RV';                   
+        names = {'a', 'b', 'c', ...};   // UNIQUE IDENTIFIER same names = same variable
+                                                                        // names are also used when storing results 
+        --- optional ---
+        sizes = [1, 2, 3, ...];         // size of each name. default = ones()
+                                                                        // if size = -1, it is found out from previous instances of the same name
+        times = [-1, -2, 0, ...];       // time shifts with respect to current time, default = zeros()
         \endcode
         */
@@ -737 +735 @@
                 ivec valid_ids = rv.findself_ids ( rv_up );
                 RV rv_hist = rv.subselect ( find ( valid_ids >= 0 ) ); // select only rvs that are in rv_up
-          RV rv_hist0 =rv_hist.remove_time();  // these RVs will form history at time =0
-          v2h_up = rv_hist0.dataind(rv_up); // indeces of elements of rv_up to be copied
-          // now we need to know what is needed from Up
+                RV rv_hist0 =rv_hist.remove_time();  // these RVs will form history at time =0
+                // now we need to know what is needed from Up
                 rv_hist = rv_hist.expand_delayes(); // full regressor - including time 0
-          Hrv=rv_hist.subt(rv_hist0);   // remove time 0
+                Hrv=rv_hist.subt(rv_hist0);   // remove time 0
                 history = zeros ( Hrv._dsize() );
 
+                // decide if we need to copy val to history
+                if (Hrv._dsize() >0) {
+                        v2h_up = rv_hist0.dataind(rv_up); // indeces of elements of rv_up to be copied
+                } // else v2h_up is empty
+                
                 Hrv.dataind ( rv, h2v_hist, h2v_down );