Changeset 265 for bdm/stat/libDS.cpp

Timestamp:

02/09/09 23:14:58 (15 years ago)

Author:

smidl

Message:

UI in matlab

Files:

• bdm/stat/libDS.cpp (modified) (3 diffs)

bdm/stat/libDS.cpp

@@ -44 +44 @@
 void ArxDS::step() {
         double tmp;
+        //shift history
+        H.shift_right ( 0, Drv.count() +Urv.count() );
+
+        H.set_subvector ( Drv.count(), U ); // write U after Drv
+
         //get regressor
         rgr = rgrlnk.get_val ( H );
         // Eval Y
-        Y = model.samplecond ( rgr,tmp );
+        H.set_subvector ( 0, model.samplecond ( rgr,tmp ) );
 
-        //shift history
-        H.shift_right ( 0, Drv.count() +Urv.count() );
-        //fill new data
-        H.set_subvector ( Drv.count(),Y );
-
-        //Leaving U.length() empty slots - these will be filled by write()
 }
 
@@ -60 +59 @@
 RV fullrgr ( const RV &drv0, const RV &urv0, const RV &rrv0 ) {
         RV T ( urv0 );
-        RV pom = concat(drv0, urv0);
+        RV pom = concat ( drv0, urv0 );
         int mint = rrv0.mint();
         for ( int i=0; i>mint; i-- ) {
@@ -69 +68 @@
 }
 
-ArxDS::ArxDS ( RV &drv, RV &urv, RV &rrv ) : 
-                DS(drv,urv), Rrv(rrv), Hrv( fullrgr ( drv,urv,rrv )), //RVs
-                Y(drv.count()), H(Hrv.count()) ,rgr ( rrv.count() ),  //tmp variables
-                rgrlnk (Hrv ,rrv ) ,model ( drv,rrv ) {
+ArxDS::ArxDS ( RV &drv, RV &urv, RV &rrv ) :
+                DS ( drv,urv ), Rrv ( rrv ), Hrv ( concat(drv,fullrgr ( drv,urv,rrv )) ), //RVs
+                H ( Hrv.count() ) ,U ( urv.count() ),rgr ( rrv.count() ),  //tmp variables
+                rgrlnk ( rrv, Hrv ) ,model ( drv,rrv ) {
 }