Changeset 18

Timestamp:

02/01/08 10:49:29 (17 years ago)

Author:

smidl

Message:

update

Files:

• Makefile (modified) (1 diff)
• bdm/Makefile (modified) (2 diffs)
• bdm/design/Makefile (modified) (1 diff)
• bdm/estim/Makefile (modified) (1 diff)
• bdm/math/Makefile (modified) (1 diff)
• bdm/math/libDC.cpp (modified) (3 diffs)
• bdm/stat/Makefile (modified) (1 diff)
• bdm/stat/libBM.h (modified) (1 diff)
• bdm/stat/libDS.cpp (added)
• bdm/stat/libDS.h (added)
• mixpp.kdevelop (modified) (2 diffs)
• mixpp.kdevelop.filelist (modified) (1 diff)
• tests/Makefile (modified) (2 diffs)
• tests/test0.cpp (modified) (1 diff)
• tests/testKF.cpp (modified) (2 diffs)

Makefile

@@ -1 @@
-export LDFLAGS=-Ldebug/usr/lib/ -litpp 
+export LDLIBS=-litpp_debug
 export CPPFLAGS=-g
 

bdm/Makefile

@@ -1 @@
-CPPFLAGS = -g
-
-
-export CPPFLAGS
-
 all: subsystem libbdm.a
 
@@ -13 +8 @@
 
 clean:
+        $(RM) *.o *.a
         cd stat && $(MAKE) clean
         cd estim && $(MAKE) clean
-        cd design && $(MAKE) clean
+#       cd design && $(MAKE) clean
         cd math && $(MAKE) clean
 
-libbdm.a: itpp_ext.o
+libbdm.a: itpp_ext.o subsystem
         $(AR) rvus $@ ./stat/*.o ./estim/*.o  ./math/*.o itpp_ext.o

bdm/design/Makefile

@@ -1 +1 @@
 all:
+
+clean:
+        $(RM) *.o

bdm/estim/Makefile

@@ -2 +2 @@
 
 clean:
-        rm *.o
+        $(RM) *.o

bdm/math/Makefile

@@ -2 +2 @@
 
 clean:
-        rm *.o
+        $(RM) *.o

bdm/math/libDC.cpp

@@ -31 +31 @@
 
         dim = V.cols();
+        mat F;
+        vec D0;
         it_assert_debug( dim == V.rows(),"ldmat::ldmat matrix V is not square!" );
-
         
+        //decompose V in cholesky
+        D0 = ones(dim);
+        
+
+        using std::cout;
+        cout<<V;
+        chol(V,F);
+        // L and D will be allocated by ldform()
+        this->ldform(F,D0);     
 }
 
@@ -194 +204 @@
 
         it_assert_debug( A.cols()==dim,"ldmat::ldform A is not compatible" );
-        it_assert_debug( D.length()==A.rows(),"ldmat::ldform Vector D must have the length as row count of A" );
+        it_assert_debug( D0.length()==A.rows(),"ldmat::ldform Vector D must have the length as row count of A" );
 
         L=concat_vertical( zeros( n,n ), diag( sqrt( D0 ) )*A );
@@ -202 +212 @@
         
         vec w=zeros( n );
-        vec v;
+        vec v=zeros(n);
         double sum, beta, pom;
 

bdm/stat/Makefile

@@ -3 +3 @@
 
 clean:
-        rm *.o
+        $(RM) *.o

bdm/stat/libBM.h

@@ -112 +112 @@
 };
 
+/*! \brief Abstract class for discrete-time sources of data.
+
+The class abstracts operations of: (i) data aquisition, (ii) data-preprocessing, (iii) scaling of data, and (iv) data resampling from the task of estimation and control.
+Moreover, for controlled systems, it is able to receive the desired control action and perform it in the next step. (Or as soon as possible).
+
+*/
+class DS {
+        //!Observed variables, returned by \c getdata().
+        RV Drv; 
+        //!Action variables, accepted by \c write().
+        RV Urv; //
+public:
+        //! Returns full vector of observed data 
+        void getdata(vec &dt);
+        //! Returns data records at indeces.
+        void getdata(vec &dt, ivec &indeces);
+        //! Accepts action variable and schedule it for application.
+        void write(vec &ut);
+        //! Accepts action variables at specific indeces        
+        void write(vec &ut, ivec &indeces);
+        /*! \brief Method that assigns random variables to the datasource. 
+        Typically, the datasource will be constructed without knowledge of random variables. This method will associate existing variables with RVs.
+        
+        (Inherited from m3k, may be deprecated soon).
+        */
+        void linkrvs(RV &drv, RV &urv);
+        
+        //! Moves from $t$ to $t+1$, i.e. perfroms the actions and reads response of the system. 
+        void step();
+};
 
 

mixpp.kdevelop

@@ -18 +18 @@
     <run>
       <directoryradio>executable</directoryradio>
-      <mainprogram>/home/smidl/work/mixpp/tests/testKF</mainprogram>
+      <mainprogram>/home/smidl/work/mixpp/tests/test0</mainprogram>
       <programargs></programargs>
       <globaldebugarguments></globaldebugarguments>
@@ -222 +222 @@
     <tree>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <hidenonprojectfiles>true</hidenonprojectfiles>
       <showvcsfields>false</showvcsfields>
     </tree>

mixpp.kdevelop.filelist

@@ -22 +22 @@
 bdm/stat/libBM.cpp
 bdm/stat/libBM.h
+bdm/stat/libDS.cpp
+bdm/stat/libDS.h
 bdm/stat/libEF.cpp
 bdm/stat/libEF.h

tests/Makefile

@@ -1 @@
-LDFLAGS = -L../bdm
-LDLIBS = -lbdm -litpp
+LDFLAGS += -L../bdm
+LDLIBS += -lbdm
 
-all: subsystem test0 testKF
+all: subsystem test0 testKF testSL
         echo $(CPPFLAGS)
 
@@ -12 +12 @@
 testKF: testKF.o
 
+testSL: testSL.o
+
 clean:
         $(RM) test0

tests/test0.cpp

@@ -41 +41 @@
                 cout << "ld:"<<Il.to_mat() << "eye:"<< I <<endl;
 
+        cout << "Test ldform()"<<endl;
+        mat V = "1 2; 2 3"; 
+        ldmat lV(V);
+//      cout << "ld:" << lV.to_mat() << "eye:"<< I <<endl;
+
 
         //Exit program:

tests/testKF.cpp

@@ -20 +20 @@
         int Ndat;
 
-        fin.seek( "d" );
-        fin >> Dt;
+        bool xxx= fin.seek( "d" );
+        fin >>Dt;
         fin.seek( "A" ); 
         fin >> A;
@@ -34 +34 @@
         fin.seek( "Q" ); fin >> Q;
         fin.seek( "P0" ); fin >> P0;
-        fin.seek( "mu0" ); fin >> Mu0; mu0=Mu0;
+        fin.seek( "mu0" ); fin >> Mu0; 
+        mu0=Mu0.get_col(0);
         
         Ndat = Dt.cols();