Changeset 392

Timestamp:

06/19/09 17:57:53 (15 years ago)

Author:

smidl

Message:

compilation fixes - UI_build use exceptions now!!!!

Location:

library/bdm

Files:

• base/bdmbase.h (modified) (1 diff)
• base/user_info.cpp (modified) (4 diffs)
• base/user_info.h (modified) (3 diffs)
• mex/mex_parser.h (modified) (1 diff)
• stat/merger.h (modified) (4 diffs)

library/bdm/base/bdmbase.h

@@ -570 +570 @@
 public:
         //!Default constructor
-        mepdf ( epdf* em, bool owning_ep0=false ) :mpdf ( ) {ep= em ;owning_ep=owning_ep0;};
+        mepdf ( epdf* em, bool owning_ep0=false ) :mpdf ( ) {ep= em ;owning_ep=owning_ep0;dimc=0;};
         mepdf (const epdf* em ) :mpdf ( ) {ep=const_cast<epdf*>( em );};
         void condition ( const vec &cond ) {}

library/bdm/base/user_info.cpp

@@ -229 +229 @@
                 {
                 ASSERT_UITYPE(link.result[0],TypeString);
-                        if( link.result[0] != "matrix" )
+                        const char* elem1=(const char*)link.result[0];
+                        if( (strcmp(elem1, "matrix") ))
                                 ui_error( "the setting supposed to represent a matrix element has wrong syntax", link.result );
 
@@ -280 +281 @@
     if ( link.result.isNumber() )
     {
-        ASSERT_UITYPE(link.result,TypeInt);
+  //      ASSERT_UITYPE(link.result,TypeInt);
         vector.set_length( 1 );
         vector(0) = link.result;
@@ -299 +300 @@
 
                 Setting &elements = link.result[2];
-        ASSERT_UITYPE(elements[0],TypeInt);
+        // ASSERT_UITYPE(elements[0],TypeInt); -- spolehame an autoconvert
 
 
         if ( matrix.cols() == 1 )
                         for ( int i=0; i<len; i++ )
-                                vector(i) = matrix(i,1);
+                                vector(i) = matrix(i,0);
                 else
                         for ( int i=0; i<len; i++ )
-                                vector(i) = matrix(1,i);
+                                vector(i) = matrix(0,i);
         return;
 
@@ -353 +354 @@
         if ( matrix.cols() == 1 )
                         for ( int i=0; i<len; i++ )
-                                vector(i) = matrix(i,1);
+                                vector(i) = matrix(i,0);
                 else
                         for ( int i=0; i<len; i++ )
-                                vector(i) = matrix(1,i);
+                                vector(i) = matrix(0,i);
         return;
     }

library/bdm/base/user_info.h

@@ -11 +11 @@
 #include "itpp/itbase.h"
 
+#include <stdexcept>
 
 using std::string;
@@ -27 +28 @@
 namespace bdm
 {
+        
+        //! exception used in UI::build if it fails it can be caught and handled - see merger_mex.h
+class UIbuildException : public std::invalid_argument {
+        public:
+                UIbuildException() : std::invalid_argument("class name") { }
+};
+        
 class UI_File : public Config
 {
@@ -153 +161 @@
 
                 instance = NULL;
-                try
-                {
-                        instance = (T*) typeless_instance ;
+                //try catch does not work!!!
+                instance = dynamic_cast<T*>(typeless_instance);
+                if (!instance){
+                        throw UIbuildException();
                 }
-                catch(...)
-                {
-                        it_error ( "UI error: class " + class_name + " is not a descendant of the desired output class. Try to call the UI::build function with a different type parameter." );
-                }
-                
+//              catch(...)
+//              {
+//                      it_error ( "UI error: class " + class_name + " is not a descendant of the desired output class. Try to call the UI::build function with a different type parameter." );
+//              }
+//              
                 try
                 {

library/bdm/mex/mex_parser.h

@@ -24 +24 @@
                 Setting & child = setting.add(name,Setting::TypeList);
                 fillList(child,mxarray);
+        }
+        void addGroup(const mxArray *mxarray, const char* name){
+                Setting & setting = this->getRoot(); //setting is a group
+                Setting & child = setting.add(name,Setting::TypeGroup);
+                fillGroup(child,mxarray);
+        }
+        operator Setting&()
+        {
+                 return getRoot();
         }
 private:

library/bdm/stat/merger.h

@@ -81 +81 @@
                 void set_sources (const Array<mpdf*> &Sources, bool own) {
                         compositepdf::set_elements (Sources,own);
+                        Nsources=mpdfs.length();
                         //set sizes
                         dls.set_size (Sources.length());
@@ -128 +129 @@
                                 smpi (j) = XYZ (j) (0); /* beginning of the interval*/ 
                                 it_assert(gridsize(j)!=0.0,"Zeros in gridsize!");
-                                steps (j) = (smpi(j) - XYZ(j)(1))/gridsize(j);
+                                steps (j) = ( XYZ(j)(1)-smpi(j) )/gridsize(j);
                         }
                         // fill samples
@@ -138 +139 @@
                                 for (int j = 0;j < dim;j++) {
                                         if (ind (j) == gridsize (j) - 1) { //j-th index is full
-                                                ind (j) = 0; //shift back
+//                                              ind (j) = 0; //shift back
                                                 smpi(j) = XYZ(j)(0);
                                                 
-                                                ind (j + 1) ++; //increase the next dimension;
+//                                              ind (j + 1) ++; //increase the next dimension;
                                                 smpi(j+1) += steps(j+1);
                                                 
                                                 if (ind (j + 1) < gridsize (j + 1) - 1) break;
                                         } else {
-                                                ind (j) ++; 
+//                                              ind (j) ++; 
                                                 smpi(j) +=steps(j);
                                                 break;
@@ -272 +273 @@
                                         set_method (GEOMETRIC);
                                 else if (!strcmp (meth_str.c_str(), "lognormal")) {
-                                        set_method (GEOMETRIC);
+                                        set_method (LOGNORMAL);
                                         set.lookupValue( "beta",beta);
                                 }
                         }
-                        validate();
                 }