Changeset 760a78f in git

Timestamp:

Apr 28, 2011, 2:50:43 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

aec5c92fa3e0f853348936026c999351aa972656

Parents:

4c6e42085a4a443ab70a8774732655228f25f63c

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-04-28 14:50:43+02:00

git-committer:

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

Message:

less warnings: unused variables, unused debug stuff, const in result
   type, inline without procedure body

Location:

libpolys/polys

Files:

• kbuckets.h (modified) (2 diffs)
• sbuckets.cc (modified) (1 diff)
• sbuckets.h (modified) (1 diff)
• simpleideals.cc (modified) (2 diffs)
• simpleideals.h (modified) (3 diffs)

libpolys/polys/kbuckets.h

@@ -52 +52 @@
 
 /////////////////////////////////////////////////////////////////////////////
-// Gets leading monom of bucket, does NOT change Bpoly!!!!!
-// Returned monom is READ ONLY, i.e. no manipulations are allowed !!!!
-//
-inline const poly kBucketGetLm(kBucket_pt bucket);
-
-/////////////////////////////////////////////////////////////////////////////
 // Extracts lm of Bpoly, i.e. Bpoly is changed s.t.
 // Bpoly == Bpoly - Lm(Bpoly)
@@ -204 +198 @@
 #endif
 
-inline const poly kBucketGetLm(kBucket_pt bucket)
+/////////////////////////////////////////////////////////////////////////////
+// Gets leading monom of bucket, does NOT change Bpoly!!!!!
+// Returned monom is READ ONLY, i.e. no manipulations are allowed !!!!
+//
+inline poly kBucketGetLm(kBucket_pt bucket)
 {
   #ifdef   HAVE_COEF_BUCKETS

libpolys/polys/sbuckets.cc

@@ -48 +48 @@
 
 /// Returns bucket ring
-const ring sBucketGetRing(const sBucket_pt bucket)
+ring sBucketGetRing(const sBucket_pt bucket)
 { return bucket->bucket_ring; }
 

libpolys/polys/sbuckets.h

@@ -35 +35 @@
 
 /// Returns bucket ring
-const ring sBucketGetRing(const sBucket_pt bucket);
+ring sBucketGetRing(const sBucket_pt bucket);
 
 /////////////////////////////////////////////////////////////////////////////

libpolys/polys/simpleideals.cc

@@ -370 +370 @@
 * copy an ideal
 */
-#ifdef PDEBUG
-ideal id_DBCopy(ideal h1,const char *f,int l, const ring r)
-{
-  int i;
-  ideal h2;
-
-  id_DBTest(h1,PDEBUG,f,l,r);
-//#ifdef TEST
-  if (h1 == NULL)
-  {
-    h2=idDBInit(1,1,f,l);
-  }
-  else
-//#endif
-  {
-    h2=idDBInit(IDELEMS(h1),h1->rank,f,l);
-    for (i=IDELEMS(h1)-1; i>=0; i--)
-      h2->m[i] = p_Copy(h1->m[i],r);
-  }
-  return h2;
-}
-#else
 ideal id_Copy(ideal h1, const ring r)
 {
@@ -411 +389 @@
   return h2;
 }
-#endif
 
 #ifdef PDEBUG

libpolys/polys/simpleideals.h

@@ -21 +21 @@
   #define MATROWS(i) ((i)->nrows)
   #define MATELEM(mat,i,j) ((mat)->m)[MATCOLS((mat)) * ((i)-1) + (j)-1]
-   
+
 };
 
@@ -49 +49 @@
 extern omBin sip_sideal_bin;
 
-#ifdef PDEBUG
-ideal idDBInit (int size, int rank, const char *f, int l);
-#define idInit(A,B) idDBInit(A,B,__FILE__,__LINE__)
-#else
 /*- creates an ideal -*/
 ideal idInit (int size, int rank=1);
-#endif
+
 /*- deletes an ideal -*/
 void id_Delete (ideal* h, ring r);
@@ -71 +67 @@
 #endif
 
-#ifdef PDEBUG
-ideal id_DBCopy(ideal h1,const char *f,int l, const ring r);
-#define id_Copy(A,R) id_DBCopy(A,__FILE__,__LINE__,R)
-#else
 ideal id_Copy (ideal h1,const ring r);
-#endif
+
   /*adds two ideals without simplifying the result*/
 ideal id_SimpleAdd (ideal h1,ideal h2, const ring r);