Changeset 1307 for applications/robust

Timestamp:

03/24/11 16:21:08 (14 years ago)

Author:

sindj

Message:

Odstraneni dalsich chyb ve spojovani polyhedronu. Jeste nejsou vsechny vychytane. JS

Location:

applications/robust

Files:

• main.cpp (modified) (1 diff)
• robustlib.h (modified) (10 diffs)

applications/robust/main.cpp

@@ -162 +162 @@
                 vector<vec> conditions;
                 //emlig* emliga = new emlig(2);
-                RARX* my_rarx = new RARX(2,0);
+                RARX* my_rarx = new RARX(2,1);
 
                 for(int k = 1;k<170;k++)

applications/robust/robustlib.h

@@ -767 +767 @@
                                                         }
 
-                                                        //current_parent->set_state(0,MERGE);                                                   
+                                                        //current_parent->set_state(0,MERGE);   
+
+                                                        if(level == number_of_parameters - 1)
+                                                        {
+                                                                toprow* cur_par_toprow = ((toprow*)current_parent);
+                                                                cur_par_toprow->probability = 0.0;
+                                                                                
+                                                                for(list<set<vertex*>>::iterator t_ref = current_parent->triangulation.begin();t_ref!=current_parent->triangulation.end();t_ref++)
+                                                                {
+                                                                        cur_par_toprow->probability += cur_par_toprow->integrate_simplex(*t_ref,'C');
+                                                                }                                                                       
+                                                        }
                                                 }
 
@@ -776 +787 @@
                                                 }                                               
 
-                                                current_parent->mergechild = NULL;
-                                                current_parent->message_counter = 0;                                            
-
-                                                if(level == number_of_parameters - 1)
-                                                {
-                                                        toprow* cur_par_toprow = ((toprow*)current_parent);
-                                                        cur_par_toprow->probability = 0.0;
-                                                                        
-                                                        for(list<set<vertex*>>::iterator t_ref = current_parent->triangulation.begin();t_ref!=current_parent->triangulation.end();t_ref++)
-                                                        {
-                                                                cur_par_toprow->probability += cur_par_toprow->integrate_simplex(*t_ref,'C');
-                                                        }                                                                       
-                                                }
+                                                                                                
                                         }                                       
                                 }
@@ -879 +878 @@
                                                         }
 
-                                                        current_parent->positivechildren.clear();
-                                                        current_parent->negativechildren.clear();
-                                                        current_parent->neutralchildren.clear();
-                                                        current_parent->totallyneutralchildren.clear();
-                                                        current_parent->totallyneutralgrandchildren.clear();
-                                                        // current_parent->grandparents.clear();
-                                                        current_parent->positiveneutralvertices.clear();
-                                                        current_parent->negativeneutralvertices.clear();
-                                                        current_parent->totally_neutral = NULL;
-                                                        current_parent->kids_rel_addresses.clear();
-                                                        current_parent->message_counter = 0;
+                                                        if(current_parent->mergechild == NULL)
+                                                        {
+                                                                current_parent->positivechildren.clear();
+                                                                current_parent->negativechildren.clear();
+                                                                current_parent->neutralchildren.clear();
+                                                                current_parent->totallyneutralchildren.clear();
+                                                                current_parent->totallyneutralgrandchildren.clear();
+                                                                // current_parent->grandparents.clear();
+                                                                current_parent->positiveneutralvertices.clear();
+                                                                current_parent->negativeneutralvertices.clear();
+                                                                current_parent->totally_neutral = NULL;
+                                                                current_parent->kids_rel_addresses.clear();
+                                                        }                                                       
                                                 }
                                         }
@@ -896 +897 @@
                                 if(is_last)
                                 {
+                                        current_parent->mergechild = NULL;
+                                        current_parent->message_counter = 0;
+
                                         send_state_message(current_parent,toadd,toremove,level+1);
                                 }
@@ -1213 +1217 @@
                                                 }
                                                 
