Changeset 24d587 in git for Singular/kInline.cc

Timestamp:

Dec 20, 2000, 12:15:50 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c22d845dacb42bdd0a798a7eb2606d8e9f6f6095

Parents:

bad9f3c06133001d0c55551cbf4faf2ca805670e

Message:

* clean-up[ of LDeg/FDeg stuff
* tailRing for local homg


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

File:

• Singular/kInline.cc (modified) (5 diffs)

Singular/kInline.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: kInline.cc,v 1.20 2000-12-19 18:31:40 obachman Exp $
+ *  Version: $Id: kInline.cc,v 1.21 2000-12-20 11:15:42 obachman Exp $
  *******************************************************************/
 #ifndef KINLINE_CC
@@ -20 +20 @@
 
 #define HAVE_TAIL_BIN
-// Hmm ... this I don't understand:
-// with HAVE_LM_BIN, cyclic_7 is appr. 10% slower (on Intel)
+// This doesn't really work, fixme, if necessary
 // #define HAVE_LM_BIN
 
-KINLINE skStrategy::skStrategy()
-{
-  memset(this, 0, sizeof(skStrategy));
-  tailRing = currRing;
-  P.tailRing = currRing;
-  tl = -1;
-  sl = -1;
-#ifdef HAVE_LM_BIN
-  lmBin = omGetStickyBinOfBin(currRing->PolyBin);
-#endif
-#ifdef HAVE_TAIL_BIN
-  tailBin = omGetStickyBinOfBin(currRing->PolyBin);
-#endif
-  pOrigFDeg = pFDeg;
-  pOrigLDeg = pLDeg;
-}
-
-KINLINE skStrategy::~skStrategy()
-{
-  if (lmBin != NULL)
-    omMergeStickyBinIntoBin(lmBin, currRing->PolyBin);
-  if (tailBin != NULL)
-    omMergeStickyBinIntoBin(tailBin, 
-                            (tailRing != NULL ? tailRing->PolyBin:
-                             currRing->PolyBin));
-  if (currRing != tailRing)
-    rKillModifiedRing(tailRing);
-  pLDeg = pOrigLDeg;
-  pFDeg = pOrigFDeg;
-}
 
 KINLINE TObject* skStrategy::S_2_T(int i)
@@ -388 +357 @@
 KINLINE long sTObject::pLDeg()
 {
-  return ::pLDeg(GetLmTailRing(), &length, tailRing);
+  return tailRing->pLDeg(GetLmTailRing(), &length, tailRing);
 }
 KINLINE long sTObject::SetDegStuffReturnLDeg()
@@ -698 +667 @@
     int i = kBucketCanonicalize(bucket);
     pNext(tp) = bucket->buckets[i];
-    long ldeg = ::pLDeg(tp, &length, tailRing);
+    long ldeg = tailRing->pLDeg(tp, &length, tailRing);
     pNext(tp) = NULL;
     return ldeg;
   }
   else
-    return ::pLDeg(tp, &length, tailRing);
+    return tailRing->pLDeg(tp, &length, tailRing);
 }
 KINLINE long sLObject::pLDeg(BOOLEAN deg_last)
@@ -713 +682 @@
 #ifdef HAVE_ASSUME
   long fdeg;
-  fdeg = ::pLDeg(GetLmTailRing(), &length, tailRing);
-  assume (pLength == length && fdeg == ::pFDeg(last, tailRing));
+  fdeg = tailRing->pLDeg(GetLmTailRing(), &length, tailRing);
+  assume (pLength == length && fdeg == tailRing->pFDeg(last, tailRing));
   return fdeg;
 #else
   length = pLength;
-  return ::pFDeg(last, tailRing);
+  return tailRing->pFDeg(last, tailRing);
 #endif
 }