Changeset 270 for bdm/stat/libFN.h

Timestamp:

02/16/09 10:02:08 (15 years ago)

Author:

smidl

Message:

Changes in the very root classes!
* rv and rvc are no longer compulsory,
* samplecond does not return ll
* BM has drv

Files:

• bdm/stat/libFN.h (modified) (5 diffs)

bdm/stat/libFN.h

@@ -28 +28 @@
                 vec eval ( const vec &cond ) {return val;};
                 //!Default constructor
-                constfn ( const vec &val0 ) :fnc(val0.length()), val ( val0 ) {};
+                constfn ( const vec &val0 ) :fnc(), val ( val0 ) {dimy=val.length();};
 };
 
@@ -38 +38 @@
                 //! Matrix A
                 mat A;
-                //! Matrix B
+                //! vector B
                 vec B;
         public :
-                vec eval (const vec &cond ) {it_assert_debug ( cond.length() ==rv.count(), "linfn::eval Wrong cond." );return A*cond+B;};
+                vec eval (const vec &cond ) {it_assert_debug ( cond.length() ==A.cols(), "linfn::eval Wrong cond." );return A*cond+B;};
 
 //              linfn evalsome ( ivec &rvind );
                 //!default constructor
-                linfn ( const RV &rv0 ) : fnc(rv0.count()), rv ( rv0 ),A ( eye ( rv0.count() ) ),B ( zeros ( rv0.count() ) ) { };
+                linfn ( ) : fnc(), A ( ),B () { };
                 //! Set values of \c A and \c B
-                void set_parameters ( const mat &A0 , const vec &B0 ) {A=A0; B=B0;};
+                void set_parameters ( const mat &A0 , const vec &B0 ) {A=A0; B=B0; dimy=A.rows();};
 };
 
@@ -86 +86 @@
                 virtual void dfdu_cond ( const vec &x0, const vec &u0, mat &A, bool full=true ) {};
                 //!Default constructor (dimy is not set!)
-                diffbifn (int dimy, const RV rvx0, const RV rvu0 ) : fnc(dimy), rvx ( rvx0 ),rvu ( rvu0 ) {dimx=rvx.count();dimu=rvu.count();};
+                diffbifn () : fnc() {};
                 //! access function
                 int _dimx() const{return dimx;}
@@ -100 +100 @@
                 mat B;
         public :
+                //!\name Constructors
+                //!@{
+                
+                bilinfn () : diffbifn () ,A() ,B()      {};
+                bilinfn (const mat A0, const mat B0) {set_parameters(A0,B0);};
+                //! Alternative constructor
+                void set_parameters(const mat A0, const mat B0){
+                        it_assert_debug(A0.rows()==B0.rows(),"");
+                        A=A0;B=B0;
+                        dimy=A.rows();
+                        dimx=A.cols();
+                        dimu=B.cols();
+                }
+                //!@}
+                
+                //!\name Mathematical operations
+                //!@{
                 vec eval ( const  vec &x0, const vec &u0 );
-
-                //! Default constructor
-                bilinfn ( const RV &rvx0, const RV &rvu0 ) : diffbifn (dimx, rvx0,rvu0 ) ,A ( eye ( dimx ) ),B ( zeros ( dimx,dimu ) )  {};
-                //! Alternative constructor
-                bilinfn ( const RV &rvx0, const RV &rvu0, const mat &A0, const mat &B0 );
-                //!
                 void dfdx_cond ( const vec &x0, const vec &u0, mat &F, bool full )
                 {
@@ -118 +129 @@
                         if ( full ) F=B;        //else : nothing has changed no need to regenerate
                 }
+                //!@}
 };