Changeset 246a66 in git

Timestamp:

Feb 15, 2024, 2:47:17 PM (3 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

083f003065d6d79ac5e85e9da00f276e58a5aacb

Parents:

c7c2d4b890e7240d503735adc7d3f2ab61cd4adf

Message:

cohomo.cc p1

File:

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

Singular/dyn_modules/cohomo/cohomo.cc

@@ -49 +49 @@
 static void listprint(std::vector<int> vec)
 {
-  unsigned i;
-  for(i=0;i<vec.size();i++)
+  for(unsigned i=0;i<vec.size();i++)
   {
     Print("   _[%d]=%d\n",i+1,vec[i]);
@@ -65 +64 @@
 static void listsprint(std::vector<std::vector<int> > posMat)
 {
-  unsigned i;
-  for(i=0;i<posMat.size();i++)
+  for(unsigned i=0;i<posMat.size();i++)
   {
     Print("[%d]:\n",i+1);
     listprint(posMat[i]);
-    Print("\n");
+    PrintLn();
     PrintLn();
   }
@@ -84 +82 @@
 static void id_print(ideal h)
 {
-  int i;
-  for(i=0;i<IDELEMS(h);i++)
+  for(int i=0;i<IDELEMS(h);i++)
   {
     Print(" [%d]\n",i+1);
@@ -116 +113 @@
     Print("[%d]:\n",i+1);
     lpprint(pvs[i]);
-    Print("\n");
+    PrintLn();
     PrintLn();
   }
@@ -132 +129 @@
 static bool IsinL(int a, std::vector<int> vec)
 {
-  unsigned i;
-  for(i=0;i<vec.size();i++)
+  for(unsigned i=0;i<vec.size();i++)
   {
     if(a==vec[i])
@@ -147 +143 @@
 static std::vector<int> vecIntersection(std::vector<int> p, std::vector<int> q)
 {
-  unsigned i;
   std::vector<int> inte;
-  for(i=0;i<p.size();i++)
+  for(unsigned i=0;i<p.size();i++)
   {
     if(IsinL(p[i],q))
@@ -160 +155 @@
 static bool vsubset(std::vector<int> vec1, std::vector<int> vec2)
 {
-  int i;
   if(vec1.size()>vec2.size())
     return false;
-  for(i=0;i<vec1.size();i++)
+  for(int i=0;i<vec1.size();i++)
   {
     if(!IsinL(vec1[i],vec2))
@@ -186 +180 @@
 static bool vInvsl(std::vector<int> vec, std::vector<std::vector<int> > vecs)
 {
-  int i;
-  for(i=0;i<vecs.size();i++)
+  for(int i=0;i<vecs.size();i++)
   {
     if(vEvl(vec,vecs[i]))
@@ -201 +194 @@
 {
   std::vector<int> vec=vec1;
-  unsigned i;
-  for(i=0;i<vec2.size();i++)
+  for(unsigned i=0;i<vec2.size();i++)
   {
     if(!IsinL(vec2[i],vec))
@@ -225 +217 @@
 static std::vector<std::vector<int> > vsMinusv(std::vector<std::vector<int> > vecs, std::vector<int> vec)
 {
-  int i;
   std::vector<std::vector<int> > rem;
-  for(i=0;i<vecs.size();i++)
+  for(int i=0;i<vecs.size();i++)
   {
     if(!vEvl(vecs[i],vec))
@@ -239 +230 @@
 static std::vector<std::vector<int> > vsUnion(std::vector<std::vector<int> > vs1, std::vector<std::vector<int> > vs2)
 {
-  int i;
   std::vector<std::vector<int> > vs=vs1;
-  for(i=0;i<vs2.size();i++)
+  for(int i=0;i<vs2.size();i++)
   {
     if(!vInvsl(vs2[i],vs))
@@ -253 +243 @@
 static std::vector<std::vector<int> > vsIntersection(std::vector<std::vector<int> > vs1, std::vector<std::vector<int> > vs2)
 {
-  int i;
   std::vector<std::vector<int> > vs;
-  for(i=0;i<vs2.size();i++)
+  for(int i=0;i<vs2.size();i++)
   {
     if(vInvsl(vs2[i],vs1))
@@ -271 +260 @@
 static std::vector<int> support1(poly p)
 {
-  int j;
   std::vector<int> supset;
-  if(p==0) return supset;
-  for(j=1;j<=rVar(currRing);j++)
+  if(p==NULL) return supset;
+  for(int j=1;j<=rVar(currRing);j++)
   {
     if(pGetExp(p,j)>0)
@@ -304 +292 @@
 static std::vector<int> support2(poly p)
 {
-  int j;
   poly q;
   std::vector<int> supset;
-  for(j=1;j<=rVar(currRing);j++)
-  {
-    q=pCopy(p);
+  for(int j=1;j<=rVar(currRing);j++)
+  {
+    q=p;
     while (q!=NULL)
     {
@@ -317 +304 @@
         break;
       }
-      q=pNext(q);
+      pIter(q);
     }
   }
@@ -343 +330 @@
 static poly pMake(std::vector<int> vbase)
 {
-  int n=vbase.size(); poly p,q=0;
+  int n=vbase.size(); poly p,q;
+  q=NULL;
   for(int i=0;i<n;i++)
   {
@@ -358 +346 @@
 static ideal idMake(std::vector<std::vector<int> > vecs)
 {
-  int lv=vecs.size(), i;
+  int lv=vecs.size();
   poly p;
   ideal id_re=idInit(1,1);
-  for(i=0;i<lv;i++)
+  for(int i=0;i<lv;i++)
   {
     p=pMake(vecs[i]);
@@ -379 +367 @@
   ideal idq=kNF(gb,NULL,h1);
   idSkipZeroes(idq);
+  idDelete(&gb);
   return idq;
 }
@@ -386 +375 @@
 static int pcoef(poly p, int m)
 {
-  int i,co; poly q=pCopy(p);
-  for(i=1;i<=currRing->N;i++)
+  int co; poly q=p;
+  for(int i=1;i<=currRing->N;i++)
   {
     if(p_GetExp(q,m,currRing)!=0)
@@ -405 +394 @@
 static bool vInp(int m,poly p)
 {
-  poly q=pCopy(p);
+  poly q=p;
   while (q!=NULL)
   {
@@ -420 +409 @@
 static std::vector<int> vMake(poly p)
 {
-  int i;
   std::vector<int> vbase;
-  for(i=1;i<=currRing->N;i++)
+  for(int i=1;i<=currRing->N;i++)
   {
     if(vInp(i,p))
@@ -441 +429 @@
   std::vector<int> vec;
   std::vector<std::vector<int> > vecs;
-  int i;
-  for(i=0;i<IDELEMS(h);i++)
+  for(int i=0;i<IDELEMS(h);i++)
   {
     vec=vMake(h->m[i]);
@@ -456 +443 @@
   ideal h1=idMake(vec1), h2=idMake(vec2);
   ideal h=idmodulo(h1,h2);
+  idDelete(&h1);
+  idDelete(&h2);
   std::vector<std::vector<int> > vecs= vsMake(h);
   return vecs;
@@ -934 +923 @@
 static ideal finda(ideal h,poly S,int ddeg)
 {
-  poly e=pOne();
   ideal h2=id_complement(h), aset=idInit(1,1);
   int i,deg1=pTotaldegree(S);
@@ -954 +942 @@
     idSkipZeroes(aset);
   }
-  else idInsertPoly(aset,e);
+  else
+  {
+    poly e=pOne();
+    idInsertPoly(aset,e);
+  }
   return(aset);
 }