Changeset eace2a in git

Timestamp:

Dec 21, 2023, 11:21:04 AM (5 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

f17fdfaee3919c92810e337bf022084eb688c857

Parents:

3bda0f8e48dbfc2445bc024874a93dab2ade12fd

Message:

prune_map

Files:

• Singular/iparith.cc (modified) (1 diff)
• Singular/table.h (modified) (1 diff)
• Tst/New.lst (modified) (1 diff)
• Tst/New/prune_map.res.gz.uu (added)
• Tst/New/prune_map.stat (added)
• Tst/New/prune_map.tst (added)
• kernel/ideals.cc (modified) (1 diff)

Singular/iparith.cc

@@ -3063 +3063 @@
 static BOOLEAN jjPRUNE_MAP(leftv res, leftv v, leftv ma)
 {
-  if ((ma->rtyp!=IDHDL)||(ma->e!=NULL))
-  {
-    WerrorS("2nd argument must have a name");
+  if (ma->Typ()!=SMATRIX_CMD)
+  {
+    WerrorS("expected prune_map(`module`,`smatrix`)`");
     return TRUE;
   }

Singular/table.h

@@ -754 +754 @@
 ,{D(jjPARSTR2),   PARSTR_CMD,     STRING_CMD,     RING_CMD,   INT_CMD, ALLOW_NC |ALLOW_RING}
 ,{D(jjPRINT_FORMAT), PRINT_CMD,   STRING_CMD,     DEF_CMD,    STRING_CMD, ALLOW_NC |ALLOW_RING}
-,{D(jjPRUNE_MAP), PRUNE_MAP_CMD,  MODUL_CMD,      MODUL_CMD,  SMATRIX_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{D(jjPRUNE_MAP), PRUNE_MAP_CMD,  MODUL_CMD,      MODUL_CMD,  IDHDL,      ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjQUOT),      QUOTIENT_CMD,   IDEAL_CMD,      IDEAL_CMD,  IDEAL_CMD, ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjQUOT),      QUOTIENT_CMD,   MODUL_CMD,      MODUL_CMD,  IDEAL_CMD, ALLOW_PLURAL |ALLOW_RING}

Tst/New.lst

@@ -38 +38 @@
 New/print_param_poly_short.tst
 New/print_qring.tst
+New/prune_map.tst
 New/qring_2tom.tst
 New/qring_ZmtoZmn.tst

kernel/ideals.cc

@@ -2756 +2756 @@
   ideal res=idMinEmbedding1(arg,FALSE,w,red_comp,del);
   trans=idLift(arg,res,NULL,TRUE,FALSE,FALSE,NULL);
-  int curr=0;
   for(int i=1;i<=arg->rank;i++)
   {
     g[i-1]=red_comp[i];
-    if (red_comp[i]==curr) g[i-1]=0;
-    curr=red_comp[i];
-  }
-  omFree(red_comp);
+  }
+  idDeleteComps(res,red_comp,del);
   return res;
 }