Changeset 1068 for library/bdm/stat/exp_family.cpp
- Timestamp:
- 06/09/10 18:35:14 (14 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
library/bdm/stat/exp_family.cpp
r1064 r1068 134 134 135 135 double m = nu - nPsi - dimx - 1; 136 #define 137 #define 136 #define log2 0.693147180559945286226763983 137 #define logpi 1.144729885849400163877476189 138 138 #define log2pi 1.83787706640935 139 139 #define Inf std::numeric_limits<double>::infinity() … … 149 149 - 0.5 * dimx * ( m * log2 + 0.5 * ( dimx - 1 ) * log2pi ) - lg; 150 150 151 // 151 // bdm_assert_debug ( ( ( -nkG - nkW ) > -Inf ) && ( ( -nkG - nkW ) < Inf ), "ARX improper" ); 152 152 if ( -nkG - nkW == Inf ) { 153 153 cout << "??" << endl; … … 186 186 M = iLsub * Lpsi; 187 187 } 188 /* 189 190 191 192 193 194 195 188 /* if ( 0 ) { // test with Peterka 189 mat VF = V.to_mat(); 190 mat Vf = VF ( 0, dimx - 1, 0, dimx - 1 ); 191 mat Vzf = VF ( dimx, end, 0, dimx - 1 ); 192 mat VZ = VF ( dimx, end, dimx, end ); 193 194 mat Lam2 = Vf - Vzf.T() * inv ( VZ ) * Vzf; 195 }*/ 196 196 } 197 197 … … 203 203 204 204 mat Lsub = L ( 1, end, 1, end ); 205 // 205 // mat Dsub = diag ( D ( 1, end ) ); 206 206 207 207 ldmat LD ( inv ( Lsub ).T(), 1.0 / D ( 1, end ) ); … … 715 715 } 716 716 717 void 717 void euni::to_setting (Setting &set) const { 718 718 epdf::to_setting ( set ); 719 719 UI::save ( high, set, "high" ); … … 731 731 pdf::from_setting(set); 732 732 g=UI::build<fnc>(set,"g",UI::compulsory); 733 validate(); 734 } 733 } 734 735 735 void mgdirac::to_setting(Setting &set) const { 736 736 pdf::to_setting(set); 737 737 UI::save(g.get(), set, "g"); 738 738 } 739 739 740 void mgdirac::validate() { 740 741 pdf::validate();