Changeset 2f436b in git for Singular/prCopy.cc

Timestamp:

Dec 31, 2000, 4:14:47 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e609098c45a74ac91c002ffa7ece5eebe7f8c002

Parents:

33ec1145a109507ad3e3cf4a69a847b703358e93

Message:

* version 1-3-13: sparsemat improivements


git-svn-id: file:///usr/local/Singular/svn/trunk@5003 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/prCopy.cc (modified) (3 diffs)

Singular/prCopy.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: prCopy.cc,v 1.10 2000-12-08 14:43:46 Singular Exp $ */
+/* $Id: prCopy.cc,v 1.11 2000-12-31 15:14:43 obachman Exp $ */
 /*
 * ABSTRACT - implementation of functions for Copy/Move/Delete for Polys
@@ -14 +14 @@
 #include "ring.h"
 #include "ideals.h"
-
-// define to 0 to never revert, 
-//           1 to always revert
-// undef if revert as given by parameter
-// #define REVERT 0
-
-// a sorting of polys based on buckets
-class pBucketPoly
-{
-public:
-  poly p;
-  long length;
-  long max_length;
-};
-
-static inline poly p_BucketSort(poly p, const ring r)
-{
-#if PDEBUG > 0
-  long l_orig = pLength(p);
-#endif
-  
-  long max_length = 1;
-  long i;
-  long l_p;
-  pBucketPoly buckets[BIT_SIZEOF_LONG - 3];
-  poly q;
-
-  buckets[0].p = p;
-  buckets[0].length = 1;
-  buckets[0].max_length = 2;
-  q = pNext(p);
-  pNext(buckets[0].p) = NULL;
-
-  while (q != NULL)
-  {
-    p = q;
-    pIter(q);
-    pNext(p) = NULL;
-    i = 0;
-    l_p = 1;
-    while (1)
-    {
-      if (buckets[i].p == NULL)
-      {
-        buckets[i].p = p;
-        buckets[i].length = l_p;
-        break;
-      }
-      buckets[i].p = p_Merge_q(buckets[i].p, p, r);
-      buckets[i].length += l_p;
-      if (buckets[i].length <= buckets[i].max_length)
-        break;
-      p = buckets[i].p;
-      l_p = buckets[i].length;
-      buckets[i].p = NULL;
-      buckets[i].length = 0;
-      i++;
-      if (i == max_length)
-      {
-        buckets[i].p = p;
-        buckets[i].length = l_p;
-        buckets[i].max_length = 1 << (i + 1);
-        max_length = i+1;
-        break;
-      }
-    }
-  }
-  
-  i = 0;
-  while (buckets[i].p == NULL) i++;
-  p = buckets[i].p;
-  for (i++; i<max_length; i++)
-  {
-    if (buckets[i].p != NULL)
-      p = p_Merge_q(buckets[i].p, p, r);
-  }
-
-  p_Test(p, r);
-#if PDEBUG > 0
-  assume(l_orig == pLength(p));
-#endif
-  return p;
-}
-
-// Sorts poly, reverts it first -- this way, almost sorted polys's
-// don't have n^2 sorting property
-poly prSortR(poly p, ring r, BOOLEAN revert)
-{
-  if (p == NULL) return NULL;
-  poly qq, result = NULL;
-
-#ifdef REVERT  
-#if REVERT == 1
-  revert = 1;
-#elif REVERT == 0
-  revert = 0;
-#endif
-#endif
-  if (revert)
-  {
-    // there must be a bug here: consider m1->m2
-    while (p != NULL)
-    {
-      qq = p;
-      pIter(p);
-      qq->next = result;
-      result = qq;
-    }
-    p = result;
-  }
-
-  return p_BucketSort(p, r);
-}
+#include "sbuckets.h"
 
 static inline void 
@@ -330 +218 @@
 }
 
-/////////////////////////////////////////////////////////////////////////
-// prDelete
-typedef void (*prDeleteProc_t)(poly &src_p, ring src_r);
-
-static inline void prDeleteR_NSimple(poly &p, ring r)
-{
-  poly next;
-  
-  while (p != NULL)
-  {
-    next = pNext(p);
-    omFreeBin(p, r->PolyBin);
-    p = next;
-  }
-}
-
-static inline void prDeleteR_NoNSimple(poly &p, ring r)
-{
-  poly next;
-  
-  while (p != NULL)
-  {
-    next = pNext(p);
-    nDelete(&pGetCoeff(p));
-    omFreeBin(p, r->PolyBin);
-    p = next;
-  }
-}
-
-void prDelete(poly &p)
-{
-  if (rField_has_simple_Alloc(currRing))
-    prDeleteR_NSimple(p, currRing);
-  else
-    prDeleteR_NoNSimple(p, currRing);
-}
-
-void prDeleteR(poly &p, ring r)
-{
-  if (rField_has_simple_Alloc(r))
-    prDeleteR_NSimple(p, r);
-  else
-    prDeleteR_NoNSimple(p, r);
-}
-
-
-static inline void idrDelete(ideal &id, ring r,  prDeleteProc_t prproc)
-{
-  if (id == NULL) return;
-  int i = IDELEMS(id);
-
-  for (; i>=0; i--)
-    prproc(id->m[i], r);
-  
-  omFreeSize(id->m, IDELEMS(id)*sizeof(poly));
-  omFreeBin(id, sip_sideal_bin);
-  id = NULL;
-}
-
-void idrDelete(ideal &id)
-{
-  prDeleteProc_t prproc;
-  if (rField_has_simple_Alloc(currRing))
-    prproc = prDeleteR_NSimple;
-  else
-    prproc = prDeleteR_NoNSimple;
-  
-  idrDelete(id, currRing, prproc);
-}
-
-void idrDeleteR(ideal &id, ring r)
-{
-  prDeleteProc_t prproc;
-  if (rField_has_simple_Alloc(r))
-    prproc = prDeleteR_NSimple;
-  else
-    prproc = prDeleteR_NoNSimple;
-  
-  idrDelete(id, r, prproc);
-}
-
-  
-  
-