Changeset 3b1d9a in git for Singular/ipassign.cc

Timestamp:

Aug 10, 2011, 6:03:37 PM (13 years ago)

Author:

Burcin Erocal <burcin@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

7b2b05e5e54bc3ab322d7d747d4f5afdd8352050

Parents:

1085d42039758a8ec5ff857d7c0b1d53388050e6

git-author:

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

git-committer:

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

Message:

Convert Singular/maps_ip.cc to libpolys.

File:

• Singular/ipassign.cc (modified) (9 diffs)

Singular/ipassign.cc

@@ -17 +17 @@
 #include <misc/options.h>
 #include <Singular/ipid.h>
-#include <kernel/idrec.h>
+#include <Singular/idrec.h>
 #include <misc/intvec.h>
 #include <omalloc/omalloc.h>
@@ -30 +30 @@
 #include <Singular/lists.h>
 #include <coeffs/numbers.h>
-#include <kernel/longalg.h>
+#include <polys/ext_fields/longalg.h>
 #include <kernel/stairc.h>
 #include <polys/monomials/maps.h>
@@ -39 +39 @@
 #include <Singular/silink.h>
 #include <Singular/ipshell.h>
-#include <kernel/sca.h>
+#include <polys/nc/sca.h>
 #include <Singular/blackbox.h>
 
@@ -131 +131 @@
     {
       poly p=(poly)IDDATA(h);
-      IDDATA(h)=(char*)pMinPolyNormalize(p);
+      IDDATA(h)=(char*)p_MinPolyNormalize(p, currRing);
       break;
     }
@@ -141 +141 @@
       int i;
       ideal I=(ideal)IDDATA(h);
-      for(i=IDELEMS(I)-1;i>=0;i--) I->m[i]=pMinPolyNormalize(I->m[i]);
+      for(i=IDELEMS(I)-1;i>=0;i--)
+              I->m[i]=p_MinPolyNormalize(I->m[i], currRing);
       break;
     }
@@ -169 +170 @@
   {
     if ((rPar(currRing)!=1)
-      || (rField_is_GF()))
+      || (rField_is_GF(currRing)))
     {
       WerrorS("no minpoly allowed");
@@ -486 +487 @@
   if (res->data!=NULL) idDelete((ideal*)&res->data);
   res->data=(void *)a->CopyD(MATRIX_CMD);
-  if (a->rtyp==IDHDL) idNormalize((ideal)a->Data());
-  else                idNormalize((ideal)res->data);
+  if (a->rtyp==IDHDL) id_Normalize((ideal)a->Data(), currRing);
+  else                id_Normalize((ideal)res->data, currRing);
   jiAssignAttr(res,a);
   if (((res->rtyp==IDEAL_CMD)||(res->rtyp==MODUL_CMD))
@@ -529 +530 @@
   ((ideal)m)->rank=1;
   MATROWS(m)=1;
-  idNormalize((ideal)m);
+  id_Normalize((ideal)m, currRing);
   res->data=(void *)m;
   if (TEST_V_QRING && (currQuotient!=NULL)) jjNormalizeQRingId(res);
@@ -579 +580 @@
   res->data=(void *)a->CopyD(IDEAL_CMD);
   f=(map)res->data;
-  idNormalize((ideal)f);
+  id_Normalize((ideal)f, currRing);
   f->preimage = rn;
   return FALSE;