Changeset 853

Timestamp:

03/05/10 11:12:07 (15 years ago)

Author:

mido

Message:

small patch of LOGGERS and DOCUMENTATION

Location:

library

Files:

• bdm/bdmroot.h (modified) (5 diffs)
• doc/tutorial/005userguide0.dox (modified) (1 diff)
• doc/tutorial/01userguide.dox (modified) (1 diff)

library/bdm/bdmroot.h

@@ -38 +38 @@
 void UI_DBG (const Setting &S, const string &spc, ostream &out );
         
-
 //! level of details that will be logged to a logger
 // DULEZITE TODO - zde musi respektovat aktualne ulozene hodnoty, tj. nacist je, pak pridat
@@ -53 +52 @@
         bitset<32> values;
 
-        virtual const Array<string> &names() const
-        {
-                return T::__option_names();
+        const Array<string> &names() const
+        {
+                return T::option_names();
         }
 
@@ -77 +76 @@
 
 // MUZEME INTERNE POUZIVAT ENUMY, A KLIDNE MENIT JEJICH PORADI, DIKY TOMUHLE MAKRU SE VZDY NAMAPUJI NA TY SPRAVNE STRINGY 
-#define LOG_LEVEL(CLASSNAME,...) private: friend class logged_options<CLASSNAME>; static const Array<string> &__option_names() { static const Array<string> option_names( "{"#__VA_ARGS__"}" ); return option_names; }; public: enum possible_options { __VA_ARGS__ }; logged_options<CLASSNAME> log_level;
+#define LOG_LEVEL(CLASSNAME,...) private: friend class logged_options<CLASSNAME>; static const Array<string> &option_names() { static const Array<string> option_names( "{"#__VA_ARGS__"}" ); return option_names; }; public: enum possible_options { __VA_ARGS__ }; logged_options<CLASSNAME> log_level;
 
 //forward declaration
@@ -96 +95 @@
 //! Root class of BDM objects
 class root {
+private:
+        //! It is necessary to allow calling of from_setting and to_setting within the UI class ++ i log_options
+        friend class UI;
+
+        // TODO okomentovat
+        static const Array<string> &option_names() 
+        { 
+                static const Array<string> option_names; 
+                return option_names; 
+        }; 
+
 protected:
         //! record of connections to the logger
         log_record* logrec;
-
-        //! It is necessary to allow calling of from_setting and to_setting within the UI class
-        friend class UI;
 
         /*!     
@@ -182 +189 @@
 
 public:
-        enum possible_options{};
+        // TODO okomentovat
+        enum possible_options { };
+
         //!default constructor
         root() : logrec ( NULL ) {};

library/doc/tutorial/005userguide0.dox

@@ -24 +24 @@
 \section secnario Prepared Scenarios
 
-Since some tasks are repeatedly occuring in practical applications of decision making, these tasks has been identified and prepared as standalone applications (or mex files). These taska are implemented in separate toolbox - bdmtoolbox. Binary version of the toolbox is available see \ref install.
+Since some tasks are repeatedly occuring in practical applications of decision making, these tasks has been identified and prepared as standalone applications (or mex files). These tasks are implemented in separate toolbox - bdmtoolbox. Binary version of the toolbox is available see \ref install.
 
 The predefined scenarios are:

library/doc/tutorial/01userguide.dox

@@ -2 +2 @@
 \page userguide BDM Use - System, Data, Simulation
 
-This section serves as introdustion to the scenario of data simulation. Since it is the simpliest of all scenarios defined in \ref userguide0 it also serves as introduction to configuration of an experiment (see \ref ui) and basic decision making objects (bdm::RV and bdm::DS).
+This section serves as introduction to the scenario of data simulation. Since it is the simpliest of all scenarios defined in \ref userguide0 it also serves as introduction to configuration of an experiment (see \ref ui) and basic decision making objects (bdm::RV and bdm::DS).
 
 All experiments are demonstarted on scenario simulator which can be either standalone application or mex file (simulator.mex**).