Changeset 1376 for applications/robust/robustlib.h

Timestamp:

06/21/11 19:09:56 (13 years ago)

Author:

sindj

Message:

Uprava integrace v souladu s clankem. JS

Files:

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

applications/robust/robustlib.h

@@ -22 +22 @@
 using namespace itpp;
 
-const double max_range = 10;//numeric_limits<double>::max()/10e-10;
+const double max_range = 5;//numeric_limits<double>::max()/10e-10;
 
 /// An enumeration of possible actions performed on the polyhedrons. We can merge them or split them.
@@ -753 +753 @@
                         {
                                 vertex_ref++;
-                        }
-                        while((*vertex_ref)->parentconditions.find(condition)==(*vertex_ref)->parentconditions.end());
-
-                        double product = (*vertex_ref)->get_coordinates()*condition->value;
+
+                                if(vertex_ref==horiz_ref->vertices.end())
+                                {
+                                        return;
+                                }
+                        }
+                        while((*vertex_ref)->parentconditions.find(condition)!=(*vertex_ref)->parentconditions.end());
+
+                        
+                        
+                        vec appended_coords = (*vertex_ref)->get_coordinates();
+                        appended_coords.ins(0,-1.0);
+                        
+                        double product = appended_coords*condition->value;
 
                         if(should_be_added)
@@ -1677 +1687 @@
                         }
 
+                        for(int i = 1;i<for_merging.size();i++)
+                        {
+                                for(list<polyhedron*>::iterator merge_ref = for_merging[i].begin();merge_ref!=for_merging[i].end();merge_ref++)
+                                {
+                                        delete (*merge_ref);
+                                }
+                        }
+                        
                         for(set<vertex*>::iterator vert_ref = vertices_to_be_reduced.begin();vert_ref!=vertices_to_be_reduced.end();vert_ref++)
                         {