[BACK]Return to imach.c CVS log [TXT] [DIR] Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.292 and 1.293

version 1.292, 2019/05/09 14:17:20 version 1.293, 2019/05/09 15:17:34
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.293  2019/05/09 15:17:34  brouard
     *** empty log message ***
   
   Revision 1.292  2019/05/09 14:17:20  brouard    Revision 1.292  2019/05/09 14:17:20  brouard
   Summary: Some updates    Summary: Some updates
   
Line 2966  double **pmij(double **ps, double *cov, Line 2969  double **pmij(double **ps, double *cov,
       ps[ii][ii]=1;        ps[ii][ii]=1;
     }      }
   }    }
       /* Added for backcast */ /* Transposed matrix too */
       for(jj=1; jj<= nlstate+ndeath; jj++){
       s1=0.;
       for(ii=1; ii<= nlstate+ndeath; ii++){
         s1+=ps[ii][jj];
       }
       for(ii=1; ii<= nlstate; ii++){
         ps[ii][jj]=ps[ii][jj]/s1;
       }
     }
     /* Transposition */
     for(jj=1; jj<= nlstate+ndeath; jj++){
       for(ii=jj; ii<= nlstate+ndeath; ii++){
         s1=ps[ii][jj];
         ps[ii][jj]=ps[jj][ii];
         ps[jj][ii]=s1;
       }
     }
   /* for(ii=1; ii<= nlstate+ndeath; ii++){ */    /* for(ii=1; ii<= nlstate+ndeath; ii++){ */
   /*   for(jj=1; jj<= nlstate+ndeath; jj++){ */    /*   for(jj=1; jj<= nlstate+ndeath; jj++){ */
   /*    printf(" pmij  ps[%d][%d]=%lf ",ii,jj,ps[ii][jj]); */    /*    printf(" pmij  ps[%d][%d]=%lf ",ii,jj,ps[ii][jj]); */
Line 10787  int main(int argc, char *argv[]) Line 10806  int main(int argc, char *argv[])
   
   int *tab;     int *tab; 
   int mobilavproj=0 , prevfcast=0 ; /* moving average of prev, If prevfcast=1 prevalence projection */    int mobilavproj=0 , prevfcast=0 ; /* moving average of prev, If prevfcast=1 prevalence projection */
   /* int backcast=0; */ /* defined as global for mlikeli and mle */    int backcast=0; /* defined as global for mlikeli and mle*/
   int mobilav=0,popforecast=0;    int mobilav=0,popforecast=0;
   int hstepm=0, nhstepm=0;    int hstepm=0, nhstepm=0;
   int agemortsup;    int agemortsup;
Removed from v.1.292  
changed lines
  Added in v.1.293

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