Changeset 1211 for applications/robust

Timestamp:

10/04/10 15:09:42 (14 years ago)

Author:

sindj

Message:

Dodelavky splitting - nedokonceno. JS

Files:

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

applications/robust/robustlib.h

@@ -58 +58 @@
         vector<polyhedron*> neutralchildren;
 
+        vector<polyhedron*> totallyneutralgrandchildren;
+
+        vector<polyhedron*> totallyneutralchildren;
+
         bool totally_neutral;
 
@@ -261 +265 @@
 
         void send_state_message(polyhedron* sender, bool shouldsplit, bool shouldmerge, int level)
-        {
+        {                       
+
                 if(shouldsplit||shouldmerge)
                 {
@@ -332 +337 @@
                                 if(shouldsplit)
                                         {
+                                                current_parent->totallyneutralgrandchildren.insert(current_parent->totallyneutralgrandchildren.end(),sender->totallyneutralchildren.begin(),sender->totallyneutralchildren.end());
+
                                                 switch(sender->get_state(SPLIT))
                                                 {
@@ -348 +355 @@
                                                                 current_parent->totally_neutral = current_parent->totally_neutral && sender->totally_neutral;
                                                         }
+
+                                                        if(sender->totally_neutral)
+                                                        {
+                                                                current_parent->totallyneutralchildren.push_back(sender);
+                                                        }
                                                         
                                                 break;
@@ -357 +369 @@
                                                 if(is_last)
                                                 {
+                                                        unique(current_parent->totallyneutralgrandchildren.begin(),current_parent->totallyneutralgrandchildren.end());
+
                                                         if((current_parent->negativechildren.size()>0&&current_parent->positivechildren.size()>0)||
                                                                                                                 (current_parent->neutralchildren.size()>0&&current_parent->totally_neutral==false))
@@ -365 +379 @@
                                                                         current_parent->set_state(0, SPLIT);
                                                         }
-                                                        else if(current_parent->negativechildren.size()>0)
+                                                        else
                                                         {
-                                                                current_parent->set_state(-1, SPLIT);
-
+                                                                if(current_parent->negativechildren.size()>0)
+                                                                {
+                                                                        current_parent->set_state(-1, SPLIT);
+                                                                }
+                                                                else if(current_parent->positivechildren.size()>0)
+                                                                {
+                                                                current_parent->set_state(1, SPLIT);
+                                                                }
+                                                                else
+                                                                {
+                                                                        current_parent->raise_multiplicity();                                                           
+                                                                }
+
+                                                                current_parent->positivechildren.clear();
                                                                 current_parent->negativechildren.clear();
                                                                 current_parent->neutralchildren.clear();
-                                                                
-                                                        }
-                                                        else if(current_parent->positivechildren.size()>0)
-                                                        {
-                                                                current_parent->set_state(1, SPLIT);
-
-                                                                current_parent->positivechildren.clear();
-                                                                current_parent->neutralchildren.clear();
-                                                        }
-                                                        else
-                                                        {
-                                                                current_parent->raise_multiplicity();
-
-                                                                current_parent->neutralchildren.clear();
+                                                                current_parent->totallyneutralchildren.clear();
+                                                                current_parent->totallyneutralgrandchildren.clear();
+                                                                current_parent->totally_neutral = NULL; 
                                                         }
                                                 }
@@ -508 +523 @@
                                 if(should_add)
                                 {
-                                        current_vertex->set_state(toadd*appended_vec,SPLIT);
+                                        double local_condition = toadd*appended_vec;
+
+                                        current_vertex->set_state(local_condition,SPLIT);
+
+                                        if(local_condition == 0)
+                                        {
+                                                current_vertex->totally_neutral = true;
+
+                                                current_vertex->multiplicity++;
+                                        }                                       
                                 }
                         
                                 if(should_remove)
                                 {
-                                        current_vertex->set_state(toremove*current_vertex->get_coordinates(),MERGE);
-                                }
-
-                                if(current_vertex->get_state(MERGE) == 0)
-                                {
-                                        for_merging[0].push_back(current_vertex);
-                                }
+                                        double local_condition = toremove*appended_vec;
+
+                                        current_vertex->set_state(local_condition,MERGE);
+
+                                        if(local_condition == 0)
+                                        {
+                                                for_merging[0].push_back(current_vertex);
+                                        }
+                                }                               
                         }
 
@@ -533 +559 @@
                                 polyhedron* current_polyhedron = (*vert_ref)[original_size-1-split_counter];
 
-
+                                
                         }
                 }