Changeset f34cd44 in git

Timestamp:

Jul 2, 2015, 12:00:57 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

7036d0b9fb90dfbbb225e698220889d8bfd08fb3bbfc4a825e46a6bf0bdd30896d5189f16c4e4d99

Parents:

74dcead93fa7d8032514e5919362facbb50b1c0e

Message:

fix: fetch/imap via p_PermPoly (not maEval) (in maApplyFetch)

Files:

• Singular/maps_ip.cc (modified) (2 diffs)
• Tst/Short/bug_tr723.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_tr723.stat (modified) (1 diff)
• Tst/Short/bug_tr723.tst (modified) (1 diff)
• libpolys/coeffs/numbers.cc (modified) (1 diff)
• libpolys/coeffs/rintegers.cc (modified) (1 diff)

Singular/maps_ip.cc

@@ -145 +145 @@
         }
       }
-      else
-      if ((what==IMAP_CMD) || ((what==FETCH_CMD)  && (nMap!=ndCopyMap)))
+      else if ((what==IMAP_CMD) || (what==FETCH_CMD))
       {
         for (i=R*C-1;i>=0;i--)
@@ -155 +154 @@
         }
       }
-      else /* if(what==MAP_CMD) */
-      {
+      else /* (what==MAP_CMD) */
+      {
+        assume(what==MAP_CMD);
         matrix s=mpNew(N,maMaxDeg_Ma((ideal)data,preimage_r));
         for (i=R*C-1;i>=0;i--)

Tst/Short/bug_tr723.res.gz.uu

@@ -1 +1 @@
 begin 640 bug_tr723.res.gz
-M'XL("$]8D54``V)U9U]T<C<R,RYR97,`G93!3H-`$(;O/,6D\0`5*3M;"H1T
-M#\9+$^.EWHQI6HN5"&C8;6Q]>G>U'6HJI<*%9?C_G>%C=J;W-Y,[`&`";B?7
-MT%-2>7FVZ"76=/<&!>C@+"LS93N)9>X@!"S6JYFJ0N1>F7YX4LT5.;@`6@\]
-M@"HK5U#!&&S?G3LNV!MWZW[JQ?*]3A,(@.)MN<Y3*(QT[O0W_55:VLRY#/@H
-M"OW8C_O;[Q!W:M_(^!*K>&"/XQ83>4*Q*TJ:3"1L+B[Z7=QSJIY>[,J%XJ"0
-MN*&0O8#Y;0)6<V.HN<E4_:!+_ON%3/\"LLN_[:0=:NUKEN<Z#\6"?4S6,4-Z
-M,+@Z_R)G2$W`3G<!B[IU`6N"?X(1^@>Y<%S09L@Z;(;&@]J$1R[;UT]'!D[4
-M69UYV!4Q!A[U#HX(-Y[7WQAVPXY12TMCW,"8MQT&SAJ!D@0)(=8;'PP?KH>/
-3&5UF.*VE=B87UA?P=GB9\`0`````
+M'XL(",(+E54``V)U9U]T<C<R,RYR97,`G91-;X)`$(;O_HI)TP-8BNPL"(3(
+MH>G%I.E!>FL:HY524J"-K*GVUW?7CUF-12U<%F;GG9E]F)WDZ7[X"``LAH?A
+M'5R)6MA%/KV*.LEV!V.0QG%>Y<(PHXY:(8YANLC&8NXCMZOTVZ[%1)""QT#O
+MK@TPSZL,YC``P[$FI@7&TEI9/_)E]J73>#%`^3E;%"F4RG5B=I?=+*T,9MYX
+MO!_X3NB$W=7:Q$VMZRM=U"F?V<O@C(@T?KPMJE:9R+&YN."PN+=4O+X;<PO*
+MO4+"AD)V#LPYY\`T-X:26YV*#;KHOR=D\A>0O/Y;3KZN]/W(BT+F(9NWL]7:
+MIDCW>K>7/Z3TJ0G8Z2Y@0;LN8$WP3S!"9R\7#DH*AJQ%,%0:E"(\4AF._#H2
+M<*+.=&:W+6+T;.H=[!-NO*R_T6^''8,S+8UA`V-^[C)PU@B47)`0H@[,VR+D
+M-*H2A2"O1)JE\HXSAYO6TMK#Q3U]4;F"G<_220%#*5MJ)QHR(VG?15L=Q%'X
+MUK,$C,0:2JYC==85[8>[`XZBS9J0UG5T#2ZSUR-:#>%%+0E%UYU?OH[&GM@%
+"````
 `
 end

Tst/Short/bug_tr723.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1435588687:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:107648
-1 >> tst_memory_1 :: 1435588687:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:2232320
-1 >> tst_memory_2 :: 1435588687:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:2232320
-1 >> tst_timer_1 :: 1435588687:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:1
+1 >> tst_memory_0 :: 1435831234:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:107760
+1 >> tst_memory_1 :: 1435831234:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:2232320
+1 >> tst_memory_2 :: 1435831234:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:2232320
+1 >> tst_timer_1 :: 1435831234:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:0

Tst/Short/bug_tr723.tst

@@ -31 +31 @@
  m2;
  kill r2;
+ //-------------------------------------------
+ ring S = (integer, 103),x,dp;
+
+ ideal I = x;
+ ring R = integer,y,dp;
+ fetch (S,I);
+ kill R; kill S;
 
 tst_status(1);$

libpolys/coeffs/numbers.cc

@@ -228 +228 @@
 number ndCopyMap(number a, const coeffs aRing, const coeffs r)
 {
-  assume( getCoeffType(r) == getCoeffType(aRing) );
+  // aRing and r need not be the same, but must be the same representation
+  assume(aRing->rep==r->rep);
   if ( nCoeff_has_simple_Alloc(r) && nCoeff_has_simple_Alloc(aRing) )
     return a;

libpolys/coeffs/rintegers.cc

@@ -339 +339 @@
 {
   /* dst = currRing */
-  if (nCoeff_is_Ring_Z(src) || nCoeff_is_Ring_ModN(src) || nCoeff_is_Ring_PtoM(src))
+  /* dst = nrn */
+  if ((src->rep==n_rep_gmp)
+  && (nCoeff_is_Ring_Z(src) || nCoeff_is_Ring_ModN(src) || nCoeff_is_Ring_PtoM(src)))
+  {
+    return ndCopyMap; //nrzCopyMap;
+  }
+  if ((src->rep==n_rep_gap_gmp) /*&& nCoeff_is_Ring_Z(src)*/)
   {
     return ndCopyMap; //nrzCopyMap;