Changeset 5ecf042 in git for Singular/kutil.cc

Timestamp:

Dec 19, 2000, 7:31:48 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7022cd9d4b1177139f7d205efecb93fa232cc319

Parents:

b9d57bdc42ac80a762bda08cdb917d46e9f35616

Message:

* LIB: some categoy changes
* libparse: added -c option
* reimplementation of reing dpenendent options (put to ring->options)


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

File:

• Singular/kutil.cc (modified) (7 diffs)

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.86 2000-12-18 17:47:18 obachman Exp $ */
+/* $Id: kutil.cc,v 1.87 2000-12-19 18:31:41 obachman Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -647 +647 @@
     }
   }
-  r_assume(L->max == NULL);
   if (L->p1 == NULL)
   {
@@ -776 +775 @@
         return dReportError("L[%d].i_r2 out of sync", i);
     }
+    if (strat->L[i].i_r != -1)
+      return dReportError("L[%d].i_r out of sync", i);
   }
   return TRUE;
@@ -3991 +3992 @@
     for (i=strat->sl; i>0; i--)
     {
-      //if (strat->interpt) test_int_std(strat->kIdeal);
-      strat->S[i] = redtailBba(strat->S[i],i-1,strat);
+      TObject* T_j = strat->s_2_t(i);
+      if (T_j != NULL)
+      {
+        assume(strat->S[i] == T_j->p);
+        strat->S[i] = redtailBba(T_j, i-1, strat);
+        assume(strat->S[i] == T_j->p);
+        if (strat->redTailChange && strat->tailRing != currRing)
+        {
+          if (T_j->max != NULL) p_LmFree(T_j->max, strat->tailRing);
+          if (pNext(T_j->p) != NULL) 
+            T_j->max = p_GetMaxExpP(pNext(T_j->p), strat->tailRing);
+          else
+            T_j->max = NULL;
+        }
+      }
+      else
+        strat->S[i] = redtailBba(strat->S[i],i-1,strat);
+
       if (TEST_OPT_INTSTRATEGY)
       {
@@ -4130 +4147 @@
   
   if (L != NULL && L->tailRing != new_tailRing)
-    L->ShallowCopyDelete(new_tailRing, p_shallow_copy_delete);
-  if (T != NULL && T->tailRing != new_tailRing)
+  {
+    if (L->i_r < 0)    
+      L->ShallowCopyDelete(new_tailRing, p_shallow_copy_delete);
+    else
+    {
+      assume(L->i_r <= strat->tl);
+      TObject* t_l = strat->R[L->i_r];
+      assume(t_l != NULL);
+      L->tailRing = new_tailRing;
+      L->p = t_l->p;
+      L->t_p = t_l->t_p;
+      L->max = t_l->max;
+    }
+  }
+      
+  if (T != NULL && T->tailRing != new_tailRing && T->i_r < 0)
     T->ShallowCopyDelete(new_tailRing, new_tailBin, p_shallow_copy_delete);
     
@@ -4172 +4203 @@
 }
 
-#endif // KUTIL_CC
 
 #if 0
@@ -4325 +4355 @@
 
 #endif
+
+#endif // KUTIL_CC