chiark
/
gitweb
/
~ianmdlvl
/
nlopt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
765b76a
)
whoops, missed one static variable in luksan; thanks to Gert Wollny for the bug report
author
stevenj
<stevenj@alum.mit.edu>
Wed, 8 Jun 2011 17:23:00 +0000
(13:23 -0400)
committer
stevenj
<stevenj@alum.mit.edu>
Wed, 8 Jun 2011 17:23:00 +0000
(13:23 -0400)
darcs-hash:
20110608172300
-c8de0-
d09a1cd26ebc53d58b795086b21663c580eaf8a7
.gz
luksan/luksan.h
patch
|
blob
|
history
luksan/pssubs.c
patch
|
blob
|
history
diff --git
a/luksan/luksan.h
b/luksan/luksan.h
index 5161bf5ff8225a96e2574bc23395009dd3e62850..01ac07ba29b6da5e3db2b81f5dc0b59aa952ecbb 100644
(file)
--- a/
luksan/luksan.h
+++ b/
luksan/luksan.h
@@
-34,7
+34,7
@@
nlopt_result luksan_pnet(int n, nlopt_func f, void *f_data,
typedef struct {
double fl, fu, pl, rl, pu, ru;
typedef struct {
double fl, fu, pl, rl, pu, ru;
- int mes1, mes2, mes3, mode;
+ int mes1, mes2, mes3, mode
, mtyp
;
} ps1l01_state;
/***************************** internal routines *************************/
} ps1l01_state;
/***************************** internal routines *************************/
diff --git
a/luksan/pssubs.c
b/luksan/pssubs.c
index 5393d74ffac0f04fa2815ea16a377dc9b34fa074..cfec171b3986092241b0f27124fd11dd682add97 100644
(file)
--- a/
luksan/pssubs.c
+++ b/
luksan/pssubs.c
@@
-206,10
+206,10
@@
L1:
that used static local variables */
#define SS(var) state->var = var
#define SAVE_STATE SS(fl); SS(fu); SS(pl); SS(rl); SS(pu); SS(ru); \
that used static local variables */
#define SS(var) state->var = var
#define SAVE_STATE SS(fl); SS(fu); SS(pl); SS(rl); SS(pu); SS(ru); \
- SS(mes1); SS(mes2); SS(mes3); SS(mode)
+ SS(mes1); SS(mes2); SS(mes3); SS(mode)
; SS(mtyp)
#define RS(var) var = state->var
#define RESTORE_STATE RS(fl); RS(fu); RS(pl); RS(rl); RS(pu); RS(ru); \
#define RS(var) var = state->var
#define RESTORE_STATE RS(fl); RS(fu); RS(pl); RS(rl); RS(pu); RS(ru); \
- RS(mes1); RS(mes2); RS(mes3); RS(mode)
+ RS(mes1); RS(mes2); RS(mes3); RS(mode)
; RS(mtyp)
/* cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc */
/* cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc */
@@
-296,7
+296,7
@@
void luksan_ps1l01__(double *r__, double *rp,
double fl, fu, pl, rl, pu, ru;
int mes1, mes2, mes3, mode;
int merr;
double fl, fu, pl, rl, pu, ru;
int mes1, mes2, mes3, mode;
int merr;
-
static
int mtyp;
+ int mtyp;
int init1;
double rtemp;
int init1;
double rtemp;