Changeset 383

Timestamp:

06/17/09 23:54:11 (16 years ago)

Author:

smidl

Message:

mex for merging and fixes in UI

Files:

• bdm/stat/libBM.h (modified) (2 diffs)
• bdm/user_info.cpp (modified) (2 diffs)
• bdm/user_info.h (modified) (1 diff)
• library/mex/merger_mx.cpp (added)
• library/mex/mexlog.h (modified) (1 diff)

bdm/stat/libBM.h

@@ -566 +566 @@
 
 */
-class mepdf : public mpdf
-{
-public:
-  //!Default constructor
-  mepdf(epdf* em) : mpdf() {ep = em ;};
-  mepdf(const epdf* em) : mpdf() {ep = const_cast<epdf*>(em);};
-  void condition(const vec &cond) {}
+class mepdf : public mpdf {
+        bool owning_ep; // flag trigers deleting ep by destructor
+public:
+        //!Default constructor
+        mepdf ( epdf* em, bool owning_ep0=false ) :mpdf ( ) {ep= em ;owning_ep=owning_ep0;};
+        mepdf (const epdf* em ) :mpdf ( ) {ep=const_cast<epdf*>( em );};
+        void condition ( const vec &cond ) {}
+        ~mepdf(){if (owning_ep) delete ep;}
 };
 
@@ -578 +579 @@
 //!this abstract class is common to epdf and mpdf
 //!\todo Think of better design - global functions rv=get_rv(Array<mpdf*> mpdfs); ??
-class compositepdf
-{
+class compositepdf {
 protected:
   //!Number of mpdfs in the composite

bdm/user_info.cpp

@@ -106 +106 @@
 const Setting& UI::SettingResolver::initialize_reference(UI_File *&file, const Setting &potential_link)
 {
+        file = NULL;
+
     if ( potential_link.getType() !=  Setting::TypeString )
             return potential_link;
@@ -122 +124 @@
     else
         {
-                file = NULL;
                 result = &potential_link;
         while ( !result->isRoot() )

bdm/user_info.h

@@ -232 +232 @@
         {
                 T* instance;
-                from_setting<T>( to_child_setting( element, index ) );
+                from_setting<T>( instance, to_child_setting( element, index ) );
                 return instance;
         }

library/mex/mexlog.h

@@ -20 +20 @@
 };
 
+void Arrayvec2mxArray(const Array<vec> &in, mxArray *out)
+{
+  int rows, cols, r, c;
+
+  double* temp = (double *) mxGetPr(out);
+  if (temp == 0) mexErrMsgTxt("mat2mxArray: Pointer to data is NULL");
+
+  cols = in.size();
+  if (cols == 0) mexErrMsgTxt("mat2mxArray: Data has zero columns");
+
+  rows = in(0).length(); //length of the first vec
+  if (rows == 0) mexErrMsgTxt("mat2mxArray: Data has zero rows");
+
+  for (c = 0; c < cols; c++) {
+    for (r = 0; r < rows; r++) {
+      *temp++ = in(c)(r);
+    }
+  }
+
+}
 class mexlog : public memlog {
         public: