Changeset ed6b03 in git

Timestamp:

Jun 8, 2022, 2:05:49 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

762afe1b4c00a799ba78e7d2cf486e090c6a5333

Parents:

1ead6f7a96c0b74c88cce4a314fd1d652c7fb0af

Message:

compiler warnings (cohomo.cc)

File:

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

Singular/dyn_modules/cohomo/cohomo.cc

@@ -656 +656 @@
 int pvert(poly p)
 {
-  int i, j, vert=0;
+  int i, vert=0;
   for(i=currRing->N;i>0;i--)
   {
@@ -781 +781 @@
 ideal sfreemon(ideal h,int deg)
 {
-  int i,j,t;
+  int j;
   ideal temp;
   temp=idInit(1,1);
@@ -808 +808 @@
 ideal id_sfmon(ideal h)
 {
-  ideal asfmons,sfmons,mons,p;
+  ideal asfmons,sfmons,mons;
   int j, vert=idvert(h);
   mons=id_MaxIdeal(1, currRing);
@@ -856 +856 @@
 bool IsInX(poly p,ideal X)
 {
-  int i,j;
+  int i;
   for(i=0;i<IDELEMS(X);i++)
   {
@@ -878 +878 @@
 {
   ideal h,qrh;
-  int i;
   h=idAdd(h1,h2);
   qrh=scKBase(deg,h);
@@ -910 +909 @@
 ideal idsrRing(ideal h)
 {
-  int max,i,j,n;
+  int i,n;
   ideal pp,qq,rsr,ppp,hc=idCopy(h);
   for(i=1;i<=rVar(currRing);i++)
@@ -990 +989 @@
 ideal IsSimplex(ideal h)
 {
-  int i,j,ifbreak=0,max=id_maxdeg(h);
+  int i,max=id_maxdeg(h);
   poly e=pOne();
   ideal id_re, id_so=idCopy(h);
@@ -1107 +1106 @@
   poly e=pOne();
   ideal h2=id_complement(h), aset=idInit(1,1);
-  int i,j,deg1=pTotaldegree(S);
+  int i,deg1=pTotaldegree(S);
   int tdeg=deg1+ddeg;
   if(tdeg!=0)
@@ -1420 +1419 @@
 std::vector<int> ofindbases1(int num, int vnum, std::vector<int> bset,std::vector<std::vector<int> > gset)
 {
-  int i,j,m;
   std::vector<std::vector<int> > goodset;
   std::vector<int> fvars=freevars(num,   bset,  gset), oset, base;
@@ -1444 +1442 @@
 std::vector<std::vector<int> > ofindbases(int num,  std::vector<int> bset,std::vector<std::vector<int> > gset)
 {
-  int i,j,m;
+  int i,m;
   std::vector<std::vector<int> > bases;
   std::vector<int> fvars=freevars(num,   bset,  gset), base1;
@@ -1478 +1476 @@
 std::vector<std::vector<int> > eli2(int num, std::vector<int> bset,std::vector<std::vector<int> > gset)
 {
-  int i,j;
   std::vector<int> badset;
   std::vector<std::vector<int> > goodset, solve;
@@ -1572 +1569 @@
 ideal p_a(ideal h)
 {
-  poly e=pOne(), p;
+  poly p;
   int i,j,deg=0,deg0;
   ideal aset=idCopy(h),ia,h1=idsrRing(h);
@@ -1692 +1689 @@
   std::vector<int> vert=vertset(lk), bv;
   res=b_subsets(vert);
-  int i, j, nu=res.size(), adg=pTotaldegree(a);
+  int i, adg=pTotaldegree(a);
   poly e=pOne();
   ideal idd=idInit(1,1);
@@ -1858 +1855 @@
 poly pMake3(std::vector<int> vbase)
 {
-  int n=vbase.size(),co=1;
+  int co=1;
   poly p,q=0;
   for(int i=0;i<3;i++)
@@ -1894 +1891 @@
 void equmab(int num)
 {
-  int i,j;
+  int i;
   //Print("There are %d new variables for equations solving.\n",num);
   ring r=currRing;
@@ -2123 +2120 @@
 {
   //ring r=currRing;
-  int i;
   //assume (LIB "presolve.lib");
   sleftv a;a.Init();
@@ -2153 +2149 @@
 std::vector<int> numfree(ideal h)
 {
-  int i,j,num=0;
+  int i,j;
   std::vector<int> fvar;
   for(j=1;j<=currRing->N;j++)
@@ -2326 +2322 @@
 std::vector<std::vector<int> > subspacet(std::vector<std::vector<int> > mv, std::vector<int> bv,std::vector<std::vector<int> > ntvs)
 {
-  int i,j;
   std::vector<int> alset=findalpha(mv,bv), subase;
   std::vector<std::vector<int> > subases;
-  for(i=0;i<alset.size();i++)
+  for(unsigned i=0;i<alset.size();i++)
   {
     subase=subspacet1(alset[i],ntvs);
@@ -2524 +2519 @@
 //returns true if pv union qv union av minus bv is in hvs
 //hvs is simplicial complex
-bool nabtconditionv(std::vector<std::vector<int> > hvs,  std::vector<int> pv, std::vector<int> qv, std::vector<int> av,  std::vector<int> bv)
+static bool nabtconditionv(std::vector<std::vector<int> > hvs,  std::vector<int> pv, std::vector<int> qv)
 {
   std::vector<int> v1;
@@ -2546 +2541 @@
     {
       var.clear();
-      if(nabtconditionv(hvs, Nv[i], Nv[j], av, bv))
+      if(nabtconditionv(hvs, Nv[i], Nv[j]))
       {
         var.push_back(i);
@@ -2786 +2781 @@
       for(j=i+1;j<n;j++)
       {
-        if(nabtconditionv(hvs,nv[i],nv[j],av,bv))
+        if(nabtconditionv(hvs,nv[i],nv[j]))
         {
           good=listsinsertlist(good,i+1,j+1);
@@ -2837 +2832 @@
 {
   ideal bi=findb(h),ai;
-  int mm=0,index=0;
+  int mm=0;
   id_print(bi);
   poly a,b;
@@ -2986 +2981 @@
 ideal genst(ideal h, poly a, poly b)
 {
-  int i,j;
   std::vector<std::vector<int> > hvs=supports(h),mv,mts;
   std::vector<int> av=support1(a), bv=support1(b);
@@ -2993 +2987 @@
   std::vector<std::vector<poly> > pvs=idMakei(mv,mts);
   ideal gens=idInit(1,1);
-  for(i=0;i<pvs.size();i++)
+  for(unsigned i=0;i<pvs.size();i++)
   {
     idInsertPoly(gens,pvs[i][0]);
@@ -3122 +3116 @@
         pWrite(b);
         intvec *solve=gradedpiece2n(h, a, b);
+        delete solve;
         gp++;
       }
@@ -3226 +3221 @@
       for(j=i+1;j<n;j++)
       {
-        if(nabtconditionv(hvs,nv[i],nv[j],av,bv))
+        if(nabtconditionv(hvs,nv[i],nv[j]))
         {
           good=listsinsertlist(good,i+1,j+1);
@@ -3268 +3263 @@
 {
   t_start=clock();
-  int i,j,co;
   poly e=pOne();
   std::vector<int> av=support1(a),bv=support1(b),index, em;
@@ -3422 +3416 @@
 intvec * gradedpiece2nl(ideal h,poly a,poly b)
 {
-  int i,j,t;
   poly e=pOne();
   std::vector<int> av=support1(a), bv=support1(b), em;
@@ -3504 +3497 @@
 std::vector<std::vector<int> > triface(poly p, int vert)
 {
-  int i;
   std::vector<int> vec, fv=support1(p);
   std::vector<std::vector<int> > fvs0, fvs;
@@ -3511 +3503 @@
   fvs0=b_subsets(fv);
   fvs0=vsMinusv(fvs0,fv);
-  for(i=0;i<fvs0.size();i++)
+  for(unsigned i=0;i<fvs0.size();i++)
   {
     vec=fvs0[i];
@@ -3519 +3511 @@
   return (fvs);
 }
-
-
-
-
-
-
 
 // the size of p's support must be 3
@@ -3574 +3560 @@
 std::vector<int> commonedge(poly p, poly q)
 {
-  int i,j;
   std::vector<int> ev, fv1= support1(p), fv2= support2(q);
-  for(i=0;i<fv1.size();i++)
+  for(unsigned i=0;i<fv1.size();i++)
   {
     if(IsinL(fv1[i], fv2))
@@ -3588 +3573 @@
 {
   intvec *m;
-  int i,j;
+  int i;
   std::vector<int> dg=commonedge(p, q);
   int lg=dg.size();
@@ -3606 +3591 @@
 std::vector<std::vector<int> > tetraface(poly p, poly q, int vert)
 {
-  int i;
   std::vector<int> ev=commonedge(p, q), vec, fv1=support1(p), fv2=support1(q);
   std::vector<std::vector<int> > fvs1, fvs2, fvs;
@@ -3617 +3601 @@
   fvs2=vsUnion(fvs1, fvs2);
   fvs2=vsMinusv(fvs2, ev);
-  for(i=0;i<fvs2.size();i++)
+  for(unsigned i=0;i<fvs2.size();i++)
   {
     vec=fvs2[i];
@@ -3630 +3614 @@
 ideal triangulations2(ideal h, poly p, poly q, int vert)
 {
-  int i,j;
   std::vector<int> ev, fv1=support1(p), fv2=support1(q);
   std::vector<std::vector<int> > vecs=supports(h), vs1;
@@ -3649 +3632 @@
 std::vector<std::vector<int> > penface(poly p, poly q, poly g, int vert)
 {
-  int i, en=0;
+  int en=0;
   std::vector<int> ev1=commonedge(p, q), ev2=commonedge(p, g), ev3=commonedge(q, g), ind, vec, fv1=support1(p), fv2=support1(q), fv3=support1(g);
   std::vector<std::vector<int> > fvs1, fvs2, fvs3, fvs, evec;
@@ -3655 +3638 @@
   evec.push_back(ev2);
   evec.push_back(ev3);
-  for(i=0;i<evec.size();i++)
+  for(unsigned i=0;i<evec.size();i++)
   {
     if(evec[i].size()==2)
@@ -3674 +3657 @@
     fvs3=vsUnion(fvs3, fvs2);
     fvs3=vsUnion(fvs3, fvs1);
-    for(i=0;i<evec.size();i++)
+    for(unsigned i=0;i<evec.size();i++)
     {
       if(evec[i].size()==2)
@@ -3681 +3664 @@
       }
     }
-    for(i=0;i<fvs3.size();i++)
+    for(unsigned i=0;i<fvs3.size();i++)
     {
       vec=fvs3[i];
@@ -3695 +3678 @@
 ideal triangulations3(ideal h, poly p, poly q, poly g, int vert)
 {
-  int i,j;
   std::vector<int> ev1=commonedge(p, q), ev2=commonedge(p, g), ev3=commonedge(q, g), fv1=support1(p), fv2=support1(q), fv3=support1(g);
   std::vector<std::vector<int> > vecs=supports(h), vs1, evec;
@@ -3701 +3683 @@
   evec.push_back(ev2);
   evec.push_back(ev3);
-  for(i=0;i<evec.size();i++)
+  for(unsigned i=0;i<evec.size();i++)
   {
     if(evec[i].size()==2)
@@ -3722 +3704 @@
 int valency(ideal h, poly p)
 {
-  int i, val=0;
+  int val=0;
   std::vector<int> ev=support1(pCopy(p));
   int ver=ev[0];
 //PrintS("the vertex is :\n"); listprint(p);
   std::vector<std::vector<int> > vecs=supports(idCopy(h));
-  for(i=0;i<vecs.size();i++)
+  for(unsigned i=0;i<vecs.size();i++)
   {
     if(vecs[i].size()==2 && IsinL(ver, vecs[i]))
@@ -3772 +3754 @@
 std::vector<std::vector<int> > vsMinusvs(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(unsigned i=0;i<vs2.size();i++)
   {
     vs=vsMinusv(vs, vs2[i]);
@@ -3785 +3766 @@
 {
   std::vector<std::vector<int> >  sset, bv;
-  for(int i=0;i<vs.size();i++)
+  for(unsigned i=0;i<vs.size();i++)
   {
     bv=b_subsets(vs[i]);
@@ -3849 +3830 @@
 ideal c_New(ideal Io, ideal sig)
 {
-  poly p, q, g;
   std::vector<std::vector<int> > vs1=p_constant(Io, sig), vs2=p_change(sig), vs3=p_new(Io, sig), vsig=supports(sig), vs;
   std::vector<int> ev;
@@ -3890 +3870 @@
   std::vector<std::vector<int> > ss=supports(idCopy(Sigma)), fvs;
   std::vector<int> av=support1(a), intvec, vv;
-  for(int i=0;i<ss.size();i++)
+  for(unsigned i=0;i<ss.size();i++)
   {
     intvec=vecIntersection(ss[i], av);
@@ -3904 +3884 @@
 
 
-std::vector<std::vector<int> > phi2(poly a, ideal Xo, ideal Sigma, int vert)
+static std::vector<std::vector<int> > phi2(poly a, ideal Xo, ideal Sigma)
 {
 
@@ -3932 +3912 @@
   {
     lk1=phi1(a, Sigma);
-    lk2=phi2(a, Xo, Sigma, vert);
+    lk2=phi2(a, Xo, Sigma);
     lkn=vsMinusvs(lko, lk1);
     lkn=vsUnion(lkn, lk2);
@@ -3939 +3919 @@
   if(ord==3)
   {
-    lkn=phi2(a, Xo, Sigma, vert);
+    lkn=phi2(a, Xo, Sigma);
     return lkn;
   }
@@ -3955 +3935 @@
   std::vector<std::vector<int> > xvs=supports(idCopy(Xs)), bs=b_subsets(bv);
   bs=vsMinusv(bs, bv);
-  for(int i=0;i<bs.size();i++)
+  for(unsigned i=0;i<bs.size();i++)
   {
     if(!vInvsl(bs[i], xvs))
@@ -3988 +3968 @@
 int ifIso(poly p, poly q, poly f, poly g, poly a, poly b)
 {
-  int i;
   std::vector<int> va=support1(a), vb=support1(b), vp=support1(p),  vq=support1(q), vf=support1(f), vg=support1(g);
   std::vector<int>   v1=phimagel(vp, va, vb), v2=phimagel(vq, va, vb), v3=phimagel(vf, va, vb), v4=phimagel(vg, va, vb);
@@ -4004 +3983 @@
 {
   ideal h=idInit(1,1);
-  int i,j,eq=0;
+  int i;
   for(i=0;i<IDELEMS(I);i++)
   {
@@ -4030 +4009 @@
 {
   std::vector<int> vec;
-  for(int i=0;i<v1.size();i++)
+  for(unsigned i=0;i<v1.size();i++)
   {
     vec.push_back(v1[i]-v2[i]);
@@ -4040 +4019 @@
 std::vector<int> gdegree(poly a, poly b)
 {
-  int i,j;
+  int i;
   std::vector<int> av,bv;
   for(i=1;i<=currRing->N;i++)
@@ -4273 +4252 @@
 {
   intvec *m;
-  int i,j;
+  int i;
   std::vector<int> dg=gdegree(a,b);
   int lg=dg.size();