[BACK]Return to mh.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / hgm / mh / src

Diff for /OpenXM/src/hgm/mh/src/mh.c between version 1.8 and 1.10

version 1.8, 2013/03/05 07:03:37 version 1.10, 2013/03/07 05:23:31
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/hgm/mh/src/mh.c,v 1.7 2013/03/05 06:35:54 takayama Exp $ */  /* $OpenXM: OpenXM/src/hgm/mh/src/mh.c,v 1.9 2013/03/07 03:00:43 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
 #include "sfile.h"  #include "sfile.h"
 #include "mh.h"  #include "mh.h"
 #define WSIZE 1024  #define WSIZE 1024
 extern int MH_DEBUG;  extern int MH_DEBUG;
 static imypower(int x,int n) {  static int imypower(int x,int n) {
   int a,i;    int a,i;
   a = 1;    a = 1;
   for (i=0; i<n; i++) a = a*x;    for (i=0; i<n; i++) a = a*x;
Line 22  struct cWishart *new_cWishart(int rank) {
Line 22  struct cWishart *new_cWishart(int rank) {
 }  }
   
 struct cWishart *mh_cwishart_gen(int m,int n,double beta[],double x0,  struct cWishart *mh_cwishart_gen(int m,int n,double beta[],double x0,
                               int approxDeg,double h, int dp, double x,int modep[]) {                                int approxDeg,double h, int dp, double x,int modep[]) {
   /*    /*
      modep[0]. Do Koev-Edelman (ignored for now).       modep[0]. Do Koev-Edelman (ignored for now).
      modep[1]. Do the HGM       modep[1]. Do the HGM
Line 125  struct cWishart *mh_cwishart_gen(int m,int n,double be
Line 125  struct cWishart *mh_cwishart_gen(int m,int n,double be
 /* Cumulative probability distribution function of the first eigenvalue of  /* Cumulative probability distribution function of the first eigenvalue of
    Wishart matrix by Series */     Wishart matrix by Series */
 struct cWishart *mh_cwishart_s(int m,int n,double beta[],double x0,  struct cWishart *mh_cwishart_s(int m,int n,double beta[],double x0,
                                int approxDeg,double h, int dp, double x) {                                 int approxDeg,double h, int dp, double x) {
   int modep[]={1,0,0};    int modep[]={1,0,0};
   return(mh_cwishart_gen(m,n,beta,x0,approxDeg,h,dp,x,modep));    return(mh_cwishart_gen(m,n,beta,x0,approxDeg,h,dp,x,modep));
 }  }
Line 133  struct cWishart *mh_cwishart_s(int m,int n,double beta
Line 133  struct cWishart *mh_cwishart_s(int m,int n,double beta
 /* Cumulative probability distribution function of the first eigenvalue of  /* Cumulative probability distribution function of the first eigenvalue of
    Wishart matrix by HGM */     Wishart matrix by HGM */
 struct cWishart *mh_cwishart_hgm(int m,int n,double beta[],double x0,  struct cWishart *mh_cwishart_hgm(int m,int n,double beta[],double x0,
                                  int approxDeg, double h, int dp , double x)                                   int approxDeg, double h, int dp , double x)
 {  {
   int modep[]={1,1,0};    int modep[]={1,1,0};
   return(mh_cwishart_gen(m,n,beta,x0,approxDeg,h,dp,x,modep));    return(mh_cwishart_gen(m,n,beta,x0,approxDeg,h,dp,x,modep));

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.10

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>