Changeset 1357 for applications/robust

Timestamp:

05/06/11 16:25:00 (14 years ago)

Author:

sindj

Message:

Opravena chyba s uvolnovanim pameti pri ruseni ve for_merging poli a dalsi drobne nedostatky. JS

Location:

applications/robust

Files:

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

applications/robust/main.cpp

@@ -18 +18 @@
 
 const int emlig_size = 2;
-const int utility_constant = 10;
+const int utility_constant = 5;
 
 
@@ -139 +139 @@
         vector<vector<string>> strings;
 
-        char* file_strings[3] = {"c:\\dataCDClosePercDiff","c:\\ar_student_single","c:\\ar_cauchy_single"};
+        char* file_strings[3] = {"c:\\dataADClosePercDiff","c:\\ar_student_single","c:\\ar_cauchy_single"};
 
         for(int i = 0;i<3;i++)
@@ -166 +166 @@
                 }
         }
+
+        
         
         for(int j = 0;j<strings.size();j++)
@@ -171 +173 @@
                 vector<vec> conditions;
                 //emlig* emliga = new emlig(2);
-                RARX* my_rarx = new RARX(2,10,false);
+                RARX* my_rarx = new RARX(2,8,false);
                 
                 

applications/robust/robustlib.cpp

@@ -169 +169 @@
                                                         base_ref++;
 
-                                                        if(base_ref == simplex->vertices.end())
+                                                        if(base_ref == simplex->vertices.end()&&simplex->vertices.size()!=2)
                                                         {
                                                                 throw new exception("Equal local conditions are paired. If this ever occurs, the software has to be modified to include multiplied a_0!!");
                                                         }
+                                                        /*
+                                                        else if(implex->vertices.size()==2)
+                                                        {
+                                                                return relative_coords[0]*exp
+                                                        }
+                                                        */
                                                         
                                                         order_correct = false;                                          

applications/robust/robustlib.h

@@ -22 +22 @@
 using namespace itpp;
 
-const double max_range = 50;//numeric_limits<double>::max()/10e-10;
+const double max_range = 5;//numeric_limits<double>::max()/10e-10;
 
 /// An enumeration of possible actions performed on the polyhedrons. We can merge them or split them.
@@ -924 +924 @@
                                         case 0:
                                                 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(level!=0)
+                                                {
+                                                        current_parent->positiveneutralvertices.insert(sender->positiveneutralvertices.begin(),sender->positiveneutralvertices.end());
+                                                        current_parent->negativeneutralvertices.insert(sender->negativeneutralvertices.begin(),sender->negativeneutralvertices.end());                                          
+                                                }
+                                                else
+                                                {
+                                                        current_parent->positiveneutralvertices.insert(*sender->vertices.begin());
+                                                        current_parent->negativeneutralvertices.insert(*sender->vertices.begin());
+                                                }
 
                                                 if(sender->totally_neutral)
@@ -1317 +1326 @@
 
                                                 current_vertex->raise_multiplicity();
-                                                current_vertex->parentconditions.insert(condition_to_add);
-
-                                                current_vertex->negativeneutralvertices.insert(current_vertex);
-                                                current_vertex->positiveneutralvertices.insert(current_vertex);
+                                                current_vertex->parentconditions.insert(condition_to_add);                                              
                                         }
                                         else
@@ -1367 +1373 @@
                                 for(list<polyhedron*>::iterator merge_ref = for_merging[i].begin();merge_ref!=for_merging[i].end();merge_ref++)
                                 {
-                                        cout << (*merge_ref)->get_state(MERGE) << ",";
-                                }
-
-                                cout << endl;
+                                        
+                                        for(list<polyhedron*>::iterator par_ref = (*merge_ref)->children.begin();par_ref!=(*merge_ref)->children.end();par_ref++)
+                                        {
+                                                if(find((*par_ref)->parents.begin(),(*par_ref)->parents.end(),(*merge_ref))==(*par_ref)->parents.end())
+                                                {
+                                                        cout << "Parent/child relations are not matched!" << endl;
+                                                }
+                                        }
+                                        
+                                        //cout << (*merge_ref)->get_state(MERGE) << ",";
+                                }
+
+                                // cout << endl;
                         }
                         */
+                        
+                        
 
                         cout << "Merging." << endl;
@@ -1591 +1608 @@
                                                 {
                                                         (*grand_p_ref)->totallyneutralgrandchildren.erase(*merge_ref);
-                                                }
+                                                }                               
+
+                                                statistic.delete_polyhedron(k-1,*merge_ref);
+
                                                 
-                                                for_splitting[k-1].remove(*merge_ref);
-
-                                                statistic.delete_polyhedron(k-1,*merge_ref);
 
                                                 if(k==1)
-                                                {
+                                                {                                                       
                                                         vertices_to_be_reduced.insert((vertex*)(*merge_ref));
+                                                        for_splitting[k-1].remove(*merge_ref);
                                                 }
                                                 else
                                                 {
-                                                        delete *merge_ref;
+                                                        delete (*merge_ref);
+                                                        for_splitting[k-1].remove(*merge_ref);
                                                 }
                                         }
@@ -1620 +1639 @@
                                 else
                                 {
-                                        delete *vert_ref;
+                                        delete (*vert_ref);
                                 }
                         }
@@ -1812 +1831 @@
                 */
 
-                cout << "Normalization factor: " << normalization_factor << endl;       
+                // cout << "Normalization factor: " << normalization_factor << endl;    
 
                 log_nc = log(normalization_factor) + logfact(condition_order-number_of_parameters-2);
@@ -2708 +2727 @@
                         
                         yt.ins(c_size,1.0);
-                }
-                
+                }               
+
                 if(yt.size() == posterior->number_of_parameters+1)
                 {