testcase assignment error

Author: HenryHRich

jsrc/ct.c

@@ -740,12 +740,13 @@ ASSERT(0,EVNONCE)
   break;}
  case 14:  { // threadpool keepwarm (in sec): set to y, return previous value
 #if PYXES
+#define MAXLINGER 0.1  //  maximum time we will allow for lingering
   ASSERT(AR(w)==1,EVRANK) ASSERT(AN(w)==2,EVLENGTH)  // arg is threadpool# keepwarm
   if(AT(w)!=FL)RZ(w=cvt(FL,w));  // make arg float type
   D dpoolno=DAV(w)[0]; I poolno=(I)dpoolno; ASSERT((D)poolno==dpoolno,EVDOMAIN) ASSERT(BETWEENO(poolno,0,MAXTHREADPOOLS),EVLIMIT)  // extract threadpool# and audit it
   JOBQ *jobq=&(*JT(jt,jobqueue))[poolno];
   D oldval=jobq->keepwarmns*1e-9;
-  D kwtime=DAV(w)[1]; ASSERT(kwtime>=0,EVDOMAIN); if(kwtime>0.003)kwtime=0.003; I kwtimens=(I)(kwtime*1000000000);  // limit time to 3ms and convert to ns
+  D kwtime=DAV(w)[1]; ASSERT(kwtime>=0,EVDOMAIN); if(unlikely(kwtime>MAXLINGER))kwtime=MAXLINGER; I kwtimens=(I)(kwtime*1000000000);  // limit time and convert to ns
   jobq->keepwarmns=kwtimens;  // store new value
   z=scf(oldval);  // return old value
 #else

jsrc/vfrom.c

@@ -781,7 +781,7 @@ static unsigned char jtmvmsparsex(J jt,void* const ctx,UI4 ti){
    COLLPE
   }else{
    // here for sparse dot-product.
-   colx-=n;  // the offset into A starts after the identity prefix
+// obsolete    colx-=n;  // the offset into A starts after the identity prefix
    // look up column info, get A values and row numbers
    I an=axv[colx][1];  // number of sparse atoms in each row
    D *vv=avv0+axv[colx][0];  // pointer to values for this section of A
@@ -873,7 +873,7 @@ static unsigned char jtmvmsparsex(J jt,void* const ctx,UI4 ti){
   if(bv==0){  // one product, or Dpiv
    if(zv)break;  // if just one product, skip the setup for next column
    // here for Dpiv.  bestrow+1 is the # pivots found; we add/sub/store that in the Dpiv block based on 'prirow'
-   exlist[colx]=exlist[colx]*!!prirow+bestrow*(prirow|1);  //  add/sub/init Dpiv value.  Only one thread ever touches a column 
+   exlist[*ndx]=exlist[*ndx]*!!prirow+bestrow*(prirow|1);  //  add/sub/init Dpiv value.  Only one thread ever touches a column 
   }else if(exlist==0){  // looking for nonimproving pivots?
    // not looking for nonimproving pivots.  Do a normal pivot-pick
    // column ran to completion.  Detect unbounded
@@ -1052,15 +1052,15 @@ F1(jtmvmsparse){PROLOG(832);
    bv=zv=0;
    exlist=IAV(C(AAV(w)[9]));  // remember address of exclusions
    ASSERT(AR(C(AAV(w)[9]))==1,EVRANK); ASSERT(ISDENSETYPE(AT(C(AAV(w)[9])),INT),EVDOMAIN);  // must be integer list
-   ASSERT(AN(C(AAV(w)[9]))==AS(C(AAV(w)[2]))[0]+AS(C(AAV(w)[4]))[0],EVLENGTH);  // length of Dpiv is #cols of A + #rows of A (=M)
+   ASSERT(AN(C(AAV(w)[9]))==AS(C(AAV(w)[1]))[0]+AS(C(AAV(w)[4]))[0],EVLENGTH);  // length of Dpiv is #cols of A + #rows of A (=M)
    z=mtv;  // no error is possible; use harmless return value
   }
  }
 
 
 #define YC(n) .n=n,
 struct mvmctx opctx={.ctxlock=0,.abortcolandrow=-1,.bestcolandrow={-1,-1},YC(ndxa)YC(n)YC(minimp)YC(bv)YC(thresh)YC(bestcol)YC(bestcolrow)YC(zv)YC(Frow)YC(nfreecolsd)
- YC(ncolsd)YC(impfac)YC(prirow)YC(bvgrd0)YC(bvgrde)YC(exlist)YC(nexlist)YC(yk)YC(bkmin).axv=(I(*)[2])IAV(C(AAV(w)[1])),.amv0=IAV(C(AAV(w)[2])),.avv0=DAV(C(AAV(w)[3])),.mv0=DAV(C(AAV(w)[4])),
+ YC(ncolsd)YC(impfac)YC(prirow)YC(bvgrd0)YC(bvgrde)YC(exlist)YC(nexlist)YC(yk)YC(bkmin).axv=((I(*)[2])IAV(C(AAV(w)[1])))-n,.amv0=IAV(C(AAV(w)[2])),.avv0=DAV(C(AAV(w)[3])),.mv0=DAV(C(AAV(w)[4])),
  .ndotprods=0,.ncolsproc=0,.taskmask=0};
 #undef YC
 

test/g520.ijs

@@ -130,13 +130,12 @@ assert. 3 0 0 4 11 0 -: (128!:9) 1 2 3 0;(,."1 (_2) ]\ 00 0);(0$00);(0$0.0);M;bk
 
 NB. Dpiv
 M=. |: _4 ]\ _1. 0 2 3  0 2 3 4  2 3 4 5  3 4 5 6    NB. 
-Dpiv=. (#M) $ _1
+Dpiv=. (1+#M) $ _1
 assert. '' -: 128!:9 (0 1 2);(,."1 (_2) ]\ 00 0);(0$00);(0$0.0);M;0 1 2;1.0 0 0 0 0 0 0;'';'';Dpiv  NB. init
-assert Dpiv -: 1 2 3 _1
+assert Dpiv -: 1 2 3 _1 _1
 assert. '' -: 128!:9 (1 2 3);(,."1 (_2) ]\ 00 0);(0$00);(0$0.0);M;1 2 3;2.5 0 0 0 0 0 1;'';'';Dpiv  NB. add
-assert Dpiv -: 1 4 6 2
-assert. '' -: 128!:9 (0 1 2 3);(,."1 (_2) ]\ 00 0);(0$00);(0$0.0);M;0 3;2.5 0 0 0 0 0 _1;'';'';Dpiv  NB. add
-assert Dpiv -: 0 3 5 0
+assert Dpiv -: 1 4 6 2 _1
+assert. '' -: 128!:9 (0 1 2 3);(,."1 (_2) ]\ 00 0);(0$00);(0$0.0);M;0 3;2.5 0 0 0 0 0 _1;'';'';Dpiv  NB. sub
 
 NB. Repeat multithreaded
 bxr =. </.~  0 1 $~ $  NB. 2 threads
@@ -223,13 +222,13 @@ assert. 3 0 0 4 11 0 mt3 128!:9 (bxr 1 2 3 0);(,."1 (_2) ]\ 00 0);(0$00);(0$0.0)
 
 NB. Dpiv
 M=. |: _4 ]\ _1. 0 2 3  0 2 3 4  2 3 4 5  3 4 5 6    NB. 
-Dpiv=. (#M) $ _1
+Dpiv=. (1+#M) $ _1
 assert. '' -: 128!:9 (bxr 0 1 2);(,."1 (_2) ]\ 00 0);(0$00);(0$0.0);M;0 1 2;1.0 0 0 0 0 0 0;'';'';Dpiv  NB. init
-assert Dpiv -: 1 2 3 _1
+assert Dpiv -: 1 2 3 _1 _1
 assert. '' -: 128!:9 (bxr 1 2 3);(,."1 (_2) ]\ 00 0);(0$00);(0$0.0);M;1 2 3;2.5 0 0 0 0 0 1;'';'';Dpiv  NB. add
-assert Dpiv -: 1 4 6 2
-assert. '' -: 128!:9 (bxr 0 1 2 3);(,."1 (_2) ]\ 00 0);(0$00);(0$0.0);M;0 3;2.5 0 0 0 0 0 _1;'';'';Dpiv  NB. add
-assert Dpiv -: 0 3 5 0
+assert Dpiv -: 1 4 6 2 _1
+assert. '' -: 128!:9 (bxr 0 1 2 3);(,."1 (_2) ]\ 00 0);(0$00);(0$0.0);M;0 3;2.5 0 0 0 0 0 _1;'';'';Dpiv  NB. sub
+assert Dpiv -: 0 3 5 0 _1
 
 
 delth''  NB. make sure we end with an empty system

test/gspi.ijs

@@ -167,8 +167,8 @@ d=: df s=: 0(2)}$. i.5
 (s i. 0) -: d i. 0
 (s i: 0) -: d i: 0
 
-s =. $.,1
-s =. 0 (0}) s
+s =: $.,1
+s =: 0 (0}) s
 1 = s i. 1
 1 = (8 $. s) i. 1