Changeset c462b55 in git

Timestamp:

Mar 22, 2011, 11:04:13 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

494884581702ad06eefdf632a5e1abb42bd90f4d

Parents:

ba0fc3d4dcb089fc5523e7af222a8f52d7cb44b8

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-03-22 11:04:13+01:00

git-committer:

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

Message:

 p_MinComp, p_MaxComp

Location:

libpolys/polys

Files:

• Makefile.am (modified) (2 diffs)
• monomials/p_polys.h (modified) (1 diff)
• pInline0.h (modified) (1 diff)
• sbuckets.cc (modified) (1 diff)

libpolys/polys/Makefile.am

@@ -15 +15 @@
         templates/p_Procs_Lib.cc \
         polys0.cc polys1.cc prCopy.cc prCopyTemplate.cc \
-        kbuckets.cc sbuckets.cc templates/p_Procs.cc weights.cc
+        kbuckets.cc sbuckets.cc templates/p_Procs.cc weight.cc
 
 BUILT_SOURCES = templates/p_Procs.inc
@@ -28 +28 @@
         templates/p_Procs_Dynamic.h templates/p_Procs_Impl.h templates/p_Procs_Set.h templates/p_Procs_Static.h \
         monomials/p_polys.h monomials/polys-impl.h monomials/maps.h polys.h prCopy.h prCopyMacros.h \
-        kbuckets.h sbuckets.h simpleideals.h weights.h
+        kbuckets.h sbuckets.h simpleideals.h weight.h
 
 P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION

libpolys/polys/monomials/p_polys.h

@@ -332 +332 @@
 static inline   void p_SetCompP(poly a, int i, ring r);
 static inline   void p_SetCompP(poly a, int i, ring lmRing, ring tailRing);
-static inline   long p_MaxComp(poly p, ring lmRing, ring tailRing);
-inline long p_MaxComp(poly p,ring lmRing) {return p_MaxComp(p,lmRing,lmRing);}
-static inline   long p_MinComp(poly p, ring lmRing, ring tailRing);
-inline long p_MinComp(poly p,ring lmRing) {return p_MinComp(p,lmRing,lmRing);}
+
+// returns maximal column number in the modul element a (or 0)
+static inline long p_MaxComp(poly p, ring lmRing, ring tailRing)
+{
+  long result,i;
+
+  if(p==NULL) return 0;
+  result = p_GetComp(p, lmRing);
+  if (result != 0)
+  {
+    loop
+    {
+      pIter(p);
+      if(p==NULL) break;
+      i = p_GetComp(p, tailRing);
+      if (i>result) result = i;
+    }
+  }
+  return result;
+}
+
+static inline long p_MaxComp(poly p,ring lmRing) {return p_MaxComp(p,lmRing,lmRing);}
+
+static inline   long p_MinComp(poly p, ring lmRing, ring tailRing)
+{
+  long result,i;
+
+  if(p==NULL) return 0;
+  result = p_GetComp(p,lmRing);
+  if (result != 0)
+  {
+    loop
+    {
+      pIter(p);
+      if(p==NULL) break;
+      i = p_GetComp(p,tailRing);
+      if (i<result) result = i;
+    }
+  }
+  return result;
+}
+
+static inline long p_MinComp(poly p,ring lmRing) {return p_MinComp(p,lmRing,lmRing);}
 
 /***************************************************************

libpolys/polys/pInline0.h

@@ -73 +73 @@
 
 // returns minimal column number in the modul element a (or 0)
-PINLINE0 long p_MinComp(poly p, ring lmRing, ring tailRing)
-{
-  long result,i;
-
-  if(p==NULL) return 0;
-  result = p_GetComp(p,lmRing);
-  if (result != 0)
-  {
-    loop
-    {
-      pIter(p);
-      if(p==NULL) break;
-      i = p_GetComp(p,tailRing);
-      if (i<result) result = i;
-    }
-  }
-  return result;
-}
-
-// returns maximal column number in the modul element a (or 0)
-PINLINE0 long p_MaxComp(poly p, ring lmRing, ring tailRing)
-{
-  long result,i;
-
-  if(p==NULL) return 0;
-  result = p_GetComp(p, lmRing);
-  if (result != 0)
-  {
-    loop
-    {
-      pIter(p);
-      if(p==NULL) break;
-      i = p_GetComp(p, tailRing);
-      if (i>result) result = i;
-    }
-  }
-  return result;
-}
-
 BOOLEAN   p_IsConstantPoly(const poly p, const ring r)
 {

libpolys/polys/sbuckets.cc

@@ -10 +10 @@
  *  Version: $Id$
  *******************************************************************/
-#include <kernel/mod2.h>
-
-#include <kernel/sbuckets.h>
+//#include <kernel/mod2.h>
+
+#include <polys/sbuckets.h>
 #include <omalloc/omalloc.h>
-#include <kernel/ring.h>
-#include <kernel/p_Procs.h>
-#include <kernel/p_polys.h>
+#include <polys/monomials/ring.h>
+//#include <kernel/p_Procs.h>
+#include <polys/monomials//p_polys.h>