Skip to content

Commit

Permalink
240201.010253.HKT minor revision
Browse files Browse the repository at this point in the history
  • Loading branch information
zaikunzhang committed Jan 31, 2024
1 parent c159aed commit c0f43e3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion c/include/prima/prima.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ typedef enum {
PRIMA_NEWUOA, // Unconstrained
PRIMA_BOBYQA, // Bound-constrained
PRIMA_LINCOA, // Linearly constrained
PRIMA_COBYLA // Nonlinearly constrained
PRIMA_COBYLA, // Nonlinearly constrained
} prima_algorithm_t;


Expand Down
5 changes: 5 additions & 0 deletions c/prima.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,19 +201,24 @@ const char *prima_get_rc_string(const prima_rc_t rc)
}
}


// Functions implemented in Fortran (*_c.f90)
int cobyla_c(const int m_nlcon, const prima_objcon_t calcfc, const void *data, const int n, double x[], double *f, double *cstrv, double nlconstr[],
const int m_ineq, const double Aineq[], const double bineq[],
const int m_eq, const double Aeq[], const double beq[],
const double xl[], const double xu[],
const double f0, const double nlconstr0[],
int *nf, const double rhobeg, const double rhoend, const double ftarget, const int maxfun, const int iprint, const prima_callback_t callback, int *info);

int bobyqa_c(prima_obj_t calfun, const void *data, const int n, double x[], double *f, const double xl[], const double xu[],
int *nf, const double rhobeg, const double rhoend, const double ftarget, const int maxfun, const int npt, const int iprint, const prima_callback_t callback, int *info);

int newuoa_c(prima_obj_t calfun, const void *data, const int n, double x[], double *f,
int *nf, const double rhobeg, const double rhoend, const double ftarget, const int maxfun, const int npt, const int iprint, const prima_callback_t callback, int *info);

int uobyqa_c(prima_obj_t calfun, const void *data, const int n, double x[], double *f,
int *nf, const double rhobeg, const double rhoend, const double ftarget, const int maxfun, const int iprint, const prima_callback_t callback, int *info);

int lincoa_c(prima_obj_t calfun, const void *data, const int n, double x[], double *f,
double *cstrv,
const int m_ineq, const double Aineq[], const double bineq[],
Expand Down

0 comments on commit c0f43e3

Please sign in to comment.