Changeset 760 for library/bdm

Timestamp:

01/05/10 22:19:49 (14 years ago)

Author:

smidl

Message:

cleanups & stuff for SYSID like estimation

Location:

library/bdm

Files:

• base/bdmbase.h (modified) (1 diff)
• base/user_info.h (modified) (1 diff)
• stat/discrete.cpp (modified) (1 diff)
• stat/emix.cpp (modified) (1 diff)
• stat/exp_family.h (modified) (2 diffs)

library/bdm/base/bdmbase.h

@@ -612 +612 @@
                 // TODO we do not want to store rvc.. 
                 // therfore, pdf::to_setting( set ) is omitted
+                root::to_setting(set);
                 UI::save( &rv, set, "rv" );
         }

library/bdm/base/user_info.h

@@ -545 +545 @@
         //! A root descendant instance is stored in the new child Setting appended to the passed element
         template< class T> static void save ( const T * const instance, Setting &element, const string &name = "" ) {
-                Setting &set = ( name == "" ) ? element.add ( Setting::TypeGroup )
+                Setting &set = ( name == "" ) ?  (element.getType()==Setting::TypeArray) ? element.add ( Setting::TypeGroup ) : element 
                                : element.add ( name, Setting::TypeGroup );
 

library/bdm/stat/discrete.cpp

@@ -97 +97 @@
 
 void discrete_support::from_setting ( const Setting &set ) {
-        UI::get ( Spoints, set, "points", UI::compulsory );
+        UI::get ( Spoints, set, "points", UI::optional );
         if ( points() < 1 ) {
                 int npoints;

library/bdm/stat/emix.cpp

@@ -7 +7 @@
         
         bool isnamed = Coms0 ( 0 )->isnamed();
-        int i;
         RV tmp_rv;
         if ( isnamed ) tmp_rv = Coms0 ( 0 )->_rv();

library/bdm/stat/exp_family.h

@@ -1422 +1422 @@
         };
         virtual void    validate (){
-          bdm_assert ( n > 0, "Empty samples" );
-          epdf::validate ( samples ( 0 ).length() );
+          bdm_assert (samples.length()==w.length(),"samples and weigths are of different lengths");
+          n = w.length();
+          if (n>0)
+                epdf::validate ( samples ( 0 ).length() );
         }
         //! Potentially dangerous, use with care.
@@ -1483 +1485 @@
         //! For this class, qbounds are minimum and maximum value of the population!
         void qbounds ( vec &lb, vec &ub, double perc = 0.95 ) const;
-};
+
+        void to_setting ( Setting &set ) const {
+                epdf::to_setting( set );
+                UI::save ( samples, set, "samples" );
+                UI::save ( w, set, "w" );
+        }
+
+        void from_setting ( const Setting &set ) {
+                epdf::from_setting( set );
+                
+                UI::get( samples, set, "samples", UI::compulsory );
+                UI::get ( w, set, "w", UI::compulsory );
+                validate();
+        }
+
+};
+UIREGISTER(eEmp);