Changeset 257

Timestamp:

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

Author:

smidl

Message:

All objects have a virtual predecessor. This allows type checking in UI, see

Files:

• bdm/stat/libBM.h (modified) (1 diff)
• bdm/stat/loggers.h (modified) (1 diff)
• bdm/uibuilder.cpp (modified) (2 diffs)
• bdm/uibuilder.h (modified) (3 diffs)
• pmsm/CMakeLists.txt (modified) (1 diff)
• pmsm/sim.cpp (modified) (2 diffs)
• tests/UI/UIbuilder_test.cpp (modified) (3 diffs)

bdm/stat/libBM.h

@@ -26 +26 @@
 
 //! Root class of BDM objects
-class bdmroot{};
+class bdmroot{
+        virtual void print(){}
+};
 
 //! Structure of RV (used internally), i.e. expanded RVs

bdm/stat/loggers.h

@@ -26 +26 @@
 This class abstracts logging of results from implementation. This class replaces direct logging of results (e.g. to files or to global variables) by calling methods of a logger. Specializations of this abstract class for specific storage method are designed.
 */
-class logger {
+class logger : public bdmroot{
 protected:
         //! RVs of all logged variables. 

bdm/uibuilder.cpp

@@ -5 +5 @@
 UImap __uimap__;
 
-void UIexternal::build(Setting &S, bdmroot* &result) const{
+bdmroot* UIexternal::build(Setting &S) const{
         Config C;
+        bdmroot* tmp;
         try{
                 C.readFile((const char*)S["filename"]);
@@ -14 +15 @@
         try {   
                 Setting& remS=C.lookup((const char*)S["path"]);
-                UIbuild(remS,result);
+                UIbuild(remS,tmp);
         }
         catch (...) { it_error("External field " + string(S.getPath()) + " not valid");
         }
-        
+        return tmp;
 };
 UIREGISTER(UIexternal);
 
-void UIinternal::build(Setting &S, bdmroot* &result) const{
+bdmroot* UIinternal::build(Setting &S) const{
+        bdmroot* tmp;
         try {   
                 Setting* Stmp = &S;
                 do {Stmp=&(Stmp->getParent());} while (!Stmp->isRoot());
                 Setting& intS=Stmp->lookup((const char*)S["path"]);
-                UIbuild(intS,result);
+                UIbuild(intS,tmp);
         }
         catch (...) { it_error("Internal field " + string(S.getPath()) + " not valid");
         }
-        
+        return tmp;
 };
 UIREGISTER(UIinternal);

bdm/uibuilder.h

@@ -76 +76 @@
         };
         public:
-                //!Constructor needs to be run only once via REGISTERUI
+                //!Constructor needs to be run only once macro UIREGISTER
                 UIbuilder(const string &typ){__uimap__.insert(make_pair(typ,this));}
                 //! Function building the computational object
-                virtual void build(Setting &S, bdmroot* &result) const =0;
+                virtual bdmroot* build(Setting &S) const =0;
 };
 
@@ -85 +85 @@
         public:
                 UIexternal():UIbuilder("external"){}
-                void build(Setting &S, bdmroot* &result) const;
+                bdmroot* build(Setting &S) const;
 };
 
@@ -91 +91 @@
         public:
                 UIinternal():UIbuilder("internal"){}
-                void build(Setting &S, bdmroot* &result) const;
+                bdmroot* build(Setting &S) const;
 };
 
-//! Prototype of a UI builder. Return value is by the second argument since it allows some type of type checking.
+//! Prototype of a UI builder. Return value is by the second argument since it type checking via \c dynamic_cast.
 template<class T>
 void UIbuild(Setting &S, T* &ret){
         CHECK_UITYPE(S,TypeGroup);
-        T* tmp;
         // Check if field "type" is present, if not it is not a valid UI
         it_assert_debug(S.exists("type"), string(S.getPath())+" is not a valid UI!");
                 
-        const string typ=S["type"];
-        
+        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!");
         }
         
-        const UIbuilder* is= iter->second; 
         //BUILD the result
-        is->build(S,(bdmroot*&)(tmp));
-        // make assignment
-        ret=tmp;
+        ret = dynamic_cast<T*>(iter->second->build(S));
+};
+
+//! Auxiliary function allowing recursivity in S
+template<class T>
+void UIcall(Setting &S, void (*func)(Setting&, T), T Tmp ){
+        CHECK_UITYPE(S,TypeGroup);
+        // Check if field "type" is present, if not it is not a valid UI
+        it_assert_debug(S.exists("type"), string(S.getPath())+" is not a valid UI!");
+                
+        const string typ=S["type"];     
+        if(typ=="internal"){
+                try {   
+                        Setting* Stmp = &S;
+                        do {Stmp=&(Stmp->getParent());} while (!Stmp->isRoot());
+                        Setting& intS=Stmp->lookup((const char*)S["path"]);
+                        func(intS, Tmp); // <======== calling UIset
+                        return;
+                }
+                catch (...) { it_error("Internal field " + string(S.getPath()) + " not valid");
+                }
+        }
+        if(typ=="extern"){
+                Config C;
+                bdmroot* tmp;
+                try{C.readFile((const char*)S["filename"]);} catch (...){
+                        it_error("File " + string((const char*)S["filename"]) + " not found or broken");
+                }
+                try {func(C.lookup((const char*)S["path"]), Tmp);} catch (...) { //<=========== calling UIset
+                        it_error("External field " + string(S.getPath()) + " not valid");
+                }
+                return;
+        }
+        
+        // v======================= calling final set
+        func(S, Tmp);
 };
 

pmsm/CMakeLists.txt

@@ -30 +30 @@
 EXEC (mpf_load pmsmsim)
 
-#EXEC (sim pmsmsim config++)
+EXEC (sim pmsmsim)
 EXEC (sim_var pmsmsim)
 EXEC (sim_var_arx pmsmsim)

pmsm/sim.cpp

@@ -11 +11 @@
 */
 
-#include <config/uibuilder.h>
+#include <uibuilder.h>
 #include <stat/libDS.h>
 #include "pmsmDS.h"
 
+#include <stat/loggers_ui.h>
+
 using namespace bdm;
 int main() {
-        UIFile F("sim.bdm");
+        UIFile F("sim.txt");
 
         logger* L; 
-        UIbuild(F.lookup("logger"),&L);
+        UIbuild(F.lookup("logger"),L);
         pmsmDS * DS;
-        UIbuild(F.lookup("system"),&DS);
+        UIbuild(F.lookup("system"),DS);
         int Ndat;
         F.lookupValue("ndat",Ndat);
@@ -36 +38 @@
         
         L->finalize(); 
+        
+        delete L;
+        delete DS;
         return 0;
 }

tests/UI/UIbuilder_test.cpp

@@ -21 +21 @@
         public:
         UItest():UIbuilder("test"){}
-        void build(Setting &S, bdmroot* &ret) const{
+        bdmroot* build(Setting &S) const{
                 try{
                         int a=S["a"];
@@ -27 +27 @@
                         S.lookupValue("S",St);
                         cls* tmp = new cls(a,St);
-                        ret=tmp;
+                        return tmp;
                 }
                 catch (...){
@@ -38 +38 @@
         public:
         UItest2():UIbuilder("test2"){}
-        void build(Setting &S, bdmroot* &ret) const{
+        bdmroot* build(Setting &S) const{
                 try{
                         int a=S["a"];
                         string St;
                         S.lookupValue("S",St);
-                        cls* tmp = new cls2(a,St);
-                        ret=tmp;
+                        return  new cls2(a,St);
                 }
                 catch (...){