Changeset fe115e in git

Timestamp:

Jul 27, 2018, 4:53:52 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

82000a0806cbcd483e007cfcb21cafe00c300866

Parents:

67b0ec85dfdf4ff933fe777f3cd375cf40e22563

Message:

extend coef(I,m) to ideal I

Files:

• Singular/iparith.cc (modified) (1 diff)
• Singular/table.h (modified) (1 diff)
• doc/reference.doc (modified) (previous)
• libpolys/polys/matpol.cc (modified) (6 diffs)
• libpolys/polys/matpol.h (modified) (1 diff)

Singular/iparith.cc

@@ -1795 +1795 @@
   if ((p==NULL)||(pNext(p)!=NULL)) return TRUE;
   res->data=(char *)mp_CoeffProc((poly)u->Data(),p /*(poly)v->Data()*/,currRing);
+  return FALSE;
+}
+static BOOLEAN jjCOEF_Id(leftv res, leftv u, leftv v)
+{
+  poly p=(poly)v->Data();
+  if ((p==NULL)||(pNext(p)!=NULL)) return TRUE;
+  res->data=(char *)mp_CoeffProcId((ideal)u->Data(),p /*(poly)v->Data()*/,currRing);
   return FALSE;
 }

Singular/table.h

@@ -600 +600 @@
 #endif
 ,{D(jjCOEF),      COEF_CMD,       MATRIX_CMD,     POLY_CMD,   POLY_CMD, ALLOW_NC |ALLOW_RING}
+,{D(jjCOEF_Id),   COEF_CMD,       MATRIX_CMD,     IDEAL_CMD,  POLY_CMD, ALLOW_NC |ALLOW_RING}
 ,{D(jjCOEFFS_Id), COEFFS_CMD,     MATRIX_CMD,     IDEAL_CMD,  POLY_CMD, ALLOW_NC |ALLOW_RING}
 ,{D(jjCOEFFS_Id), COEFFS_CMD,     MATRIX_CMD,     MODUL_CMD,  POLY_CMD, ALLOW_NC |ALLOW_RING}

libpolys/polys/matpol.cc

@@ -32 +32 @@
 static poly mp_Exdiv ( poly m, poly d, poly vars, const ring);
 static poly mp_Select (poly fro, poly what, const ring);
+static poly mp_SelectId (ideal I, poly what, const ring R);
 
 /// create a r x c zero-matrix
@@ -411 +412 @@
     co = mpNew(2, 1);
     MATELEM(co,1,1) = p_One(R);
-    MATELEM(co,2,1) = NULL;
+    //MATELEM(co,2,1) = NULL;
     return co;
   }
@@ -426 +427 @@
       pNext(h)=NULL;
       MATELEM(co,1,i) = h;
-      MATELEM(co,2,i) = NULL;
+      //MATELEM(co,2,i) = NULL;
       if (p_IsConstant(h, R)) pos_of_1 = i;
     }
@@ -438 +439 @@
       pNext(h)=NULL;
       MATELEM(co,1,i) = h;
-      MATELEM(co,2,i) = NULL;
+      //MATELEM(co,2,i) = NULL;
       if (p_IsConstant(h, R)) pos_of_1 = i;
     }
@@ -476 +477 @@
 }
 
+matrix mp_CoeffProcId (ideal I, poly vars, const ring R)
+{
+  assume(vars!=NULL);
+  poly sel, h;
+  int l, i;
+  int pos_of_1 = -1;
+  matrix co;
+
+  if (idIs0(I))
+  {
+    co = mpNew(IDELEMS(I)+1,1);
+    MATELEM(co,1,1) = p_One(R);
+    return co;
+  }
+  sel = mp_SelectId(I, vars, R);
+  l = pLength(sel);
+  co = mpNew(IDELEMS(I)+1, l);
+
+  if (rHasLocalOrMixedOrdering(R))
+  {
+    for (i=l; i>=1; i--)
+    {
+      h = sel;
+      pIter(sel);
+      pNext(h)=NULL;
+      MATELEM(co,1,i) = h;
+      //MATELEM(co,2,i) = NULL;
+      if (p_IsConstant(h, R)) pos_of_1 = i;
+    }
+  }
+  else
+  {
+    for (i=1; i<=l; i++)
+    {
+      h = sel;
+      pIter(sel);
+      pNext(h)=NULL;
+      MATELEM(co,1,i) = h;
+      //MATELEM(co,2,i) = NULL;
+      if (p_IsConstant(h, R)) pos_of_1 = i;
+    }
+  }
+  for(int j=0;j<IDELEMS(I);j++)
+  {
+    poly f=I->m[j];
+    while (f!=NULL)
+    {
+      i = 1;
+      loop
+      {
+        if (i!=pos_of_1)
+        {
+          h = mp_Exdiv(f, MATELEM(co,1,i),vars, R);
+          if (h!=NULL)
+          {
+            MATELEM(co,j+2,i) = p_Add_q(MATELEM(co,j+2,i), h, R);
+            break;
+          }
+        }
+        if (i == l)
+        {
+          // check monom 1 last:
+          if (pos_of_1 != -1)
+          {
+            h = mp_Exdiv(f, MATELEM(co,1,pos_of_1),vars, R);
+            if (h!=NULL)
+            {
+              MATELEM(co,j+2,pos_of_1) = p_Add_q(MATELEM(co,j+2,pos_of_1), h, R);
+            }
+          }
+          break;
+        }
+        i ++;
+      }
+      pIter(f);
+    }
+  }
+  return co;
+}
+
 /*2
 *exact divisor: let d  == x^i*y^j, m is thought to have only one term;
@@ -682 +763 @@
     res = p_Insert(h, res, R);
     fro = fro->next;
+  }
+  return res;
+}
+
+static poly mp_SelectId (ideal I, poly what, const ring R)
+{
+  int i;
+  poly h, res;
+  res = NULL;
+  for(int j=0;j<IDELEMS(I);j++)
+  {
+    poly fro=I->m[j];
+    while (fro!=NULL)
+    {
+      h = p_One(R);
+      for (i=1; i<=rVar(R); i++)
+        p_SetExp(h,i, p_GetExp(fro,i, R) * p_GetExp(what, i, R), R);
+      p_SetComp(h, p_GetComp(fro, R), R);
+      p_Setm(h, R);
+      res = p_Insert(h, res, R);
+      fro = fro->next;
+    }
   }
   return res;

libpolys/polys/matpol.h

@@ -71 +71 @@
 
 matrix mp_CoeffProc (poly f, poly vars, const ring r);
+matrix mp_CoeffProcId (ideal I, poly vars, const ring R);
 /// corresponds to Macauley's coef:
 /// the exponent vector of vars has to contain the variables, eg 'xy';