Changeset acfb434 in git

Timestamp:

Mar 12, 2021, 2:09:50 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

0732b5d0bf1071123316c1301d6f92ab2e4cac3a14fb1bda29b68a3a94beabc02612639b98e12fbd

Parents:

0dd7e8bafbd1f4c71feb76c0c887ba2fbbc66ef73648b2bef793a083d375af65419598beca5015cd

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-03-12 14:09:50+01:00

git-committer:

GitHub <noreply@github.com>2021-03-12 14:09:50+01:00

Message:

Merge pull request #1062 from zickgraf/liftstd5_fix

Fix liftstd with 5 arguments and adapt tests

Files:

• Singular/LIB/algebra.lib (modified) (5 diffs)
• Singular/iparith.cc (modified) (1 diff)
• Tst/Short/liftstd_m.res.gz.uu (modified) (1 diff)
• Tst/Short/liftstd_m.stat (modified) (1 diff)
• Tst/Short/liftstd_m.tst (modified) (1 diff)
• libpolys/coeffs/ffields.cc (modified) (3 diffs)
• libpolys/coeffs/numbers.cc (modified) (1 diff)

Singular/LIB/algebra.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="version algebra.lib 4.1.2.0 Feb_2019 "; // $Id$
+version="version algebra.lib 4.2.0.1 Mar_2021 "; // $Id$
 category="Commutative Algebra";
 info="
@@ -66 +66 @@
     int m = ncols(A);
     int i;
-    string mp=string(minpoly);
     //-----------------
     // neu CL 10/05:
     int is_qring;
