Changeset a0432f in git

Timestamp:

Aug 3, 2011, 6:15:59 PM (13 years ago)

Author:

Burcin Erocal <burcin@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

71fcb3f6531e433dbdb1966908154aa7c46a268a

Parents:

0519cc9cca8089c23b749034d116897e8eeb3157

git-author:

Burcin Erocal <burcin@erocal.org>2011-08-03 18:15:59+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:14:19+01:00

Message:

Fixed Singular/ipconv.cc (if it breaks it's Oleksandr's fault).

Files:

• Singular/ipconv.cc (modified) (7 diffs)
• Singular/ipshell.cc (modified) (2 diffs)
• libpolys/coeffs/coeffs.h (modified) (1 diff)

Singular/ipconv.cc

@@ -18 +18 @@
 #include <Singular/subexpr.h>
 #include <coeffs/numbers.h>
-#include <kernel/modulop.h>
-#include <kernel/longrat.h>
-#include <kernel/longalg.h>
+#include <coeffs/coeffs.h>
+#include <polys/ext_fields/longalg.h>
 #ifdef HAVE_RINGS
-#include <kernel/rmodulon.h>
-#include <kernel/rmodulo2m.h>
-#include <kernel/rintegers.h>
+#include <coeffs/rmodulon.h>
+#include <coeffs/rmodulo2m.h>
+#include <coeffs/rintegers.h>
 #endif
 #include <polys/matpol.h>
@@ -54 +53 @@
 static void * iiBI2P(void *data)
 {
-  number n=nInit_bigint((number)data);
-  nlDelete((number *)&data,NULL);
+  number n=n_Init_bigint((number)data, currRing->cf, currRing->cf);
+  n_Delete((number *)&data,currRing);
   poly p=pNSet(n);
   return (void *)p;
@@ -69 +68 @@
 static void * iiBI2V(void *data)
 {
-  number n=nInit_bigint((number)data);
+  number n=n_Init_bigint((number)data, currRing->cf, currRing->cf);
   nlDelete((number *)&data,NULL);
   poly p=pNSet(n);
@@ -86 +85 @@
 {
   ideal I=idInit(1,1);
-  number n=nInit_bigint((number)data);
+  number n=n_Init_bigint((number)data, currRing->cf, currRing->cf);
   nlDelete((number *)&data,NULL);
   poly p=pNSet(n);
@@ -165 +164 @@
   if (currRing==NULL) return NULL;
   // a bigint is really a number from char 0, with diffrent operations...
-  return (void*)nInit_bigint((number)data);
+  return (void*)n_Init_bigint((number)data, currRing->cf, currRing->cf);
 }
 
@@ -302 +301 @@
           else if(pIsConstant((poly)input->data))
           {
-            output->name=nName(pGetCoeff((poly)input->data));
+            output->name=ndName(pGetCoeff((poly)input->data), currRing->cf);
           }
 #ifdef TEST
@@ -315 +314 @@
       else if ((input->rtyp==NUMBER_CMD) && (input->name==NULL))
       {
-        output->name=nName((number)input->data);
+        output->name=ndName((number)input->data, currRing->cf);
       }
       else

Singular/ipshell.cc

@@ -31 +31 @@
 #include <coeffs/numbers.h>
 #include <kernel/modulop.h>
-#include <kernel/longalg.h>
+#include <polys/ext_fields/longalg.h>
 #include <Singular/lists.h>
 #include <Singular/attrib.h>
@@ -43 +43 @@
 #include <coeffs/gnumpfl.h>
 //#include <kernel/mpr_base.h>
-#include <kernel/ffields.h>
+#include <coeffs/ffields.h>
 #include <polys/clapsing.h>
 #include <kernel/hutil.h>

libpolys/coeffs/coeffs.h

@@ -573 +573 @@
 }
 
+static inline number  n_Init_bigint(number i, const coeffs dummy,
+                const coeffs dst)
+{
+  assume(dummy != NULL && dst != NULL); assume(dst->cfInit_bigint!=NULL); 
+  return dst->cfInit_bigint(i, dummy, dst);
+}
+
 /// returns TRUE, if r is not a field and r has non-trivial units
 static inline BOOLEAN nCoeff_has_Units(const coeffs r)