allow negative maxeval in luksan algorithms

stevengj · stevengj · commit a01f9e03ea30 · 2024-10-15T07:52:13.000-04:00
diff --git a/src/algs/luksan/plip.c b/src/algs/luksan/plip.c
@@ -445,7 +445,7 @@ nlopt_result luksan_plip(int n, nlopt_func f, void *f_data,
 
      if (mf <= 0) {
 	  mf = MAX2(MEMAVAIL/n, 10);
-	  if (stop->maxeval && stop->maxeval <= mf)
+	  if (stop->maxeval > 0 && stop->maxeval <= mf)
 	       mf = MAX2(stop->maxeval, 1);
      }
 
diff --git a/src/algs/luksan/plis.c b/src/algs/luksan/plis.c
@@ -440,7 +440,7 @@ nlopt_result luksan_plis(int n, nlopt_func f, void *f_data,
 
      if (mf <= 0) {
 	  mf = MAX2(MEMAVAIL/n, 10);
-	  if (stop->maxeval && stop->maxeval <= mf)
+	  if (stop->maxeval > 0 && stop->maxeval <= mf)
 	       mf = MAX2(stop->maxeval, 1);
      }
 
diff --git a/src/algs/luksan/pnet.c b/src/algs/luksan/pnet.c
@@ -589,7 +589,7 @@ nlopt_result luksan_pnet(int n, nlopt_func f, void *f_data,
 
      if (mf <= 0) {
 	  mf = MAX2(MEMAVAIL/n, 10);
-	  if (stop->maxeval && stop->maxeval <= mf)
+	  if (stop->maxeval > 0 && stop->maxeval <= mf)
 	       mf = MAX2(stop->maxeval, 1);
      }
 

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ nlopt_result luksan_plip(int n, nlopt_func f, void *f_data,`
`445`	`445`
`446`	`446`	`if (mf <= 0) {`
`447`	`447`	`mf = MAX2(MEMAVAIL/n, 10);`
`448`		`- if (stop->maxeval && stop->maxeval <= mf)`
	`448`	`+ if (stop->maxeval > 0 && stop->maxeval <= mf)`
`449`	`449`	`mf = MAX2(stop->maxeval, 1);`
`450`	`450`	`}`
`451`	`451`
Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ nlopt_result luksan_plis(int n, nlopt_func f, void *f_data,`
`440`	`440`
`441`	`441`	`if (mf <= 0) {`
`442`	`442`	`mf = MAX2(MEMAVAIL/n, 10);`
`443`		`- if (stop->maxeval && stop->maxeval <= mf)`
	`443`	`+ if (stop->maxeval > 0 && stop->maxeval <= mf)`
`444`	`444`	`mf = MAX2(stop->maxeval, 1);`
`445`	`445`	`}`
`446`	`446`
Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,7 @@ nlopt_result luksan_pnet(int n, nlopt_func f, void *f_data,`
`589`	`589`
`590`	`590`	`if (mf <= 0) {`
`591`	`591`	`mf = MAX2(MEMAVAIL/n, 10);`
`592`		`- if (stop->maxeval && stop->maxeval <= mf)`
	`592`	`+ if (stop->maxeval > 0 && stop->maxeval <= mf)`
`593`	`593`	`mf = MAX2(stop->maxeval, 1);`
`594`	`594`	`}`
`595`	`595`