Changeset 1390 for applications

Timestamp:

09/18/11 11:04:27 (13 years ago)

Author:

sindj

Message:

Drobne upravy kolem samplovani. JS

Location:

applications/robust

Files:

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

applications/robust/main.cpp

@@ -99 +99 @@
                         if(has_constant)
                         {
-                                my_rarx = new RARX(ar_components.size()+1,window_size,true,sqrt(2*apriorno),sqrt(2*apriorno),ar_components.size()+4);
+                                my_rarx = new RARX(ar_components.size()+1,window_size,true,pow(apriorno,2.0),pow(apriorno,2.0),ar_components.size()+4);
                                 my_arx  = NULL;
                         }
                 else
                         {
-                                my_rarx = new RARX(ar_components.size(),window_size,false,sqrt(2*apriorno),sqrt(2*apriorno),ar_components.size()+3);
+                                my_rarx = new RARX(ar_components.size(),window_size,false,pow(apriorno,2.0),pow(apriorno,2.0),ar_components.size()+3);
                                 my_arx  = NULL;
                         }
@@ -274 +274 @@
         vector<vector<string>> strings;
 
-        char* file_string =  "C:\\ar_student_single"; //"C:\\Users\\Hontik\\Desktop\\Bayes\\dataADClosePercDiff"; //  
+        char* file_string =  "C:\\dataADClosePercDiff"; // "C:\\ar_student_single"; // 
 
         char dfstring[80];

applications/robust/robustlib.h

@@ -2654 +2654 @@
 
                         double exponent = extended_coords*condition_and_simplex.first;
-                        double sample_prob = 1/pow(probability_and_sigma.second,(int)conditions.size()-number_of_parameters+3)*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;