Changeset d617329 in git

Timestamp:

Oct 11, 2018, 11:49:32 AM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

20483a73a695dab2104a9dca0ae2c273bf1a6896

Parents:

94d1b0ec03c34f2a04c02470e552e268073d9aa9

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2018-10-11 11:49:32+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2018-10-11 11:52:59+02:00

Message:

allow ^ for poly in LPring

Location:

Singular

Files:

• iparith.cc (modified) (2 diffs)
• table.h (modified) (1 diff)

Singular/iparith.cc

@@ -609 +609 @@
   poly u_p=(poly)u->CopyD(POLY_CMD);
   if ((u_p!=NULL)
+  #ifdef HAVE_SHIFTBBA
+  && (!rIsLPRing(currRing))
+  #endif
   && ((v_i!=0) &&
       ((long)pTotaldegree(u_p) > (signed long)currRing->bitmask / (signed long)v_i/2)))
@@ -4438 +4441 @@
   int isLetterplace=(int)(long)atGet(v,"isLetterplaceRing",INT_CMD);
   ring r=rCompose(l,TRUE,mm,isLetterplace);
-  #ifdef HAVE_SHIFTBBA
-  if (isLetterplace)
-  {
-    r->ShortOut=FALSE;
-    r->CanShortOut=FALSE;
-    r->isLPring=TRUE;
-  }
-  #endif
   res->data=(char *)r;
   return (r==NULL);

Singular/table.h

@@ -473 +473 @@
 ,{D(jjPOWER_BI),   '^',           BIGINT_CMD,     BIGINT_CMD, INT_CMD, ALLOW_NC | ALLOW_RING}
 ,{D(jjPOWER_N),   '^',            NUMBER_CMD,     NUMBER_CMD, INT_CMD, ALLOW_NC | ALLOW_RING}
-,{D(jjPOWER_P),   '^',            POLY_CMD,       POLY_CMD,   INT_CMD, ALLOW_PLURAL | ALLOW_RING}
+,{D(jjPOWER_P),   '^',            POLY_CMD,       POLY_CMD,   INT_CMD, ALLOW_NC | ALLOW_RING}
 ,{D(jjPOWER_ID),  '^',            IDEAL_CMD,      IDEAL_CMD,  INT_CMD, ALLOW_PLURAL | ALLOW_RING}
 #ifdef SINGULAR_4_2