Changeset 384 for library/bdm/base

Timestamp:

06/19/09 10:17:25 (15 years ago)

Author:

mido

Message:

possibly broken?

Location:

library/bdm

Files:

• . (moved) (moved from bdm)
• base (added)
• base/bdmbase.cpp (moved) (moved from bdm/stat/libBM.cpp) (3 diffs)
• base/bdmbase.h (moved) (moved from bdm/stat/libBM.h) (4 diffs)
• base/datasources.cpp (moved) (moved from bdm/stat/libDS.cpp) (1 diff)
• base/datasources.h (moved) (moved from bdm/stat/libDS.h) (1 diff)
• base/libconfig (moved) (moved from bdm/libconfig)
• base/loggers.cpp (moved) (moved from bdm/stat/loggers.cpp)
• base/loggers.h (moved) (moved from bdm/stat/loggers.h) (1 diff)
• base/user_info.cpp (moved) (moved from bdm/user_info.cpp) (2 diffs)
• base/user_info.h (moved) (moved from bdm/user_info.h) (3 diffs)

library/bdm/base/bdmbase.cpp

@@ -1 +1 @@
 
-#include "libBM.h"
+#include "bdmbase.h"
 
 //! Space of basic BDM structures
@@ -255 +255 @@
         RV rv; //empty rv
         bool rvaddok;
-        for ( int i = 0;i < n;i++ ) {
+        for ( int i = 0;i < mpdfs.length();i++ ) {
                 rvaddok=rv.add ( mpdfs ( i )->_rv() ); //add rv to common rvs.
                 // If rvaddok==false, mpdfs overlap => assert error.
@@ -264 +264 @@
 
 void compositepdf::setrvc ( const RV &rv, RV &rvc ) {
-        for ( int i = 0;i < n;i++ ) {
+        for ( int i = 0;i < mpdfs.length();i++ ) {
                 RV rvx = mpdfs ( i )->_rvc().subt ( rv );
                 rvc.add ( rvx ); //add rv to common rvc

library/bdm/base/bdmbase.h

@@ -11 +11 @@
 */
 
-#ifndef BM_H
-#define BM_H
+#ifndef BDMBASE_H
+#define BDMBASE_H
 
 #include <map>
@@ -18 +18 @@
 #include "../itpp_ext.h"
 #include "../bdmroot.h"
-#include "../user_info.h"
+#include "user_info.h"
 
 
@@ -566 +566 @@
 
 */
-class mepdf : public mpdf
-{
-public:
-  //!Default constructor
-  mepdf(epdf* em) : mpdf() {ep = em ;};
-  mepdf(const epdf* em) : mpdf() {ep = const_cast<epdf*>(em);};
-  void condition(const vec &cond) {}
-};
-
-//!\brief Abstract composition of pdfs, will be used for specific classes
+class mepdf : public mpdf {
+        bool owning_ep; // flag trigers deleting ep by destructor
+public:
+        //!Default constructor
+        mepdf ( epdf* em, bool owning_ep0=false ) :mpdf ( ) {ep= em ;owning_ep=owning_ep0;};
+        mepdf (const epdf* em ) :mpdf ( ) {ep=const_cast<epdf*>( em );};
+        void condition ( const vec &cond ) {}
+        ~mepdf(){if (owning_ep) delete ep;}
+};
+
+//!\brief Chain rule of pdfs - abstract part common for mprod and merger. 
 //!this abstract class is common to epdf and mpdf
-class compositepdf
-{
+//!\todo Think of better design - global functions rv=get_rv(Array<mpdf*> mpdfs); ??
+class compositepdf {
 protected:
   //!Number of mpdfs in the composite
@@ -786 +787 @@
 
 }; //namespace
-#endif // BM_H
+#endif // BDMBASE_H

library/bdm/base/datasources.cpp

@@ -1 +1 @@
 
-#include "libDS.h"
+#include "datasources.h"
 
 using namespace bdm;

library/bdm/base/datasources.h

@@ -11 +11 @@
 */
 
-#ifndef DS_H
-#define DS_H
-
-
-#include "libBM.h"
-#include "libEF.h"
-#include "../user_info.h"
+#ifndef DATASOURCE_H
+#define DATASOURCE_H
+
+
+#include "../base/bdmbase.h"
+#include "../stat/exp_family.h"
+#include "../base/user_info.h"
 
 namespace bdm {

library/bdm/base/loggers.h

@@ -14 +14 @@
 #define LGR_H
 
-#include "libBM.h"
-#include "../user_info.h"
+#include "base/bdmbase.h"
+#include "../base/user_info.h"
 
 namespace bdm{

library/bdm/base/user_info.cpp

@@ -106 +106 @@
 const Setting& UI::SettingResolver::initialize_reference(UI_File *&file, const Setting &potential_link)
 {
+        file = NULL;
+
     if ( potential_link.getType() !=  Setting::TypeString )
             return potential_link;
@@ -122 +124 @@
     else
         {
-                file = NULL;
                 result = &potential_link;
         while ( !result->isRoot() )

library/bdm/base/user_info.h

@@ -8 +8 @@
 
 #include "libconfig/libconfig.h++"
-#include "bdmroot.h"
+#include "../bdmroot.h"
 #include "itpp/itbase.h"
 
@@ -17 +17 @@
 
 #ifndef BDMLIB 
+//!Macro for registration of classes into map of UserInfos -- registered class is scriptable 
 #define UIREGISTER(class_name) template<> const Particular_UI<class_name>& Particular_UI<class_name>::ui = Particular_UI<class_name>(#class_name) 
 #else
@@ -231 +232 @@
         {
                 T* instance;
-                from_setting<T>( to_child_setting( element, index ) );
+                from_setting<T>( instance, to_child_setting( element, index ) );
                 return instance;
         }