Changeset 1413 for applications/robust/robustlib.h

Timestamp:

12/09/11 17:53:36 (12 years ago)

Author:

sindj

Message:

Update hlavnich casti z Thinkeru. JS

Files:

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

applications/robust/robustlib.h

@@ -437 +437 @@
                 start_poly = new polyhedron();
         };
-
-        ~c_statistic()
-        {
-                delete end_poly;
-                delete start_poly;
-        }
 
         void append_polyhedron(int row, polyhedron* appended_start, polyhedron* appended_end)
@@ -1103 +1097 @@
 
                 this->condition_order = condition_order;
+        }
+
+        ~emlig()
+        {
+                for(int i = 0;i<statistic.size();i++)
+                {
+                        polyhedron* current_polyhedron;
+                        while(statistic.rows[i]!=statistic.end_poly)
+                        {
+                                current_polyhedron = statistic.rows[i];
+                                statistic.delete_polyhedron(i,statistic.rows[i]);
+                                delete current_polyhedron;
+                        }
+                }
+                
+                delete statistic.end_poly;
+                delete statistic.start_poly;
+
+                for(list<condition*>::reverse_iterator c_ref = conditions.rbegin();c_ref!=conditions.rend();c_ref++)
+                {
+                        delete *c_ref;
+                }
+
+                cout << "Emlig deleted." << endl;
         }
 
@@ -2302 +2320 @@
                         pair<double,double> probability_and_sigma = choose_sigma(condition_and_simplex.second);
 
+                        /*
+                        if(samples.cols()<10)
+                        {
+                                cout << "S-P:" << probability_and_sigma.first << ", ";
+                                pause(0.3);
+                        }*/
+
                         int dimension = condition_and_simplex.second->vertices.size();
 
@@ -2336 +2361 @@
 
                         double exponent = extended_coords*condition_and_simplex.first;
-                        double sample_prob = 1*condition_and_simplex.second->volume/condition_and_simplex.second->probability/pow(2*probability_and_sigma.second,condition_order)*exp(-exponent/probability_and_sigma.second);//*probability_and_sigma.first;                   
+                        double sample_prob = 1*condition_and_simplex.second->volume/condition_and_simplex.second->probability/pow(2*probability_and_sigma.second,condition_order)*exp(-exponent/probability_and_sigma.second)*probability_and_sigma.first;                      
+
+                        /*
+                        if(samples.cols()<20)
+                        {
+                                cout << "prob:" << sample_prob << endl;
+                                pause(0.2);
+                        }
+                        */                      
 
                         sample_coords.ins(sample_coords.size(),probability_and_sigma.second);
@@ -2736 +2769 @@
         };
 
+        ~RARX()
+        {
+                delete posterior;
+        }
+
         void bayes(itpp::vec yt)
         {