[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.2 and 1.3

version 1.2, 2013/02/23 06:01:53 version 1.3, 2013/02/23 07:00:21
Line 1 
Line 1 
 /* $OpenXM$ */  /* $OpenXM: OpenXM/src/hgm/mh/src/mh.c,v 1.2 2013/02/23 06:01:53 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
 #include "sfile.h"  #include "sfile.h"
 #include "mh.h"  #include "mh.h"
Line 21  struct cWishart *new_cWishart(int rank) {
Line 21  struct cWishart *new_cWishart(int rank) {
   return(cwp);    return(cwp);
 }  }
   
 static  struct cWishart *mh_cwishart_gen(int m,int n,double beta[],double x0,
 struct cWishart *cwishart_gen(int m,int n,double beta[],double x0,  
                               int approxDeg,double h, int dp, double x,int mode) {                                int approxDeg,double h, int dp, double x,int mode) {
   struct SFILE *fp;    struct SFILE *fp;
   char swork[WSIZE];    char swork[WSIZE];
Line 117  struct cWishart *cwishart_gen(int m,int n,double beta[
Line 116  struct cWishart *cwishart_gen(int m,int n,double beta[
    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) {
   return(cwishart_gen(m,n,beta,x0,approxDeg,h,dp,x,0));    return(mh_cwishart_gen(m,n,beta,x0,approxDeg,h,dp,x,0));
 }  }
   
 /* Cumulative probability distribution function of the first eigenvalue of  /* Cumulative probability distribution function of the first eigenvalue of
Line 125  struct cWishart *mh_cwishart_s(int m,int n,double beta
Line 124  struct cWishart *mh_cwishart_s(int m,int n,double beta
 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)
 {  {
   return(cwishart_gen(m,n,beta,x0,approxDeg,h,dp,x,1));    return(mh_cwishart_gen(m,n,beta,x0,approxDeg,h,dp,x,1));
 }  }
   
 #ifdef STANDALONE  #ifdef STANDALONE

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

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