Changeset 1319 for applications/robust

Timestamp:

03/28/11 18:09:23 (14 years ago)

Author:

sindj

Message:

Dalsi opravy ve slucovani. Ted uz to bezi!. Hura. JS

Location:

applications/robust

Files:

• main.cpp (modified) (2 diffs)
• robustlib.h (modified) (15 diffs)

applications/robust/main.cpp

@@ -162 +162 @@
                 vector<vec> conditions;
                 //emlig* emliga = new emlig(2);
-                RARX* my_rarx = new RARX(2,1);
+                RARX* my_rarx = new RARX(2,30);
 
                 for(int k = 1;k<170;k++)
@@ -209 +209 @@
                                         }
                                         myfile.close();
-                                }
-                                        
+                                }                                       
                         }       
                         

applications/robust/robustlib.h

@@ -21 +21 @@
 using namespace itpp;
 
-const double max_range = 100;//numeric_limits<double>::max()/10e-10;
+const double max_range = 10;//numeric_limits<double>::max()/10e-10;
 
 /// An enumeration of possible actions performed on the polyhedrons. We can merge them or split them.
@@ -738 +738 @@
                                         if(is_last)
                                         {                                               
+                                                if(parent_state == 1)
+                                                {
+                                                        ((toprow*)current_parent)->condition_sum-=toremove->value;
+                                                        ((toprow*)current_parent)->condition_order--;
+                                                }
+
+                                                if(parent_state == -1)
+                                                {
+                                                        ((toprow*)current_parent)->condition_sum+=toremove->value;
+                                                        ((toprow*)current_parent)->condition_order--;
+                                                }
+                                                
                                                 if(current_parent->mergechild != NULL)
                                                 {
@@ -755 +767 @@
                                                 else
                                                 {
-                                                        if(parent_state == 1)
-                                                        {
-                                                                ((toprow*)current_parent)->condition_sum-=toremove->value;
-                                                                ((toprow*)current_parent)->condition_order--;
-                                                        }
-
-                                                        if(parent_state == -1)
-                                                        {
-                                                                ((toprow*)current_parent)->condition_sum+=toremove->value;
-                                                                ((toprow*)current_parent)->condition_order--;
-                                                        }
-
                                                         //current_parent->set_state(0,MERGE);   
 
@@ -784 +784 @@
                                                 {
                                                         for_merging[level+1].push_back(current_parent);
-                                                        // current_parent->parentconditions.erase(toremove);
+                                                        //current_parent->parentconditions.erase(toremove);
                                                 }                                               
 
@@ -845 +845 @@
                                                 else
                                                 {
-                                                                
-
                                                         if(current_parent->negativechildren.size()>0)
                                                         {
@@ -852 +850 @@
 
                                                                 ((toprow*)current_parent)->condition_sum-=toadd->value;
-
                                                                         
                                                         }
@@ -945 +942 @@
                 for(int i = 0;i<statistic.size();i++)
                 {
+                        int zero = 0;
+                        int one  = 0;
+                        int two  = 0;
+
                         for(polyhedron* horiz_ref = statistic.rows[i];horiz_ref!=statistic.get_end();horiz_ref=horiz_ref->next_poly)
                         {
@@ -961 +962 @@
 
                                 char* string = "Checkpoint";
+
+                                if((*horiz_ref).parentconditions.size()==0)
+                                {
+                                        zero++;
+                                }
+                                else if((*horiz_ref).parentconditions.size()==1)
+                                {
+                                        one++;                                  
+                                }
+                                else
+                                {
+                                        two++;
+                                }
+                                
                         }
                 }
@@ -1037 +1052 @@
         void add_and_remove_condition(vec toadd, vec toremove)
         {
+                step_me(0);
+                
                 likelihood_value = numeric_limits<double>::max();
 
@@ -1208 +1225 @@
                                                 toprow* current_negative = (toprow*)(*merge_ref)->negativeparent;
 
-                                                current_positive->condition_sum -= toremove;
-                                                current_positive->condition_order--;
+                                                //current_positive->condition_sum -= toremove;
+                                                //current_positive->condition_order--;
+
+                                                current_positive->parentconditions.erase(condition_to_remove);
                                                 
                                                 current_positive->children.insert(current_positive->children.end(),current_negative->children.begin(),current_negative->children.end());
@@ -1242 +1261 @@
                                                 }
 
-                                                if(current_positive->get_state(SPLIT)!=0||current_negative->get_state(SPLIT)==0)
+                                                if(current_positive->get_state(SPLIT)!=0&&current_negative->get_state(SPLIT)==0)
                                                 {
                                                         for(list<polyhedron*>::iterator parent_ref = current_positive->parents.begin();parent_ref!=current_positive->parents.end();parent_ref++)
@@ -1429 +1448 @@
                                         delete *vert_ref;
                                 }
-                        }                       
-                }
-                
-                
+                        }
+
+                        delete condition_to_remove;
+                }
+                
+                vector<int> sizevector;
+                for(int s = 0;s<statistic.size();s++)
+                {
+                        sizevector.push_back(statistic.row_size(s));
+                        cout << statistic.row_size(s) << ", ";
+                }
+
+                cout << endl;
 
                 if(should_add)
@@ -1495 +1523 @@
                                         positive_poly->my_emlig = this;
                                         negative_poly->my_emlig = this;
+
+                                        positive_poly->parentconditions.insert(current_polyhedron->parentconditions.begin(),current_polyhedron->parentconditions.end());
+                                        negative_poly->parentconditions.insert(current_polyhedron->parentconditions.begin(),current_polyhedron->parentconditions.end());
 
                                         for(set<polyhedron*>::iterator grand_ref = current_polyhedron->totallyneutralgrandchildren.begin(); grand_ref != current_polyhedron->totallyneutralgrandchildren.end();grand_ref++)
@@ -1586 +1617 @@
                 }
 
-                /*
-                vector<int> sizevector;
+                
+                sizevector.clear();
                 for(int s = 0;s<statistic.size();s++)
                 {
@@ -1593 +1624 @@
                         cout << statistic.row_size(s) << ", ";
                 }
-                */
-
-                // cout << endl;
+                
+                cout << endl;
 
                 /*