Changeset ef8adb in git

Timestamp:

May 9, 2006, 1:50:50 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

e407985ee963ce0d6fb4fa83e5fc3d9410208014

Parents:

b4ab6fbc04ef9aeef95a3b0e1f048490cf8649d4

Message:

*hannes: cancel attributes in assigns


git-svn-id: file:///usr/local/Singular/svn/trunk@9119 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/iparith.cc (modified) (6 diffs)
• Tst/Short/bug_41.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_41.stat (modified) (1 diff)
• Tst/Short/bug_41.tst (modified) (1 diff)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.394 2006-05-08 17:45:31 Singular Exp $ */
+/* $Id: iparith.cc,v 1.395 2006-05-09 11:50:48 Singular Exp $ */
 
 /*
@@ -1244 +1244 @@
   res->data=u->data; u->data=NULL;
   res->name=u->name; u->name=NULL;
+  res->attribute=u->attribute; u->attribute=NULL;
   res->e=u->e;       u->e=NULL;
   if (res->e==NULL) res->e=jjMakeSub(v);
@@ -1283 +1284 @@
     p->data=u->data;
     p->name=u->name;
-    p->flag|=u->flag;
+    p->flag=u->flag;
+    p->attribute=u->attribute;
     p->e=jjMakeSub(&t);
   }
@@ -3422 +3424 @@
 static BOOLEAN jjHOMOG1(leftv res, leftv v)
 {
-  intvec *w;
-  res->data=(void *)idHomModule((ideal)v->Data(),currQuotient,&w);
-  if ((res->data!=NULL) && (v->rtyp==IDHDL))
-  {
-    char *isHomog=omStrDup("isHomog");
-    if (v->e==NULL)
-      atSet((idhdl)(v->data),isHomog,w,INTVEC_CMD);
-    else
-      atSet((idhdl)(v->LData()),isHomog,w,INTVEC_CMD);
-  }
-  else if (w!=NULL) delete w;
+  intvec *w=(intvec*)atGet(v,"isHomog",INTVEC_CMD);
+  ideal v_id=(ideal)v->Data();
+  if (w==NULL)
+  {
+    res->data=(void *)idHomModule(v_id,currQuotient,&w);
+    if ((res->data!=NULL) && (v->rtyp==IDHDL))
+    {
+      char *isHomog=omStrDup("isHomog");
+      if (v->e==NULL)
+        atSet((idhdl)(v->data),isHomog,w,INTVEC_CMD);
+      else
+        atSet((idhdl)(v->LData()),isHomog,w,INTVEC_CMD);
+    }
+    else if (w!=NULL) delete w;
+  }
+  else
+    res->data=(void *)idTestHomModule(v_id,currQuotient,w);
   return FALSE;
 }
@@ -4634 +4642 @@
     return TRUE;
   }
-  res->data=u->data;
-  u->data=NULL;
-  res->rtyp=u->rtyp;
-  u->rtyp=0;
-  res->name=u->name;
-  u->name=NULL;
+  res->data=u->data; u->data=NULL;
+  res->rtyp=u->rtyp; u->rtyp=0;
+  res->name=u->name; u->name=NULL;
+  res->attribute=u->attribute; u->attribute=NULL;
   Subexpr e=jjMakeSub(v);
           e->next=jjMakeSub(w);
@@ -4665 +4671 @@
     return TRUE;
   }
-  res->data=u->data;
-  u->data=NULL;
-  res->rtyp=u->rtyp;
-  u->rtyp=0;
-  res->name=u->name;
-  u->name=NULL;
+  res->data=u->data; u->data=NULL;
+  res->rtyp=u->rtyp; u->rtyp=0;
+  res->name=u->name; u->name=NULL;
+  res->attribute=u->attribute; u->attribute=NULL;
   Subexpr e=jjMakeSub(v);
           e->next=jjMakeSub(w);

Tst/Short/bug_41.res.gz.uu

@@ -1 +1 @@
 begin 640 bug_41.res.gz
-M'XL(""):7T0``V)U9U\T,2YR97,`G9-?2\,P%,7?^RDNQ8<.2F;2[H^.YD%\
-M<""^S+<Q1JNQ#62I-*FZ;V_B1E+6*L6G)C?GW/O+*=D\WZ^?``!3>%S?0:B5
-M1H(7X2K8G$\(!5/<<\EU-%D%]@N40M&6^Q0CR3Z1TKEV\H3"=`JYU@TOX*UN
-M0'"E@0EV8%(K)TL1N/4,0<-E"8T?.J?`7UDN@&=?OKJ@IVXBXS'WY26%JC[4
-M922V>&<0L3NYH6>22)BZK,^[5C-'@J^]YF2WNUNN'FS+&/3QG0&7^H.].&*,
-M.QZR^[6UB<ZM$]2UQ&'55FT8XXF[!DY'P,[^`3N_A/WQV/G>X-6+#O,2@1UC
-M7-G1<XX(E?1"'9;U<OP+C73B)(E%(Q=H9$2$I!?AL*R7VK"L$Q<Q<=F78I]#
-/JR+S:Z^";\?A$F%?`P``
+M'XL("."!8$0``V)U9U\T,2YR97,`G93/;\(@%,?O_A4OS0XU:ZJ`OXT<EAUF
+MLNSB;HLQ;666!.G2TJG__4`=5.V6;J?"X[TO'[Y]L'A]G+\``*+P/'\`3Q4J
+M%#SVIJW%>053T,$5EUSY[6G+?(%2B,O-JH="R79AH2)ETPF%3@<BI7(>PWN6
+M@^"%`B;8EDE5V+1>"';<#R'G<@.YVW1`@:]9)(#/]BXZI"<U,>,!=^$1A33;
+M9AM?O*&E1D1V94S/)+[0<9F=9Z5BE@1U7<ZIW,PFO'@RD@&HPP<#+M4G2RPQ
+M0I4:O/Q16EMGQR2LE@1>6J:E%Z"V/0;J-8#M_P-V<`U[K#'[NP*7/:PPCT(P
+MV^BJV<%Q-C`5WYA:GW;CXV]HN&(G)@8-7Z'A!A;B&POKTVY<JT^KV(6U79>M
+M?VSA8@)%FI5B#3&#))()$X*M89<R"2IEYSY/TDAN*KIC=S](-S37('#G).B[
+MXWFUW0FVS+Q1:Q!2K]/[JT[?N4`&FM;\EOT]<L##"\5:*\FH(J*/;QX=\[*4
+/A:]OR5WK"S?7`LVJ!```
 `
 end

Tst/Short/bug_41.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1147099682:2006050513:3-0-2:ix86-Linux:nepomuck:282752
-1 >> tst_memory_1 :: 1147099682:2006050513:3-0-2:ix86-Linux:nepomuck:817376
-1 >> tst_memory_2 :: 1147099682:2006050513:3-0-2:ix86-Linux:nepomuck:817376
-1 >> tst_timer_1 :: 1147099682:2006050513:3-0-2:ix86-Linux:nepomuck:1
+1 >> tst_memory_0 :: 1147175392:2006050513:3-0-2:ix86-Linux:nepomuck:282800
+1 >> tst_memory_1 :: 1147175392:2006050513:3-0-2:ix86-Linux:nepomuck:817184
+1 >> tst_memory_2 :: 1147175392:2006050513:3-0-2:ix86-Linux:nepomuck:817184
+1 >> tst_timer_1 :: 1147175392:2006050513:3-0-2:ix86-Linux:nepomuck:3

Tst/Short/bug_41.tst

@@ -26 +26 @@
 attrib(l[2]);
 
+// attrib for ideals: should be cancelled when the ideal changes
+
+i=x,y;
+homog(i);
+attrib(i);
+homog(i);
+attrib(i);
+
+i[2]=x+1;
+attrib(i);
+
 tst_status(1);$