Diff for /imach/src/imach.c between versions 1.164 and 1.167

version 1.164, 2014/12/16 10:52:11 version 1.167, 2014/12/22 13:50:56
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.167  2014/12/22 13:50:56  brouard
     Summary: Testing uname and compiler version and if compiled 32 or 64
   
     Testing on Linux 64
   
     Revision 1.166  2014/12/22 11:40:47  brouard
     *** empty log message ***
   
     Revision 1.165  2014/12/16 11:20:36  brouard
     Summary: After compiling on Visual C
   
     * imach.c (Module): Merging 1.61 to 1.162
   
   Revision 1.164  2014/12/16 10:52:11  brouard    Revision 1.164  2014/12/16 10:52:11  brouard
   Summary: Merging with Visual C after suppressing some warnings for unused variables. Also fixing Saito's bug 0.98Xn    Summary: Merging with Visual C after suppressing some warnings for unused variables. Also fixing Saito's bug 0.98Xn
   
Line 497 Line 510
  end   end
 */  */
   
   #define POWELL /* Instead of NLOPT */
   
   
    
 #include <math.h>  #include <math.h>
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
Line 513 Line 525
   
 #include <limits.h>  #include <limits.h>
 #include <sys/types.h>  #include <sys/types.h>
   #include <sys/utsname.h>
 #include <sys/stat.h>  #include <sys/stat.h>
 #include <errno.h>  #include <errno.h>
 /* extern int errno; */  /* extern int errno; */
