Changeset c45564 in git

Timestamp:

May 28, 2020, 3:59:45 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

0d9fc0cf670c06a6a5fa2528276fe4efc95a2820

Parents:

d2ead71f26dd6534952a6986bca121c8aff5f2ed

Message:

add: jjsetMinpoly

Files:

• Singular/ipassign.cc (modified) (8 diffs)
• Singular/ipshell.h (modified) (1 diff)
• Tst/Short/bug_minpoly.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_minpoly.stat (modified) (1 diff)
• Tst/Short/bug_minpoly2.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_minpoly2.stat (modified) (1 diff)
• Tst/Short/bug_misc.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_misc.stat (modified) (1 diff)

Singular/ipassign.cc

@@ -171 +171 @@
   }
 }
-static BOOLEAN jjMINPOLY(leftv, leftv a)
-{
-  if( !nCoeff_is_transExt(currRing->cf) && (currRing->idroot == NULL) && n_IsZero((number)a->Data(), currRing->cf) )
-  {
-#ifndef SING_NDEBUG
-    WarnS("Set minpoly over non-transcendental ground field to 0?!");
-    Warn("in >>%s<<",my_yylinebuf);
-#endif
+BOOLEAN jjSetMinpoly(ring r, number a, BOOLEAN modify)
+{
+  if( !nCoeff_is_transExt(r->cf) && (r->idroot == NULL) && n_IsZero(a, r->cf) )
+  {
     return FALSE;
   }
 
 
-  if ( !nCoeff_is_transExt(currRing->cf) )
-  {
-    WarnS("Trying to set minpoly over non-transcendental ground field...");
-    if(!nCoeff_is_algExt(currRing->cf) )
+  if ( !nCoeff_is_transExt(r->cf) )
+  {
+    if(!nCoeff_is_algExt(r->cf) )
     {
       WerrorS("cannot set minpoly for these coeffients");
@@ -192 +187 @@
     }
   }
-  if ((rVar(currRing->cf->extRing)!=1)
-  && !n_IsZero((number)a->Data(), currRing->cf) )
+  if ((rVar(r->cf->extRing)!=1)
+  && !n_IsZero(a, r->cf) )
   {
     WerrorS("only univarite minpoly allowed");
@@ -200 +195 @@
 
   BOOLEAN redefine_from_algext=FALSE;
-  if ( currRing->idroot != NULL )
-  {
-    redefine_from_algext=(currRing->cf->extRing->qideal!=NULL);
-//    return TRUE;
-#ifndef SING_NDEBUG
-    idhdl p = currRing->idroot;
-
-    WarnS("no minpoly allowed if there are local objects belonging to the basering: ");
-
-    while(p != NULL)
-    {
-      PrintS(p->String(TRUE)); Print("(%s)\n",IDID(p));
-      p = p->next;
-    }
-#endif
-  }
-
-//  assume (currRing->idroot==NULL);
-
-  number p = (number)a->CopyD(NUMBER_CMD);
-  n_Normalize(p, currRing->cf);
-
-  if (n_IsZero(p, currRing->cf))
-  {
-    n_Delete(&p, currRing->cf);
-    if( nCoeff_is_transExt(currRing->cf) )
-    {
-#ifndef SING_NDEBUG
-      WarnS("minpoly is already 0...");
-#endif
+  if ( r->idroot != NULL )
+  {
+    redefine_from_algext=(r->cf->extRing->qideal!=NULL);
+  }
+
+//  assume (r->idroot==NULL);
+
+  number p = n_Copy(a,r->cf);
+  n_Normalize(p, r->cf);
+
+  if (n_IsZero(p, r->cf))
+  {
+    n_Delete(&p, r->cf);
+    if( nCoeff_is_transExt(r->cf) )
+    {
       return FALSE;
     }
@@ -235 +215 @@
     return TRUE;
   }
-
+  if (!modify) r=rCopy(r);
   // remove all object currently in the ring
-  while(currRing->idroot!=NULL)
+  while(r->idroot!=NULL)
   {
 #ifndef SING_NDEBUG
-    Warn("killing a local object due to minpoly change: %s", IDID(currRing->idroot));
+    Warn("killing a local object due to minpoly change: %s", IDID(r->idroot));
 #endif
-    killhdl2(currRing->idroot,&(currRing->idroot),currRing);
+    killhdl2(r->idroot,&(r->idroot),r);
   }
 
   AlgExtInfo A;
 
-  A.r = rCopy(currRing->cf->extRing); // Copy  ground field!
+  A.r = rCopy(r->cf->extRing); // Copy  ground field!
   // if minpoly was already set:
-  if( currRing->cf->extRing->qideal != NULL ) id_Delete(&(A.r->qideal),A.r);
+  if( r->cf->extRing->qideal != NULL ) id_Delete(&(A.r->qideal),A.r);
   ideal q = idInit(1,1);
   if ((p==NULL) ||(NUM((fraction)p)==NULL))
@@ -256 +236 @@
     // cleanup A: TODO
     rDelete( A.r );
+    if (!modify) rDelete(r);
     return TRUE;
   }
@@ -261 +242 @@
   {
     poly n=DEN((fraction)(p));
-    if(!p_IsConstantPoly(n,currRing->cf->extRing))
+    if(!p_IsConstantPoly(n,r->cf->extRing))
     {
       WarnS("denominator must be constant - ignoring it");
     }
-    p_Delete(&n,currRing->cf->extRing);
+    p_Delete(&n,r->cf->extRing);
     DEN((fraction)(p))=NULL;
   }
@@ -273 +254 @@
   A.r->qideal = q;
 
-#if 0
-  PrintS("\nTrying to conver the currRing into an algebraic field: ");
-  PrintS("Ground poly. ring: \n");
-  rWrite( A.r );
-  PrintS("\nGiven MinPOLY: ");
-  p_Write( A.i->m[0], A.r );
-#endif
-
-  // :(
-//  NUM((fractionObject *)p) = NULL; // makes 0/ NULL fraction - which should not happen!
-//  n_Delete(&p, currRing->cf); // doesn't expect 0/ NULL :(
   if (!redefine_from_algext)
   {
@@ -297 +267 @@
     // cleanup A: TODO
     rDelete( A.r );
+    if (!modify) rDelete(r);
     return TRUE;
   }
   else
   {
-    nKillChar(currRing->cf); currRing->cf=new_cf;
-  }
-  return FALSE;
+    nKillChar(r->cf); r->cf=new_cf;
+  }
+  return FALSE;
+}
+static BOOLEAN jjMINPOLY(leftv, leftv a)
+{
+  return jjSetMinpoly(currRing,(number)a->Data(),TRUE);
 }
 

Singular/ipshell.h

@@ -171 +171 @@
 /* Assigments : */
 BOOLEAN iiAssign(leftv left, leftv right, BOOLEAN toplevel=TRUE);
+BOOLEAN jjSetMinpoly(ring r, number a, BOOLEAN modify);
 
 typedef BOOLEAN (*proci)(leftv,leftv,Subexpr);

Tst/Short/bug_minpoly.res.gz.uu

@@ -1 +1 @@
 begin 640 bug_minpoly.res.gz
-M'XL("*%C15@``V)U9U]M:6YP;VQY+G)E<P!54,M.PS`0O.<K1A6'M#(N`0H2
-M48V$N%1"7-I[FSB;8"FL*]L!PM?CT)*6TSYF9G=GUYOGU2N`3.%E]81)\$&V
-MIISDR?J(7"O$YM:P">DT3X8(I5!VS?;=\-ZVO63ZE#X48=3<*(SYK80SW,`O
-MKT3Z)7KQ+0I1"CT5U?ZT9:%PG+9$EB?S.68S;%P_*(.%I_"'PWZ0`UN^#*Y@
-MKXDKXE"T:)SMN$)MJ*VDE$F<^@A=,-OP3U];A_!&GJ`MU9'.P1_(Y%S$K-:=
-M<U3!,&)94A00#H>VA@F+!^S.CMV-)N[.;-_+W[<-;^E\FDWSB^0'ZE0]`6P!
-"````
+M'XL(")B?SUX"`V)U9U]M:6YP;VQY+G)E<P!-3\%JPD`0O><K'N(A@64Q;:U@
+M<`OB12B]V+LFZT07TEG9G=#:K^]:;>II9MZ;F??>YGVU?@-0&KRNEQA)%-VY
+M9E1EFQOS8)#`K6,G>5%EEPICT/2'[8?CD^_.FNE31ZEEN'DT&/HGC>#X@+B8
+MJ/Q+G=6WJE6C;*'VIW^5J<'MVP)EE27D!;9F]H)(\L>A]0%RI$BPGMK6$4N\
+M+E,(B?/6]B'0'HZ1QH;2`>$JTCDF3.?8W0GM!@//=Y9G^C?R)5(?\[*HQMD/
+(N41"_B@!````
 `
 end

