Changeset 8fd62c in git

Timestamp:

Oct 17, 2018, 3:09:37 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

fab4706447a1dd4c936f1e7b0fd3c1c9920279de

Parents:

6a0ad7542c11c59c63743cd18b8e8f68f098d75f

Message:

add rPlusVar, rMinusVar (ring manipulation: R+"y","y"+R,R-"y")

Files:

• Singular/iparith.cc (modified) (1 diff)
• Singular/ipshell.cc (modified) (3 diffs)
• Singular/table.h (modified) (3 diffs)
• libpolys/polys/monomials/ring.cc (modified) (4 diffs)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

Singular/iparith.cc

@@ -3158 +3158 @@
   res->data = (char*)l;
   return FALSE;
+}
+static BOOLEAN jjRMINUS(leftv res, leftv u, leftv v)
+{
+  ring r=rMinusVar((ring)u->Data(),(char*)v->Data());
+  res->data = (char *)r;
+  return r==NULL;
+}
+static BOOLEAN jjRPLUS(leftv res, leftv u, leftv v)
+{
+  int left;
+  if (u->Typ()==RING_CMD) left=0;
+  else
+  {
+    leftv h=u;u=v;v=h;
+    left=1;
+  }
+  ring r=rPlusVar((ring)u->Data(),(char*)v->Data(),left);
+  res->data = (char *)r;
+  return r==NULL;
 }
 static BOOLEAN jjRSUM(leftv res, leftv u, leftv v)

Singular/ipshell.cc

@@ -2937 +2937 @@
             (rField_is_Q(currRing) || rField_is_Q_a(currRing) ||
              rField_is_Zp(currRing) || rField_is_Zp_a(currRing) ||
-             rField_is_Zn(currRing)))
+             rField_is_Zn(currRing)))
            ||
            (rField_is_Zp_a(orig_ring) &&  // Zp(a..) -> Zp(a..) || Zp
@@ -5643 +5643 @@
           ch=32003;
         }
-        #ifndef TEST_ZN_AS_ZP
+        #ifndef TEST_ZN_AS_ZP
         cf = nInitChar(n_Zp, (void*)(long)ch);
-        #else
+        #else
         mpz_t modBase;
         mpz_init_set_ui(modBase, (long)ch);
@@ -5655 +5655 @@
         cf->is_domain=1;
         cf->has_simple_Inverse=1;
-        #endif
+        #endif
       }
       else

Singular/table.h

@@ -352 +352 @@
 ,{D(lAdd),        '+',            LIST_CMD,       LIST_CMD,   LIST_CMD, ALLOW_NC | ALLOW_RING}
 ,{D(jjRSUM),      '+',            RING_CMD,       RING_CMD,   RING_CMD, ALLOW_NC | ALLOW_RING}
-,{D(jjPLUS_B_P),    '+',          BUCKET_CMD,     BUCKET_CMD, POLY_CMD, ALLOW_NC | ALLOW_RING}
+,{D(jjRPLUS),     '+',            RING_CMD,       RING_CMD,   STRING_CMD, ALLOW_NC | ALLOW_RING}
+,{D(jjRPLUS),     '+',            RING_CMD,       STRING_CMD, RING_CMD, ALLOW_NC | ALLOW_RING}
+,{D(jjPLUS_B_P),  '+',            BUCKET_CMD,     BUCKET_CMD, POLY_CMD, ALLOW_NC | ALLOW_RING}
 ,{D(jjMINUS_I),   '-',            INT_CMD,        INT_CMD,    INT_CMD, ALLOW_NC | ALLOW_RING}
 ,{D(jjMINUS_BI),  '-',            BIGINT_CMD,     BIGINT_CMD, BIGINT_CMD, ALLOW_NC | ALLOW_RING}
@@ -365 +367 @@
 ,{D(jjOP_BIM_I),  '-',            BIGINTMAT_CMD,  BIGINTMAT_CMD, INT_CMD, ALLOW_NC | ALLOW_RING}
 ,{D(jjOP_I_BIM),  '-',            BIGINTMAT_CMD,  INT_CMD, BIGINTMAT_CMD, ALLOW_NC | ALLOW_RING}
-,{D(jjOP_BIM_BI),  '-',           BIGINTMAT_CMD,  BIGINTMAT_CMD, BIGINT_CMD, ALLOW_NC | ALLOW_RING}
-,{D(jjOP_BI_BIM),  '-',           BIGINTMAT_CMD,  BIGINT_CMD, BIGINTMAT_CMD, ALLOW_NC | ALLOW_RING}
+,{D(jjOP_BIM_BI), '-',            BIGINTMAT_CMD,  BIGINTMAT_CMD, BIGINT_CMD, ALLOW_NC | ALLOW_RING}
+,{D(jjOP_BI_BIM), '-',            BIGINTMAT_CMD,  BIGINT_CMD, BIGINTMAT_CMD, ALLOW_NC | ALLOW_RING}
 ,{D(jjOP_IV_I),   '-',            INTVEC_CMD,     INTVEC_CMD, INT_CMD, ALLOW_NC | ALLOW_RING}
 ,{D(jjOP_IM_I),   '-',            INTMAT_CMD,     INTMAT_CMD, INT_CMD, ALLOW_NC | ALLOW_RING}
@@ -382 +384 @@
 ,{D(jjMINUS_BIM), '-',            CMATRIX_CMD,    CMATRIX_CMD,CMATRIX_CMD, ALLOW_NC | ALLOW_RING}
 #endif