Line 531 Line 544
 #include <gsl/gsl_multimin.h>  #include <gsl/gsl_multimin.h>
 #endif  #endif
   
   
 #ifdef NLOPT  #ifdef NLOPT
 #include <nlopt.h>  #include <nlopt.h>
 typedef struct {  typedef struct {
Line 691  static double maxarg1,maxarg2; Line 705  static double maxarg1,maxarg2;
       
 #define SIGN(a,b) ((b)>0.0 ? fabs(a) : -fabs(a))  #define SIGN(a,b) ((b)>0.0 ? fabs(a) : -fabs(a))
 #define rint(a) floor(a+0.5)  #define rint(a) floor(a+0.5)
   /* http://www.thphys.uni-heidelberg.de/~robbers/cmbeasy/doc/html/myutils_8h-source.html */
   /* #define mytinydouble 1.0e-16 */
   /* #define DEQUAL(a,b) (fabs((a)-(b))<mytinydouble) */
   /* http://www.thphys.uni-heidelberg.de/~robbers/cmbeasy/doc/html/mynrutils_8h-source.html */
   /* static double dsqrarg; */
   /* #define DSQR(a) (DEQUAL((dsqrarg=(a)),0.0) ? 0.0 : dsqrarg*dsqrarg) */
 static double sqrarg;  static double sqrarg;
 #define SQR(a) ((sqrarg=(a)) == 0.0 ? 0.0 :sqrarg*sqrarg)  #define SQR(a) ((sqrarg=(a)) == 0.0 ? 0.0 :sqrarg*sqrarg)
 #define SWAP(a,b) {temp=(a);(a)=(b);(b)=temp;}   #define SWAP(a,b) {temp=(a);(a)=(b);(b)=temp;} 
Line 2147  void likelione(FILE *ficres,double p[], Line 2166  void likelione(FILE *ficres,double p[],
   
 void mlikeli(FILE *ficres,double p[], int npar, int ncovmodel, int nlstate, double ftol, double (*func)(double []))  void mlikeli(FILE *ficres,double p[], int npar, int ncovmodel, int nlstate, double ftol, double (*func)(double []))
 {  {
   int i,j, iter;    int i,j, iter=0;
   double **xi;    double **xi;
   double fret;    double fret;
   double fretone; /* Only one call to likelihood */    double fretone; /* Only one call to likelihood */
Line 4087  fprintf(fichtm," \n<ul><li><b>Graphs</b> Line 4106  fprintf(fichtm," \n<ul><li><b>Graphs</b>
 <img src=\"%s%d_2.png\">",stepm,subdirf2(optionfilefiname,"pe"),jj1,subdirf2(optionfilefiname,"pe"),jj1,subdirf2(optionfilefiname,"pe"),jj1);   <img src=\"%s%d_2.png\">",stepm,subdirf2(optionfilefiname,"pe"),jj1,subdirf2(optionfilefiname,"pe"),jj1,subdirf2(optionfilefiname,"pe"),jj1); 
        /* Period (stable) prevalence in each health state */         /* Period (stable) prevalence in each health state */
        for(cpt=1; cpt<=nlstate;cpt++){         for(cpt=1; cpt<=nlstate;cpt++){
          fprintf(fichtm,"<br>- Convergence from cross-sectional prevalence in each state (1 to %d) to period (stable) prevalence in specific state %d <a href=\"%s%d_%d.png\">%s%d_%d.png</a><br> \           fprintf(fichtm,"<br>- Convergence to period (stable) prevalence in state %d. Or probability to be in state %d being in state (1 to %d) at different ages. <a href=\"%s%d_%d.png\">%s%d_%d.png</a><br> \
 <img src=\"%s%d_%d.png\">",nlstate, cpt, subdirf2(optionfilefiname,"p"),cpt,jj1,subdirf2(optionfilefiname,"p"),cpt,jj1,subdirf2(optionfilefiname,"p"),cpt,jj1);  <img src=\"%s%d_%d.png\">", cpt, cpt, nlstate, subdirf2(optionfilefiname,"p"),cpt,jj1,subdirf2(optionfilefiname,"p"),cpt,jj1,subdirf2(optionfilefiname,"p"),cpt,jj1);
        }         }
      for(cpt=1; cpt<=nlstate;cpt++) {       for(cpt=1; cpt<=nlstate;cpt++) {
         fprintf(fichtm,"\n<br>- Life expectancy by health state (%d) at initial age and its decomposition into health expectancies in each alive state (1 to %d) : <a href=\"%s%d%d.png\">%s%d%d.png</a> <br> \          fprintf(fichtm,"\n<br>- Life expectancy by health state (%d) at initial age and its decomposition into health expectancies in each alive state (1 to %d) : <a href=\"%s%d%d.png\">%s%d%d.png</a> <br> \
Line 5406  calandcheckages(int imx, int maxwav, dou Line 5425  calandcheckages(int imx, int maxwav, dou
     return (1);      return (1);
 }  }
   
   syscompilerinfo()
    {
      /* #include "syscompilerinfo.h"*/
   #include <gnu/libc-version.h>
   #if defined(__GNUC__)
   # if defined(__GNUC_PATCHLEVEL__)
   #  define __GNUC_VERSION__ (__GNUC__ * 10000 \
                               + __GNUC_MINOR__ * 100 \
                               + __GNUC_PATCHLEVEL__)
   # else
   #  define __GNUC_VERSION__ (__GNUC__ * 10000 \
                               + __GNUC_MINOR__ * 100)
   # endif
   #endif
   
   // http://stackoverflow.com/questions/4605842/how-to-identify-platform-compiler-from-preprocessor-macros
   #ifdef _WIN32 // note the underscore: without it, it's not msdn official!
       // Windows (x64 and x86)
   #elif __unix__ // all unices, not all compilers
       // Unix
   #elif __linux__
       // linux
   #elif __APPLE__
       // Mac OS, not sure if this is covered by __posix__ and/or __unix__ though...
   #endif
   
   /*  __MINGW32__   */
   /*  __CYGWIN__   */
   /* __MINGW64__  */
   // http://msdn.microsoft.com/en-us/library/b0084kay.aspx
   /* _MSC_VER  //the Visual C++ compiler is 17.00.51106.1, the _MSC_VER macro evaluates to 1700. Type cl /?  */
   /* _MSC_FULL_VER //the Visual C++ compiler is 15.00.20706.01, the _MSC_FULL_VER macro evaluates to 150020706 */
   /* _WIN64  // Defined for applications for Win64. */
   /* _M_X64 // Defined for compilations that target x64 processors. */
   /* _DEBUG // Defined when you compile with /LDd, /MDd, and /MTd. */
   #include <stdint.h>
   #if UINTPTR_MAX == 0xffffffff
      printf("32-bit \n"); /* 32-bit */
   #elif UINTPTR_MAX == 0xffffffffffffffff
     printf("64-bit \n");/* 64-bit */
   #else
    printf("wtf-bit \n"); /* wtf */
   #endif
   
   struct utsname sysInfo;
   
      if (uname(&sysInfo) != -1) {
         puts(sysInfo.sysname);
         puts(sysInfo.nodename);
         puts(sysInfo.release);
         puts(sysInfo.version);
         puts(sysInfo.machine);
      }
      else
         perror("uname() error");
      printf("GNU C version %d\n", __GNUC_VERSION__);
     printf("GNU libc version: %s\n", gnu_get_libc_version());
   
    }
   
 /***********************************************/  /***********************************************/
 /**************** Main Program *****************/  /**************** Main Program *****************/
Line 5436  int main(int argc, char *argv[]) Line 5514  int main(int argc, char *argv[])
   double agedeb;    double agedeb;
   double ageminpar=1.e20,agemin=1.e20, agemaxpar=-1.e20, agemax=-1.e20;    double ageminpar=1.e20,agemin=1.e20, agemaxpar=-1.e20, agemax=-1.e20;
   
     double fret;
   double dum; /* Dummy variable */    double dum; /* Dummy variable */
   double ***p3mat;    double ***p3mat;
   double ***mobaverage;    double ***mobaverage;
Line 5583  int main(int argc, char *argv[]) Line 5661  int main(int argc, char *argv[])
  optionfilext=%s\n\   optionfilext=%s\n\
  optionfilefiname='%s'\n",pathimach,pathtot,path,optionfile,optionfilext,optionfilefiname);   optionfilefiname='%s'\n",pathimach,pathtot,path,optionfile,optionfilext,optionfilefiname);
   
     syscompilerinfo();
   
   printf("Local time (at start):%s",strstart);    printf("Local time (at start):%s",strstart);
   fprintf(ficlog,"Local time (at start): %s",strstart);    fprintf(ficlog,"Local time (at start): %s",strstart);
   fflush(ficlog);    fflush(ficlog);

Removed from v.1.164  
changed lines
  Added in v.1.167


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