Changeset 256

Timestamp:

01/28/09 10:01:18 (16 years ago)

Author:

smidl

Message:

uibuilder works (again)

Files:

• CMakeLists.txt (modified) (1 diff)
• bdm/CMakeLists.txt (modified) (1 diff)
• bdm/stat/libBM.h (modified) (9 diffs)
• bdm/stat/libEF.h (modified) (1 diff)
• bdm/uibuilder.cpp (modified) (2 diffs)
• bdm/uibuilder.h (modified) (5 diffs)
• tests/CMakeLists.txt (modified) (1 diff)
• tests/UI/UIbuilder_test.cpp (modified) (6 diffs)

CMakeLists.txt

@@ -26 +26 @@
 ELSE()
         #This is for UNIX makefile which does only one release at a time.
-        SET(CMAKE_BUILD_TYPE Optimized)
+        SET(CMAKE_BUILD_TYPE Debug)
         SET(CMAKE_CXX_FLAGS "-Wall -pipe  -Wno-unknown-pragmas")
         SET(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG -O2")

bdm/CMakeLists.txt

@@ -1 +1 @@
 # Create a library called "bdm" which includes sources from all directories
-
-#add_subdirectory(config)
 
 SET(BdmMath math/libDC.cpp math/libDC.h math/chmat.cpp math/chmat.h)

bdm/stat/libBM.h

@@ -26 +26 @@
 
 //! Root class of BDM objects
-class base{};
+class bdmroot{};
 
 //! Structure of RV (used internally), i.e. expanded RVs
@@ -47 +47 @@
 */
 
-class RV :base{
+class RV :public bdmroot{
 protected:
         //! size = sum of sizes
@@ -139 +139 @@
 //! Class representing function \f$f(x)\f$ of variable \f$x\f$ represented by \c rv
 
-class fnc :base{
+class fnc :public bdmroot{
 protected:
         //! Length of the output vector
@@ -165 +165 @@
 //! Probability density function with numerical statistics, e.g. posterior density.
 
-class epdf :base {
+class epdf :public bdmroot {
 protected:
         //! Identified of the random variable
@@ -217 +217 @@
 //TODO Samplecond can be generalized
 
-class mpdf {
+class mpdf : public bdmroot{
 protected:
         //! modeled random variable
@@ -358 +358 @@
 };
 
-//!\brief Abstract composition of pdfs, a base for specific classes
+//!\brief Abstract composition of pdfs, will be used for specific classes
 //!this abstract class is common to epdf and mpdf
 class compositepdf {
@@ -381 +381 @@
 */
 
-class DS {
+class DS : public bdmroot{
 protected:
         //!Observed variables, returned by \c getdata().
@@ -413 +413 @@
 */
 
-class BM {
+class BM :public bdmroot{
 protected:
         //!Random variable of the posterior
@@ -473 +473 @@
 */
 
-class BMcond :base{
+class BMcond :public bdmroot{
 protected:
         //! Identificator of the conditioning variable

bdm/stat/libEF.h

@@ -345 +345 @@
  \f]
 
- Inverse Gamma can be converted to Gamma using \[
+ Inverse Gamma can be converted to Gamma using \f[
  x\sim iG(a,b) => 1/x\sim G(a,1/b)
-\]
+\f]
 This relation is used in sampling.
  */

bdm/uibuilder.cpp

@@ -5 +5 @@
 UImap __uimap__;
 
-void UIexternal::build(Setting &S, void** result) const{
+void UIexternal::build(Setting &S, bdmroot* &result) const{
         Config C;
         try{
@@ -22 +22 @@
 UIREGISTER(UIexternal);
 
-void UIinternal::build(Setting &S, void** result) const{
+void UIinternal::build(Setting &S, bdmroot* &result) const{
         try {   
                 Setting* Stmp = &S;

bdm/uibuilder.h

@@ -2 +2 @@
 #define UIBUILD
 
-#include "libconfig/libconfig.h++"
 #include <itpp/itbase.h>
 #include "stat/libBM.h"
+#include "libconfig/libconfig.h++"
 
 namespace bdm{
@@ -76 +76 @@
         };
         public:
+                //!Constructor needs to be run only once via REGISTERUI
                 UIbuilder(const string &typ){__uimap__.insert(make_pair(typ,this));}
-                virtual void build(Setting &S, void** result) const =0;
+                //! Function building the computational object
+                virtual void build(Setting &S, bdmroot* &result) const =0;
 };
 
@@ -83 +85 @@
         public:
                 UIexternal():UIbuilder("external"){}
-                void build(Setting &S, void** result) const;
+                void build(Setting &S, bdmroot* &result) const;
 };
 
@@ -89 +91 @@
         public:
                 UIinternal():UIbuilder("internal"){}
-                void build(Setting &S, void** result) const;
+                void build(Setting &S, bdmroot* &result) const;
 };
 
 //! Prototype of a UI builder. Return value is by the second argument since it allows some type of type checking.
 template<class T>
-                void UIbuild(Setting &S, T** ret){
+void UIbuild(Setting &S, T* &ret){
         CHECK_UITYPE(S,TypeGroup);
         T* tmp;
@@ -101 +103 @@
                 
         const string typ=S["type"];
+        
         // Find "type" in list of registred UI builders
         UImap::const_iterator iter = __uimap__.find( typ );
         if( iter == __uimap__.end()) {
+                cout << "UI error" << endl;
                 it_error("UI of type \"" + typ + "\" is not registered!");
         }
-        else {
-                const UIbuilder* is= iter->second; 
-                //BUILD the result
-                is->build(S,reinterpret_cast<void**>(&tmp));
-        }
+        
+        const UIbuilder* is= iter->second; 
+        //BUILD the result
+        is->build(S,(bdmroot*&)(tmp));
         // make assignment
-        *ret=tmp;
+        ret=tmp;
 };
 

tests/CMakeLists.txt

@@ -4 +4 @@
 # Make sure the linker can find the Hello library once it is built.
 link_directories (${BDM_BINARY_DIR}/bdm)
-
-# Define macro for testing a file
-MACRO(TEST FN)
-        add_executable (${FN} ${FN}.cpp)
-        target_link_libraries (${FN} debug itpp_debug)
-        target_link_libraries (${FN} optimized itpp)
-        target_link_libraries (${FN} bdm ${AddLib})
-ENDMACRO(TEST)
 
 # Add executable called "helloDemo" that is built from the source files

tests/UI/UIbuilder_test.cpp

@@ -5 +5 @@
 using namespace bdm;
 
-class cls {
+class cls :public bdmroot{
         public:
                 int a;
@@ -21 +21 @@
         public:
         UItest():UIbuilder("test"){}
-        void build(Setting &S, void** ret) const{
+        void build(Setting &S, bdmroot* &ret) const{
                 try{
                         int a=S["a"];
@@ -27 +27 @@
                         S.lookupValue("S",St);
                         cls* tmp = new cls(a,St);
-                        *ret=tmp;
+                        ret=tmp;
                 }
                 catch (...){
@@ -38 +38 @@
         public:
         UItest2():UIbuilder("test2"){}
-        void build(Setting &S, void** ret) const{
+        void build(Setting &S, bdmroot* &ret) const{
                 try{
                         int a=S["a"];
@@ -44 +44 @@
                         S.lookupValue("S",St);
                         cls* tmp = new cls2(a,St);
-                        *ret=tmp;
+                        ret=tmp;
                 }
                 catch (...){
@@ -59 +59 @@
 
 int main(){
-
 UIFile UI("UIbuilder_test.cfg");
 
 cls* Cls;
-UIbuild(UI.lookup("test"),&Cls);
+UIbuild(UI.lookup("test"),Cls);
 cls* Cls2;
-UIbuild(UI.lookup("test2"),&Cls2);
+UIbuild(UI.lookup("test2"),Cls2);
 cls* Cls3;
-UIbuild(UI.lookup("test3"),&Cls3);
+UIbuild(UI.lookup("test3"),Cls3);
 
 Cls->print();
 Cls2->print();
-Cls3->print();
-return 0;
+Cls3->print(); 
+
+delete Cls;
+delete Cls2;
+delete Cls3;
 }