Changeset 41ea815 in git

Timestamp:

Dec 8, 2008, 6:48:07 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

16ffb58aa2fb7d89cb13b506827574293b64bc37

Parents:

a48078e64d5cf6c4eadf3329daf985be7b2bd938

Message:

*hannes: bigint -> number/ideal


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

Location:

Singular

Files:

• iparith.cc (modified) (2 diffs)
• ipconv.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.481 2008-11-12 12:51:15 Singular Exp $ */
+/* $Id: iparith.cc,v 1.482 2008-12-08 17:48:07 Singular Exp $ */
 
 /*
@@ -6318 +6318 @@
         break;
       }
+      case BIGINT_CMD:
+      {
+        number b=(number)h->Data(BIGINT_CMD);
+        number n=nInit_bigint(b);
+        if (!nIsZero(n))
+        {
+          p=pOne();
+          pSetCoeff(p,n);
+        }
+        else
+        {
+          p=NULL;
+          nDelete(&n);
+        }
+        break;
+      }
       case NUMBER_CMD:
       {

Singular/ipconv.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipconv.cc,v 1.39 2008-07-16 12:51:26 Singular Exp $ */
+/* $Id: ipconv.cc,v 1.40 2008-12-08 17:48:07 Singular Exp $ */
 /*
 * ABSTRACT: automatic type conversions
@@ -160 +160 @@
 }
 
-extern number ngfMapQ(number from); // gnumpfl.cc
-extern number ngcMapQ(number from); // gnumpc.cc
-extern number nrMapQ(number from);  // shortfl.cc
-
 static void * iiBI2N(void *data)
 {
   if (currRing==NULL) return NULL;
   // a bigint is really a number from char 0, with diffrent operations...
-  if (rField_is_Q())      return (void*)nlCopy((number)data);
-  if (rField_is_Zp())     return (void*)npMap0((number)data);
-  if (rField_is_long_R()) return (void*)ngfMapQ((number)data);
-  if (rField_is_long_C()) return (void*)ngcMapQ((number)data);
-  if (rField_is_R())      return (void*)nrMapQ((number)data);
-  if (rField_is_Q_a())    return (void*)naMap00((number)data);
-  if (rField_is_Zp_a())   return (void*)naMap0P((number)data);
-#ifdef HAVE_RINGS
-  if (rField_is_Ring_Z())   return (void*)nrzMapQ((number)data);
-  if (rField_is_Ring_ModN())   return (void*)nrnMapQ((number)data);
-  if (rField_is_Ring_PtoM())   return (void*)nrnMapQ((number)data);
-  if (rField_is_Ring_2toM())   return (void*)nr2mMapQ((number)data);
-#endif
-  WerrorS("cannot convert bigint to this ring");
-  return NULL;
+  return (void*)nInit_bigint((number)data);
 }