Changeset 99c34c in git

Timestamp:

Jul 25, 2017, 3:15:07 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '98550b669234b32be762076c32b3be2c35188ac4')

Children:

8a56bb20ce24ff417ec3e90dc3086523518b044cbb865eb91673e33d3e7f851b088b48a8ff0731b7

Parents:

4b6d98d864dc84324edd68f69498842e26f79071

Message:

chg: use standard type conversions for jjIDEAL_PL

File:

• Singular/iparith.cc (modified) (1 diff)

Singular/iparith.cc

@@ -6645 +6645 @@
   int i=0;
   poly p;
+  int dest_type=POLY_CMD;
+  if (iiOp==MODUL_CMD) dest_type=VECTOR_CMD;
   while (h!=NULL)
   {
-    switch(h->Typ())
-    {
-      case POLY_CMD:
-      {
-        p=(poly)h->CopyD(POLY_CMD);
-        break;
-      }
-      case INT_CMD:
-      {
-        number n=nInit((int)(long)h->Data());
-        if (!nIsZero(n))
-        {
-          p=pNSet(n);
-        }
-        else
-        {
-          p=NULL;
-          nDelete(&n);
-        }
-        break;
-      }
-      case BIGINT_CMD:
-      {
-        number b=(number)h->Data();
-        nMapFunc nMap=n_SetMap(coeffs_BIGINT,currRing->cf);
-        if (nMap==NULL) return TRUE;
-        number n=nMap(b,coeffs_BIGINT,currRing->cf);
-        if (!nIsZero(n))
-        {
-          p=pNSet(n);
-        }
-        else
-        {
-          p=NULL;
-          nDelete(&n);
-        }
-        break;
-      }
-      case NUMBER_CMD:
-      {
-        number n=(number)h->CopyD(NUMBER_CMD);
-        if (!nIsZero(n))
-        {
-          p=pNSet(n);
-        }
-        else
-        {
-          p=NULL;
-          nDelete(&n);
-        }
-        break;
-      }
-      case VECTOR_CMD:
-      {
-        p=(poly)h->CopyD(VECTOR_CMD);
-        if (iiOp!=MODUL_CMD)
-        {
-          idDelete(&id);
-          pDelete(&p);
-          return TRUE;
-        }
-        rank=si_max(rank,(int)pMaxComp(p));
-        break;
-      }
-      default:
-      {
-        idDelete(&id);
-        return TRUE;
-      }
-    }
-    if ((iiOp==MODUL_CMD)&&(p!=NULL)&&(pGetComp(p)==0))
-    {
-      pSetCompP(p,1);
+    // use standard type conversions to poly/vector
+    int ri;
+    int ht=h->Typ();
+    if (ht==dest_type)
+    {
+      p=(poly)h->CopyD();
+      if (p!=NULL) rank=si_max(rank,(int)pMaxComp(p));
+    }
+    else if ((ri=iiTestConvert(ht,dest_type,dConvertTypes))!=0)
+    {
+      sleftv tmp;
+      leftv hnext=h->next;
+      h->next=NULL;
+      iiConvert(ht,dest_type,ri,h,&tmp,dConvertTypes);
+      h->next=hnext;
+      p=(poly)tmp.data;
+      if (p!=NULL) rank=si_max(rank,(int)pMaxComp(p));
+    }
+    else
+    {
+      idDelete(&id);
+      return TRUE;
     }
     id->m[i]=p;