Changeset 19df79 in git

Timestamp:

Dec 21, 2000, 5:37:52 PM (22 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

cc3a04e207e65e63ef1f42613861ce5365082fff

Parents:

d9f665b2cc780458978ceb1111b560b41f9f9d4e

Message:

* towards tailRings for local case


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

Location:

Singular

Files:

• configure.in (modified) (1 diff)
• hdegree.cc (modified) (2 diffs)
• kInline.cc (modified) (2 diffs)
• kstd1.cc (modified) (10 diffs)
• kstd2.cc (modified) (5 diffs)
• kutil.cc (modified) (13 diffs)
• kutil.h (modified) (2 diffs)
• mod_raw.cc (modified) (2 diffs)
• stairc.h (modified) (2 diffs)

Singular/configure.in

@@ -311 +311 @@
           fi
         ;;
+        IRIX-6)
+          LD_DYN_FLAGS="-lc"
+          ac_lib_dl=yes
+        ;;
 esac
 AC_SUBST(LD_DYN_FLAGS)

Singular/hdegree.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: hdegree.cc,v 1.22 2000-09-18 09:19:00 obachman Exp $ */
+/* $Id: hdegree.cc,v 1.23 2000-12-21 16:37:48 obachman Exp $ */
 /*
 *  ABSTRACT -  dimension, multiplicity, HC, kbase
@@ -1049 +1049 @@
 
 
-void scComputeHC(ideal S, int ak, poly &hEdge)
+void scComputeHC(ideal S, int ak, poly &hEdge, ring tailRing)
 {
   int  i;
   Exponent_t  k = ak;
   hNvar = pVariables;
-  hexist = hInit(S, NULL, &hNexist);
+  hexist = hInit(S, NULL, &hNexist, tailRing);
   if (k!=0)
     hComp(hexist, hNexist, k, hexist, &hNstc);

Singular/kInline.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: kInline.cc,v 1.21 2000-12-20 11:15:42 obachman Exp $
+ *  Version: $Id: kInline.cc,v 1.22 2000-12-21 16:37:49 obachman Exp $
  *******************************************************************/
 #ifndef KINLINE_CC
@@ -50 +50 @@
   }
   return NULL;
+}
+
+KINLINE poly skStrategy::kNoetherTail()
+{
+  if (tailRing == currRing)
+    return kNoether;
+  else
+  {
+    assume((kNoether == NULL && t_kNoether == NULL) ||
+           (kNoether != NULL && t_kNoether != NULL));
+    return t_kNoether;
+  }
 }
 

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.75 2000-12-20 11:15:43 obachman Exp $ */
+/* $Id: kstd1.cc,v 1.76 2000-12-21 16:37:49 obachman Exp $ */
 /*
 * ABSTRACT:
@@ -11 +11 @@
 
 // define if tailrings should be used
-#define HAVE_TAIL_RING
+// #define HAVE_TAIL_RING
 
 #include "mod2.h"
@@ -134 +134 @@
     h->GetP();
     h->SetLength(strat->length_pLength);
-    ret = ksReducePoly(&L, with, strat->kNoether, NULL, strat);
+    ret = ksReducePoly(&L, with, strat->kNoetherTail(), NULL, strat);
     if (ret)
     {
@@ -147 +147 @@
   }
   else
-    ret = ksReducePoly(h, with, strat->kNoether, NULL, strat);
+    ret = ksReducePoly(h, with, strat->kNoetherTail(), NULL, strat);
 #ifdef KDEBUG
   if (TEST_OPT_DEBUG)
@@ -357 +357 @@
     }
 #endif
-    ksReducePoly(h, &(strat->T[j]), strat->kNoether, NULL, strat);
+    ksReducePoly(h, &(strat->T[j]), strat->kNoetherTail(), NULL, strat);
 #ifdef KDEBUG
     if (TEST_OPT_DEBUG)
@@ -527 +527 @@
       /*- try to reduce the s-polynomial -*/
       o = H.SetpFDeg();
-      cancelunit(&H);
+      if (flag != 2) cancelunit(&H);
       H.ecart = pLDeg(H.p,&(H.length))-o;
       j = 0;
@@ -749 +749 @@
         }
         /* create the real one */
-        ksCreateSpoly(&(strat->L[j]), strat->kNoether, FALSE, 
+        ksCreateSpoly(&(strat->L[j]), strat->kNoetherTail(), FALSE, 
                       strat->tailRing, m1, m2, strat->R);
 
@@ -806 +806 @@
         }
         /* create the real one */
