Changeset e7cc1eb in git

Timestamp:

Dec 1, 2023, 11:32:32 AM (6 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

968c3de8bc8f0e58c68d8e1efc5ed7b3c6fdaf32

Parents:

873fc1222e995d7cb33f79d8f1792ce418c8c72c

Message:

idMinEmbedding_with_map_v, 4.3.2p11

Files:

• Singular/iparith.cc (modified) (2 diffs)
• kernel/ideals.cc (modified) (1 diff)
• kernel/mod2.h (modified) (1 diff)

Singular/iparith.cc

@@ -3084 +3084 @@
       intvec **ww=&w;
       ideal mat;
-      int *g=(int*)omAlloc((v_id->rank+1)*sizeof(int));
+      int *g=(int*)omAlloc(v_id->rank*sizeof(int));
       res->data = (char *)idMinEmbedding_with_map_v(v_id,ww,mat,g);
       atSet(res,omStrDup("isHomog"),*ww,INTVEC_CMD);
@@ -3090 +3090 @@
       idDelete(&IDIDEAL(h));
       IDIDEAL(h)=mat;
-      for(int i=0;i<=v_id->rank;i++) Print("v[%d]:%d ",i,g[i]); PrintLn();
-      omFree(g);
+      for(int i=0;i<v_id->rank;i++) Print("v[%d]:%d ",i+1,g[i]); PrintLn();
+      omFreeSize(g,v_id->rank*sizeof(int));
       return FALSE;
     }
   }
   ideal mat;
-  int *g=(int*)omAlloc((v_id->rank+1)*sizeof(int));
+  int *g=(int*)omAlloc(v_id->rank*sizeof(int));
   res->data = (char *)idMinEmbedding_with_map_v(v_id,NULL,mat,g);
-  for(int i=0;i<=v_id->rank;i++) Print("v[%d]:%d ",i,g[i]); PrintLn();
-  omFree(g);
+  for(int i=0;i<v_id->rank;i++) Print("v[%d]:%d ",i+1,g[i]); PrintLn();
+  omFreeSize(g,v_id->rank*sizeof(int));
   idhdl h=(idhdl)ma->data;
   idDelete(&IDIDEAL(h));

kernel/ideals.cc

@@ -2750 +2750 @@
 }
 
-ideal idMinEmbedding_with_map_v(ideal arg,intvec **w, ideal &trans, int* red_comp)
-{
+ideal idMinEmbedding_with_map_v(ideal arg,intvec **w, ideal &trans, int* g)
+{
+  int *red_comp=(int*)omAlloc((arg->rank+1)*sizeof(int));
   int del=0;
   ideal res=idMinEmbedding1(arg,FALSE,w,red_comp,del);
   trans=idLift(arg,res,NULL,TRUE,FALSE,FALSE,NULL);
-  //idDeleteComps(res,red_comp,del);
+  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);
   return res;
 }

kernel/mod2.h

@@ -20 +20 @@
 #define SINGULAR_MINOR_VERSION 3
 #define SINGULAR_SUB_VERSION 2
-#define SINGULAR_PATCHLEVEL 10
+#define SINGULAR_PATCHLEVEL 11
 #define S_ROOT_DIR ""