Changeset f498f10 in git

Timestamp:

Nov 27, 2005, 2:56:03 PM (18 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

585bbcba0c423f3cce154cc90b7ff47e29b27bfd

Parents:

e604cdf98381c71eec0218b9f81a5d4655edecf4

Message:

Makefile.in:
--> Änderungen zum kompilieren von Singularg unter Cygwin

extra.cc:
--> ringgb Funktionen unter HAVE_RING2TOM eingebaut

ipshell.cc:
--> Wenn ch=2^n, dann benutze Koeffring 2^(2^n)


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

Location:

Singular

Files:

• Makefile.in (modified) (1 diff)
• extra.cc (modified) (3 diffs)
• ipshell.cc (modified) (4 diffs)

Singular/Makefile.in

@@ -65 +65 @@
 ifneq ($(SINGUNAME),ix86-Win)
 LDFLAGS         = -L../kernel -lkernel @LDFLAGS@
+LDFLAGSG        = -L../kernel -lkernel-g @LDFLAGS@
 else
 ## -L/usr/local/lib -L../modules/python --> PySingular
 LDFLAGS         = -L../kernel -L/bin -lkernel @LDFLAGS@ -L/usr/local/lib -L../modules/python
-endif
-LDFLAGSG        = -L../kernel -lkernel-g @LDFLAGS@
+LDFLAGSG        = -L../kernel -L/bin -lkernel-g @LDFLAGS@
+endif
 LD_DYN_FLAGS    = @LD_DYN_FLAGS@
 SFLAGS          = @SFLAGS@

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.232 2005-11-18 12:42:43 wienand Exp $ */
+/* $Id: extra.cc,v 1.233 2005-11-27 13:56:02 wienand Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -54 +54 @@
 #include "prCopy.h"
 #include "mpr_complex.h"
+
+#ifdef HAVE_RING2TOM
+#include "ringgb.h"
+#endif
 
 #ifdef HAVE_WALK
@@ -2494 +2498 @@
     else
 #endif
+#ifdef HAVE_RING2TOM
+/*==================== ring-GB ==================================*/
+    if (strcmp(sys_cmd, "NF_ring")==0)
+    {
+      ring r = currRing;
+      poly f = (poly) h->Data();
+      h = h->next;
+      ideal G = (ideal) h->Data();
+      res->rtyp=POLY_CMD;
+      res->data=(poly) ringNF(f, G, r);
+      return(FALSE);
+    }
+    else
+    if (strcmp(sys_cmd, "redNF_ring")==0)
+    {
+      ring r = currRing;
+      poly f = (poly) h->Data();
+      h = h->next;
+      ideal G = (ideal) h->Data();
+      res->rtyp=POLY_CMD;
+      res->data=(poly) ringRedNF(f, G, r);
+      return(FALSE);
+    }
+    else
+    if (strcmp(sys_cmd, "reduce_fct")==0)
+    {
+      ring r = currRing;
+      poly f = (poly)h->Data();
+      res->rtyp=POLY_CMD;
+      res->data=NULL;
+      return(FALSE);
+    }
+    else
+#endif
 /*==================== t-rep-GB ==================================*/
     if (strcmp(sys_cmd, "unifastmult")==0)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.130 2005-10-24 11:55:34 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.131 2005-11-27 13:56:03 wienand Exp $ */
 /*
 * ABSTRACT:
@@ -577 +577 @@
 }
 
+#ifdef HAVE_RING2TOM
+BOOLEAN Is2toM(int p)  /* brute force !!!! */
+{
+  int test = p;
+  while (p%2 == 0) {
+    p = p / 2;
+  }
+  return (p == 1);
+}
+#endif
+
 int IsPrime(int p)  /* brute force !!!! */
 {
@@ -4342 +4353 @@
 {
   int ch;
+  int cring = 0;
   int float_len=0;
   int float_len2=0;
@@ -4426 +4438 @@
       }
     }
-    else
-      ch = IsPrime(ch);
+    else {
+#ifdef HAVE_RING2TOM
+      if (Is2toM(ch)) {
+        cring = 1; // Use Z/2^ch
+        Print("Beta: using Z/2^%d", ch);
+        PrintLn();
+      }
+      else
+#endif
+        ch = IsPrime(ch);
+    }
   }
   // allocated ring and set ch
   R = (ring) omAlloc0Bin(sip_sring_bin);
   R->ch = ch;
+  R->cring = cring;
   if (ch == -1)
   {