Changeset 1379 for applications/robust/robustlib.h

Timestamp:

07/15/11 20:26:08 (13 years ago)

Author:

sindj

Message:

Prepracovani integrace v robustlib.cpp, zjednoduseni, zesymetrizovani. Nevim jestli funguje, nutno overit a vyzkouset testovani hypotez a integraci na jednicku (u normalizacnich faktoru).JS

Files:

• applications/robust/robustlib.h (modified) (5 diffs)

applications/robust/robustlib.h

@@ -1077 +1077 @@
                 this->number_of_parameters = number_of_parameters;
 
-                condition_order = number_of_parameters+2;
+                condition_order = number_of_parameters+3;
                                                 
                 create_statistic(number_of_parameters, soft_prior_parameter);
@@ -1097 +1097 @@
                 }
 
-                log_nc = log(normalization_factor) + logfact(condition_order-number_of_parameters-2)-(condition_order-number_of_parameters-2)*log(2.0);
+                log_nc = log(normalization_factor);
 
                 /*
@@ -1105 +1105 @@
                 */
                 
-
+                cout << "Prior constructed." << endl;
         }
 
@@ -1905 +1905 @@
                 // cout << "Normalization factor: " << normalization_factor << endl;    
 
-                log_nc = log(normalization_factor) + logfact(condition_order-number_of_parameters-2)-(condition_order-number_of_parameters-2)*log(2.0);
-
+                log_nc = log(normalization_factor); // + logfact(condition_order-number_of_parameters-2)-(condition_order-number_of_parameters-2)*log(2.0);
+
+                /*
                 if(condition_order == 20)
                                                         step_me(88);
+                                                        */
 
                 //cout << "Factorial factor: " << condition_order-number_of_parameters-2 << endl;
@@ -2818 +2820 @@
                 this->has_constant = has_constant;
                 
-                posterior = new emlig(number_of_parameters,0.001);
+                posterior = new emlig(number_of_parameters,0.1);
 
                 this->window_size = window_size;