-                                                current_positive->negativechildren.insert(current_positive->negativechildren.end(),current_negative->negativechildren.begin(),current_negative->negativechildren.end());                                                
+                                                if((current_positive->get_state(SPLIT)==0&&!current_positive->totally_neutral)||(current_negative->get_state(SPLIT)==0&&!current_negative->totally_neutral))
+                                                {
+                                                        current_positive->negativechildren.insert(current_positive->negativechildren.end(),current_negative->negativechildren.begin(),current_negative->negativechildren.end());                                                
+                                                        
+                                                        current_positive->positivechildren.insert(current_positive->positivechildren.end(),current_negative->positivechildren.begin(),current_negative->positivechildren.end());
+                                                                                                        
+                                                        current_positive->neutralchildren.insert(current_positive->neutralchildren.end(),current_negative->neutralchildren.begin(),current_negative->neutralchildren.end());
                                                 
-                                                current_positive->positivechildren.insert(current_positive->positivechildren.end(),current_negative->positivechildren.begin(),current_negative->positivechildren.end());
-                                                                                                
-                                                current_positive->neutralchildren.insert(current_positive->neutralchildren.end(),current_negative->positivechildren.begin(),current_negative->positivechildren.end());
-                                        
-                                                switch((*merge_ref)->get_state(SPLIT))
-                                                {
-                                                case -1:
-                                                        current_positive->negativechildren.remove(*merge_ref);
-                                                        break;
-                                                case 0:
-                                                        current_positive->neutralchildren.remove(*merge_ref);
-                                                        break;
-                                                case 1:
-                                                        current_positive->positivechildren.remove(*merge_ref);
-                                                        break;
+                                                        switch((*merge_ref)->get_state(SPLIT))
+                                                        {
+                                                        case -1:
+                                                                current_positive->negativechildren.remove(*merge_ref);
+                                                                break;
+                                                        case 0:
+                                                                current_positive->neutralchildren.remove(*merge_ref);
+                                                                break;
+                                                        case 1:
+                                                                current_positive->positivechildren.remove(*merge_ref);
+                                                                break;
+                                                        }
+
+                                                        current_positive->totallyneutralchildren.insert(current_negative->totallyneutralchildren.begin(),current_negative->totallyneutralchildren.end());
+                                                        
+                                                        current_positive->totallyneutralchildren.erase(*merge_ref);
+
+                                                        current_positive->totallyneutralgrandchildren.insert(current_negative->totallyneutralgrandchildren.begin(),current_negative->totallyneutralgrandchildren.end());
+
+                                                        current_positive->negativeneutralvertices.insert(current_negative->negativeneutralvertices.begin(),current_negative->negativeneutralvertices.end());
+                                                        current_positive->positiveneutralvertices.insert(current_negative->positiveneutralvertices.begin(),current_negative->positiveneutralvertices.end());
+                                                }
+                                                else
+                                                {
+                                                        if(!current_positive->totally_neutral)
+                                                        {
+                                                                current_positive->positivechildren.clear();
+                                                                current_positive->negativechildren.clear();
+                                                                current_positive->neutralchildren.clear();
+                                                                current_positive->totallyneutralchildren.clear();
+                                                                current_positive->totallyneutralgrandchildren.clear();                                                          
+                                                                current_positive->positiveneutralvertices.clear();
+                                                                current_positive->negativeneutralvertices.clear();
+                                                                current_positive->totally_neutral = NULL;
+                                                                current_positive->kids_rel_addresses.clear();                                                           
+                                                        }
+                                                
                                                 }
 
@@ -1239 +1271 @@
                                                         (*parent_ref)->children.remove(current_negative);
                                                         (*parent_ref)->children.push_back(current_positive);
-                                                }
-
-                                                current_positive->totallyneutralchildren.insert(current_negative->totallyneutralchildren.begin(),current_negative->totallyneutralchildren.end());
-                                                current_positive->totallyneutralchildren.erase(*merge_ref);
-
-                                                current_positive->totallyneutralgrandchildren.insert(current_negative->totallyneutralgrandchildren.begin(),current_negative->totallyneutralgrandchildren.end());
+                                                }                                               
                                                 
                                                 current_positive->vertices.insert(current_negative->vertices.begin(),current_negative->vertices.end());
-                                                current_positive->negativeneutralvertices.insert(current_negative->negativeneutralvertices.begin(),current_negative->negativeneutralvertices.end());
-                                                current_positive->positiveneutralvertices.insert(current_negative->positiveneutralvertices.begin(),current_negative->positiveneutralvertices.end());
+                                                
                                                 
                                                 for(set<vertex*>::iterator vert_ref = (*merge_ref)->vertices.begin();vert_ref!=(*merge_ref)->vertices.end();vert_ref++)
@@ -1255 +1281 @@
                                                         {
                                                                 current_positive->vertices.erase(*vert_ref);
-                                                                current_positive->negativeneutralvertices.erase(*vert_ref);
-                                                                current_positive->positiveneutralvertices.erase(*vert_ref);
+                                                                
+                                                                if((current_positive->get_state(SPLIT)==0&&!current_positive->totally_neutral)||(current_negative->get_state(SPLIT)==0&&!current_negative->totally_neutral))
+                                                                {
+                                                                        current_positive->negativeneutralvertices.erase(*vert_ref);
+                                                                        current_positive->positiveneutralvertices.erase(*vert_ref);
+                                                                }
                                                         }
                                                 }
@@ -1314 +1344 @@
                                                 }
 
+                                                /*
                                                 for(list<polyhedron*>::iterator parent_ref = (*merge_ref)->parents.begin();parent_ref!=(*merge_ref)->parents.end();parent_ref++)
                                                 {
@@ -1321 +1352 @@
                                                         (*parent_ref)->children.remove(*merge_ref);
                                                 }
+                                                */
 
                                                 for(set<polyhedron*>::iterator grand_ch_ref = (*merge_ref)->totallyneutralgrandchildren.begin();grand_ch_ref!=(*merge_ref)->totallyneutralgrandchildren.end();grand_ch_ref++)
@@ -1333 +1365 @@
                                                 }
                                                 
+                                                for_splitting[k-1].remove(*merge_ref);
 
                                                 statistic.delete_polyhedron(k-1,*merge_ref);