+,{D(jjRMINUS),    '-',            RING_CMD,       RING_CMD,   STRING_CMD, ALLOW_NC | ALLOW_RING}
 ,{D(jjMINUS_B_P), '-',            BUCKET_CMD,     BUCKET_CMD, POLY_CMD, ALLOW_NC | ALLOW_RING}
 ,{  jjWRONG2 ,    '-',            NONE,           IDEAL_CMD,  IDEAL_CMD, ALLOW_NC | ALLOW_RING}

libpolys/polys/monomials/ring.cc

@@ -40 +40 @@
 #define BITS_PER_LONG 8*SIZEOF_LONG
 
+typedef char *             char_ptr;
 omBin sip_sring_bin = omGetSpecBin(sizeof(ip_sring));
-omBin char_ptr_bin =  omGetSpecBin(sizeof(char*));
+omBin char_ptr_bin =  omGetSpecBin(sizeof(char_ptr));
 
 
@@ -684 +685 @@
 int rChar(ring r) { return r->cf->ch; }
 
-// typedef char *             char_ptr;
-// omBin char_ptr_bin = omGetSpecBin(sizeof(char_ptr)); // deallocation?
 
 
@@ -3015 +3014 @@
       // are introduced, but their names are never set
       // hence, we do the following awkward trick
-      int N = omSizeOfAddr(r->names)/sizeof(char*);
+      int N = omSizeOfAddr(r->names)/sizeof(char_ptr);
       if (r->N < N) N = r->N;
 
@@ -5665 +5664 @@
   return 0;
 }
+
+ring rPlusVar(const ring r, char *v,int left)
+{
+  if (r->order[2]!=0)
+  {
+    WerrorS("only for rings with an ordering of one block");
+    return NULL;
+  }
+  int p;
+  if((r->order[0]==ringorder_C)
+  ||(r->order[0]==ringorder_c))
+    p=1;
+  else
+    p=0;
+  if((r->order[p]!=ringorder_dp)
+  && (r->order[p]!=ringorder_Dp)
+  && (r->order[p]!=ringorder_lp)
+  && (r->order[p]!=ringorder_rp)
+  && (r->order[p]!=ringorder_ds)
+  && (r->order[p]!=ringorder_Ds)
+  && (r->order[p]!=ringorder_ls))
+  {
+    WerrorS("ordering must be dp,Dp,lp,rp,ds,Ds or ls");
+    return NULL;
+  }
+  for(int i=r->N-1;i>=0;i--)
+  {
+    if (strcmp(r->names[i],v)==0)
+    {
+      Werror("duplicate variable name >>%s<<",v);
+      return NULL;
+    }
+  }
+  ring R=rCopy0(r);
+  char **names;
+  #ifdef HAVESHIFTBBA
+  if (rIsLPRing(r))
+  {
+    WerrorS("not yet implemnted");
+    return NULL;
+  }
+  else
+  #endif
+  {
+    R->N++;
+    names=(char**)omAlloc(R->N*sizeof(char_ptr));
+    if (left)
+    {
+      names[0]=omStrDup(v);
+      for(int i=R->N-1;i>0;i--) names[i]=R->names[i-1];
+    }
+    else
+    {
+      names[R->N-1]=omStrDup(v);
+      for(int i=R->N-2;i>=0;i--) names[i]=R->names[i];
+    }
+  }
+  omFreeSize(R->names,r->N*sizeof(char_ptr));
+  R->names=names;
+  R->block1[p]=R->N;
+  rComplete(R);
+  return R;
+}
+
+ring rMinusVar(const ring r, char *v)
+{
+  if (r->order[2]!=0)
+  {
+    WerrorS("only for rings with an ordering of one block");
+    return NULL;
+  }
+  int p;
+  if((r->order[0]==ringorder_C)
+  ||(r->order[0]==ringorder_c))
+    p=1;
+  else
+    p=0;
+  if((r->order[p]!=ringorder_dp)
+  && (r->order[p]!=ringorder_Dp)
+  && (r->order[p]!=ringorder_lp)
+  && (r->order[p]!=ringorder_rp)
+  && (r->order[p]!=ringorder_ds)
+  && (r->order[p]!=ringorder_Ds)
+  && (r->order[p]!=ringorder_ls))
+  {
+    WerrorS("ordering must be dp,Dp,lp,rp,ds,Ds or ls");
+    return NULL;
+  }
+  ring R=rCopy0(r);
+  int i=R->N;
+  while(i>0)
+  {
+    if (strcmp(R->names[i],v)==0)
+    {
+      R->N--;
+      omFree(R->names[i]);
+      for(int j=i;j<R->N;j++) R->names[j]=R->names[j+1];
+      R->names=(char**)omReallocSize(R->names,r->N*sizeof(char_ptr),R->N*sizeof(char_ptr));
+    }
+    else i--;
+  }
+  R->block1[p]=R->N;
+  rComplete(R);
+  return R;
+}

libpolys/polys/monomials/ring.h

@@ -827 +827 @@
 
 extern omBin sip_sring_bin;
-#endif
+
+// ring manipulation
+/// K[x],"y" -> K[x,y] resp. K[y,x]
+ring rPlusVar(const ring r, char *v,int left);
+
+/// undo rPlusVar
+ring rMinusVar(const ring r, char *v);
+#endif