-        ksCreateSpoly(&(strat->L[i]), strat->kNoether, FALSE, 
+        ksCreateSpoly(&(strat->L[i]), strat->kNoetherTail(), FALSE, 
                       strat->tailRing, m1, m2, strat->R);
         if (! strat->L[i].IsNull())
@@ -1098 +1098 @@
 
 #ifdef HAVE_TAIL_RING
-  if (strat->homog && strat->red == redFirst)
+//  if (strat->homog && strat->red == redFirst)
     kStratInitChangeTailRing(strat);
 #endif  
@@ -1150 +1150 @@
       }
       /* create the real one */
-      ksCreateSpoly(&(strat->P), strat->kNoether, strat->use_buckets, 
+      ksCreateSpoly(&(strat->P), strat->kNoetherTail(), strat->use_buckets, 
                     strat->tailRing, m1, m2, strat->R);
       if (!strat->use_buckets)

Singular/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.70 2000-12-20 11:15:44 obachman Exp $ */
+/* $Id: kstd2.cc,v 1.71 2000-12-21 16:37:50 obachman Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -131 +131 @@
     
     // now we found one which is divisible -- reduce it
-    ksReducePoly(h, &(strat->T[j]), strat->kNoether, NULL, strat);
+    ksReducePoly(h, &(strat->T[j]), NULL, NULL, strat);
 
 #ifdef KDEBUG
@@ -182 +182 @@
 #endif
 
-    ksReducePoly(h, &(strat->T[j]), strat->kNoether, NULL, strat);
+    ksReducePoly(h, &(strat->T[j]), NULL, NULL, strat);
 
 #ifdef KDEBUG
@@ -319 +319 @@
     assume(strat->fromT == FALSE);
 
-    ksReducePoly(h, &(strat->T[ii]), strat->kNoether, NULL, strat);
+    ksReducePoly(h, &(strat->T[ii]), NULL, NULL, strat);
 
 #ifdef KDEBUG
@@ -572 +572 @@
       }
       // create the real one
-      ksCreateSpoly(&(strat->P), strat->kNoether, strat->use_buckets, 
+      ksCreateSpoly(&(strat->P), NULL, strat->use_buckets, 
                     strat->tailRing, m1, m2, strat->R);
     }

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.90 2000-12-20 17:20:00 obachman Exp $ */
+/* $Id: kutil.cc,v 1.91 2000-12-21 16:37:50 obachman Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -161 +161 @@
     }
 
-    if (!fromNext && p_Cmp(p,strat->kNoether, L->tailRing) == -1)
+    if (!fromNext && p_Cmp(p,strat->kNoetherTail(), L->tailRing) == -1)
     {
       L->Delete();
@@ -172 +172 @@
     while (pNext(p1)!=NULL)
     { 
-      if (p_LmCmp(pNext(p1), strat->kNoether, L->tailRing) == -1)
+      if (p_LmCmp(pNext(p1), strat->kNoetherTail(), L->tailRing) == -1)
       {
         L->last = p1;
@@ -2666 +2666 @@
       if (With == NULL) break;
       strat->redTailChange=TRUE;
-      if (ksReducePolyTail(L, With, h, strat->kNoether))
+      if (ksReducePolyTail(L, With, h, strat->kNoetherTail()))
       {
         // reducing the tail would violate the exp bound
@@ -3246 +3246 @@
   {
     if (pLmShortDivisibleBy(strat->S[j],strat->sevS[j],h, not_sev))
-       return ksOldSpolyRedNew(strat->S[j],h,strat->kNoether);
+       return ksOldSpolyRedNew(strat->S[j],h,strat->kNoetherTail());
     else j++;
   }
@@ -3319 +3319 @@
     if (pLmShortDivisibleBy(strat->S[j],strat->sevS[j], h, not_sev))
     {
-      h = ksOldSpolyRed(strat->S[j],h,strat->kNoether);
+      h = ksOldSpolyRed(strat->S[j],h,strat->kNoetherTail());
       if (h==NULL) return NULL;
       j = start;
@@ -3342 +3342 @@
     if (pLmShortDivisibleBy(strat->S[j],strat->sevS[j], h, not_sev))
     {
-      h = ksOldSpolyRed(strat->S[j],h,strat->kNoether);
+      h = ksOldSpolyRed(strat->S[j],h,strat->kNoetherTail());
       if (h==NULL) return NULL;
       j = 0;
@@ -3375 +3375 @@
         
 #endif          
-        h = ksOldSpolyRed(strat->S[j],h,strat->kNoether);
+        h = ksOldSpolyRed(strat->S[j],h,strat->kNoetherTail());
 #ifdef KDEBUG
         if(TEST_OPT_DEBUG)
@@ -3866 +3866 @@
   {
     if (strat->kHEdge!=NULL) pSetComp(strat->kHEdge, strat->ak);
-    if (strat->kNoether!=NULL) pSetComp(strat->kNoether, strat->ak);
+    if (strat->kNoether!=NULL) pSetComp(strat->kNoetherTail(), strat->ak);
   }
   if(TEST_OPT_SB_1)
@@ -4050 +4050 @@
   poly newNoether;
 
-  scComputeHC(strat->Shdl,ak,strat->kHEdge);
+  scComputeHC(strat->Shdl,ak,strat->kHEdge, strat->tailRing);
+  if (strat->t_kHEdge != NULL) p_LmFree(strat->t_kHEdge, strat->tailRing);
+  if (strat->tailRing != currRing)
+    strat->t_kHEdge = k_LmInit_currRing_2_tailRing(strat->kHEdge, strat->tailRing);
   /* compare old and new noether*/
   newNoether = pLmInit(strat->kHEdge);
@@ -4078 +4081 @@
     pDelete(&strat->kNoether);
     strat->kNoether=newNoether;
+    if (strat->t_kNoether != NULL) p_LmFree(strat->t_kNoether, strat->tailRing);
+    if (strat->tailRing != currRing)
+      strat->t_kNoether = k_LmInit_currRing_2_tailRing(strat->kNoether, strat->tailRing);
+    
     return TRUE;
   }
