Changeset 1383 for applications/robust/robustlib.h

Timestamp:

08/18/11 16:02:53 (13 years ago)

Author:

sindj

Message:

Program update, kontrola vypoctu provedena, integruje spravne v nedegenerovanem pripade. JS

Files:

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

applications/robust/robustlib.h

@@ -1077 +1077 @@
                 this->number_of_parameters = number_of_parameters;
 
-                condition_order = number_of_parameters+3;
+                condition_order = number_of_parameters+2;
                                                 
                 create_statistic(number_of_parameters, soft_prior_parameter);
@@ -2056 +2056 @@
                                                 //sigma = 1/(*gamma)();
                                                                         
-                                                GamRNG.setup(conditions.size()-number_of_parameters,(*g_ref).second);
+                                                GamRNG.setup(conditions.size()-number_of_parameters+3,(*g_ref).second);
                                                                                                                                         
                                                 sigma = 1/GamRNG();
@@ -2463 +2463 @@
 
                         double exponent = extended_coords*condition_and_simplex.first;
-                        double sample_prob = 1/condition_and_simplex.second->probability/pow(probability_and_sigma.second,(int)conditions.size()-number_of_parameters)*exp((-1)/probability_and_sigma.second*exponent);
+                        double sample_prob = 1/condition_and_simplex.second->probability/pow(probability_and_sigma.second,(int)conditions.size()-number_of_parameters+3)*exp((-1)/probability_and_sigma.second*exponent);
                         sample_prob *= probability_and_sigma.first;
 
@@ -2820 +2820 @@
                 this->has_constant = has_constant;
                 
-                posterior = new emlig(number_of_parameters,0.1);
+                posterior = new emlig(number_of_parameters,0.141);
 
                 this->window_size = window_size;                
@@ -2845 +2845 @@
                 //posterior->step_me(0);
                 
+                cout << "Current condition:" << yt << endl;
+
                 /// \TODO tohle je spatne, tady musi byt jiny vypocet poctu podminek, kdyby nejaka byla multiplicitni, tak tohle bude spatne
                 if(conditions.size()>window_size && window_size!=0)
-                {                       
+                {
                         posterior->add_and_remove_condition(yt,conditions.front());
                         conditions.pop_front();