Changeset 1324 for applications/robust/robustlib.cpp

Timestamp:

04/07/11 18:33:51 (13 years ago)

Author:

sindj

Message:

Temer dodelane samplovani, rozdelany samling sigma, sampling alpha temer dokoncen. JS

Files:

• applications/robust/robustlib.cpp (modified) (9 diffs)

applications/robust/robustlib.cpp

@@ -4 +4 @@
 void polyhedron::triangulate(bool should_integrate)
         {
+                for(set<simplex*>::iterator t_ref = triangulation.begin();t_ref!=triangulation.end();t_ref++)
+                {
+                        delete (*t_ref);
+                }               
                 triangulation.clear();
 
@@ -13 +17 @@
                 if(vertices.size()==1)
                 {
-                        set<vertex*> vert_simplex;
-                        vert_simplex.insert((vertex*)this);
-
-                        triangulation.insert(pair<double,set<vertex*>>(0,vert_simplex));
+                        simplex* vert_simplex = new simplex((vertex*)this);                     
+
+                        triangulation.insert(vert_simplex);
                 }
 
                 for(list<polyhedron*>::iterator child_ref = children.begin();child_ref!=children.end();child_ref++)
                 {                       
-                        for(map<double,set<vertex*>>::iterator t_ref = (*child_ref)->triangulation.begin();t_ref!=(*child_ref)->triangulation.end();t_ref++)
-                        {
-                                set<vertex*> new_simplex;
-                                new_simplex.insert((*t_ref).second.begin(),(*t_ref).second.end());                              
-
-                                pair<set<vertex*>::iterator,bool> ret_val = new_simplex.insert(*vertices.begin());
+                        for(set<simplex*>::iterator s_ref = (*child_ref)->triangulation.begin();s_ref!=(*child_ref)->triangulation.end();s_ref++)
+                        {
+                                simplex* new_simplex = new simplex((*s_ref)->vertices);                                                         
+
+                                pair<set<vertex*>::iterator,bool> ret_val = new_simplex->vertices.insert(*vertices.begin());
 
                                 if(ret_val.second == true)
@@ -39 +41 @@
                                         }
 
-                                        triangulation.insert(pair<double,set<vertex*>>(cur_prob,new_simplex));
-                                } 
+                                        triangulation.insert(new_simplex);
+                                }
+                                else
+                                {
+                                        delete new_simplex;
+                                }
                         }       
                 }               
@@ -71 +77 @@
 
 
-        double toprow::integrate_simplex(set<vertex*> simplex, char c)
+        double toprow::integrate_simplex(simplex* simplex, char c)
         {
                 // cout << ((toprow*)this)->condition << endl;          
@@ -107 +113 @@
                         // cout << as_toprow->condition << endl;                        
 
-                        int dimension = simplex.size()-1;
+                        int dimension = simplex->vertices.size()-1;
 
                         mat jacobian(dimension,dimension);                      
@@ -114 +120 @@
                         map<double,int> as;
                         vertex* base_vertex;
-                        set<vertex*>::iterator base_ref = simplex.begin();
+                        set<vertex*>::iterator base_ref = simplex->vertices.begin();
                         bool order_correct;
                                                 
@@ -132 +138 @@
 
                                 int row_count = 0;
-                                for(set<vertex*>::iterator vert_ref = simplex.begin(); vert_ref!=simplex.end();vert_ref++)
+                                for(set<vertex*>::iterator vert_ref = simplex->vertices.begin(); vert_ref!=simplex->vertices.end();vert_ref++)
                                 {
                                         if(vert_ref != base_ref)
@@ -146 +152 @@
                                                         base_ref++;
 
-                                                        if(base_ref == simplex.end())
+                                                        if(base_ref == simplex->vertices.end())
                                                         {
                                                                 throw new exception("Equal local conditions are paired. If this ever occurs, the software has to be modified to include multiplied a_0!!");
@@ -285 +291 @@
                 
 
-                        //cout << "Probability:" << int_value << endl;
-                        
-                        return int_value;
-
-                        
+                        // cout << "Probability:" << int_value << endl;
+                        // pause(0.100);
+
+                        simplex->probability = int_value;
+                        
+                        return int_value;       
                         
                 }