Changeset 66844e in git for Singular

Timestamp:

Feb 15, 2024, 4:01:00 PM (3 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

97bbaa1d86e16934259160dd8ac8a6cd0731f80c

Parents:

083f003065d6d79ac5e85e9da00f276e58a5aacb

Message:

cohomo.cc p2

File:

• Singular/dyn_modules/cohomo/cohomo.cc (modified) (23 diffs)

Singular/dyn_modules/cohomo/cohomo.cc

@@ -460 +460 @@
     p = pOne();pSetExp(p, vbase[i], 1);pSetm(p);pSetCoeff(p, nInit(1));
     //pWrite(p);
-    q=pp_Mult_mm(q,p,currRing);
+    q=p_Mult_m(q,p,currRing);
   }
   return q;
@@ -470 +470 @@
   ideal id_re=idInit(1,1);
   poly p;
-  int i,lv=vecs.size();
-  for(i=0;i<lv;i++)
+  int lv=vecs.size();
+  for(int i=0;i<lv;i++)
   {
     p=pMaken(vecs[i]);
@@ -485 +485 @@
 static std::vector<std::vector<int> > b_subsets(std::vector<int> vec)
 {
-  int i,j;
   std::vector<int> bv;
   std::vector<std::vector<int> > vecs;
-  for(i=0;i<vec.size();i++)
+  for(int i=0;i<vec.size();i++)
   {
     bv.push_back(vec[i]);
@@ -495 +494 @@
   }
   //listsprint(vecs);
-  for(i=0;i<vecs.size();i++)
-  {
-    for(j=i+1;j<vecs.size();j++)
+  for(int i=0;i<vecs.size();i++)
+  {
+    for(int j=i+1;j<vecs.size();j++)
     {
       bv=vecUnion(vecs[i], vecs[j]);
@@ -511 +510 @@
 static int idvert(ideal h)
 {
-  int i, j, vert=0;
   if(idIs0(h))
-    return vert;
-  for(i=currRing->N;i>0;i--)
-  {
-    for(j=0;j<IDELEMS(h);j++)
+    return 0;
+  for(int i=currRing->N;i>0;i--)
+  {
+    for(int j=0;j<IDELEMS(h);j++)
     {
       if(pGetExp(h->m[j],i)>0)
       {
-        vert=i;
-        return vert;
-      }
-    }
-  }
-  return vert;
+        return i;
+      }
+    }
+  }
+  return 0;
 }
 
 static int pvert(poly p)
 {
-  int i, vert=0;
-  for(i=currRing->N;i>0;i--)
+  for(int i=currRing->N;i>0;i--)
   {
       if(pGetExp(p,i)>0)
       {
-        vert=i;
-        return vert;
-      }
-  }
-  return vert;
+        return i;
+      }
+  }
+  return 0;
 }
 
@@ -607 +602 @@
 {
   ideal h=idInit(1,1);
-  int i,j,eq=0;
-  for(i=0;i<IDELEMS(h1);i++)
+  int eq=0;
+  for(int i=0;i<IDELEMS(h1);i++)
   {
     eq=0;
-    for(j=0;j<IDELEMS(h2);j++)
-    {
-      if(p_EqualPolys(pCopy(h1->m[i]),pCopy(h2->m[j]), currRing))
+    for(int j=0;j<IDELEMS(h2);j++)
+    {
+      if(p_EqualPolys(h1->m[i],h2->m[j], currRing))
       {
         eq=1;
@@ -632 +627 @@
 static bool p_Ifsfree(poly P)
 {
-  int i,sf=1;
-  for(i=1;i<=rVar(currRing);i++)
+  int sf=1;
+  for(int i=1;i<=rVar(currRing);i++)
   {
     if (pGetExp(P,i)>1)
@@ -647 +642 @@
 static ideal sfreemon(ideal h,int deg)
 {
-  int j;
-  ideal temp;
-  temp=idInit(1,1);
+  ideal temp=idInit(1,1);
   if(!idIs0(h))
   {
-    for(j=0;j<IDELEMS(h);j++)
-    {
-      if((p_Ifsfree(h->m[j]))&&(pTotaldegree(h->m[j])==deg))
-      {
-        idInsertPoly(temp, h->m[j]);
+    for(int j=0;j<IDELEMS(h);j++)
+    {
+      if(p_Ifsfree(h->m[j])&&(pTotaldegree(h->m[j])==deg))
+      {
+        idInsertPoly(temp, pCopy(h->m[j]));
       }
     }
@@ -669 +662 @@
 {
   ideal asfmons,sfmons,mons;
-  int j, vert=idvert(h);
+  int vert=idvert(h);
   mons=id_MaxIdeal(1, currRing);
   asfmons=sfreemon(mons,1);
-  for(j=2;j<=vert;j++)
+  for(int j=2;j<=vert;j++)
   {
     mons=id_MaxIdeal(j, currRing);
     sfmons=sfreemon(mons,j);
+    idDelete(&mons);
+    ideal old_asfmons=asfmons;
     asfmons=id_Add(asfmons,sfmons,currRing);
+    idDelete(&sfmons);
+    idDelete(&old_asfmons);
   }
   return asfmons;
@@ -687 +684 @@
 static ideal id_complement(ideal h)
 {
-  int j, vert=idvert(h);
+  int vert=idvert(h);
   ideal i1=id_sfmon(h);
   ideal i3=idInit(1,1);
   poly p;
-  for(j=0;j<IDELEMS(i1);j++)
-  {
-    p=pCopy(i1->m[j]);
+  for(int j=0;j<IDELEMS(i1);j++)
+  {
+    p=i1->m[j];
     if(pvert(p)<=vert)
     {
-      idInsertPoly(i3, p);
+      idInsertPoly(i3, pCopy(p));
     }
   }
   ideal i2=idMinus(i3,h);
+  idDelete(&i3);
+  idDelete(&i1);
   idSkipZeroes(i2);
   return (i2);
@@ -708 +707 @@
 static bool IsInX(poly p,ideal X)
 {
-  int i;
-  for(i=0;i<IDELEMS(X);i++)
+  for(int i=0;i<IDELEMS(X);i++)
   {
     if(pEqualPolys(p,X->m[i]))
@@ -727 +725 @@
   h=idAdd(h1,h2);
   qrh=scKBase(deg,h);
+  idDelete(&h);
   return qrh;
 }
@@ -733 +732 @@
 static int id_maxdeg(ideal h)
 {
-  int i,max;
-  max=pTotaldegree(h->m[0]);
-  for(i=1;i<IDELEMS(h);i++)
+  int max=pTotaldegree(h->m[0]);
+  for(int i=1;i<IDELEMS(h);i++)
   {
     if(pTotaldegree(h->m[i]) > max)
@@ -747 +745 @@
 static ideal idsrRing(ideal h)
 {
-  int i,n;
   ideal pp,qq,rsr,ppp,hc=idCopy(h);
-  for(i=1;i<=rVar(currRing);i++)
+  for(int i=1;i<=rVar(currRing);i++)
   {
     pp=sfreemon(hc,i);
+    ideal old_pp=pp;
     pp=scKBase(i,pp);//quotient ring (R/I_i)_i
+    idDelete(&old_pp);
     if(!idIs0(pp))
     {
+      old_pp=pp;
       pp=sfreemon(pp,i);
+      idDelete(&old_pp);
       rsr=pp;
       //Print("This is the first quotient generators %d:\n",i);
@@ -762 +763 @@
     }
   }
-  for(n=i+1;n<=rVar(currRing);n++)
+  for(int n=i+1;n<=rVar(currRing);n++)
   {
     qq=sfreemon(hc,n);
     pp=qringadd(qq,rsr,n);
     ppp=sfreemon(pp,n);
+    ideal old_rsr=rsr;
     rsr=idAdd(rsr,ppp);
+    idDelete(&old_rsr);
+    idDelete(&ppp);
   }
   idSkipZeroes(rsr);
@@ -776 +780 @@
 static ideal SimFacset(poly p)
 {
-  int i,j,max=pTotaldegree(p);
+  int max=pTotaldegree(p);
   ideal h1,mons,id_re=idInit(1,1);
-  for(i=1;i<max;i++)
+  for(int i=1;i<max;i++)
   {
     mons=id_MaxIdeal(i, currRing);
     h1=sfreemon(mons,i);
-
-    for(j=0;j<IDELEMS(h1);j++)
+    idDelete(&mons);
+
+    for(int j=0;j<IDELEMS(h1);j++)
     {
       if(p_DivisibleBy(h1->m[j],p,currRing))
       {
         idInsertPoly(id_re, h1->m[j]);
-      }
-    }
+        h1->m[j]=NULL;
+      }
+    }
+    idDelete(&h1);
   }
   idSkipZeroes(id_re);
@@ -802 +809 @@
     if(!IsInX(h1->m[i],h))
     {
-      idInsertPoly(h, h1->m[i]);
+      idInsertPoly(h, pCopy(h1->m[i]));
     }
   }
@@ -809 +816 @@
     if(!IsInX(h2->m[i],h))
     {
-      idInsertPoly(h, h2->m[i]);
+      idInsertPoly(h, pCopy(h2->m[i]));
     }
   }
@@ -821 +828 @@
 static ideal IsSimplex(ideal h)
 {
-  int i,max=id_maxdeg(h);
+  int max=id_maxdeg(h);
   poly e=pOne();
   ideal id_re, id_so=idCopy(h);
-  for(i=0;i<IDELEMS(h);i++)
+  for(int i=0;i<IDELEMS(h);i++)
   {
     id_re=SimFacset(h->m[i]);
     if(!idIs0(id_re))
     {
+      ideal old_id_so=id_so;
       id_so=idadda(id_so, id_re);//idAdd(id_so,id_re);
-    }
+      idDelete(&old_id_so);
+    }
+    idDelete(&id_re);
   }
   idInsertPoly(id_so,e);
   idSkipZeroes(id_so);
-  return (idMinus(id_so,h));
+  ideal res=idMinus(id_so,h);
+  idDelete(&id_so);
+  return res;
 }
 
@@ -842 +854 @@
 static ideal complementsimplex(ideal h)
 {
-  int i,j;poly p,e=pOne();
+  poly p,e=pOne();
   ideal h1=idInit(1,1), pp, h3;
-  for(i=1;i<=rVar(currRing);i++)
-  {
-    p = pOne(); pSetExp(p, i, 2); pSetm(p); pSetCoeff(p, nInit(1));
+  for(int i=1;i<=rVar(currRing);i++)
+  {
+    p = pOne(); pSetExp(p, i, 2); pSetm(p);
     idInsertPoly(h1, p);
   }
   idSkipZeroes(h1);
   ideal h2=idAdd(h,h1);
+  idDelete(&h1);
   pp=scKBase(1,h2);
-  h3=idCopy(pp);
-  for(j=2;j<=rVar(currRing);j++)
+  h3=pp;
+  for(int j=2;j<=rVar(currRing);j++)
   {
     pp=scKBase(j,h2);
+    ideal old_h3=h3;
     h3=idAdd(h3,pp);
+    idDelete(&old_h3);
+    idDelete(&pp);
   }
   idInsertPoly(h3, e);
@@ -865 +881 @@
 static int dim_sim(ideal h)
 {
-  int dim=pTotaldegree(h->m[0]), i;
-  for(i=1; i<IDELEMS(h);i++)
+  int dim=pTotaldegree(h->m[0]);
+  for(int i=1; i<IDELEMS(h);i++)
   {
     if(dim<pTotaldegree(h->m[i]))
@@ -899 +915 @@
   ideal ib=id_sfmon(h), nonf=id_complement(h), bset=idInit(1,1);
   poly e=pOne();
-  int i,j;
-  for(i=0;i<IDELEMS(ib);i++)
-  {
-    for(j=0;j<IDELEMS(nonf);j++)
+  for(int i=0;i<IDELEMS(ib);i++)
+  {
+    for(int j=0;j<IDELEMS(nonf);j++)
     {
       if(p_DivisibleBy(ib->m[i],nonf->m[j],currRing))
       {
         idInsertPoly(bset, ib->m[i]);
+        ib->m[i]=NULL;
         break;
       }
@@ -913 +929 @@
   idInsertPoly(bset,e);
   idSkipZeroes(bset);
+  idDelete(&ib);
+  idDelete(&nonf);
   return bset;
 }