20231111

  solvers.tgz:  minor tweaks that should not affect results.
  solvers2.tgz: minor tweaks as in solvers.tgz, plus a bug fix to
pfghread.c that affected Hessians of imported functions having
several arguments involving variables.

CMakeLists.txt

@@ -247,6 +247,7 @@ add_prefix(ASL2_SOURCES  ${ASL2_SOURCE_DIR}/
   degree.c        derprop.c       dtoa1.c         duthes.c
   dynlink.c       eval1.c         eval2.c         ewalloc1.c
   ewalloc2.c      f_read.c        fg_read.c       fg_write.c
+  fgh_read.c      pfg_read.c
   fpecatch.c      fpinit.c        fullhes.c       func_add.c
   funcadd1.c      g_fmt.c         genrowno.c      getenv.c
   getstub.c       htcl.c          indic_cons.c    jac0dim.c

src/solvers/asldate.c

@@ -1 +1 @@
-long ASLdate_ASL = 20230330;
+long ASLdate_ASL = 20231111;

src/solvers/changes

@@ -3334,8 +3334,18 @@ piecewise-linear terms.
   pshvprod.c in solvers2.tgz:  fix a bug in computing Hessians
 involving piecewise-linear terms.
 
-20230329
+20230330
   jac0dim.c:  change return_nofile (= asl->i.return_nofile_) so
-return_nofile = 0 or 1 work as before and (return_nofile & 2) causes
+(return_nofile & 1) works as before and (return_nofile & 2) causes
 a quiet return of 0 when the given file does not have a valid .nl
 header (the first 10 lines).  The default return_nofile is still 0.
+
+20230818
+  solvers2.tgz:  fix an error-message glitch in fg_write.c; omit
+source file jac2dim.c.
+
+20231111
+  solvers.tgz:  minor tweaks that should not affect results.
+  solvers2.tgz: minor tweaks as in solvers.tgz, plus a bug fix to
+pfghread.c that affected Hessians of imported functions having
+several arguments involving variables.

src/solvers/dtoa.c

@@ -1869,7 +1869,7 @@ mult(Bigint *a, Bigint *b MTd)
 #else
 #ifdef Pack_32
 	for(; xb < xbe; xb++, xc0++) {
-		if (y = *xb & 0xffff) {
+		if ((y = *xb & 0xffff)) {
 			x = xa;
 			xc = xc0;
 			carry = 0;
@@ -1883,7 +1883,7 @@ mult(Bigint *a, Bigint *b MTd)
 				while(x < xae);
 			*xc = carry;
 			}
-		if (y = *xb >> 16) {
+		if ((y = *xb >> 16)) {
 			x = xa;
 			xc = xc0;
 			carry = 0;
@@ -5235,9 +5235,11 @@ dtoa_r(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve, char
 #ifndef SET_INEXACT
 #ifdef Check_FLT_ROUNDS
 	try_quick = Rounding == 1;
+#else
+	try_quick = 1;
 #endif
 #endif /*SET_INEXACT*/
-#endif
+#endif /*USE_BF96*/
 
 	if (mode > 5) {
 		mode -= 4;

src/solvers/fgh_read.c

@@ -98,7 +98,7 @@ sorry_CLP(EdRead *R, const char *what)
 #define memadj(x) (((x) + (sizeof(long)-1)) & ~(sizeof(long)-1))
 #endif
 
- extern char* f_OPHOL(expr* e A_ASL);
+ extern char* f_OPHOL;
  extern efunc f_OPPLTERM, f_OPVARVAL, f_OPFUNCALL;
  extern sfunc f_OPIFSYM;
 

src/solvers/pfg_read.c

@@ -1950,13 +1950,13 @@ linterms(Static *S, cexp *c, real scale)
  static void
 dvwalk(Static *S, int i)
 {
-	int n;
-	ograd *og, *og0;
+	cexp *c;
+	dv_info *dvi;
+	expr *e;
+	int n, split;
 	linarg *tl, **tp;
+	ograd *og, *og0;
 	ps_func f;
-	dv_info *dvi;
-	cexp *c;
-	int split;
 	ASLTYPE *asl = S->asl;
 
 	Termno++;
@@ -1981,8 +1981,10 @@ dvwalk(Static *S, int i)
 		tlistgen(S, &f);
 		del_Elemtemp(S, last_psb_elem);
 		}
+	else if ((e = c->e))
+		og = awalk(S, e);
 	else
-		og = awalk(S, c->e);
+		og = 0;
 	og0 = og;
 	if (c->nlin)
 		og = af_sum(S, og, linterms(S,c,1.));

src/solvers/sphes.c

@@ -1219,7 +1219,6 @@ sphes_ASL(ASL *a, SputInfo **pspi, real *H, int nobj, real *ow, real *y)
 		*rtodo++ = 0;	/* reset */
 		while((uhw = uhwi)) {
 			uhwi = uhwi->next;
-			si = s;
 			ogp = uhw->ogp;
 			r = uhw->r;
 			ogpe = ogp + r->n;

src/solvers/xsum0.out

@@ -9,7 +9,7 @@ arithchk.c	63b0185	6532
 asl.h	1fe3527a	42925
 asl_pfg.h	6483336	1268
 asl_pfgh.h	49b5a53	1288
-asldate.c	158d058e	29
+asldate.c	f734fb13	29
 atof.c	1fabc7d3	1747
 auxinfo.c	1a3c8690	1488
 avltree.c	10aeaa58	11346
@@ -32,7 +32,7 @@ conval.c	f1e4dc7d	4569
 degree.c	3eafa26	4337
 derprop.c	e75c750f	1361
 details.c0	fa7ec7b3	182
-dtoa.c	fd6feb77	158408
+dtoa.c	576045b	158447
 dtoa1.c	1928cdca	3352
 duthes.c	e13b176c	3874
 dvalue.hd	9606f1	1125
@@ -103,7 +103,7 @@ op_type.hd	f803bc0b	1287
 op_typeb.hd	1c1e0c07	1287
 opcode.hd	12bc8de3	1348
 opnos.hd	1a7c2f8d	78
-pfg_read.c	10bf2455	98287
+pfg_read.c	1dca51d4	98321
 pfghread.c	b815512	1107
 printf.c	147de217	24293
 pshvprod.c	1dcadea7	32089
@@ -125,7 +125,7 @@ rops2.c	25c9f1	20459
 sigcatch.c	fe35ba8b	2374
 sjac0dim.c	ff686adb	1546
 sos_add.c	fb5da0e8	23060
-sphes.c	e4e0bfbe	27806
+sphes.c	f70a4208	27795
 sprintf.c	e6ce1d45	3050
 sscanf.c	f5a6f021	3327
 stderr.c	fc99b4f4	2096

src/solvers2/asldate.c

@@ -1 +1 @@
-long ASLdate_ASL = 20230818;
+long ASLdate_ASL = 20231111;

src/solvers2/dtoa.c

@@ -1869,7 +1869,7 @@ mult(Bigint *a, Bigint *b MTd)
 #else
 #ifdef Pack_32
 	for(; xb < xbe; xb++, xc0++) {
-		if (y = *xb & 0xffff) {
+		if ((y = *xb & 0xffff)) {
 			x = xa;
 			xc = xc0;
 			carry = 0;
@@ -1883,7 +1883,7 @@ mult(Bigint *a, Bigint *b MTd)
 				while(x < xae);
 			*xc = carry;
 			}
-		if (y = *xb >> 16) {
+		if ((y = *xb >> 16)) {
 			x = xa;
 			xc = xc0;
 			carry = 0;
@@ -5235,9 +5235,11 @@ dtoa_r(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve, char
 #ifndef SET_INEXACT
 #ifdef Check_FLT_ROUNDS
 	try_quick = Rounding == 1;
+#else
+	try_quick = 1;
 #endif
 #endif /*SET_INEXACT*/
-#endif
+#endif /*USE_BF96*/
 
 	if (mode > 5) {
 		mode -= 4;