Changeset 230 for bdm

Timestamp:

01/15/09 10:53:55 (15 years ago)

Author:

smidl

Message:

mpf_delta - estimation of covariance weight

Location:

bdm

Files:

• math/chmat.h (modified) (1 diff)
• stat/loggers.cpp (modified) (1 diff)

bdm/math/chmat.h

@@ -75 +75 @@
         chmat& operator += ( const chmat &A2 );
         chmat& operator -= ( const chmat &A2 ) ;
+        chmat& operator * ( const chmat &A2 );
+        chmat& operator * ( const double &d ){Ch*d; return *this;};
+        chmat& operator = ( const chmat &A2 ){Ch=A2.Ch;dim=A2.dim;return *this;}
 };
 

bdm/stat/loggers.cpp

@@ -44 +44 @@
                 for ( j=0;j<entries ( i ).length();j++ ) { //for RVs in entries
                         int rvsize = entries ( i ).size ( j );
-                        if ( rvsize ==1 ) {
-                                scalarnames ( ii ) = names ( i ) + "_" + entries ( i ).name ( j );
-                                ii++;
-                        }
-                        else {
+                        // for non-empty names
+                        if (names(i).length()>0) {scalarnames(ii)=names(i) + "_";}
+                        // add name
+                        scalarnames ( ii ) +=  entries ( i ).name ( j );
+                        // add number when needed
+                        if ( rvsize >1 ) {
+                                // copy the same name for th whole RV
+                                for ( k=1;k<rvsize;k++ ) {scalarnames(ii+k)=scalarnames(ii);}
+                                // add numbers
                                 for ( k=0;k<rvsize;k++ ) { //for all scalars in given RV
                                         sprintf ( num,"%d",k );
-                                        scalarnames ( ii ) = names ( i ) + "_" + entries ( i ).name ( j ) + "_" + num;
+                                        scalarnames ( ii ) += (std::string)"_" + num;
                                         ii++;
                                 }
-                        }
+                        } else {
+                        ii++;}
                 }
         }