Changeset 6fc941 in git

Timestamp:

May 29, 2006, 6:10:50 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

9f738e4e4d9a2396fedb4bf644b5fc7cbac460ad

Parents:

7145030af0d072406bdbbd5f4cbd550cdea8ccba

Message:

*hannes: bigint prep (3)


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

Location:

Singular

Files:

• ipconv.cc (modified) (6 diffs)
• ipid.cc (modified) (5 diffs)

Singular/ipconv.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipconv.cc,v 1.28 2005-07-27 15:47:57 Singular Exp $ */
+/* $Id: ipconv.cc,v 1.29 2006-05-29 16:10:50 Singular Exp $ */
 /*
 * ABSTRACT: automatic type conversions
@@ -17 +17 @@
 #include "subexpr.h"
 #include "numbers.h"
+#include "modulop.h"
+#include "longalg.h"
 #include "matpol.h"
 #include "silink.h"
@@ -96 +98 @@
   return (void *)m;
 }
+static void * iiBI2N(void *d)
+{
+  void *r=NULL;
+  if (rField_is_Q())
+    r=d;
+  else
+  {
+    number n=(number)d;
+    if (rField_is_Zp())
+    {
+      r=(void *)npMap0(n);
+    }
+    else if (rField_is_Q_a())
+    {
+      r=(void *)naMap00(n);
+    }
+    else if (rField_is_Zp_a())
+    {
+      r=(void *)naMap0P(n);
+    }
+    else
+      WerrorS("cannot convert bigint to this field");
+    nlDelete(&n,NULL);
+  }
+  return r;
+}
+
+static void * iiN2P(void *data);
+static void * iiBI2P(void *d)
+{
+  void *r=iiBI2N(d);
+  if(errorreported) return NULL;
+  else              return iiN2P(r);
+}
 
 static void * iiDummy(void *data)
@@ -124 +160 @@
 {
   number n=nInit((int)(long)data);
+  return (void *)n;
+}
+
+static void * iiI2BI(void *data)
+{
+  number n=nlInit((int)(long)data);
   return (void *)n;
 }
@@ -211 +253 @@
 {
 //   input type       output type     convert procedure
+//  int -> bigint
+   { INT_CMD,         BIGINT_CMD,     iiI2BI , NULL },
 //  int -> number
    { INT_CMD,         NUMBER_CMD,     iiI2N , NULL },
@@ -229 +273 @@
 //  intmat -> matrix
    { INTMAT_CMD,      MATRIX_CMD,     iiIm2Ma , NULL },
+//  bigint -> number
+   { BIGINT_CMD,      NUMBER_CMD,     iiBI2N , NULL },
+//  bigint -> poly
+   { BIGINT_CMD,      NUMBER_CMD,     iiBI2P , NULL },
 //  number -> poly
    { NUMBER_CMD,      POLY_CMD,       iiN2P  , NULL },

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.74 2006-05-29 15:14:29 Singular Exp $ */
+/* $Id: ipid.cc,v 1.75 2006-05-29 16:10:50 Singular Exp $ */
 
 /*
@@ -251 +251 @@
       case BIGINT_CMD:
         IDNUMBER(h) = nlInit(0);
-        break;
+        break;
       case IDEAL_CMD:
       case MODUL_CMD:
@@ -342 +342 @@
       {
         goto errlabel;
-      } 
+      }
       if (BVERBOSE(V_REDEFINE))
         Warn("redefining %s **",s);
@@ -717 +717 @@
   if (h2!=NULL) return h2;
   if (h!=NULL) return h;
-#ifdef HAVE_NS  
+#ifdef HAVE_NS
   if (basePack!=currPack)
     return basePack->idroot->get(n,myynest);
-#endif      
-  return NULL; 
+#endif
+  return NULL;
 }
 
@@ -727 +727 @@
 {
   if (hasFlag(h,FLAG_STD)) PrintS(" (SB)");
-#ifdef HAVE_PLURAL  
+#ifdef HAVE_PLURAL
   if (hasFlag(h,FLAG_TWOSTD)) PrintS(" (2SB)");
-#endif  
+#endif
 }