Changeset 1365 for applications/robust/robustlib.h

Timestamp:

05/10/11 13:10:46 (13 years ago)

Author:

sindj

Message:

Cele rozkopano a znovu poskladano za ucelem spravne integrace a nic - jen se mi podarilo doplnit faktor 1/2^{n. Sakris. JS}

Files:

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

applications/robust/robustlib.h

@@ -1063 +1063 @@
         /// A default constructor creates an emlig with predefined statistic representing only the range of the given
         /// parametric space, where the number of parameters of the needed model is given as a parameter to the constructor.
-        emlig(int number_of_parameters, bool is_proper, double soft_prior_parameter)
+        emlig(int number_of_parameters, double soft_prior_parameter)
         {       
                 this->number_of_parameters = number_of_parameters;
 
                 condition_order = number_of_parameters+2;
-
-                if(is_proper)
-                        condition_order++;
-                
+                                                
                 create_statistic(number_of_parameters, soft_prior_parameter);
 
@@ -1078 +1075 @@
                 min_ll = numeric_limits<double>::max();         
 
-                if(is_proper)
-                {
-                        double normalization_factor = 0;
-                        int counter = 0;
-                        for(polyhedron* top_ref = statistic.rows[number_of_parameters];top_ref!=statistic.get_end();top_ref=top_ref->next_poly)
-                        {
-                                counter++;
-                                toprow* cur_toprow = (toprow*)top_ref;
+                
+                double normalization_factor = 0;
+                int counter = 0;
+                for(polyhedron* top_ref = statistic.rows[number_of_parameters];top_ref!=statistic.get_end();top_ref=top_ref->next_poly)
+                {
+                        counter++;
+                        toprow* cur_toprow = (toprow*)top_ref;
                                 
-                                set<simplex*>::iterator cur_simplex = cur_toprow->triangulation.begin();
-                                normalization_factor += cur_toprow->integrate_simplex(*cur_simplex,'X');
-                        }
-
-                        log_nc = log(normalization_factor) + logfact(condition_order-number_of_parameters-2);
-
-                        /*
-                        cout << "part1: " << log(normalization_factor) << endl;
-                        cout << "part2: " << logfact(condition_order-number_of_parameters-2) << endl;
-                        pause(1);
-                        */
-                }
+                        set<simplex*>::iterator cur_simplex = cur_toprow->triangulation.begin();
+                        normalization_factor += cur_toprow->integrate_simplex(*cur_simplex,'X');
+                }
+
+                log_nc = log(normalization_factor) + logfact(condition_order-number_of_parameters-2)-(condition_order-number_of_parameters-2)*2;
+
+                /*
+                cout << "part1: " << log(normalization_factor) << endl;
+                cout << "part2: " << logfact(condition_order-number_of_parameters-2) << endl;
+                pause(1);
+                */
+                
 
         }
@@ -1884 +1880 @@
                 // cout << "Normalization factor: " << normalization_factor << endl;    
 
-                log_nc = log(normalization_factor) + logfact(condition_order-number_of_parameters-2);
-
-                
+                log_nc = log(normalization_factor) + logfact(condition_order-number_of_parameters-2)-(condition_order-number_of_parameters-2)*2;
+
+                /*
                 cout << "part1: " << log(normalization_factor) << endl;
                 cout << "part2: " << logfact(condition_order-number_of_parameters-2) << endl;
                 pause(1);
+                */
                 
 
@@ -2608 +2605 @@
                                                 vec2.ins(0,soft_prior_parameter);
 
-                                                vec1.ins(0,-1);
-                                                vec2.ins(0,-1);
-                                        }
-                                        
-                                        cout << vec1 << endl;
-                                        cout << vec2 << endl;
+                                                vec1.ins(0,0);
+                                                vec2.ins(0,0);
+                                        }
+                                        
+                                        // cout << vec1 << endl;
+                                        // cout << vec2 << endl;
 
 
@@ -2791 +2788 @@
                 this->has_constant = has_constant;
                 
-                posterior = new emlig(number_of_parameters,true,0.001);
+                posterior = new emlig(number_of_parameters,0.001);
 
                 this->window_size = window_size;