Changeset 1320 for applications/robust/robustlib.cpp

Timestamp:

03/31/11 18:46:06 (13 years ago)

Author:

sindj

Message:

Rozdelano samplovani z emlig. Zbyva dodelat vypocet v jednotlivych simplexech triangulace. JS

Files:

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

applications/robust/robustlib.cpp

@@ -16 +16 @@
                         vert_simplex.insert((vertex*)this);
 
-                        triangulation.push_back(vert_simplex);
+                        triangulation.insert(pair<double,set<vertex*>>(0,vert_simplex));
                 }
 
                 for(list<polyhedron*>::iterator child_ref = children.begin();child_ref!=children.end();child_ref++)
                 {                       
-                        for(list<set<vertex*>>::iterator t_ref = (*child_ref)->triangulation.begin();t_ref!=(*child_ref)->triangulation.end();t_ref++)
+                        for(map<double,set<vertex*>>::iterator t_ref = (*child_ref)->triangulation.begin();t_ref!=(*child_ref)->triangulation.end();t_ref++)
                         {
                                 set<vertex*> new_simplex;
-                                new_simplex.insert((*t_ref).begin(),(*t_ref).end());                            
+                                new_simplex.insert((*t_ref).second.begin(),(*t_ref).second.end());                              
 
                                 pair<set<vertex*>::iterator,bool> ret_val = new_simplex.insert(*vertices.begin());
@@ -30 +30 @@
                                 if(ret_val.second == true)
                                 {
-                                        triangulation.push_back(new_simplex);
+                                        double cur_prob = 0;
 
                                         if(should_integrate)
                                         {
-                                                ((toprow *)this)->probability += ((toprow *)this)->integrate_simplex(new_simplex, 'S');
-                                        }
+                                                cur_prob = ((toprow *)this)->integrate_simplex(new_simplex, 'S');
+
+                                                ((toprow *)this)->probability += cur_prob;
+                                        }
+
+                                        triangulation.insert(pair<double,set<vertex*>>(cur_prob,new_simplex));
                                 } 
                         }