Changeset 4969680 in git for Singular

Timestamp:

Feb 16, 2024, 11:48:39 AM (3 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

ed6cce7a3936eb40676c2649aaa5fc9749dc2fea

Parents:

42ac6b15560fb5e2de442989e1b5875144ffc0d3

Message:

cohomo.cc p3

File:

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

Singular/dyn_modules/cohomo/cohomo.cc

@@ -942 +942 @@
 static ideal finda(ideal h,poly S,int ddeg)
 {
-  ideal h2=id_complement(h), aset=idInit(1,1);
-  int i,deg1=pTotaldegree(S);
+  ideal aset=idInit(1,1);
+  int deg1=pTotaldegree(S);
   int tdeg=deg1+ddeg;
   if(tdeg!=0)
@@ -950 +950 @@
     std::vector<std::vector<int> > hvs=supports(h);
     ideal ia=id_MaxIdeal(tdeg, currRing);
-    for(i=0;i<IDELEMS(ia);i++)
+    for(int i=0;i<IDELEMS(ia);i++)
     {
       v=support1(ia->m[i]);
@@ -957 +957 @@
       {
         idInsertPoly(aset, ia->m[i]);
+        ia->m[i]=NULL;
       }
     }
     idSkipZeroes(aset);
+    idDelete(&ia);
   }
   else
@@ -997 +999 @@
     }
   }
+  idDelete(&h2);
   return vecs;
 }
@@ -1096 +1099 @@
 static std::vector<int> freevars(int n,  std::vector<int> bset, std::vector<std::vector<int> > gset)
 {
-  int ql=gset.size(), bl=bset.size(), i;
+  int ql=gset.size(), bl=bset.size();
   std::vector<int> mvar, fvar;
-  for(i=0;i<bl;i++)
+  for(int i=0;i<bl;i++)
   {
     mvar.push_back(bset[i]);
   }
-  for(i=0;i<ql;i++)
+  for(int i=0;i<ql;i++)
   {
     mvar.push_back(gset[i][0]);
   }
-  for(i=1;i<=n;i++)
+  for(int i=1;i<=n;i++)
   {
     if(!IsinL(i,mvar))
@@ -1119 +1122 @@
 static std::vector<int> fvarsvalue(int vnum, std::vector<int> fvars)
 {
-  int i;
   std::vector<int> fset=fvars;
-  for(i=0;i<fset.size();i++)
+  for(int i=0;i<fset.size();i++)
   {
     if(fset[i]==vnum)
@@ -1137 +1139 @@
 {
   std::vector<int> badset=bset;
-  int i,j,m, bl=bset.size(), gl=gset.size();
-  for(i=0;i<bl;i++)
+  int m, bl=bset.size(), gl=gset.size();
+  for(int i=0;i<bl;i++)
   {
     m=badset[i];
-    for(j=0;j<gl;j++)
+    for(int j=0;j<gl;j++)
     {
       if(gset[j][0]==m && !IsinL(gset[j][1],badset))
@@ -1180 +1182 @@
 static std::vector<int> vecbase1(int num, std::vector<int> oset)
 {
-  int i;
   std::vector<int> base;
-  for(i=0;i<num;i++)
+  for(int i=0;i<num;i++)
   {
     if(IsinL(i+1,oset))
@@ -1196 +1197 @@
 static std::vector<int> make0(int n)
 {
-  int i;
   std::vector<int> vec;
-  for(i=0;i<n;i++)
+  for(int i=0;i<n;i++)
   {
     vec.push_back(0);
@@ -1209 +1209 @@
 static std::vector<int> make1(int n)
 {
-  int i;
   std::vector<int> vec;
-  for(i=0;i<n;i++)
+  for(int i=0;i<n;i++)
   {
     vec.push_back(1);
@@ -1238 +1237 @@
 static std::vector<std::vector<int> > ofindbases(int num,  std::vector<int> bset,std::vector<std::vector<int> > gset)
 {
-  int i,m;
   std::vector<std::vector<int> > bases;
   std::vector<int> fvars=freevars(num,   bset,  gset), base1;
@@ -1248 +1246 @@
   else
   {
-    for(i=0;i<fvars.size();i++)
-    {
-      m=fvars[i];
+    for(unsigned i=0;i<fvars.size();i++)
+    {
+      int m=fvars[i];
       base1=ofindbases1(num, m, bset, gset);
       bases.push_back(base1);
@@ -1304 +1302 @@
 static std::vector<std::vector<int> > links(poly a, ideal h)
 {
-  int i;
   std::vector<std::vector<int> > lk,X=supports(h);
   std::vector<int> U,In,av=support1(a);
-  for(i=0;i<X.size();i++)
+  for(int i=0;i<X.size();i++)
   {
     U=vecUnion(av,X[i]);