Changeset 9ae5a3 in git for Singular/subexpr.cc

Timestamp:

May 1, 2018, 3:33:42 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

216f06ee7f80913e6ca48a862d43e0f3a02be9f4

Parents:

9922fa723f8d8897179b004e96357ea3d9a9a7e8

Message:

add: polyBucket stuff

File:

• Singular/subexpr.cc (modified) (5 diffs)

Singular/subexpr.cc

@@ -115 +115 @@
         case BIGINTMAT_CMD:
           ((bigintmat *)d)->pprint(colmax);
+          break;
+        case BUCKET_CMD:
+          {
+            sBucket_pt b=(sBucket_pt)d;
+            if ((e==NULL)
+            && (TEST_V_QRING)
+            &&(currRing->qideal!=NULL))
+            {
+              poly p=pCopy(sBucketPeek(b));
+              jjNormalizeQRingP(p);
+              PrintNSpaces(spaces);
+              pWrite0(p);
+              pDelete(&p);
+              break;
+            }
+            else
+              sBucketPrint(b);
+          }
           break;
         case UNKNOWN:
@@ -427 +445 @@
     case BIGINTMAT_CMD:
       return (void*)bimCopy((bigintmat *)d);
+    case BUCKET_CMD:
+      return (void*)sBucketCopy((sBucket_pt)d);
     case INTVEC_CMD:
     case INTMAT_CMD:
@@ -528 +548 @@
       break;
     }
+    case BUCKET_CMD:
+    {
+      sBucket_pt b=(sBucket_pt)d;
+      sBucketDeleteAndDestroy(&b);
+      break;
+    }
     case INTVEC_CMD:
     case INTMAT_CMD:
@@ -689 +715 @@
   if(!errorreported)
   {
-    data=s_internalCopy(rtyp,d);
+    if (rtyp==BUCKET_CMD)
+    {
+      rtyp=POLY_CMD;
+      data=(void*)pCopy(sBucketPeek((sBucket_pt)d));
+    }
+    else
+      data=s_internalCopy(rtyp,d);
     if ((source->attribute!=NULL)||(source->e!=NULL))
       attribute=source->CopyA();
@@ -844 +876 @@
           return StringEndS();
           }
-
+        case BUCKET_CMD:
+          return sBucketString((sBucket_pt)d);
         case MATRIX_CMD:
           s= iiStringMatrix((matrix)d,dim, currRing);