Changeset 1335 for applications/robust/robustlib.cpp

Timestamp:

04/19/11 18:15:22 (13 years ago)

Author:

sindj

Message:

Dokoncovani samplingu, uz to skoro funguje, jen to spatne generuje sigma. JS

Files:

• applications/robust/robustlib.cpp (modified) (4 diffs)

applications/robust/robustlib.cpp

@@ -2 +2 @@
 
 
-void polyhedron::triangulate(bool should_integrate)
+double polyhedron::triangulate(bool should_integrate)
         {
                 for(set<simplex*>::iterator t_ref = triangulation.begin();t_ref!=triangulation.end();t_ref++)
@@ -48 +48 @@
                                 }
                         }       
-                }               
+                }       
+
+                if(should_integrate)
+                {
+                        return ((toprow *)this)->probability;
+                }
+                else
+                {
+                        return 0.0;
+                }
                 
                 /*
@@ -165 +174 @@
                                                 
 
-                                                if(a_0<current_emlig->likelihood_value)
+                                                if(a_0<current_emlig->min_ll)
                                                 {
                                                         current_emlig->minimal_vertex = base_vertex;
-                                                        current_emlig->likelihood_value = a_0;
+                                                        current_emlig->min_ll = a_0;
                                                 }
 
                                                 double a_m = (*vert_ref)->get_coordinates()*cur_condition-as_toprow->condition_sum[0];
-                                                if(a_m<current_emlig->likelihood_value)
+                                                if(a_m<current_emlig->min_ll)
                                                 {
                                                         current_emlig->minimal_vertex = (*vert_ref);
-                                                        current_emlig->likelihood_value = a_m;                                          
+                                                        current_emlig->min_ll = a_m;                                            
                                                 }
 
@@ -212 +221 @@
                         }*/
 
-                        double int_value = 0;
+                        double int_value = 0;                   
 
                         // cout << jacobian << endl;