Changeset bafe9c in git for Singular/ipassign.cc

Timestamp:

Apr 1, 2008, 6:32:40 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9676ea20c5b413901217dc054c67c5e9b03a512a

Parents:

bcfdafa7e446687dbf7583be1d7a09ab1a9152d9

Message:

*hannes: fix qring in qring


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

File:

• Singular/ipassign.cc (modified) (8 diffs)

Singular/ipassign.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipassign.cc,v 1.95 2008-04-01 15:21:47 Singular Exp $ */
+/* $Id: ipassign.cc,v 1.96 2008-04-01 16:32:40 Singular Exp $ */
 
 /*
@@ -155 +155 @@
       }
     }
-    default: 
+    default:
     //case RESOLUTION_CMD:
        Werror("type %d too complex...set minpoly before",IDTYP(h)); break;
@@ -521 +521 @@
   return FALSE;
 }
-#if 0
 static BOOLEAN jiA_QRING(leftv res, leftv a,Subexpr e)
 {
@@ -531 +530 @@
     return TRUE;
   }
-  ring qr;
-  int i,j;
-  int *pi;
-
-  assumeStdFlag(a);
-  #ifdef HAVE_PLURAL
-  if(rIsPluralRing(currRing))
-  {
-    if (!hasFlag(a,FLAG_TWOSTD))
-    {
-      Warn("%s is no twosided standard basis",a->Name());
-    }
-  }
-  #endif
-  qr=(ring)res->Data();
+
+  ring qr=(ring)res->Data(); // the declaration allocated space
   ring qrr=rCopy(currRing);
-  memcpy4(qr,qrr,sizeof(ip_sring));
-  omFreeBin((ADDRESS)qrr, ip_sring_bin);
-  if (qr->qideal!=NULL) idDelete(&qr->qideal);
-  qr->qideal = (ideal)a->CopyD(IDEAL_CMD);
-  //currRing=qr;
-  //currRingHdl=(idhdl)res->data;
-  //currQuotient=qr->qideal;
-  rSetHdl((idhdl)res->data);
-  return FALSE;
-}
-#endif
-static BOOLEAN jiA_QRING(leftv res, leftv a,Subexpr e)
-{
-  // the follwing can only happen, if:
-  //   - the left side is of type qring AND not an id
-  if ((e!=NULL)||(res->rtyp!=IDHDL))
-  {
-    WerrorS("qring_id expected");
-    return TRUE;
-  }
-
-  ring qr=(ring)res->Data(); // the declaration allocated space
-  ring qrr=rCopy(currRing); 
                  // we have to fill it, but the copy also allocates space
   memcpy4(qr,qrr,sizeof(ip_sring));
@@ -576 +539 @@
   ideal id=(ideal)a->CopyD(IDEAL_CMD);
   if (idElem(id)>1) assumeStdFlag(a);
-  qr->qideal = id;
   if (currRing->qideal!=NULL) /* we are already in a qring! */
   {
-    ideal tmp=idAdd(id,currRing->qideal);
+    ideal tmp=idSimpleAdd(id,currRing->qideal);
+    // both ideals should be GB, so dSimpleAdd is sufficient
     idDelete(&id);
     id=tmp;
   }
+  qr->qideal = id;
 
   // qr is a copy of currRing with the new qideal!
@@ -593 +557 @@
     }
 
-    nc_SetupQuotient(qr, currRing); 
+    nc_SetupQuotient(qr, currRing);
   }
   #endif
@@ -806 +770 @@
       if ((l->rtyp==IDHDL) && (l->e==NULL))
         Werror("`%s`(%s) = `%s` is not supported",
-          Tok2Cmdname(lt),l->Name(),Tok2Cmdname(rt));
+          Tok2Cmdname(lt),l->Name(),Tok2Cmdname(rt));
       else
          Werror("`%s` = `%s` is not supported"
@@ -1014 +978 @@
       }
   }
-  oldL=(lists)l->Data(); 
+  oldL=(lists)l->Data();
   if (oldL!=NULL) oldL->Clean();
   if (l->rtyp==IDHDL)