Changeset 1338 for applications/robust/robustlib.h

Timestamp:

04/27/11 19:00:36 (13 years ago)

Author:

sindj

Message:

Zacatky experimentovani v robustlib. Zacleneni vypoctu polynomialni rovnice pro optimalni akci s vyuzitim funkce itpp::roots(). Odstranovani zbylych chyb. JS

Files:

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

applications/robust/robustlib.h

@@ -883 +883 @@
                                 {
                                         current_parent->totallyneutralgrandchildren.insert(sender->totallyneutralchildren.begin(),sender->totallyneutralchildren.end());
-
+                                        
                                         for(set<polyhedron*>::iterator tot_child_ref = sender->totallyneutralchildren.begin();tot_child_ref!=sender->totallyneutralchildren.end();tot_child_ref++)
                                         {
                                                 (*tot_child_ref)->grandparents.insert(current_parent);
+                                        }
+
+                                        if(current_parent->totally_neutral == NULL)
+                                        {
+                                                current_parent->totally_neutral = sender->totally_neutral;
+                                        }
+                                        else
+                                        {
+                                                current_parent->totally_neutral = current_parent->totally_neutral && sender->totally_neutral;
                                         }
 
@@ -898 +907 @@
                                                 current_parent->neutralchildren.push_back(sender);
                                                 current_parent->positiveneutralvertices.insert(sender->positiveneutralvertices.begin(),sender->positiveneutralvertices.end());
-                                                current_parent->negativeneutralvertices.insert(sender->negativeneutralvertices.begin(),sender->negativeneutralvertices.end());
-
-                                                if(current_parent->totally_neutral == NULL)
-                                                {
-                                                        current_parent->totally_neutral = sender->totally_neutral;
-                                                }
-                                                else
-                                                {
-                                                        current_parent->totally_neutral = current_parent->totally_neutral && sender->totally_neutral;
-                                                }
+                                                current_parent->negativeneutralvertices.insert(sender->negativeneutralvertices.begin(),sender->negativeneutralvertices.end());                                          
 
                                                 if(sender->totally_neutral)
@@ -922 +922 @@
 
                                         if(is_last)
-                                        {
+                                        {                                               
                                                 
-                                                /// \TODO Nechapu druhou podminku, zda se mi ze je to spatne.. Nemela by byt jen prvni? Nebo se jedna o nastaveni totalni neutrality?
-                                                if((current_parent->negativechildren.size()>0&&current_parent->positivechildren.size()>0)||
-                                                                                                        (current_parent->neutralchildren.size()>0&&current_parent->totally_neutral==false))
+                                                if((current_parent->negativechildren.size()>0&&current_parent->positivechildren.size()>0)
+                                                                                                        ||(current_parent->neutralchildren.size()>0&&current_parent->totallyneutralchildren.empty()))
                                                 {
                                                         for_splitting[level+1].push_back(current_parent);                                               
@@ -981 +980 @@
                                                                 current_parent->negativechildren.clear();
                                                                 current_parent->neutralchildren.clear();
-                                                                current_parent->totallyneutralchildren.clear();
+                                                                //current_parent->totallyneutralchildren.clear();
                                                                 current_parent->totallyneutralgrandchildren.clear();
                                                                 // current_parent->grandparents.clear();
@@ -1002 +1001 @@
                         
                         }
-                        
+
+                        sender->totallyneutralchildren.clear();                 
                 }               
         }
@@ -1049 +1049 @@
                         {
                                 
-                                
+                                /*
                                 if(i==statistic.size()-1)
                                 {
@@ -1055 +1055 @@
                                         cout << "Order:" << ((toprow*)horiz_ref)->condition_order << endl;
                                 }
+                                */
+
+                                cout << "Stepped." << endl;
                                 
                                 /*
@@ -1259 +1262 @@
                                                 current_vertex->negativeneutralvertices.insert(current_vertex);
                                                 current_vertex->positiveneutralvertices.insert(current_vertex);
-                                        }                                       
+                                        }
+                                        else
+                                        {
+                                                current_vertex->totally_neutral = false;
+                                        }
                                 }
                         
@@ -1296 +1303 @@
                 if(should_remove)
                 {
+                        /*
                         for(int i = 0;i<for_merging.size();i++)
                         {
@@ -1305 +1313 @@
                                 cout << endl;
                         }
+                        */
+
+                        cout << "Merging." << endl;
 
                         set<vertex*> vertices_to_be_reduced;                    
@@ -1407 +1418 @@
                                                         }
 
+                                                        /*
                                                         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());
@@ -1423 +1436 @@
                                                                 current_positive->negativechildren.clear();
                                                                 current_positive->neutralchildren.clear();
-                                                                current_positive->totallyneutralchildren.clear();
+                                                                // current_positive->totallyneutralchildren.clear();
                                                                 current_positive->totallyneutralgrandchildren.clear();                                                          
                                                                 current_positive->positiveneutralvertices.clear();
@@ -1558 +1571 @@
                 }
                 
+                /*
                 vector<int> sizevector;
                 for(int s = 0;s<statistic.size();s++)
@@ -1564 +1578 @@
                         cout << statistic.row_size(s) << ", ";
                 }
-
-                cout << endl;
+                */
+
+                //cout << endl;
+
+                // this->step_me(2);
 
                 if(should_add)
@@ -1722 +1739 @@
                 }
 
-                
+                /*
                 sizevector.clear();
                 for(int s = 0;s<statistic.size();s++)
@@ -1731 +1748 @@
                 
                 cout << endl;
+                */
 
                 /*
@@ -1943 +1961 @@
 
                                 //// cout << "Sigma: " << sigma << endl;
-                                //// cout << "Nr. of runs: " << number_of_runs << endl;
+                                //// cout << "Nr. of sigma runs: " << number_of_runs << endl;
 
                                 int dimension = (*s_ref)->vertices.size()-1;
@@ -2087 +2105 @@
                                         sample_mat.ins_col(0,sample_coordinates);
 
-                                        cout << sample_mat.cols() << ",";
+                                        // cout << sample_mat.cols() << ",";
                                 }
 
@@ -2096 +2114 @@
                         }
 
-                        cout << endl;
+                        // cout << endl;
                         return sample_mat;
                 }