Changeset 1299 for applications/robust/robustlib.cpp

Timestamp:

03/16/11 17:20:48 (13 years ago)

Author:

sindj

Message:

Skoro dodelano slucovani polyhedronu v pripade odstraneni podminky (bylo nutne udelat znovu, kvuli predchozi ztrate prace zpusebene budto SVN nebo mnou). JS

Files:

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

applications/robust/robustlib.cpp

@@ -4 +4 @@
 void polyhedron::triangulate(bool should_integrate)
         {
+                this->triangulation.clear();
+
                 if(should_integrate)
                 {
@@ -14 +16 @@
                         {
                                 set<vertex*> new_simplex;
-                                new_simplex.insert((*t_ref).begin(),(*t_ref).end());                            
-
-                                pair<set<vertex*>::iterator,bool> ret_val = new_simplex.insert(*vertices.begin());
-
-                                if(ret_val.second == true)
-                                {
+                                new_simplex.insert((*t_ref).begin(),(*t_ref).end());                    
+
+                                for(set<vertex*>::iterator suitable_vert_ref = vertices.begin();*suitable_vert_ref<*(*t_ref).begin();suitable_vert_ref++)
+                                {
+                                        new_simplex.insert(*suitable_vert_ref);
+
                                         triangulation.push_back(new_simplex);
 
@@ -26 +28 @@
                                                 ((toprow *)this)->probability += ((toprow *)this)->integrate_simplex(new_simplex, 'S');
                                         }
-                                } 
+                                }                               
                         }       
                 }               
@@ -87 +89 @@
 
                         
-                                //cout << endl << "Base coords:" << base_vertex->get_coordinates() << endl;
+                                cout << endl << "Base coords:" << base_vertex->get_coordinates() << endl;
 
                                 a_0 = base_vertex->get_coordinates()*cur_condition-as_toprow->condition[0];
@@ -134 +136 @@
                                                 //cout << "a0:" << a_0 << " a0 coords:" << base_vertex->get_coordinates() << " am:" << a_m << " am coords:" << (*vert_ref)->get_coordinates() << endl;
 
-                                                //cout << "Absolute coords:(V"  << row_count << ")" << (*vert_ref)->get_coordinates() << endl;
+                                                cout << "Absolute coords:(V"  << row_count << ")" << (*vert_ref)->get_coordinates() << endl;
                                                 //cout << "Relative coords:(V"  << row_count << ")" << relative_coords << endl;