Tst/Short/bug_minpoly.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:107200
-1 >> tst_memory_1 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2228224
-1 >> tst_memory_2 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2228224
-1 >> tst_timer_1 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:0
+1 >> tst_memory_0 :: 1590665113:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:85216
+1 >> tst_memory_1 :: 1590665113:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:2150192
+1 >> tst_memory_2 :: 1590665113:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:2191296
+1 >> tst_timer_1 :: 1590665113:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:4

Tst/Short/bug_minpoly2.res.gz.uu

@@ -1 +1 @@
 begin 640 bug_minpoly2.res.gz
-M'XL(""6*8UD"`V)U9U]M:6YP;VQY,BYR97,`75!-:\)`$+WG5SQ"#QM)5MQ6
-M;0GNH?0BB!?M65:SAH5T5G8G;?/OFXB-I:<9YO&^9K=_6V\!S#0VZU>D'%DV
-M[IB6R>Z&*(W^>'#D6&1E,DQHC6-;'SX<77S3*4GV2T8V/)(>-<;]22(XJA%6
-M8IZ;+/_.J\M=?JYQDUD95:@[L+@F2@?JOT1+C>`]^_-[GZ43BS[5=(K)!/O0
-M#4;L$2W_RL)_V@#R5'`P%$^6*DML&M3!MU3A[&Q322D380J5C2;/?QJ\R.L+
-2AH9M%+.L?$A^`+"]93,X`0``
+M'XL(")6?SUX"`V)U9U]M:6YP;VQY,BYR97,`78Y!"X)`$(7O^RL&Z;`+NN"6
+M5HASB"Y"=+'.LF+)@NV*KI3_/A71Z#3#O'GO?>GMG%P!P$>X)"=P;&MYI7(G
+M(NFL"(3AF"FM+&41&2<@0MZ5V4OIVE2]X/KQYJV5=C%M$99]QZ%1NH0FIH$K
+MF?MQBWJ-#Q#FF%@*3ZQ".!$YH_6/:(_0&&/-\SZP]#0<J*CT!%L>#C_M1S[A
+1CW1=2WT6;<@7E0-\A?0`````
 `
 end

Tst/Short/bug_minpoly2.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1499695653:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:167984
-1 >> tst_memory_1 :: 1499695653:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:2215936
-1 >> tst_memory_2 :: 1499695653:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:2215936
-1 >> tst_timer_1 :: 1499695653:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:2
+1 >> tst_memory_0 :: 1590665109:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:174624
+1 >> tst_memory_1 :: 1590665109:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:2183168
+1 >> tst_memory_2 :: 1590665109:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:2281488
+1 >> tst_timer_1 :: 1590665109:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:6

Tst/Short/bug_misc.res.gz.uu

@@ -1 +1 @@
 begin 640 bug_misc.res.gz
-M'XL("(@?N%X"`V)U9U]M:7-C+G)E<P#56-UOXC@0?^>O&*WN(2PA31P2H!6<
-MU+V'6ZG:E^Z][.FV&Q(#UA&;LYV6\-??.-]0VNNM1-4BM3CC\7S\_)NQP^W7
-MWSY_`0!O#C>?K^&#5MK9L,6'J]YM-4/F@,([QIFV^E<]\PWS.2RRU5W*5.QP
-M^N`H'>EF@3^'9CQRX.("M'2"J0O#,WP:3X$#6REB6+:1AW-\,OX?(G4)7_ZX
-MN8&$2KJ$AS6+UZC.N&9\!?A%)8\VH+3,8IU)VL-%B`*/4@IP"33=ZKPP;R;,
-M=S%S/*'S+:K#T8HZFG$'EDD#RV1R7EBFI:<UA67&8\T$5Z#RO5TFK6BL;?@G
-M$YI1KD%23)Y#A$!$/(ED`HM(4515FD8)B"5.K2BG,BIP4U0#6U:K;J^!*2-R
-M:M^>ZX#8&I=6K=)O-L=#PDEC1,Y\XKJ^;>WLW-[W[63;ZI`6,L]W(!5)MJ&0
-MSC`!BR4TVEB[06[O!OM^Q_!H#I'6DBVL%*5F>,G4[;5=;@^F7<M^%ZE8M>)[
-M&K?>@CFD5[WT3^^OV>XCIFR1_K`<>/U!7DOVE:19AHQ3.BD<W_W?M1U^>,B/
-M(C]@LV:?VHS[=C4D@[V=^]WDIW-@6*.%;W^P(_E@MQ_D>Y00E.3^(!_5NL1M
-M@&)/`%5KXEZ]*)#J,>]$1$@GHM)_&8N?F_#($(7#?#38Y1@GV3?+_(/@N*B>
-M,DU5HS,JT68-VJ7]NZ[]1X:#%F82(LRSFOT=1NV#.I4NL\BXD\H@+_/8MWA.
-M7HRGV:7G_9I2:#W[[BG/03/MO=2SWZDHWZ])MO9F1?&U_A#9:HK,=JW85$5=
-M@\5`6&O/7A-TBDWFXT=L!0E=X@F!=9V"]81N0WD?RZ5HPD7!>+9K@XO_>JX]
-MW-N[<I0;V:X->GQ0W2=YX4]JLV4MOMCVM`5GY#8=>CP]2X<^:-,CKW*7&^B2
-M+%U@R\:A@@>FUY`ROA6;O-$F3M4[\6\&EFM'?<RITSE'6#[5(E2(OI.AU\Z-
-MCN=(O7U?2_]:%*V]5A+W5`(7?*AEQ%5,>8*L16ZLI,AX`DM&-XGC.#T\;7Z%
-M3R+;)*BM(<:CICA/B],GVJP<H#M-N<(#X;(V/INYY3HJI9`@XCB32"+D+.#C
-M@BZ%I%`&OF&<8O"7\.,X^A]-:L%[3BUX-K6P0\YQ2\[P%<@Y>0DYP2IN67B]
-MHK)"&B'$RU9*4R'SINA'TP/R!M^#BKKE/OD>"<Q%@O'[:,,2B!3$ZTA&,1X^
-M3&D6FUN(0?U@BZ"X0YAUF:*)\[@;&6?6*;=-7($[/XR+',3U2E&1XZB\@ZA(
-M\/I!D4=(D8.8+',Q6%%I(Z;]@_">,7IB46L?FY>Y=QKUPE0LZ'+)8G-8(L.^
-M?;NP#$OZ9HHC&[&$,='[2"J\>'M&6GT6&Q'_;=YM4"YD4O(RV78TVL\EF"N]
-M,L/="1.D:^)3$RFV4BXH8BQG;8,-@J?P(3^##WF$3_B?^+P-=,9--[[JN8UT
-MTF#6E4Z?P,S^&<SL1YB%Q]7]1KI.Z+W%KA.2M]=U0O^\72<<O9>N$YZYOX3O
-GI+^$)_M+.#ES)^F\)8SQ+<'\-F9^_LH4OLQ?_=+[%T.P<%Y1$P``
+M'XL(".2?SUX"`V)U9U]M:7-C+G)E<P#56$MOXS80OOM7#!8]R+&L2)0EOV`7
+MR/;0!8*]I+ULT<W*$FT3M427I!+)O[Y#O>TX:;J`TZP`6]1P.(]/,Q]IW_WV
+MRZ?/`.`LX?;3#7Q04ED[MOHP[]U5,V0)*+QG"5-&?][3=U@N895N[F,F0RNA
+MCY94@6H6N$MHQB,+KJ]!"<N;VC"\P-5X\BS8"Q["NHW<7^*3]O\8R!E\_OWV
+M%B(JZ!H>MRS<HCI+%$LV@#<JDF`'4HDT5*F@/5R$*"1!3`%F0..]R@OS>D+?
+MBYG3"97O41U.5M31C#NP3!I8)I/+PC(M/6TIK-,D5(PG$F1^,,ND)0V5"7^G
+M7#&:*!`4DT\@0""")`I$!*M`4E25B@81\#5.;6A"15#@)JD"MJY6W=T`DUID
+MU;X=VP*^URZ-6J7?O!P'"TYH(V+A$MMV32,S<_/0-Z-]JT-:R!S7@IA'Z8Y"
+MO,`$#!;18&=D@]S,!H=^Q_!H"8%2@JV,&*5Z.&/R[L8L7P^F7<M^Y3'?M.('
+M&K;>O"7$\U[\A_/G(KO"E`W2'Y8#IS_(:\FADC3+L.*DB@K']_]U;:<^'*R/
+M(C]@B^8]M1GWS6I(!@<S=[O)3Y?`L$<+W^X@(_D@.PSR`TH(2G)WD(]J76(W
+M0+%G@*HU\5V]*I#J,>]$1$@GHM)_&8N;Z_#($(7#?#3(<HR3')IE[E%P":^>
+M4D5EHS,JT68-VJ7]^Z[])X:]%F;B(\R+NOH[%77PZE2ZE47&G50&>9G'H<5S
+M\FH\]5MZV:]NA=:S:Y_S[#73SFL]NYV.<MVZR+;.HFB^UA\B6TV11=:*=5?4
+M/5@,N+%US"U!IT@R5U=(!1%=XPZ!?1V#\8QN4_(NMDM!PD7#.*9M@HU?/=L<
+M'LRL'.5:EK5!CX^Z^VQ=N)/:;-F+K[8];<$9V0U#CZ<78>@CFAXYE;M<0Q>E
+M\0HI&X<2'IG:0LR2/=_EC3:Q*N[$SP(,VPSZF%.'.4?8/M4B5`B^DJ'3SHU.
+MY\B\ASO%S_"1I[L($JX@Q&VBV`N+G2/8;2R@F:*)1#*?U:L7"[M<1X7@`G@8
+MI@(+`.L-\'%%UUQ0*)WN6$+1\0R^G7K^UH3E_5]A>2^&Y7>*8MP6A?\&13%Y
+M35&`49QN\%A#BYI0'-($NQ!B&G.1-\TVFAX5C??5JTJF[%S7(9[>P%GR$.Q8
+M!(&$<!N(($329U*Q4._^&O6-X&@?UHSN(@N*O5NO2R6-K*<LH)T9Y]PV<7GV
+M\C@N<A37&T5%3J-RCJ(BWML'19X@18YB,O2&O*'"1$S[1^&]8/3,HM8^DH8^
+M[VGUPE3(Z7K-0KU)885]^7)MZ"KIZZD$JY$*G>A#("0>>!TMK:[5CH=_Z=\4
+M*.<B*NLRVG<TVFL&^B@M]3`[8X)T37QL(D4*2SA%C,6B)3;/>PX?\CWXD"?X
+M^/^*S_M`9]PPZ;QG-]))@UE7.GT&,_-[,#.?8.:?=O<[81W?>8^LXY/WQSJ^
+M>UG6\4<_"NOX%^87_P?A%_\LO_B3"S-)YW0^QM.Y_D]*_^V42OP1/?^I]P\`
+'$ZDNR1(`````
 `
 end

Tst/Short/bug_misc.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1589125000:4131, 64 bit:4.1.3:x86_64-Linux:nepomuck:217224
-1 >> tst_memory_1 :: 1589125000:4131, 64 bit:4.1.3:x86_64-Linux:nepomuck:2278208
-1 >> tst_memory_2 :: 1589125000:4131, 64 bit:4.1.3:x86_64-Linux:nepomuck:2319312
-1 >> tst_timer_1 :: 1589125000:4131, 64 bit:4.1.3:x86_64-Linux:nepomuck:4
+1 >> tst_memory_0 :: 1590665188:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:217232
+1 >> tst_memory_1 :: 1590665188:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:2278216
+1 >> tst_memory_2 :: 1590665188:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:2319312
+1 >> tst_timer_1 :: 1590665188:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:5