Changeset e2efbe9 in git

Timestamp:

May 4, 2009, 5:06:16 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

5684dfa909063f2b118082f73dce26a57ed264e0

Parents:

233f2e504906a97e837a6704ca5f2f22d86c4bb8

Message:

*hannes: qring handling


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

Location:

Singular

Files:

• ipassign.cc (modified) (4 diffs)
• ipid.cc (modified) (2 diffs)
• ipshell.cc (modified) (3 diffs)

Singular/ipassign.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipassign.cc,v 1.104 2009-05-01 15:09:32 Singular Exp $ */
+/* $Id: ipassign.cc,v 1.105 2009-05-04 15:06:15 Singular Exp $ */
 
 /*
@@ -550 +550 @@
   }
 
-  ring qr=(ring)res->Data(); // the declaration allocated space
-  omFreeBin((ADDRESS)qr, ip_sring_bin);
-  ring qrr=rCopy(currRing);
+  ring qr;
+  //qr=(ring)res->Data();
+  //if (qr!=NULL) omFreeBin((ADDRESS)qr, ip_sring_bin);
+  assume(res->Data()==NULL);
+  qr=rCopy(currRing);
                  // we have to fill it, but the copy also allocates space
   idhdl h=(idhdl)res->data; // we have res->rtyp==IDHDL
-  IDRING(h)=qrr;
-  qr=qrr;
+  IDRING(h)=qr;
 
 #ifdef HAVE_PLURAL
@@ -578 +579 @@
     idDelete(&id);
     id=tmp;
-     // delete the qr copy of quotient ideal!!!
+    // delete the qr copy of quotient ideal!!!
     idDelete(&qr->qideal);
   }
-  qrr->qideal = id;
+  qr->qideal = id;
 
   // qr is a copy of currRing with the new qideal!
@@ -598 +599 @@
   }
   #endif
-  //currRing=qr;
-  //currRingHdl=(idhdl)res->data;
-  //currQuotient=qr->qideal;
   rSetHdl((idhdl)res->data);
   return FALSE;

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.84 2008-04-28 13:54:16 Singular Exp $ */
+/* $Id: ipid.cc,v 1.85 2009-05-04 15:06:15 Singular Exp $ */
 
 /*
@@ -320 +320 @@
         break;
       case RING_CMD:
-      case QRING_CMD:
         IDRING(h) = (ring) omAlloc0Bin(sip_sring_bin);
         break;

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.203 2009-03-11 09:43:29 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.204 2009-05-04 15:06:16 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -340 +340 @@
     ||(IDTYP(h)==QRING_CMD))
     {
-      if (IDRING(h)->idroot!=NULL)
+      if ((IDRING(h)!=NULL) && (IDRING(h)->idroot!=NULL))
+      // we have to test IDRING(h)!=NULL: qring Q=groebner(...): killlocals
       {
   //    Print("into ring %s, lev %d for lev %d\n",IDID(h),IDLEV(h),v);
@@ -4337 +4338 @@
 //   Print(" new ring:%s (l:%d)\n",IDID(h),IDLEV(h));
     rg = IDRING(h);
+    if (rg==NULL) return; //id <>NULL, ring==NULL
     omCheckAddrSize((ADDRESS)h,sizeof(idrec));
     if (IDID(h))  // OB: ????