Changeset 1269 for applications/robust/robustlib.h

Timestamp:

01/07/11 10:09:42 (13 years ago)

Author:

sindj

Message:

Oprava faktorialu zapornych cisel ve vypoctu integralu v triangulaci. Zbyva opravit nenaplneni podminky v nekterych toprow polyhedronech. JS

Files:

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

applications/robust/robustlib.h

@@ -960 +960 @@
                                                 vec new_coordinates = coordinates1*t+(coordinates2(1,coordinates2.size()-1)-coordinates1);                                      
 
-                                                vertex* neutral_vertex = new vertex(new_coordinates);
-
-                                                neutral_vertex->my_emlig = this;
+                                                vertex* neutral_vertex = new vertex(new_coordinates);                                           
 
                                                 new_totally_neutral_child = neutral_vertex;
@@ -968 +966 @@
                                         else
                                         {
-                                                toprow* neutral_toprow = new toprow();
-
-                                                neutral_toprow->my_emlig = this;
+                                                toprow* neutral_toprow = new toprow();                                          
 
                                                 new_totally_neutral_child = neutral_toprow;
                                         }
+
+                                        new_totally_neutral_child->my_emlig = this;
                                         
                                         new_totally_neutral_child->children.insert(new_totally_neutral_child->children.end(),
@@ -985 +983 @@
                                                 new_totally_neutral_child->vertices.insert((*grand_ref)->vertices.begin(),(*grand_ref)->vertices.end());
                                         }
+
+                                        cout << ((toprow*)current_polyhedron)->condition << endl << toadd << endl;
 
                                         toprow* positive_poly = new toprow(((toprow*)current_polyhedron)->condition+toadd, ((toprow*)current_polyhedron)->condition_order+1);
@@ -1071 +1071 @@
                 }
 
-                
-        }
-
+                /*
+                for(polyhedron* topr_ref = statistic.rows[statistic.size()-1];topr_ref!=statistic.row_ends[statistic.size()-1]->next_poly;topr_ref=topr_ref->next_poly)
+                {
+                        cout << ((toprow*)topr_ref)->condition << endl;
+                }
+                */
+
+        }
 
         void set_correction_factors(int order)