Changeset 4cbb61 in git

Timestamp:

Jan 13, 2006, 5:46:49 PM (18 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

cea6f37c01957588684897357ff64b4850b3dc6a

Parents:

9f108329a8f460977e75c73c8544bc11d52cfb46

Message:

RING2TOM Merger


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

Location:

Singular

Files:

• ipshell.cc (modified) (3 diffs)
• misc.cc (modified) (2 diffs)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.132 2005-11-27 15:41:50 wienand Exp $ */
+/* $Id: ipshell.cc,v 1.133 2006-01-13 16:46:48 wienand Exp $ */
 /*
 * ABSTRACT:
@@ -578 +578 @@
 
 #ifdef HAVE_RING2TOM
-BOOLEAN Is2toM(int p)  /* brute force !!!! */
-{
+int Is2toM(int p)  /* brute force !!!! */
+{
+  if (p <= 0) return 0;
   int test = p;
+  int i = 0;
   while (p%2 == 0) {
     p = p / 2;
-  }
-  return (p == 1);
+    i++;
+  }
+  if (p == 1) {
+    return i;
+  }
+  return 0;
 }
 #endif
@@ -4442 +4448 @@
     else {
 #ifdef HAVE_RING2TOM
-      if (Is2toM(ch)) {
+      int blupp = Is2toM(ch);
+      if (blupp != 0) {
         cring = 1; // Use Z/2^ch
+        ch = blupp;
         Print("Beta: using Z/2^%d", ch);
         PrintLn();

Singular/misc.cc

@@ -290 +290 @@
 
         if (TEST_OPT_INTSTRATEGY && (currRing!=NULL)
-        && rField_has_simple_inverse())
-        {
+        && rField_has_simple_inverse()
+#ifdef HAVE_RING2TOM
+        && !rField_is_Ring_2toM(currRing)
+#endif
+        ) {
           test &=~Sy_bit(OPT_INTSTRATEGY);
         }
@@ -317 +320 @@
           Warn("cannot set option");
         if (TEST_OPT_INTSTRATEGY && (currRing!=NULL)
-        && rField_has_simple_inverse())
-        {
+        && rField_has_simple_inverse()
+#ifdef HAVE_RING2TOM
+        && !rField_is_Ring_2toM(currRing)
+#endif
+        ) {
           test &=~Sy_bit(OPT_INTSTRATEGY);
         }