Changeset 1405 for applications/robust/robustlib.h

Timestamp:

11/11/11 21:27:50 (13 years ago)

Author:

sindj

Message:

 

Files:

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

applications/robust/robustlib.h

@@ -1658 +1658 @@
                                                 // **************************************************************************
 
+                                                if(current_negative->get_state(SPLIT)==0)
+                                                {
+                                                        for_splitting[k].remove(current_negative);
+                                                }                                               
+                                                
                                                 if(!current_positive->totally_neutral)
                                                 {
@@ -1687 +1692 @@
                                                                 // polyhedron to neutral
                                                                 current_positive->set_state(0,SPLIT);
-
-                                                                for_splitting[k].remove(current_negative);
+                                                                
                                                                 // and we add it to the list of polyhedrons to be SPLIT
                                                                 for_splitting[k].push_back(current_positive);                                                   
@@ -1696 +1700 @@
                                                         // If the MERGEd polyhedron is to be split..
                                                         if(current_positive->get_state(SPLIT)==0)
-                                                        {
+                                                        {                                                               
                                                                 // We need to fill the lists related to split with correct values, adding the SPLIT
                                                                 // positive, negative and neutral children to according list in the MERGE positive,
@@ -1759 +1763 @@
 
                                                 // We clear the grandparents list for further reuse.
-                                                current_positive->grandparents.clear();
-                                
-                                                // Triangulate the newly created polyhedron and compute its normalization integral if the
-                                                // polyhedron is a toprow.
-                                                normalization_factor += current_positive->triangulate(k==for_splitting.size()-1 && !will_be_split);
+                                                current_positive->grandparents.clear();                         
+                                                
                                                 
                                                 // Delete the negative polyhedron from the Hasse diagram (rewire all the connections)
@@ -1817 +1818 @@
                                                 {                                                       
                                                         vertices_to_be_reduced.insert((vertex*)(*merge_ref));                                                   
-                                                }                                                                                               
+                                                }       
+
+                                                // Triangulate the newly created polyhedron and compute its normalization integral if the
+                                                // polyhedron is a toprow.
+                                                normalization_factor += current_positive->triangulate(k==for_splitting.size()-1 && !will_be_split);
                                         }
                                 }                       
@@ -1926 +1931 @@
                                                 toprow* neutral_toprow = new toprow();
                                                 
-                                                // A toprow needs a valid condition
-                                                neutral_toprow->condition_sum   = ((toprow*)current_polyhedron)->condition_sum; // tohle tu bylo driv: zeros(number_of_parameters+1);
-                                                neutral_toprow->condition_order = ((toprow*)current_polyhedron)->condition_order+1;
+                                                if(k==number_of_parameters)
+                                                {
+                                                        // A toprow needs a valid condition
+                                                        neutral_toprow->condition_sum   = ((toprow*)current_polyhedron)->condition_sum; // tohle tu bylo driv: zeros(number_of_parameters+1);
+                                                        neutral_toprow->condition_order = ((toprow*)current_polyhedron)->condition_order+1;
+                                                }
 
                                                 // We assign it to the totally neutral child variable