Changeset 895 for library/bdm/base/datasources.h

Timestamp:

04/08/10 16:01:03 (14 years ago)

Author:

smidl

Message:

get rid of Yrv in DS

Files:

• library/bdm/base/datasources.h (modified) (4 diffs)

library/bdm/base/datasources.h

@@ -97 +97 @@
                 set_drv ( *r, RV() ); //empty urv
                 dtsize = r->_dsize();
-                ytsize = dtsize;
                 utsize = 0;
         }
@@ -219 +218 @@
                 dt =  zeros ( iepdf->dimension() );
                 dtsize = dt.length();
-                ytsize = dt.length();
                 set_drv ( iepdf->_rv(), RV() );
                 utsize = 0;
@@ -281 +279 @@
                 ipdf = UI::build<pdf> ( set, "pdf", UI::compulsory );
 
-                Yrv = ipdf->_rv();
+                RV Yrv = ipdf->_rv();
                 // get unique rvs form rvc
                 RV rgrv0 = ipdf->_rvc().remove_time();
                 // input is what in not in Yrv
                 Urv = rgrv0.subt ( Yrv );
-                set_drv ( Yrv, Urv );
+                set_drv ( concat(Yrv,Urv), Urv );
                 // connect input and output to rvc
                 ut2rgr.set_connection ( ipdf->_rvc(), Urv );
@@ -308 +306 @@
                 ut = zeros ( Urv._dsize() );
 
-                ytsize = yt.length();
                 utsize = ut.length();
-                dtsize = ytsize + utsize;
+                dtsize = yt.length() + utsize;
         }