Changeset 359

Timestamp:

06/08/09 15:38:41 (15 years ago)

Author:

mido

Message:

patch buildu ve windows, nyni je pod winxp/vs9.0 vse v cajku

Files:

• applications/pmsm/pmsmDS.h (modified) (2 diffs)
• bdm/stat/libBM.h (modified) (1 diff)
• bdm/user_info.h (modified) (2 diffs)

applications/pmsm/pmsmDS.h

@@ -256 +256 @@
         //statistics
         int dim=IM->dimension();
+
         vec mu0;
-        if (!UI::get( mu0, root, "mu0") )
+        if(root.exists("mu0"))
+                        UI::get( mu0, root, "mu0");
+                else
             mu0=zeros(dim);
+
         mat P0;
-        vec dP0;
-
-        if (UI::get(dP0,root, "dP0") )
+        if(root.exists( "dP0" ))
+                {
+                        vec dP0;        
+                        UI::get(dP0,root, "dP0");
             P0=diag(dP0);
-        else if (!UI::get(P0,root, "P0") )
+                }
+                else if (root.exists("P0"))
+                        UI::get(P0,root, "P0");
+                else
             P0=eye(dim);
 
@@ -327 +335 @@
         int dim=IM->dimension();
         vec mu0;
-        vec dP0;
+        if( root.exists( "mu0"))
+                        UI::get(mu0, root, "mu0");
+                else
+            mu0=zeros(dim);
+
         mat P0;
-        if (!UI::get(mu0, root, "mu0"))
-            mu0=zeros(dim);
-        if (!UI::get( P0, root, "P0" ))
-            if (UI::get(dP0, root, "dP0"))
-                P0=diag(dP0);
-            else
-                P0=eye(dim);
+
+                if(root.exists("dP0"))
+                {
+                        vec dP0;                                
+                        UI::get(dP0, root, "dP0");
+                        P0=diag(dP0);
+                }
+                else if(root.exists("P0"))
+                        UI::get( P0, root, "P0" );
+                else
+                        P0=eye(dim);
 
         set_statistics(mu0,P0);

bdm/stat/libBM.h

@@ -227 +227 @@
 //! Probability density function with numerical statistics, e.g. posterior density.
 
-class epdf :public bdmroot {
+class epdf : public bdmroot {
 protected:
         //! dimension of the random variable

bdm/user_info.h

@@ -143 +143 @@
 
 
+        //! \name Matematical Operations TODO
+        //!@{
+
         //! This methods tries to build a new double matrix 
         static void from_setting( mat& matrix, const Setting &element );        
@@ -207 +210 @@
                         from_setting( array_to_load(i), root[i] ); 
         }
+
+          //!@}
+
 
         static void ui_error( string message, const Setting &element );