Changeset 1366 for applications/robust/robustlib.h

Timestamp:

05/10/11 18:59:52 (13 years ago)

Author:

sindj

Message:

Jupiijahou, snad se podarilo dobojovat s normalizacnim faktorem. Pridany vsechny potrebne logaritmy do log_nc. JS

Files:

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

applications/robust/robustlib.h

@@ -22 +22 @@
 using namespace itpp;
 
-const double max_range = 5;//numeric_limits<double>::max()/10e-10;
+const double max_range = 10;//numeric_limits<double>::max()/10e-10;
 
 /// An enumeration of possible actions performed on the polyhedrons. We can merge them or split them.
@@ -1087 +1087 @@
                 }
 
-                log_nc = log(normalization_factor) + logfact(condition_order-number_of_parameters-2)-(condition_order-number_of_parameters-2)*2;
+                log_nc = log(normalization_factor) + logfact(condition_order-number_of_parameters-2)-(condition_order-number_of_parameters-2)*log(2.0);
 
                 /*
@@ -1880 +1880 @@
                 // cout << "Normalization factor: " << normalization_factor << endl;    
 
-                log_nc = log(normalization_factor) + logfact(condition_order-number_of_parameters-2)-(condition_order-number_of_parameters-2)*2;
+                log_nc = log(normalization_factor) + logfact(condition_order-number_of_parameters-2)-(condition_order-number_of_parameters-2)*log(2.0);
 
                 /*
@@ -2445 +2445 @@
         int logfact(int factor)
         {
-                if(factor>0)
-                {
-                        return factor+logfact(factor-1);
+                if(factor>1)
+                {
+                        return log((double)factor)+logfact(factor-1);
                 }
                 else
@@ -2788 +2788 @@
                 this->has_constant = has_constant;
                 
-                posterior = new emlig(number_of_parameters,0.001);
+                posterior = new emlig(number_of_parameters,0.01);
 
                 this->window_size = window_size;