/[ascend]/trunk/models/johnpye/tron/asc_tron.c
ViewVC logotype

Diff of /trunk/models/johnpye/tron/asc_tron.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1502 by jpye, Fri Jun 22 05:03:51 2007 UTC revision 1503 by jpye, Sat Jun 23 12:44:10 2007 UTC
# Line 133  typedef struct{ Line 133  typedef struct{
133      double *x;      double *x;
134      double *xupper; /* upper bounds on each variable */      double *xupper; /* upper bounds on each variable */
135      double *xlower; /* lower bounds on each variable */      double *xlower; /* lower bounds on each variable */
136      double *f;      double *g; /* gradients of f with respect to each variable */
137      double *g;      TronMatrix A; /* hessian matrix, passed to TRON? */
138      TronMatrix A, B, L;      TronMatrix B; /* some matrix that we get back from TRON */
139        TronMatrix L; /* some other matrix that we get back from TRON */
140    
141      double *xc, *s, *dsave, *wa;      double *xc, *s, *dsave, *wa;
142      int *indfree, *isave, *iwa;      int *indfree, *isave, *iwa;
# Line 664  static int tron_iterate(slv_system_t ser Line 665  static int tron_iterate(slv_system_t ser
665      double delta = SLV_PARAM_REAL(&(sys->params),TRON_PARAM_GTOL);      double delta = SLV_PARAM_REAL(&(sys->params),TRON_PARAM_GTOL);
666      /** @TODO fmin should be taken from the model declaration somehow, not a solar parameter. */      /** @TODO fmin should be taken from the model declaration somehow, not a solar parameter. */
667    
668      DTRON(&(sys->n),sys->x,sys->xlower,sys->xupper,sys->f,sys->g      DTRON(&(sys->n),sys->x,sys->xlower,sys->xupper,&(sys->objective),sys->g
669          ,TRON_MATRIX_ARG(sys,A)          ,TRON_MATRIX_ARG(sys,A)
670          ,&frtol,&fatol,&fmin,&cgtol,&itermax,&delta,sys->task          ,&frtol,&fatol,&fmin,&cgtol,&itermax,&delta,sys->task
671          ,TRON_MATRIX_ARG(sys,B)          ,TRON_MATRIX_ARG(sys,B)
Legend:
Removed from v.1502  
changed lines
  Added in v.1503
john.pye@anu.edu.au
 ViewVC Help
Powered by ViewVC 1.1.22