Changeset 73ad0c in git

Timestamp:

Jul 29, 2011, 10:40:39 AM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

71955d1046512d6a8fedecbd18e77a75a4bd5fa0

Parents:

bf6a4d5920ef44ffb48d0fc83b4d53589111d60c

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-29 10:40:39+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:01:15+01:00

Message:

p_Var, p_LOwVar -> p_polys.h, p_polys.cc

Files:

• kernel/ideals.cc (modified) (2 diffs)
• kernel/ideals.h (modified) (2 diffs)
• libpolys/polys/matpol.cc (modified) (5 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (1 diff)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)

kernel/ideals.cc

@@ -42 +42 @@
 #include <kernel/longrat.h>
 
-
-omBin sip_sideal_bin = omGetSpecBin(sizeof(sip_sideal));
 
 /* #define WITH_OLD_MINOR */
@@ -136 +134 @@
 }
 
-/*2
-*the minimal index of used variables - 1
-*/
-int pLowVar (poly p)
-{
-  int k,l,lex;
-
-  if (p == NULL) return -1;
-
-  k = 32000;/*a very large dummy value*/
-  while (p != NULL)
-  {
-    l = 1;
-    lex = pGetExp(p,l);
-    while ((l < (currRing->N)) && (lex == 0))
-    {
-      l++;
-      lex = pGetExp(p,l);
-    }
-    l--;
-    if (l < k) k = l;
-    pIter(p);
-  }
-  return k;
-}
 
 /*3

kernel/ideals.h

@@ -19 +19 @@
 
 
-extern omBin sip_sideal_bin;
-
-/*- creates an ideal -*/
-// ideal idInit (int size, int rank=1); // in simple...
 ideal idCopyFirstK (const ideal ide, const int k);
 
@@ -114 +110 @@
 ideal idMinBase (ideal h1);
   /*returns a minimized set of generators of h1*/
-int pLowVar (poly p);
-  /*-the minimal index of used variables - 1-*/
 void    idInitChoise (int r,int beg,int end,BOOLEAN *endch,int * choise);
 void    idGetNextChoise (int r,int end,BOOLEAN *endch,int * choise);

libpolys/polys/matpol.cc

@@ -37 +37 @@
 
 #include "sparsmat.h"
-   
-//omBin ip_smatrix_bin = omGetSpecBin(sizeof(ip_smatrix));
-#define ip_smatrix_bin sip_sideal_bin
+
+//omBin sip_sideal_bin = omGetSpecBin(sizeof(ip_smatrix));
 /*0 implementation*/
 
@@ -54 +53 @@
     return NULL;
   }
-  matrix rc = (matrix)omAllocBin(ip_smatrix_bin);
+  matrix rc = (matrix)omAllocBin(sip_sideal_bin);
   rc->nrows = r;
   rc->ncols = c;
@@ -429 +428 @@
   l = pLength(sel);
   co = mpNew(2, l);
-  
+
   if (rHasLocalOrMixedOrdering(R))
   {
@@ -732 +731 @@
 {
   omFreeSize((ADDRESS)a->m,a->nrows*a->ncols*sizeof(poly));
-  omFreeBin((ADDRESS)a, ip_smatrix_bin);
+  omFreeBin((ADDRESS)a, sip_sideal_bin);
 }
 
@@ -1500 +1499 @@
 {
   omFreeSize((ADDRESS)a->m,a->nrows*a->ncols*sizeof(poly));
-  omFreeBin((ADDRESS)a, ip_smatrix_bin);
+  omFreeBin((ADDRESS)a, sip_sideal_bin);
 }
 

libpolys/polys/monomials/p_polys.cc

@@ -3798 +3798 @@
 }
 
+int p_Var(poly m,const ring r)
+{
+  if (m==NULL) return 0;
+  if (pNext(m)!=NULL) return 0;
+  int i,e=0;
+  for (i=rVar(r); i>0; i--)
+  {
+    int exp=p_GetExp(m,i,r);
+    if (exp==1)
+    {
+      if (e==0) e=i;
+      else return 0;
+    }
+    else if (exp!=0)
+    {
+      return 0;
+    }
+  }
+  return e;
+}
+
+/*2
+*the minimal index of used variables - 1
+*/
+int p_LowVar (poly p, const ring r)
+{
+  int k,l,lex;
+
+  if (p == NULL) return -1;
+
+  k = 32000;/*a very large dummy value*/
+  while (p != NULL)
+  {
+    l = 1;
+    lex = p_GetExp(p,l,r);
+    while ((l < (rVar(r))) && (lex == 0))
+    {
+      l++;
+      lex = p_GetExp(p,l,r);
+    }
+    l--;
+    if (l < k) k = l;
+    pIter(p);
+  }
+  return k;
+}
+
 /*2
 * verschiebt die Indizees der Modulerzeugenden um i

libpolys/polys/monomials/p_polys.h

@@ -1920 +1920 @@
 /*----------------------------------------------------*/
 int   p_Var(poly mi,const ring r);
+/// the minimal index of used variables - 1
+int   p_LowVar (poly p);
 
 /*----------------------------------------------------*/