Changeset 093f30e in git

Timestamp:

Feb 8, 2008, 11:11:30 AM (15 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

60544db1dc67a36a012f9f3809c0e8d260f9bad0

Parents:

ecededc1c7ef7a762ce55b72be0707700967ceab

Message:

kstd1.cc, kstd2.cc:
redRing2toM --> redRing

kutil.*:
extendedspoly unit case

p_Mult_q.cc:
assume domain for bucket mult

pp_Mult_mm__T.cc:
free tmp memory

rmodulo2m.cc
rmodulon.cc


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

Location:

kernel

Files:

• kstd1.cc (modified) (4 diffs)
• kstd2.cc (modified) (2 diffs)
• kutil.cc (modified) (2 diffs)
• kutil.h (modified) (2 diffs)
• p_Mult_q.cc (modified) (3 diffs)
• pp_Mult_mm__T.cc (modified) (2 diffs)
• rmodulo2m.cc (modified) (3 diffs)
• rmodulon.cc (modified) (2 diffs)

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.31 2008-02-06 09:12:46 wienand Exp $ */
+/* $Id: kstd1.cc,v 1.32 2008-02-08 10:11:28 wienand Exp $ */
 /*
 * ABSTRACT:
@@ -1023 +1023 @@
 #ifdef HAVE_RINGS  //TODO Oliver
   if (rField_is_Ring(currRing)) {
-    strat->red = redRing2toM;
+    strat->red = redRing;
   }
 #endif
@@ -1084 +1084 @@
 #ifdef HAVE_RINGS  //TODO Oliver
   else if (rField_is_Ring(currRing))
-    strat->red = redRing2toM;
+    strat->red = redRing;
 #endif
   else
@@ -1925 +1925 @@
 #ifdef HAVE_RINGS  //TODO Oliver
   if (rField_is_Ring(currRing)) {
-    strat->red = redRing2toM;
+    strat->red = redRing;
   }
 #endif

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.59 2008-02-07 09:36:17 wienand Exp $ */
+/* $Id: kstd2.cc,v 1.60 2008-02-08 10:11:29 wienand Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -275 +275 @@
 *  reduction procedure for the ring Z/2^m
 */
-int redRing2toM (LObject* h,kStrategy strat)
+int redRing (LObject* h,kStrategy strat)
 {
   if (h->p == NULL && h->t_p == NULL) return 0; // spoly is zero (can only occure with zero divisors)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.82 2008-02-07 13:56:44 wienand Exp $ */
+/* $Id: kutil.cc,v 1.83 2008-02-08 10:11:29 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -2641 +2641 @@
 void enterExtendedSpoly(poly h,kStrategy strat)
 {
+  if (nIsOne(pGetCoeff(h))) return;
   number gcd;
   bool go = false;

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.29 2008-01-30 09:01:37 wienand Exp $ */
+/* $Id: kutil.h,v 1.30 2008-02-08 10:11:30 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -396 +396 @@
 int redHoney (LObject* h, kStrategy strat);
 #ifdef HAVE_RINGS
-int redRing2toM (LObject* h,kStrategy strat);
+int redRing (LObject* h,kStrategy strat);
 void enterExtendedSpoly(poly h,kStrategy strat);
 void superenterpairs (poly h,int k,int ecart,int pos,kStrategy strat, int atR = -1);

kernel/p_Mult_q.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Mult_q.cc,v 1.6 2008-01-30 18:56:37 wienand Exp $
+ *  Version: $Id: p_Mult_q.cc,v 1.7 2008-02-08 10:11:30 wienand Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -69 +69 @@
   assume(p != NULL && pNext(p) != NULL && q != NULL && pNext(q) != NULL);
   pAssume1(! pHaveCommonMonoms(p, q));
+#ifdef HAVE_RINGS
+  assume(!rField_is_Domain(currRing));
+#endif
   assume(lp >= 1 && lq >= 1);
   p_Test(p, r);
@@ -74 +77 @@
 
   poly res = pp_Mult_mm(p,q,r);     // holds initially q1*p
-#ifdef HAVE_RINGS
-  if (rField_is_Ring(currRing))
-    WarnS("_p_Mult_q_Bucket not ring testet !!!");
-#endif
   poly qq = pNext(q);               // we iter of this
   poly qn = pp_Mult_mm(qq, p,r);    // holds p1*qi

kernel/pp_Mult_mm__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pp_Mult_mm__T.cc,v 1.6 2008-02-07 08:41:00 wienand Exp $
+ *  Version: $Id: pp_Mult_mm__T.cc,v 1.7 2008-02-08 10:11:30 wienand Exp $
  *******************************************************************/
 
@@ -52 +52 @@
 #ifdef HAVE_ZERODIVISORS
     }
+    else n_Delete(&tmp, ri);
 #endif
     p = pNext(p);

kernel/rmodulo2m.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rmodulo2m.cc,v 1.15 2008-02-07 13:30:37 wienand Exp $ */
+/* $Id: rmodulo2m.cc,v 1.16 2008-02-08 10:11:30 wienand Exp $ */
 /*
 * ABSTRACT: numbers modulo 2^m
@@ -199 +199 @@
 BOOLEAN nr2mDivBy (number a,number b)
 {
-  return ((NATNUMBER) a % (NATNUMBER) b) == 0;
+  if (a == NULL)
+    return (nr2mModul % (NATNUMBER) b) == 0;
+  else
+    return ((NATNUMBER) a % (NATNUMBER) b) == 0;
   /*
   if ((NATNUMBER) a == 0) return TRUE;
@@ -397 +400 @@
   else
   {
-    nr2mExp=0;
-    nr2mModul=0;
-  }
-//  PrintS("Modul: ");
-//  Print("%d\n", nr2mModul);
+    nr2mExp=2;
+    nr2mModul=4;
+  }
 }
 
 void nr2mInitExp(int m, ring r)
 {
-  int i, w;
-
-  if (m>1)
-  {
-    nr2mExp = m;
-    nr2mModul = 2;
-    for (int i = 1; i < m; i++) {
-      nr2mModul = nr2mModul * 2;
-
-    }
-  }
-  else
-  {
-    WarnS("nInitExp failed");
-  }
+  nr2mSetExp(m, r);
+  if (m<2) WarnS("nInitExp failed: using Z/2^2");
 }
 

kernel/rmodulon.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rmodulon.cc,v 1.21 2008-02-07 13:48:05 wienand Exp $ */
+/* $Id: rmodulon.cc,v 1.22 2008-02-08 10:11:30 wienand Exp $ */
 /*
 * ABSTRACT: numbers modulo n
@@ -369 +369 @@
 {
   nrnSetExp(m, r);
+
   if (mpz_cmp_ui(nrnModul,2) <= 0)
   {
-    WarnS("nInitExp failed");
+    WarnS("nrnInitExp failed");
   }
 }