Changeset 04d04e0 in git

Timestamp:

May 22, 2007, 6:14:10 PM (17 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d3b2ebc75d75cdce3cc0fb111e38f45c5cfdfc2e

Parents:

ca545919f01532fc9a016127a36e3869cfd9591e

Message:

kleine verbesserungen und konstantencheck für ringe entfernt.


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

Location:

kernel

Files:

• kstd1.cc (modified) (3 diffs)
• kutil.cc (modified) (4 diffs)
• pInline1.h (modified) (2 diffs)

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.20 2007-05-11 10:48:03 wienand Exp $ */
+/* $Id: kstd1.cc,v 1.21 2007-05-22 16:14:09 wienand Exp $ */
 /*
 * ABSTRACT:
@@ -1069 +1069 @@
   else if (strat->kHEdgeFound || strat->homog)
     strat->red = redFirst;  /*take the first possible in T*/
+#ifdef HAVE_RINGS  //TODO Oliver
+  else if (rField_is_Ring(currRing))
+    strat->red = redRing2toM;
+#endif
   else
     strat->red = redEcart;/*take the first possible in under ecart-restriction*/
@@ -1903 +1907 @@
   strat->sevT        = initsevT();
   strat->red         = redLazy;
+#ifdef HAVE_RINGS  //TODO Oliver
+  if (rField_is_Ring(currRing)) {
+    strat->red = redRing2toM;
+  }
+#endif
   strat->tailRing    = currRing;
   if (pOrdSgn == -1)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.55 2007-05-21 17:23:36 Singular Exp $ */
+/* $Id: kutil.cc,v 1.56 2007-05-22 16:14:09 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1257 +1257 @@
   k_GetStrongLeadTerms(p, strat->S[i], currRing, m1, m2, gcd, strat->tailRing);
 
-  pSetCoeff0(m1, (number) t);
-  pSetCoeff0(m2, (number) s); 
+  pSetCoeff0(m1, (number) s);
+  pSetCoeff0(m2, (number) t);
   pSetCoeff0(gcd, (number) d);
 
@@ -1266 +1266 @@
   {
     Print("t = %d; s = %d; d = %d\n", t, s, d);
-    PrintS("--- create strong gcd poly: ");
+    PrintS("m1 = ");
+    p_wrp(m1, strat->tailRing);
+    PrintS(" ; m2 = ");
+    p_wrp(m2, strat->tailRing);
+    PrintS(" ; gcd = ");
+    wrp(gcd);
+    PrintS("\n--- create strong gcd poly: ");
+    Print("\n p: ", i);
     wrp(p);
     Print("\n strat->S[%d]: ", i);
@@ -4476 +4483 @@
   }
   /*- test, if a unit is in F -*/
-  if ((strat->sl>=0) && pIsConstant(strat->S[0]))
+  if ((strat->sl>=0) 
+#ifdef HAVE_RINGS
+       && !rField_is_Ring(currRing)
+#endif
+       && pIsConstant(strat->S[0]))
   {
     while (strat->sl>0) deleteInS(strat->sl,strat);

kernel/pInline1.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pInline1.h,v 1.11 2007-05-10 08:12:42 wienand Exp $
+ *  Version: $Id: pInline1.h,v 1.12 2007-05-22 16:14:10 wienand Exp $
  *******************************************************************/
 #ifndef PINLINE1_H
@@ -390 +390 @@
     while (i>=0);
   }
-  pDivAssume(p_DebugLmDivisibleByNoComp(a, b, r) == TRUE);
 #ifdef HAVE_RINGS
   return nDivBy(p_GetCoeff(b, r), p_GetCoeff(a, r));
 #else
+  pDivAssume(p_DebugLmDivisibleByNoComp(a, b, r) == TRUE);
   return TRUE;
 #endif