Changeset 1331 for applications/robust/robustlib.cpp

Timestamp:

04/14/11 19:24:43 (13 years ago)

Author:

sindj

Message:

Dodelan sampling sigma, zbyva doladit sampling alpha.JS

Files:

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

applications/robust/robustlib.cpp

@@ -97 +97 @@
 
                         emlig* current_emlig;
-                        simplex->gamma_parameters.clear();
-                        simplex->gamma_sum = 0;
+                        simplex->clear_gammas();
 
                         if(this->my_emlig!=NULL)
@@ -257 +256 @@
 
                                 double bracket = fact(as1_order-1)/pow(a_0-(*as_ref).first,sigma_order+1);
-                                
-                                simplex->gamma_sum += bracket*multiplier;
-                                
-                                multimap<double,double> map;
-                                simplex->gamma_parameters.push_back(map);
-                                simplex->gamma_parameters[0].insert(pair<double,double>(bracket*multiplier,a_0-(*as_ref).first));
+                                                                
+                                simplex->insert_gamma(0,bracket*multiplier,a_0-(*as_ref).first);                                                                
 
                                 bracket *= fact(sigma_order);
@@ -287 +282 @@
                                         }
 
-                                        simplex->gamma_sum += local_bracket*multiplier;
-                                        
-                                        if(simplex->gamma_parameters.size()<=k+1)
-                                        {
-                                                multimap<double,double> loc_map;
-                                                simplex->gamma_parameters.push_back(loc_map);
-                                        }
-
-                                        simplex->gamma_parameters[k+1].insert(pair<double,double>(local_bracket*multiplier,a_0-(*as_ref).first));
-
+                                        simplex->insert_gamma(k+1,local_bracket*multiplier,a_0-(*as_ref).first);
+                                        
                                         bracket += local_bracket*fact(sigma_order-k);
                                 }                               
@@ -306 +293 @@
                         double correction_term_base = correction_term/pow(a_0,sigma_order+1);
 
-                        simplex->gamma_sum += correction_term_base;
-                        simplex->gamma_parameters[0].insert(pair<double,double>(correction_term_base,a_0));
+                        simplex->insert_gamma(0,correction_term_base,a_0);                      
 
                         correction_term = fact(sigma_order)*correction_term_base;