Changeset 254 for bdm/stat

Timestamp:

01/28/09 10:00:56 (15 years ago)

Author:

smidl

Message:

create namespace bdm

Location:

bdm/stat

Files:

• emix.cpp (modified) (2 diffs)
• emix.h (modified) (2 diffs)
• libBM.cpp (modified) (2 diffs)
• libBM.h (modified) (6 diffs)
• libDS.cpp (modified) (1 diff)
• libDS.h (modified) (2 diffs)
• libEF.cpp (modified) (2 diffs)
• libEF.h (modified) (2 diffs)
• libFN.cpp (modified) (1 diff)
• libFN.h (modified) (2 diffs)
• loggers.cpp (modified) (2 diffs)
• loggers.h (modified) (2 diffs)

bdm/stat/emix.cpp

@@ -1 +1 @@
 #include "emix.h"
 
-using namespace itpp;
+namespace bdm{
 
 void emix::set_parameters ( const vec &w0, const Array<epdf*> &Coms0, bool copy ) {
@@ -47 +47 @@
 };
 
+}
 // mprod::mprod ( Array<mpdf*> mFacs, bool overlap) : mpdf ( RV(), RV() ), n ( mFacs.length() ), epdfs ( n ), mpdfs ( mFacs ), rvinds ( n ), rvcinrv ( n ), irvcs_rvc ( n ) {
 //              int i;

bdm/stat/emix.h

@@ -18 +18 @@
 //#include <std>
 
-using namespace itpp;
+namespace bdm{
 
 //this comes first because it is used inside emix!
@@ -309 +309 @@
 };
 
+}
 #endif //MX_H

bdm/stat/libBM.cpp

@@ -3 +3 @@
 #include "../itpp_ext.h"
 
-using namespace itpp;
+namespace bdm {
 
 using std::cout;
@@ -239 +239 @@
         for(int t=0;t<Data.cols();t++){bayes(Data.get_col(t));}
 }
+}

bdm/stat/libBM.h

@@ -22 +22 @@
 //#include <std>
 
+namespace bdm{
 using namespace itpp;
+
+//! Root class of BDM objects
+class base{};
 
 //! Structure of RV (used internally), i.e. expanded RVs
@@ -43 +47 @@
 */
 
-class RV {
+class RV :base{
 protected:
         //! size = sum of sizes
@@ -135 +139 @@
 //! Class representing function \f$f(x)\f$ of variable \f$x\f$ represented by \c rv
 
-class fnc {
+class fnc :base{
 protected:
         //! Length of the output vector
@@ -161 +165 @@
 //! Probability density function with numerical statistics, e.g. posterior density.
 
-class epdf {
+class epdf :base {
 protected:
         //! Identified of the random variable
@@ -469 +473 @@
 */
 
-class BMcond {
+class BMcond :base{
 protected:
         //! Identificator of the conditioning variable
@@ -484 +488 @@
 };
 
+}; //namespace
 /*! @} */
 #endif // BM_H

bdm/stat/libDS.cpp

@@ -2 +2 @@
 #include "libDS.h"
 
-//using namespace itpp;
+using namespace bdm;
 
 void MemDS::getdata(vec &dt){

bdm/stat/libDS.h

@@ -17 +17 @@
 #include "libBM.h"
 
-using namespace itpp;
-
+namespace bdm{
 /*!
 * \brief Class representing off-line data stored in memory
@@ -43 +42 @@
 };
 
-
+}; //namespace
 
 #endif // DS_H

bdm/stat/libEF.cpp

@@ -4 +4 @@
 #include <math.h>
 
-using namespace itpp;
+namespace bdm{
 
 Uniform_RNG UniRNG;
@@ -267 +267 @@
 }
 
+};

bdm/stat/libEF.h

@@ -20 +20 @@
 //#include <std>
 
-using namespace itpp;
+namespace bdm{
 
 
@@ -830 +830 @@
 };
 
+}
 #endif //EF_H

bdm/stat/libFN.cpp

@@ -3 +3 @@
 
 using std::endl;
+using namespace bdm;
 
 bilinfn::bilinfn ( const RV &rvx0, const RV &rvu0, const mat &A0, const mat &B0 ) : diffbifn (A0.rows(), rvx0,rvu0 )

bdm/stat/libFN.h

@@ -16 +16 @@
 #include "libBM.h"
 
-using namespace itpp;
+namespace bdm{
 
 //! class representing function \f$f(x) = a\f$, here \c rv is empty
@@ -121 +121 @@
 };
 
+} //namespace
 #endif // FN_H

bdm/stat/loggers.cpp

@@ -8 +8 @@
 #endif
 
+namespace bdm{
 void memlog::itsave ( const char* fname ) {
         it_file itf ( fname );
@@ -135 +136 @@
                 write_buffers ( ind ); //assuming here that i+1 was not filled
 }
+
+}

bdm/stat/loggers.h

@@ -18 +18 @@
 #include "../itpp_ext.h"
 
-using namespace itpp;
+namespace bdm{
 using std::string;
 
@@ -126 +126 @@
 };
 
-
+}
 #endif // LGR_H