Changeset 390

Timestamp:

06/19/09 12:41:37 (16 years ago)

Author:

mido

Message:

class bdmroot renamed to root, ui matrix patched (possibility of a "matrix" string at first place of the matrix list was allowed)

Location:

library

Files:

• bdm/base/bdmbase.h (modified) (7 diffs)
• bdm/base/user_info.cpp (modified) (1 diff)
• bdm/base/user_info.h (modified) (3 diffs)
• bdm/bdmroot.h (modified) (3 diffs)
• tests/test_user_info.cpp (modified) (2 diffs)

library/bdm/base/bdmbase.h

@@ -84 +84 @@
 */
 
-class RV : public bdmroot
+class RV : public root
 {
 protected:
@@ -207 +207 @@
 //! Class representing function \f$f(x)\f$ of variable \f$x\f$ represented by \c rv
 
-class fnc : public bdmroot
+class fnc : public root
 {
 protected:
@@ -231 +231 @@
 //! Probability density function with numerical statistics, e.g. posterior density.
 
-class epdf : public bdmroot
+class epdf : public root
 {
 protected:
@@ -319 +319 @@
 //TODO Samplecond can be generalized
 
-class mpdf : public bdmroot
+class mpdf : public root
 {
 protected:
@@ -522 +522 @@
 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 : public bdmroot
+class logger : public root
 {
 protected:
@@ -602 +602 @@
 */
 
-class DS : public bdmroot
+class DS : public root
 {
 protected:
@@ -674 +674 @@
 */
 
-class BM : public bdmroot
+class BM : public root
 {
 protected:

library/bdm/base/user_info.cpp

@@ -222 +222 @@
     if ( link.result.isList() )
     {
-        if ( link.result.getLength() != 3 )
-            ui_error( "the setting supposed to represent a matrix element has wrong syntax", link.result );
-
-        Setting &rows_setting = link.result[0];
-        Setting &cols_setting = link.result[1];
-        Setting &elements = link.result[2];
+                int data_offset;
+
+                if ( link.result.getLength() == 3 )
+                        data_offset = 0;
+                else if ( link.result.getLength() == 4 )
+                {
+                ASSERT_UITYPE(link.result[0],TypeString);
+                        if( link.result[0] != "matrix" )
+                                ui_error( "the setting supposed to represent a matrix element has wrong syntax", link.result );
+
+                        data_offset = 1;
+                }
+                else
+                        ui_error( "the setting supposed to represent a matrix element has wrong syntax", link.result );
+
+        Setting &rows_setting = link.result[0 + data_offset];
+        Setting &cols_setting = link.result[1 + data_offset];
+        Setting &elements = link.result[2 + data_offset];
 
         ASSERT_UITYPE(cols_setting,TypeInt);

library/bdm/base/user_info.h

@@ -113 +113 @@
 
         //! internal method assembling a typeless instance from components obtained by the 'AssemblyComponentsFromSetting()' method
-        virtual bdmroot* new_instance() const = 0;
+        virtual root* new_instance() const = 0;
         
         //! This methods tries to save an instance of type T (or some of its descendant types)
@@ -150 +150 @@
                 const UI& related_UI = Mapped_UI::retrieve_ui( class_name );
                 
-                bdmroot* typeless_instance = related_UI.new_instance();
+                root* typeless_instance = related_UI.new_instance();
 
                 instance = NULL;
@@ -339 +339 @@
         static const Particular_UI<T>& ui;      
 
-        bdmroot* new_instance() const
+        root* new_instance() const
         {
                 return new T();

library/bdm/bdmroot.h

@@ -11 +11 @@
 */
 
-#ifndef BDMROOT_H
-#define BDMROOT_H
+#ifndef root_H
+#define root_H
 
 #include <string>
@@ -26 +26 @@
 
 //! Root class of BDM objects
-class bdmroot {
+class root {
 public:
         //! make sure this is a virtual object
-        virtual ~bdmroot() 
+        virtual ~root() 
         {
         }
@@ -56 +56 @@
 
 }; //namespace
-#endif // BDMROOT_H
+#endif // root_H

library/tests/test_user_info.cpp

@@ -7 +7 @@
 using namespace bdm;
 
-class Passenger : public bdmroot
+class Passenger : public root
 {
 public:
@@ -74 +74 @@
 UIREGISTER(Robot);
 
-class Transport : public bdmroot
+class Transport : public root
 {
 public: