Changeset ed6cce in git for Singular

Timestamp:

Feb 16, 2024, 12:11:33 PM (3 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

c0f61451de447d7d807ab4f5154239ab639776e7

Parents:

4969680ed07ee6d390c94f9f9366dfa36efa4abf

Message:

cohomo.cc p4

File:

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

Singular/dyn_modules/cohomo/cohomo.cc

@@ -957 +957 @@
       {
         idInsertPoly(aset, ia->m[i]);
-        ia->m[i]=NULL;
+        ia->m[i]=NULL;
       }
     }
@@ -1344 +1344 @@
 {
   poly p;
-  int i,j,deg=0,deg0;
+  int deg=0,deg0;
   ideal aset=idCopy(h),ia,h1=idsrRing(h);
 //PrintS("idsrRing is:\n");id_print(h1);
   std::vector<int> as;
   std::vector<std::vector<int> > hvs=supports(h);
-  for(i=0;i<IDELEMS(h1);i++)
+  for(int i=0;i<IDELEMS(h1);i++)
   {
     deg0=pTotaldegree(h1->m[i]);
@@ -1355 +1355 @@
       deg=deg0;
   }
-  for(i=2;i<=deg;i++)
+  idDelete(&h1);
+  for(int i=2;i<=deg;i++)
   {
     ia=id_MaxIdeal(i, currRing);
-    for(j=0;j<IDELEMS(ia);j++)
-    {
-      p=pCopy(ia->m[j]);
+    for(int j=0;j<IDELEMS(ia);j++)
+    {
+      p=ia->m[j];
       if(!IsInX(p,h))
       {
@@ -1367 +1368 @@
         {
           idInsertPoly(aset, p);
+          ia->m[j]=NULL;
         }
       }
     }
+    idDelete(&ia);
   }
   idSkipZeroes(aset);
@@ -1412 +1415 @@
 static std::vector<int> vertset(std::vector<std::vector<int> > vecs)
 {
-  int i,j;
   std::vector<int> vert;
   std::vector<std::vector<int> > vvs;
-  for(i=1;i<=currRing->N;i++)
-  {
-    for(j=0;j<vecs.size();j++)
+  for(int i=1;i<=currRing->N;i++)
+  {
+    for(unsigned j=0;j<vecs.size();j++)
     {
       if(IsinL(i, vecs[j]))
@@ -1438 +1440 @@
   std::vector<int> vert=vertset(lk), bv;
   res=b_subsets(vert);
-  int i, adg=pTotaldegree(a);
+  int adg=pTotaldegree(a);
   poly e=pOne();
   ideal idd=idInit(1,1);
-  for(i=0;i<res.size();i++)
+  for(unsigned i=0;i<res.size();i++)
   {
     if(res[i].size()==adg)
@@ -1452 +1454 @@
     return (idd);
   }
+  pDelete(&e);
   idd=idMaken(pbv);
   return(idd);
@@ -1547 +1550 @@
 static ideal psubset(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);
@@ -1592 +1600 @@
 {
   int co=1;
-  poly p,q=0;
+  poly p,q=NULL;
   for(int i=0;i<3;i++)
   {
@@ -1599 +1607 @@
       if(i==1) co=-1;
       p = pOne();pSetExp(p, vbase[i], 1);pSetm(p);pSetCoeff(p, nInit(co));
-    }
-    else p=0;
       q = pAdd(q, p);
+    }
     co=1;
   }
@@ -1611 +1618 @@
   ideal id_re=idInit(1,1);
   poly p;
-  int i,lv=vecs.size();
-  for(i=0;i<lv;i++)
+  unsigned lv=vecs.size();
+  for(unsigned i=0;i<lv;i++)
   {
     p=pMake3(vecs[i]);
@@ -3807 +3814 @@
          res->rtyp =INTVEC_CMD;
          res->data =gradedpiece1n(h1,p,q);
+         return FALSE;
        }
      }
   }
-  return false;
+  return TRUE;
 }