@@ -4186 +4193 @@
   strat->p_shallow_copy_delete 
     = pGetShallowCopyDeleteProc(currRing, new_tailRing);
+
+  if (strat->kHEdge != NULL)
+  {
+    if (strat->t_kHEdge != NULL)
+      p_LmFree(strat->t_kHEdge, strat->tailRing);
+    strat->t_kHEdge=k_LmInit_currRing_2_tailRing(strat->kHEdge, new_tailRing);
+  }
+
+  if (strat->kNoether != NULL)
+  {
+    if (strat->t_kNoether != NULL)
+      p_LmFree(strat->t_kNoether, strat->tailRing);
+    strat->t_kNoether=k_LmInit_currRing_2_tailRing(strat->kNoether, 
+                                                   new_tailRing);
+  }
   kTest_TS(strat);
   if (TEST_OPT_PROT)
@@ -4242 +4264 @@
                             (tailRing != NULL ? tailRing->PolyBin:
                              currRing->PolyBin));
+  if (t_kHEdge != NULL)
+    p_LmFree(t_kHEdge, tailRing);
+  if (t_kNoether != NULL)
+    p_LmFree(t_kNoether, tailRing);
+
   if (currRing != tailRing)
     rKillModifiedRing(tailRing);

Singular/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.52 2000-12-20 11:15:46 obachman Exp $ */
+/* $Id: kutil.h,v 1.53 2000-12-21 16:37:51 obachman Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -234 +234 @@
   poly    kHEdge;
   poly    kNoether;
+  poly    t_kHEdge; // same polys in tailring
+  KINLINE poly    kNoetherTail();
+  poly    t_kNoether;
   BOOLEAN * NotUsedAxis;
   LObject P;

Singular/mod_raw.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mod_raw.cc,v 1.11 2000-12-12 14:54:59 obachman Exp $ */
+/* $Id: mod_raw.cc,v 1.12 2000-12-21 16:37:52 obachman Exp $ */
 /*
  * ABSTRACT: machine depend code for dynamic modules
@@ -224 +224 @@
  *****************************************************************************/
 #ifdef IRIX_6
-/* #    include <> */
+#include <dlfcn.h>
 
 void *dynl_open(char *filename)

Singular/stairc.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: stairc.h,v 1.9 2000-11-08 15:35:01 obachman Exp $ */
+/* $Id: stairc.h,v 1.10 2000-12-21 16:37:52 obachman Exp $ */
 /*
 * ABSTRACT
@@ -11 +11 @@
 #include "structs.h"
 
-void scComputeHC(ideal s,int  k,poly &hEdge);
+void scComputeHC(ideal s,int  k,poly &hEdge, ring tailRing = currRing);
 
 intvec * scIndIntvec(ideal S, ideal Q=NULL);