-    if (size(ideal(br))>0) {
+    if (size(ideal(br))>0)
+    {
       is_qring=1;
       ideal IdQ = ideal(br);
@@ -85 +85 @@
      l3[size(l3)+1] = "y("+string(yy)+")";
     }
-    ring R = create_ring(ringlist(br)[1], l3, "(dp("+string(n)+"),dp("+string(m)+"))", "no_minpoly"); 
-    if (mp!="0")
-    { execute ("minpoly=number("+mp+");"); }
-    ideal vars=x(1..n);
-    map emb=br,vars;
-    ideal A=ideal(emb(A));
-    poly check=emb(p);
+    list RL=ringlist(br);
+    RL[2]=l3; //vars
+    RL[3]=list(list("dp",1:n),list("dp",1:m)); //ord
+    RL[4]=ideal(0); // reset qring
+    ring R=ring(RL);
+    ideal A=fetch(br,A);
+    poly check=fetch(br,p);
     for (i=1;i<=m;i=i+1)
-    { A[i]=A[i]-y(i);
+    {
+      A[i]=A[i]-y(i);
     }
     //-----------------
     // neu CL 10/05:
-    if (is_qring) { A = A,emb(IdQ); }
+    if (is_qring) { A = A,fetch(br,IdQ); }
     //-----------------
     A=std(A);
@@ -108 +109 @@
   // use i also to control the display
     i = (sum(leadexp(check),1..n)==0);
-  degBound = DEGB;
+    degBound = DEGB;
     if( #[1] == 0 )
     { dbprint(printlevel-voice+3,"// "+string(check));
@@ -115 +116 @@
     else
     { list l = i,R;
-      kill A,vars,emb;
+      kill A;
       export check;
       dbprint(printlevel-voice+3,"

Singular/iparith.cc

@@ -7860 +7860 @@
       syz=&(hw->data.uideal);
       alg=syGetAlgorithm((char*)u4->Data(),currRing,(ideal)u->Data());
+      h11=(ideal)u5->Data();
     }
     else

Tst/Short/liftstd_m.res.gz.uu

@@ -1 +1 @@
 begin 644 liftstd_m.res.gz
-M'XL("%8S0F`"`VQI9G1S=&1?;2YR97,`G51-;YM`$+WS*T96#Z`N&W;`7[&,
-M1%6IBE3G4'R+HH@T3HJ$P3)K!?CUG<7.[JJ*39,+'L_7>_,&)EU_O[D%`!'#
-MSYMO,)*UY$7^.%HXZ2F",9#S(2]SZ7H+1_U"'$.1/Y/[Z6'+R\TKKV4F=448
-M@[8C#E=7;\GPFLL_D!4%_*ZVCWF9R;PJ:ZB>H=HI,RL@V[\<MIM2UKK#F)MN
-M$P[[O'R!7["$@+D-:UGGL6)GV$YCV&9RGS>0W.']77A/F0U3B93*.I,XH\3J
-MZ5!L(!'+H^4FGHG/31R7B:!..B:"6!614W".EE]H\+5QHFZ4&J<ED2")=C25
-M=$\JN9H-6[/4(TXM"QC0&.H)3L=:GT9A3>>WG>XRCD]=UE00,,%((,HGTQ?T
-MSV^9(Y0C8`T8[,E;54I5?M-];3OFJ,9(I4U+'BMY:I&>72(](L?H?XG//T,<
-M`\,%Q;]<$D$D$O3ZA@K?Z8%-!=J8/:*CP$R"M1^\O)\/#8N?VA)^9$MH;0EG
-M[RJ37M1F/J!-&-AL*!J8D##8(;Z+W:MU"3\,A_`C"V1\9L!AF,D0S/3\F'0[
-MTN/-J!1@@OJ=UU]X."1C=%[&R)(QPOZ`]H?S-.,U_%@J,Z5Q5\=Q887>M>%$
-<WA5Q\G23D/<W7%WI0^T*;_'%^0NK5O.>^04`````
+M'XL("`E*2F`"`VQI9G1S=&1?;2YR97,`G55-;Z,P$+WS*T;1'D!K*#;DJU&0
+M6*VTJK3I8<FMJBJZ<5M+!")P&N#7[Y@D-JM^B/1`<,9OGI_?>'"R_GES"P`T
+M@M\W/V`D*^EEXG&TL)+3#(L`@P\B%])V%I9Z0Q1!)IXPO'G8>CD_>)5,I<X(
+M(M#CT(.KJS,8#D*^0)IE\+?8/HH\E:+(*RB>H-BI89I!6C[OMSR7E688>X9M
+MXD$I\F?X`TOPB5V3AK0.R79&[32";2I+44-\Q^[O@GM$UD0!$4I:`YPAL-CL
+M,PXQ71Y'=NR8^;F99\N8(I.>HWZDDC!(/8_UXE0OOC9!IHD2$^Q91-&B'>Y*
+MVB>7;*V&K$GBH*:&^`1P&^H7K)8T+FZ%U*W;M)IE')U8UIC@$TK0(,3CT*7X
+MSVV(157`)S68M2?GK`2SW+K]WK3$4L0,4^L&(SWPM"=Z]IGH$09&0X7/OR*<
+M^48+HY\:>)$:QKZD)KC`1A;VI(^[]BAYAJWPRN&5EY5J"3T_,8>?33NL?.'X
+ME)R[YU9YDPZB@KR0(+:[C"L$WT":8_<5^VP#!:(.I9#J8&ON6<?]OXLQ1?MB
+MYIBF8/,>;&WB@6]D!F^JT?$D)Z8!-0C>KX$I@09^;+NQ.^C9'8S?U=8=D`OT
+M38;JZS5,,/O`EDL7GP]<//0'F!/B%RLY?OT*)2AFNGMU<</WRM&B0K.FJ^6%
+M0TH2]DH2'CN@NQA.SES#KZ4:)FC2ZF@2K)AS;91B=(5*'4V";:+N*'4+[2N;
+-.HMOUC^#^#F4V08`````
 `
 end

Tst/Short/liftstd_m.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1614951254:4201, 64 bit:4.2.0:x86_64-Linux:terra:85544
-1 >> tst_memory_1 :: 1614951254:4201, 64 bit:4.2.0:x86_64-Linux:terra:2150192
-1 >> tst_memory_2 :: 1614951254:4201, 64 bit:4.2.0:x86_64-Linux:terra:2191296
-1 >> tst_timer_1 :: 1614951254:4201, 64 bit:4.2.0:x86_64-Linux:terra:3
+1 >> tst_memory_0 :: 1615481353:4201, 64 bit:4.2.0:x86_64-Linux::85928
+1 >> tst_memory_1 :: 1615481353:4201, 64 bit:4.2.0:x86_64-Linux::2150192
+1 >> tst_memory_2 :: 1615481353:4201, 64 bit:4.2.0:x86_64-Linux::2191296
+1 >> tst_timer_1 :: 1615481353:4201, 64 bit:4.2.0:x86_64-Linux::4

Tst/Short/liftstd_m.tst

@@ -19 +19 @@
 print(T);
 
-print(liftstd(A1,T,A2));
-print(T);
-
 print(liftstd(module(A),T,S,"std"));
 print(T);
 print(S);
+
+// relative versions
+
+// the three-argument relative version is not implemented and would overwrite A2
+// print(liftstd(A1,T,A2));
+// print(T);
 
 print(liftstd(A1,T,S,A2));

libpolys/coeffs/ffields.cc

@@ -858 +858 @@
 BOOLEAN nfInitChar(coeffs r,  void * parameter)
 {
+  // the variables:
+  assume( getCoeffType(r) == n_GF );
+
+  GFInfo* p = (GFInfo *)(parameter);
+  assume (p->GFChar > 0);
+  assume (p->GFDegree > 0);
+  if ((IsPrime(p->GFChar)==p->GFChar)&&(p->GFDegree==1)) /* for oscar-system/Singular.jl/issues/177 */
+  {
+    return npInitChar(r,(void*)(long)p->GFChar);
+  }
+  if(p->GFChar > (2<<15))
+  {
+#ifndef SING_NDEBUG
+    WarnS("illegal characteristic");
+#endif
+    return TRUE;
+  }
+
+  const double check= log ((double) (p->GFChar));
+
+  #define sixteenlog2 11.09035489
+  if( (p->GFDegree * check) > sixteenlog2 )
+  {
+#ifndef SING_NDEBUG
+    Warn("Sorry: illegal size: %u ^ %u", p->GFChar, p->GFDegree );
+#endif
+    return TRUE;
+  }
+
   r->is_field=TRUE;
   r->is_domain=TRUE;
@@ -915 +944 @@
 #endif
 
-  // the variables:
-  assume( getCoeffType(r) == n_GF );
-
-  GFInfo* p = (GFInfo *)(parameter);
-  assume (p->GFChar > 0);
-  assume (p->GFDegree > 0);
 
   const char * name = p->GFPar_name;
@@ -948 +971 @@
   r->has_simple_Inverse=TRUE;
 
-  if ((IsPrime(p->GFChar)==p->GFChar)&&(p->GFDegree==1)) /* for oscar-system/Singular.jl/issues/177 */
-  {
-    return npInitChar(r,(void*)(long)p->GFChar);
-  }
-  if(p->GFChar > (2<<15))
-  {
-#ifndef SING_NDEBUG
-    WarnS("illegal characteristic");
-#endif
-    return TRUE;
-  }
-
-  const double check= log ((double) (p->GFChar));
-
-  #define sixteenlog2 11.09035489
-  if( (p->GFDegree * check) > sixteenlog2 )
-  {
-#ifndef SING_NDEBUG
-    Warn("Sorry: illegal size: %u ^ %u", p->GFChar, p->GFDegree );
-#endif
-    return TRUE;
-  }
-
   int c = (int)pow ((double)p->GFChar, (double)p->GFDegree);
 

libpolys/coeffs/numbers.cc

@@ -143 +143 @@
 static number ndParameter(const int, const coeffs r)
 {
-  Werror("ndParameter: n_Parameter is not implemented/relevant for (coeff_type = %d)",getCoeffType(r));
-  return NULL;
+  return r->cfInit(1,r);
 }