Changeset 887121 in git

Timestamp:

Oct 12, 2023, 10:35:13 AM (7 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

97d4388aa30827472f30300122c06094a96918e1

Parents:

9c060af32d374f00ad523409ccde72f818b4acbd

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2023-10-12 10:35:13+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2023-11-07 16:19:53+01:00

Message:

add id_PermIdeal

Files:

• Singular/maps_ip.cc (modified) (3 diffs)
• kernel/GBEngine/kstd1.cc (modified) (2 diffs)
• libpolys/polys/simpleideals.cc (modified) (1 diff)
• libpolys/polys/simpleideals.h (modified) (1 diff)

Singular/maps_ip.cc

@@ -170 +170 @@
       int C=((matrix)data)->cols();
       int R;
+      matrix m=NULL;
       if (w->rtyp==MAP_CMD) R=1;
       else R=((matrix)data)->rows();
-      matrix m=mpNew(R,C);
       char *tmpR=NULL;
       if(w->rtyp==MAP_CMD)
@@ -186 +186 @@
          )
       {
+        m=mpNew(R,C);
         for (i=R*C-1;i>=0;i--)
         {
@@ -194 +195 @@
       else if ((what==IMAP_CMD) || (what==FETCH_CMD))
       {
-        for (i=R*C-1;i>=0;i--)
-        {
-          m->m[i]=p_PermPoly(((ideal)data)->m[i],perm,preimage_r,currRing,
-                          nMap,par_perm,P,use_mult);
-          pTest(m->m[i]);
-        }
+        m=(matrix)id_PermIdeal((ideal)data,R,C,perm,preimage_r,currRing,
+                                    nMap,par_perm,P,use_mult);
       }
       else /* (what==MAP_CMD) */
       {
         assume(what==MAP_CMD);
+        m=mpNew(R,C);
         matrix s=mpNew(N,maMaxDeg_Ma((ideal)data,preimage_r));
         for (i=R*C-1;i>=0;i--)

kernel/GBEngine/kstd1.cc

@@ -2447 +2447 @@
 }
 
-ideal idPermIdeal(ideal I,const int *perm, const ring oldRing, const ring dst,
-       nMapFunc nMap, const int *par_perm, int OldPar, BOOLEAN use_mult)
-{
-  ideal II=idInit(IDELEMS(I),I->rank);
-  for(int i=IDELEMS(I)-1; i>=0; i--)
-  {
-    II->m[i]=p_PermPoly(I->m[i],perm,oldRing,dst,nMap,par_perm,OldPar,use_mult);
-  }
-  return II;
-}
-
 poly kTryHC(ideal F, ideal Q)
 {
@@ -2470 +2459 @@
   rChangeCurrRing(Zp_ring);
   nMapFunc nMap=n_SetMap(save_ring->cf,Zp_ring->cf);
-  ideal FF=idPermIdeal(F,NULL,save_ring,Zp_ring,nMap,NULL,0,0);
+  ideal FF=id_PermIdeal(F,IDELEMS(F),1,NULL,save_ring,Zp_ring,nMap,NULL,0,0);
   ideal QQ=NULL;
-  if (Q!=NULL) QQ=idPermIdeal(Q,NULL,save_ring,Zp_ring,nMap,NULL,0,0);
+  if (Q!=NULL) QQ=id_PermIdeal(Q,IDELEMS(Q),1,NULL,save_ring,Zp_ring,nMap,NULL,0,0);
   // call std
   ideal res=kStd(FF,QQ,testHomog,NULL,NULL);

libpolys/polys/simpleideals.cc

@@ -2187 +2187 @@
   return ret;
 }
+
+ideal id_PermIdeal(ideal I,int R, int C,const int *perm, const ring src, const ring dst,
+       nMapFunc nMap, const int *par_perm, int P, BOOLEAN use_mult)
+{
+  ideal II=(ideal)mpNew(R,C);
+  II->rank=I->rank;
+  for(int i=R*C-1; i>=0; i--)
+  {
+    II->m[i]=p_PermPoly(I->m[i],perm,src,dst,nMap,par_perm,P,use_mult);
+  }
+  return II;
+}

libpolys/polys/simpleideals.h

@@ -185 +185 @@
 /// for julia: convert an array of poly to vector
 poly id_Array2Vector(poly *m, unsigned n, const ring R);
+
+/// mapping ideals/matrices to other rings
+ideal id_PermIdeal(ideal I,int R, int C,const int *perm, const ring src,
+   const ring dst, nMapFunc nMap, const int *par_perm, int P, BOOLEAN use_mult);
 #endif