Changeset 82410d in git

Timestamp:

Nov 29, 2022, 2:46:42 PM (17 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f4e6d43624519771601ddc522f21526d0bd1d7a5

Parents:

07fefd7e1818a24a256b720bb0c7021058b855b9

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-11-29 14:46:42+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-11-29 14:48:29+01:00

Message:

simplify: static for cohomo

Location:

Singular/dyn_modules/cohomo

Files:

• cohomo.cc (modified) (218 diffs)
• cohomo.h (modified) (1 diff)

Singular/dyn_modules/cohomo/cohomo.cc

@@ -47 +47 @@
 /***************************print(only for debugging)***********************************************/
 //print vector of integers.
-void listprint(std::vector<int> vec)
+static void listprint(std::vector<int> vec)
 {
   unsigned i;
@@ -63 +63 @@
 
 //print vector of vectors of integers.
-void listsprint(std::vector<std::vector<int> > posMat)
+static void listsprint(std::vector<std::vector<int> > posMat)
 {
   unsigned i;
@@ -82 +82 @@
 
 //print ideal.
-void id_print(ideal h)
+static void id_print(ideal h)
 {
   int i;
@@ -95 +95 @@
 //only for T^2,
 //print vector of polynomials.
-void lpprint( std::vector<poly> pv)
+static void lpprint( std::vector<poly> pv)
 {
   for(unsigned i=0;i<pv.size();i++)
@@ -109 +109 @@
 }
 
-
-
 //print vector of vectors of polynomials.
-void lpsprint(std::vector<std::vector<poly> > pvs)
+static void lpsprint(std::vector<std::vector<poly> > pvs)
 {
   for(unsigned i=0;i<pvs.size();i++)
@@ -128 +126 @@
 }
 
-
-
-
-
-
-
-
-
-
 /*************operations for vectors (regard vectors as sets)*********/
 
 //returns true if integer n is in vector vec,
 //otherwise, returns false
-bool IsinL(int a, std::vector<int> vec)
+static bool IsinL(int a, std::vector<int> vec)
 {
   unsigned i;
@@ -154 +143 @@
 }
 
-
-
-
-
 //returns intersection of vectors p and q,
 //returns empty if they are disjoint
-std::vector<int> vecIntersection(std::vector<int> p, std::vector<int> q)
+static std::vector<int> vecIntersection(std::vector<int> p, std::vector<int> q)
 {
   unsigned i;
@@ -172 +157 @@
 }
 
-
-
-
-
-
-
-
-
-//returns true if vec1 is equal to vec2 (strictly equal, including the order)
-//is not used
-bool vEv(std::vector<int> vec1,std::vector<int> vec2)
-{
-  unsigned j, lg1=vec1.size(),lg2=vec2.size();
-  if(lg1!=lg2)
-  {
-    return false;
-  }
-  else
-  {
-    for(j=0;j<vec1.size();j++)
-    {
-      if(vec1[j]!=vec2[j])
-        return false;
-    }
-  }
-  return true;
-}
-
-
-
-
 //returns true if vec1 is contained in vec2
-bool vsubset(std::vector<int> vec1, std::vector<int> vec2)
+static bool vsubset(std::vector<int> vec1, std::vector<int> vec2)
 {
   int i;
@@ -218 +172 @@
 
 //not strictly equal(order doesn't matter)
-bool vEvl(std::vector<int> vec1, std::vector<int> vec2)
+static bool vEvl(std::vector<int> vec1, std::vector<int> vec2)
 {
   if(vec1.size()==0 && vec2.size()==0)
@@ -227 +181 @@
 }
 
-
 //the length of vec must be same to it of the elements of vecs
 //returns true if vec is as same as some element of vecs ((not strictly same))
 //returns false if vec is not in vecs
-bool vInvsl(std::vector<int> vec, std::vector<std::vector<int> > vecs)
+static bool vInvsl(std::vector<int> vec, std::vector<std::vector<int> > vecs)
 {
   int i;
@@ -244 +197 @@
 }
 
-
-//the length of vec must be same to it of the elements of vecs (strictly same)
-//returns the position of vec in vecs,
-//returns -1 if vec is not in vecs
-//actrually is not used.
-int vInvs(std::vector<int> vec, std::vector<std::vector<int> > vecs)
-{
-  int i;
-  for(i=0;i<vecs.size();i++)
-  {
-    if(vEv(vec,vecs[i]))
-    {
-      return i+1;
-    }
-  }
-  return -1;
-}
-
 //returns the union of two vectors(as the union of sets)
-std::vector<int> vecUnion(std::vector<int> vec1, std::vector<int> vec2)
+static std::vector<int> vecUnion(std::vector<int> vec1, std::vector<int> vec2)
 {
   std::vector<int> vec=vec1;
@@ -275 +210 @@
 }
 
-std::vector<int> vecMinus(std::vector<int> vec1,std::vector<int> vec2)
+static std::vector<int> vecMinus(std::vector<int> vec1,std::vector<int> vec2)
 {
   std::vector<int> vec;
@@ -288 +223 @@
 }
 
-std::vector<std::vector<int> > vsMinusv(std::vector<std::vector<int> > vecs, std::vector<int> vec)
+static std::vector<std::vector<int> > vsMinusv(std::vector<std::vector<int> > vecs, std::vector<int> vec)
 {
   int i;
@@ -302 +237 @@
 }
 
-
-std::vector<std::vector<int> > vsUnion(std::vector<std::vector<int> > vs1, std::vector<std::vector<int> > vs2)
+static std::vector<std::vector<int> > vsUnion(std::vector<std::vector<int> > vs1, std::vector<std::vector<int> > vs2)
 {
   int i;
@@ -317 +251 @@
 }
 
-
-
-
-
-
-std::vector<std::vector<int> > vsIntersection(std::vector<std::vector<int> > vs1, std::vector<std::vector<int> > vs2)
+static std::vector<std::vector<int> > vsIntersection(std::vector<std::vector<int> > vs1, std::vector<std::vector<int> > vs2)
 {
   int i;
@@ -336 +265 @@
 }
 
-
-
-
-
 /*************************************for transition between ideal and vectors******************************************/
 
 //P should be monomial,
 // vector version of poly support(poly p)
-std::vector<int> support1(poly p)
+static std::vector<int> support1(poly p)
 {
   int j;
@@ -359 +284 @@
 }
 
-
-
-
-
-
 //simplicial complex(the faces set is ideal h)
-std::vector<std::vector<int> >  supports(ideal h)
+static std::vector<std::vector<int> >  supports(ideal h)
 {
   std::vector<std::vector<int> > vecs;
@@ -380 +300 @@
 }
 
-
-
-
 // only for eqsolve1
 // p could be any polynomial
-std::vector<int> support2(poly p)
+static std::vector<int> support2(poly p)
 {
   int j;
@@ -406 +323 @@
 }
 
-
-
 //the supports of ideal
-std::vector<std::vector<int> >  supports2(ideal h)
+static std::vector<std::vector<int> >  supports2(ideal h)
 {
   std::vector<std::vector<int> > vecs;
@@ -423 +338 @@
   return vecs;
 }
+
 //convert the vector(vbase[i] are the coefficients of x_{i+1}) to a polynomial w.r.t. current ring
 //vector vbase has length of currRing->N.
-poly pMake(std::vector<int> vbase)
+static poly pMake(std::vector<int> vbase)
 {
   int n=vbase.size(); poly p,q=0;
@@ -435 +351 @@
       q = pAdd(q, p);
     }
-
   }
   return q;
 }
 
-
-
-
 //convert the vectors to a ideal(for T^1)
-ideal idMake(std::vector<std::vector<int> > vecs)
+static ideal idMake(std::vector<std::vector<int> > vecs)
 {
   int lv=vecs.size(), i;
@@ -458 +370 @@
 }
 
-
-
 /*****************************quotient ring of two ideals*********************/
 
 //the quotient ring of h1 respect to h2
-ideal idmodulo(ideal h1,ideal h2)
+static ideal idmodulo(ideal h1,ideal h2)
 {
   ideal gb=kStd(h2,NULL,testHomog,NULL,NULL,0,0,NULL);
@@ -474 +384 @@
 //returns the coeff of the monomial of polynomial p which involves the mth varialbe
 //assume the polynomial p has form of y1+y2+...
-int pcoef(poly p, int m)
+static int pcoef(poly p, int m)
 {
   int i,co; poly q=pCopy(p);
@@ -493 +403 @@
 
 //returns true if p involves the mth variable of the current ring
-bool vInp(int m,poly p)
+static bool vInp(int m,poly p)
 {
   poly q=pCopy(p);
@@ -507 +417 @@
 }
 
-
-
 //returns the vector w.r.t. polynomial p
-std::vector<int> vMake(poly p)
+static std::vector<int> vMake(poly p)
 {
   int i;
@@ -528 +436 @@
 }
 
-
 //returns the vectors w.r.t. ideal h
-std::vector<std::vector<int> > vsMake(ideal h)
+static std::vector<std::vector<int> > vsMake(ideal h)
 {
   std::vector<int> vec;
@@ -543 +450 @@
 }
 
-
 //the quotient ring of two ideals which are represented by vectors,
 //the result is also represented by vector.
-std::vector<std::vector<int> > vecqring(std::vector<std::vector<int> > vec1, std::vector<std::vector<int> > vec2)
+static std::vector<std::vector<int> > vecqring(std::vector<std::vector<int> > vec1, std::vector<std::vector<int> > vec2)
 {
   ideal h1=idMake(vec1), h2=idMake(vec2);
@@ -554 +460 @@
 }
 
-
-
 /****************************************************************/
 //construct a monomial based on the support of it
 //returns a squarefree monomial
-poly pMaken(std::vector<int> vbase)
+static poly pMaken(std::vector<int> vbase)
 {
   int n=vbase.size();
@@ -573 +477 @@
 
 // returns a ideal according to a set of supports
-ideal idMaken(std::vector<std::vector<int> > vecs)
+static ideal idMaken(std::vector<std::vector<int> > vecs)
 {
   ideal id_re=idInit(1,1);
@@ -588 +492 @@
 }
 
-
-
 /********************************new version for stanley reisner ideal ***********************************************/
 
-
-std::vector<std::vector<int> > b_subsets(std::vector<int> vec)
+static std::vector<std::vector<int> > b_subsets(std::vector<int> vec)
 {
   int i,j;
@@ -618 +519 @@
 }
 
-
 //the number of the variables
-int idvert(ideal h)
+static int idvert(ideal h)
 {
   int i, j, vert=0;
@@ -639 +539 @@
 }
 
-
-
-
-int pvert(poly p)
+static int pvert(poly p)
 {
   int i, vert=0;
@@ -656 +553 @@
 }
 
-
 /*
 //full complex
-std::vector<std::vector<int> > fullcomplex(ideal h)
+static std::vector<std::vector<int> > fullcomplex(ideal h)
 {
   int vert=vertnum(h), i, j;
@@ -671 +567 @@
   fmons=b_subsets(pre);
   return fmons;
-
 }*/
-
 
 /*
 //all the squarefree monomials whose degree is less or equal to n
-std::vector<std::vector<int> > sfrmons(ideal h, int n)
+static std::vector<std::vector<int> > sfrmons(ideal h, int n)
 {
   int vert=vertnum(h), i, j, time=0;
@@ -699 +593 @@
   }
   return fmons;
-
 }
 */
 
 /*
-ideal id_complement(ideal h)
+static ideal id_complement(ideal h)
 {
   int i,j;
@@ -722 +615 @@
 
 //h1 minus h2
-ideal idMinus(ideal h1,ideal h2)
+static ideal idMinus(ideal h1,ideal h2)
 {
   ideal h=idInit(1,1);
@@ -746 +639 @@
 }
 
-
-
 //If poly P is squarefree, returns 1
 //returns 0 otherwise,
-bool p_Ifsfree(poly P)
+static bool p_Ifsfree(poly P)
 {
   int i,sf=1;
@@ -764 +655 @@
 }
 
-
-
 //returns the set of all squarefree monomials of degree deg in ideal h
-ideal sfreemon(ideal h,int deg)
+static ideal sfreemon(ideal h,int deg)
 {
   int j;
@@ -786 +675 @@
 }
 
-
-
-
-
-
-
 //full simplex represented by ideal.
 //(all the squarefree monomials over the polynomial ring)
-ideal id_sfmon(ideal h)
+static ideal id_sfmon(ideal h)
 {
   ideal asfmons,sfmons,mons;
@@ -809 +692 @@
 }
 
-
-
-
-
-
 //if the input ideal is simplicial complex, returns the stanley-reisner ideal,
 //if the input ideal is stanley-reisner ideal, returns the monomial ideal according to simplicial complex.
 //(nonfaces and faces).
 //returns the complement of the ideal h (consisting of only squarefree polynomials)
-ideal id_complement(ideal h)
+static ideal id_complement(ideal h)
 {
   int j, vert=idvert(h);
@@ -837 +715 @@
 }
 
-
-
-
 //Returns true if p is one of the generators of ideal X
 //returns false otherwise
-bool IsInX(poly p,ideal X)
+static bool IsInX(poly p,ideal X)
 {
   int i;
@@ -857 +732 @@
 }
 
-
-
-
-
-
 //returns the monomials in the quotient ring R/(h1+h2) which have degree deg.
-ideal qringadd(ideal h1, ideal h2, int deg)
+static ideal qringadd(ideal h1, ideal h2, int deg)
 {
   ideal h,qrh;
@@ -871 +741 @@
 }
 
-
-
-
 //returns the maximal degree of the monomials in ideal h
-int id_maxdeg(ideal h)
+static int id_maxdeg(ideal h)
 {
   int i,max;
@@ -887 +754 @@
 }
 
-
-
-
-
-
-
 //input ideal h (a squarefree monomial ideal) is the ideal associated to simplicial complex,
 //and returns the Stanley-Reisner ideal(minimal generators)
-ideal idsrRing(ideal h)
+static ideal idsrRing(ideal h)
 {
   int i,n;
@@ -923 +784 @@
 }
 
-
-
 //returns the set of all the polynomials could divide p
-ideal SimFacset(poly p)
+static ideal SimFacset(poly p)
 {
   int i,j,max=pTotaldegree(p);
@@ -942 +801 @@
       }
     }
-
   }
   idSkipZeroes(id_re);
@@ -948 +806 @@
 }
 
-
-
-ideal idadda(ideal h1, ideal h2)
+static ideal idadda(ideal h1, ideal h2)
 {
   ideal h=idInit(1,1);
@@ -970 +826 @@
   return h;
 }
-
 
 //complicated version
 //(returns false if it is not a simplicial complex and print the simplex)
 //input h is need to be at least part of faces
-ideal IsSimplex(ideal h)
+static ideal IsSimplex(ideal h)
 {
   int i,max=id_maxdeg(h);
@@ -993 +848 @@
 }
 
-
 //input is the subset of the Stainley-Reisner ideal
 //returns the faces
 //is not used
-ideal complementsimplex(ideal h)
+static ideal complementsimplex(ideal h)
 {
   int i,j;poly p,e=pOne();
@@ -1020 +874 @@
 }
 
-
-
-int dim_sim(ideal h)
+static int dim_sim(ideal h)
 {
   int dim=pTotaldegree(h->m[0]), i;
@@ -1035 +887 @@
 }
 
-
-int num4dim(ideal h, int n)
+static int num4dim(ideal h, int n)
 {
   int num=0;
@@ -1049 +900 @@
 }
 
-
-
 /********************Procedures for T1(M method and N method) ***********/
-
-
-
-
 
 //h is ideal( monomial ideal) associated to simplicial complex
@@ -1061 +906 @@
 //at least one monomial in Stanley-Reisner ring)
 //not so efficient
-ideal findb(ideal h)
+static ideal findb(ideal h)
 {
   ideal ib=id_sfmon(h), nonf=id_complement(h), bset=idInit(1,1);
@@ -1081 +926 @@
   return bset;
 }
-
-
-
 
 //h is ideal(monomial ideal associated to simplicial complex
@@ -1090 +932 @@
 //3.x^a and x^a have disjoint supports
 //returns all the possible x^a according conditions 1. 2. 3.
-ideal finda(ideal h,poly S,int ddeg)
+static ideal finda(ideal h,poly S,int ddeg)
 {
   poly e=pOne();
@@ -1116 +958 @@
 }
 
-
-
-
-
-
-
-
 //returns true if support(p) union support(a) minus support(b) is face,
 //otherwise returns false
 //(the vector version of mabcondition)
-bool mabconditionv(std::vector<std::vector<int> > hvs,std::vector<int> pv,std::vector<int> av,std::vector<int> bv)
+static bool mabconditionv(std::vector<std::vector<int> > hvs,std::vector<int> pv,std::vector<int> av,std::vector<int> bv)
 {
   std::vector<int> uv=vecUnion(pv,av);
@@ -1137 +972 @@
 }
 
-
 // returns the set of nonfaces p where mabconditionv(h, p, a, b) is true
-std::vector<std::vector<int> > Mabv(ideal h,poly a,poly b)
+static std::vector<std::vector<int> > Mabv(ideal h,poly a,poly b)
 {
   std::vector<int> av=support1(a), bv=support1(b), pv, vec;
@@ -1160 +994 @@
 
 //subroutine for soleli1
-std::vector<int> eli1(std::vector<int> eq1,std::vector<int> eq2)
+static std::vector<int> eli1(std::vector<int> eq1,std::vector<int> eq2)
 {
   int i,j;
@@ -1179 +1013 @@
 /*
 //get triangular form(eqs.size()>0)
-std::vector<std::vector<int> > soleli1( std::vector<std::vector<int> > eqs)
+static std::vector<std::vector<int> > soleli1( std::vector<std::vector<int> > eqs)
 {
   int i,j;
@@ -1203 +1037 @@
 }*/
 //make sure the first element is smaller that the second one
-std::vector<int> keeporder(  std::vector<int> vec)
+static std::vector<int> keeporder(  std::vector<int> vec)
 {
   std::vector<int> yaya;
@@ -1216 +1050 @@
 }
 
-
-std::vector<std::vector<int> > soleli1( std::vector<std::vector<int> > eqs)
+static std::vector<std::vector<int> > soleli1( std::vector<std::vector<int> > eqs)
 {
   int i;
@@ -1247 +1080 @@
 }
 
-
-
 // input is a set of equations who is of triangular form(every equations has a form of x_i-x_j)
 // n is the number of variables
 //get the free variables and the dimension
-std::vector<int> freevars(int n,  std::vector<int> bset, std::vector<std::vector<int> > gset)
+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;
@@ -1271 +1102 @@
     }
   }
-    return fvar;
-}
-
+  return fvar;
+}
 
 //return the set of free variables except the vnum one
-std::vector<int> fvarsvalue(int vnum, std::vector<int> fvars)
+static std::vector<int> fvarsvalue(int vnum, std::vector<int> fvars)
 {
   int i;
@@ -1291 +1121 @@
 }
 
-
-
-
 //returns the simplified bset and gset
 //enlarge bset, simplify gset
-std::vector<std::vector<int> > vAbsorb( std::vector<int> bset,std::vector<std::vector<int> > gset)
+static std::vector<std::vector<int> > vAbsorb( std::vector<int> bset,std::vector<std::vector<int> > gset)
 {
   std::vector<int> badset=bset;
@@ -1338 +1165 @@
 }
 
-
-
-
-
-
 //the labels of new variables are started with 1
 //returns a vector of solution space according to index
-std::vector<int> vecbase1(int num, std::vector<int> oset)
+static std::vector<int> vecbase1(int num, std::vector<int> oset)
 {
   int i;
@@ -1359 +1181 @@
 }
 
-
-
 //returns a vector which has length of n,
 //and all the entries are 0.
-std::vector<int> make0(int n)
+static std::vector<int> make0(int n)
 {
   int i;
@@ -1374 +1194 @@
 }
 
-
 //returns a vector which has length of n,
 //and all the entries are 1.
-std::vector<int> make1(int n)
+static std::vector<int> make1(int n)
 {
   int i;
@@ -1388 +1207 @@
 }
 
-
-
-
 //input gset must be the triangular form after zero absorbing according to the badset,
 //bset must be the zero set after absorbing.
-std::vector<int> ofindbases1(int num, int vnum, std::vector<int> bset,std::vector<std::vector<int> > gset)
+static std::vector<int> ofindbases1(int num, int vnum, std::vector<int> bset,std::vector<std::vector<int> > gset)
 {
   std::vector<std::vector<int> > goodset;
@@ -1407 +1223 @@
 }
 
-
-
-
-
-
-
-
 //input gset must be the triangular form after zero absorbing according to the badset
 //bset must be the zero set after absorbing
-std::vector<std::vector<int> > ofindbases(int num,  std::vector<int> bset,std::vector<std::vector<int> > gset)
+static std::vector<std::vector<int> > ofindbases(int num,  std::vector<int> bset,std::vector<std::vector<int> > gset)
 {
   int i,m;
@@ -1440 +1249 @@
 }
 
-
-
-
-
-
-
-
 //gset is a set of equations which have forms of x_i-x_j
 //num is the number of varialbes also the length of the set which we need to consider
 //output is trigular form of gset and badset where x_i=0
-std::vector<std::vector<int> > eli2(int num, std::vector<int> bset,std::vector<std::vector<int> > gset)
+static std::vector<std::vector<int> > eli2(int num, std::vector<int> bset,std::vector<std::vector<int> > gset)
 {
   std::vector<int> badset;
@@ -1485 +1287 @@
 }
 
-
 /********************************************************************/
-
-
-
-
-
-
-
 /************************links***********************************/
 
-
 //returns the links of face a in simplicial complex X
-std::vector<std::vector<int> > links(poly a, ideal h)
+static std::vector<std::vector<int> > links(poly a, ideal h)
 {
   int i;
@@ -1520 +1313 @@
 }
 
-
-
-int redefinedeg(poly p, int  num)
+static int redefinedeg(poly p, int  num)
 {
   int deg=0, deg0;
@@ -1541 +1332 @@
 }
 
-
 // the degree of variables should be same
-ideal p_a(ideal h)
+static ideal p_a(ideal h)
 {
   poly p;
@@ -1577 +1367 @@
 }
 
-
 /*only for the exampels whose variables has degree more than 1*/
 /*ideal p_a(ideal h)
@@ -1613 +1402 @@
 }*/
 
-
-
-
-std::vector<std::vector<int> > id_subsets(std::vector<std::vector<int> > vecs)
-{
-  int i,j;
-  std::vector<std::vector<int> > vvs, res;
-  for(i=0;i<vecs.size();i++)
-  {
-    vvs=b_subsets(vecs[i]);
-    //listsprint(vvs);
-    for(j=0;j<vvs.size();j++)
-    {
-      if(!vInvsl(vvs[j],res))
-        res.push_back(vvs[j]);
-    }
-  }
-  //listsprint(res);
-  return (res);
-}
-
-
-
-
-std::vector<int> vertset(std::vector<std::vector<int> > vecs)
+static std::vector<int> vertset(std::vector<std::vector<int> > vecs)
 {
   int i,j;
@@ -1660 +1425 @@
 
 //smarter way
-ideal p_b(ideal h, poly a)
+static ideal p_b(ideal h, poly a)
 {
   std::vector<std::vector<int> > pbv,lk=links(a,h), res;
@@ -1685 +1450 @@
 /*//dump way to get pb
 // the degree of variables should be same
-ideal p_b(ideal h, poly a)
+static ideal p_b(ideal h, poly a)
 {
   std::vector<std::vector<int> > pbv,lk=links(a,h),res;
@@ -1733 +1498 @@
 }
 
-ideal p_b(ideal h, poly a)
+static ideal p_b(ideal h, poly a)
 {
   std::vector<std::vector<int> > pbv,lk=links(a,h),res;
@@ -1770 +1535 @@
 }*/
 
-
-
-
 //input is a squarefree monomial p
 //output is all the squarefree monomials which could divid p(including p itself?)
-ideal psubset(poly p)
+static ideal psubset(poly p)
 {
   int i,j,max=pTotaldegree(p);
@@ -1795 +1557 @@
 }
 
-
-
 //inserts a new vector which has two elements a and b into vector gset (which is a vector of vectors)
 //(especially for gradedpiece1 and gradedpiece1n)
-std::vector<std::vector<int> > listsinsertlist(std::vector<std::vector<int> > gset, int a, int b)
+static std::vector<std::vector<int> > listsinsertlist(std::vector<std::vector<int> > gset, int a, int b)
 {
   std::vector<int> eq;
@@ -1808 +1568 @@
 }
 
-
-
-
-
-std::vector<int> makeequation(int i,int j, int t)
+static std::vector<int> makeequation(int i,int j, int t)
 {
   std::vector<int> equation;
@@ -1822 +1578 @@
 }
 
-
-
-
-
 /****************************************************************/
 //only for solving the equations obtained from T^2
 //input should be a vector which has only 3 entries
-poly pMake3(std::vector<int> vbase)
+static poly pMake3(std::vector<int> vbase)
 {
   int co=1;
@@ -1847 +1599 @@
 }
 
-
-ideal idMake3(std::vector<std::vector<int> > vecs)
+static ideal idMake3(std::vector<std::vector<int> > vecs)
 {
   ideal id_re=idInit(1,1);
@@ -1865 +1616 @@
 
 //change the current ring to a new ring which is in num new variables
-void equmab(int num)
+static void equmab(int num)
 {
   int i;
@@ -1885 +1636 @@
 }
 
-
 //returns the trivial case of T^1
 //b must only contain one variable
-std::vector<int> subspace1(std::vector<std::vector<int> > mv, std::vector<int> bv)
+static std::vector<int> subspace1(std::vector<std::vector<int> > mv, std::vector<int> bv)
 {
   int i, num=mv.size();
@@ -1902 +1652 @@
 }
 
-
-
-
-
-
-
-
-
 /***************************only for T^2*************************************/
 //vbase only has two elements which records the position of the monomials in mv
 
-
-std::vector<poly> pMakei(std::vector<std::vector<int> > mv,std::vector<int> vbase)
+static std::vector<poly> pMakei(std::vector<std::vector<int> > mv,std::vector<int> vbase)
 {
   poly p;
@@ -1927 +1668 @@
 }
 
-
-
 // returns a ideal according to a set of supports
- std::vector<std::vector<poly> > idMakei(std::vector<std::vector<int> > mv,std::vector<std::vector<int> > vecs)
+static std::vector<std::vector<poly> > idMakei(std::vector<std::vector<int> > mv,std::vector<std::vector<int> > vecs)
 {
   int i,lv=vecs.size();
@@ -1948 +1687 @@
 /****************************************************************/
 
-
-
-
-
-
-
-
 //return the graded pieces of cohomology T^1 according to a,b
 //original method (only for debugging)
-void gradedpiece1(ideal h,poly a,poly b)
+static void gradedpiece1(ideal h,poly a,poly b)
 {
   int i,j,m;
@@ -2016 +1748 @@
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 //Returns true if b can divide p*q
-bool condition1for2(std::vector<int > pv,std::vector<int > qv,std::vector<int > bv)
+static bool condition1for2(std::vector<int > pv,std::vector<int > qv,std::vector<int > bv)
 {
   std::vector<int > vec=vecUnion(pv,qv);
@@ -2045 +1761 @@
 }
 
-
-
 //Returns true if support(p) union support(q) union support(s) union support(a) minus support(b) is face
-bool condition2for2(std::vector<std::vector<int> > hvs, std::vector<int> pv,  std::vector<int> qv, std::vector<int> sv, std::vector<int> av,  std::vector<int> bv)
+static bool condition2for2(std::vector<std::vector<int> > hvs, std::vector<int> pv,  std::vector<int> qv, std::vector<int> sv, std::vector<int> av,  std::vector<int> bv)
 {
   std::vector<int> vec=vecUnion(pv,qv);
@@ -2061 +1775 @@
 }
 
-
-
-
-
-
-bool condition3for2(std::vector<std::vector<int> > hvs, std::vector<int> pv,  std::vector<int> qv,  std::vector<int> av,  std::vector<int> bv)
+static bool condition3for2(std::vector<std::vector<int> > hvs, std::vector<int> pv,  std::vector<int> qv,  std::vector<int> av,  std::vector<int> bv)
 {
   std::vector<int> v1,v2,v3;
@@ -2083 +1792 @@
 }
 
-
-
-
-
-
-
-
-
 /****************solve the equations got from T^2*********************/
 
-ideal getpresolve(ideal h)
+static ideal getpresolve(ideal h)
 {
   //ring r=currRing;
@@ -2121 +1822 @@
 }
 
-
-
-std::vector<int> numfree(ideal h)
+static std::vector<int> numfree(ideal h)
 {
   int i,j;
@@ -2142 +1841 @@
 }
 
-
-
-
-
-std::vector<std::vector<int> > canonicalbase(int n)
+static std::vector<std::vector<int> > canonicalbase(int n)
 {
   std::vector<std::vector<int> > vecs;
@@ -2166 +1861 @@
 }
 
-
-
-
-
-std::vector<std::vector<int> > getvector(ideal h,int n)
+static std::vector<std::vector<int> > getvector(ideal h,int n)
 {
   std::vector<int> vec;
@@ -2234 +1925 @@
 
 //subspace of T2(find all the possible values of alpha)
-std::vector<int> findalpha(std::vector<std::vector<int> > mv, std::vector<int> bv)
+static std::vector<int> findalpha(std::vector<std::vector<int> > mv, std::vector<int> bv)
 {
   std::vector<int> alset;
@@ -2249 +1940 @@
 }
 
-std::vector<int> subspacet1(int num, std::vector<std::vector<int> > ntvs)
+static std::vector<int> subspacet1(int num, std::vector<std::vector<int> > ntvs)
 {
   int i, j, t, n=ntvs.size();
@@ -2275 +1966 @@
 }
 
-
-
-
 //subspace for T^2(mab method)
-std::vector<std::vector<int> > subspacet(std::vector<std::vector<int> > mv, std::vector<int> bv,std::vector<std::vector<int> > ntvs)
+static std::vector<std::vector<int> > subspacet(std::vector<std::vector<int> > mv, std::vector<int> bv,std::vector<std::vector<int> > ntvs)
 {
   std::vector<int> alset=findalpha(mv,bv), subase;
@@ -2293 +1981 @@
 }
 
-
-
-
-
-std::vector<std::vector<int> > mabtv(std::vector<std::vector<int> > hvs,  std::vector<std::vector<int> > Mv,   std::vector<int> av,  std::vector<int> bv)
+static std::vector<std::vector<int> > mabtv(std::vector<std::vector<int> > hvs,  std::vector<std::vector<int> > Mv,   std::vector<int> av,  std::vector<int> bv)
 {
   std::vector<int> v1,var;
@@ -2318 +2002 @@
 }
 
-
-
-
 //fix the problem of the number of the new variables
 //original method for T^2(only for debugging)
-void gradedpiece2(ideal h,poly a,poly b)
+static void gradedpiece2(ideal h,poly a,poly b)
 {
   int t0,t1,t2,i,j,t,m;
@@ -2405 +2086 @@
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /**********************************************************************/
 //For the method of N_{a-b}
 
-
-
-
 //returns true if pv(support of monomial) satisfies pv union av minus bv is in hvs
-bool nabconditionv(std::vector<std::vector<int> > hvs, std::vector<int> pv,  std::vector<int> av,  std::vector<int> bv)
+static bool nabconditionv(std::vector<std::vector<int> > hvs, std::vector<int> pv,  std::vector<int> av,  std::vector<int> bv)
 {
   std::vector<int> vec1=vecIntersection(pv,bv), vec2=vecUnion(pv,bv);
@@ -2450 +2103 @@
 }
 
-
-
-
-
-
 //returns N_{a-b}
-std::vector<std::vector<int> > Nabv(std::vector<std::vector<int> > hvs,  std::vector<int> av,  std::vector<int> bv)
+static std::vector<std::vector<int> > Nabv(std::vector<std::vector<int> > hvs,  std::vector<int> av,  std::vector<int> bv)
 {
   std::vector<std::vector<int> > vecs;
@@ -2471 +2119 @@
 }
 
-
-
-
-
-
 //returns true if pv union qv union av minus bv is in hvs
 //hvs is simplicial complex
@@ -2489 +2132 @@
 }
 
-
 //returns N_{a-b}^(2)
-std::vector<std::vector<int> > nabtv(std::vector<std::vector<int> > hvs,    std::vector<std::vector<int> > Nv,   std::vector<int> av,  std::vector<int> bv)
+static std::vector<std::vector<int> > nabtv(std::vector<std::vector<int> > hvs,    std::vector<std::vector<int> > Nv,   std::vector<int> av,  std::vector<int> bv)
 {
   std::vector<int> v1,var;
@@ -2511 +2153 @@
 }
 
-
-
-
-
-
-
-
-
-
 //p must be the monomial which is a face
 //  ideal sub=psubset(b); bvs=supports(sub);
-bool tNab(std::vector<std::vector<int> > hvs, std::vector<int> pv, std::vector<std::vector<int> > bvs)
+static bool tNab(std::vector<std::vector<int> > hvs, std::vector<int> pv, std::vector<std::vector<int> > bvs)
 {
   std::vector<int> sv;
@@ -2537 +2170 @@
 }
 
-std::vector<int>  tnab(std::vector<std::vector<int> > hvs,std::vector<std::vector<int> > nvs,std::vector<std::vector<int> > bvs)
+static std::vector<int>  tnab(std::vector<std::vector<int> > hvs,std::vector<std::vector<int> > nvs,std::vector<std::vector<int> > bvs)
 {
   std::vector<int> pv, vec;
@@ -2551 +2184 @@
 }
 
-
-
-
-
-
-
-
 //the image phi(pv)=pv union av minus bv
-std::vector<int> phimage(std::vector<int> pv,  std::vector<int> av, std::vector<int> bv)
+static std::vector<int> phimage(std::vector<int> pv,  std::vector<int> av, std::vector<int> bv)
 {
   std::vector<int> qv=vecUnion(pv,av);
@@ -2566 +2192 @@
 }
 
-
-
 //mvs and nvs are the supports of ideal Mab and Nab
 //vecs is the solution of nab
-std::vector<std::vector<int> > value1(std::vector<std::vector<int> > mvs, std::vector<std::vector<int> > nvs, std::vector<std::vector<int> > vecs,std::vector<int> av, std::vector<int> bv)
+static std::vector<std::vector<int> > value1(std::vector<std::vector<int> > mvs, std::vector<std::vector<int> > nvs, std::vector<std::vector<int> > vecs,std::vector<int> av, std::vector<int> bv)
 {
   int j;
@@ -2601 +2225 @@
 
     }
-
     bases.push_back(base);
     base.clear();
@@ -2608 +2231 @@
 }
 
-
-
-
-
-
-
-
-
-intvec *Tmat(std::vector<std::vector<int> > vecs)
+static intvec *Tmat(std::vector<std::vector<int> > vecs)
 {
     //std::vector<std::vector<int> > solve=gradedpiece1n(h,a,b);
@@ -2639 +2254 @@
     }
   }
-return (m);
-}
-
-
-
-
-
-
-
-
+  return (m);
+}
 
 //returns the set of position number of minimal gens in M
-std::vector<int> gensindex(ideal M, ideal ids)
+static std::vector<int> gensindex(ideal M, ideal ids)
 {
   int i;
@@ -2668 +2275 @@
 }
 
-
-
-ideal mingens(ideal h, poly a, poly b)
+static ideal mingens(ideal h, poly a, poly b)
 {
   int i;
@@ -2684 +2289 @@
 }
 
-
-
-std::vector<std::vector<int> >  minisolve(std::vector<std::vector<int> > solve,  std::vector<int> index)
+static std::vector<std::vector<int> >  minisolve(std::vector<std::vector<int> > solve,  std::vector<int> index)
 {
   int i,j;
@@ -2705 +2308 @@
 }
 
-
 //T_1 graded piece(N method)
 //frame of the most efficient version
 //regardless of links
-
-intvec * gradedpiece1n(ideal h,poly a,poly b)
+static intvec * gradedpiece1n(ideal h,poly a,poly b)
 {
   int i,j,co,n;
@@ -2776 +2377 @@
 }
 
-
-
-
-
-
 //for debugging
-void T1(ideal h)
+static void T1(ideal h)
 {
   ideal bi=findb(h),ai;
@@ -2797 +2393 @@
     if(!idIs0(ai))
     {
-    id_print(ai);
-    for(int j=0;j<IDELEMS(ai);j++)
-    {
-      //PrintS("This is a:");
-      a=pCopy(ai->m[j]);
-      //pWrite(a);
-      intvec * solve=gradedpiece1n(h, a, b);
-      if (IMATELEM(*solve,1,1)!=10)
-         mm++;
-    }
-   }
-
-  }
-      Print("Finished %d!\n",mm);
-
-}
-
-
-
-
-
-
-bool condition2for2nv(std::vector<std::vector<int> > hvs, std::vector<int> pv, std::vector<int> qv,  std::vector<int> fv)
+      id_print(ai);
+      for(int j=0;j<IDELEMS(ai);j++)
+      {
+        //PrintS("This is a:");
+        a=pCopy(ai->m[j]);
+        //pWrite(a);
+        intvec * solve=gradedpiece1n(h, a, b);
+        if (IMATELEM(*solve,1,1)!=10)
+           mm++;
+      }
+    }
+  }
+  Print("Finished %d!\n",mm);
+}
+
+static bool condition2for2nv(std::vector<std::vector<int> > hvs, std::vector<int> pv, std::vector<int> qv,  std::vector<int> fv)
 {
   std::vector<int> vec=vecUnion(pv,qv);
@@ -2832 +2421 @@
 }
 
-
-
-
-
 //for subspace of T2(find all the possible values of alpha)
-std::vector<int> findalphan(std::vector<std::vector<int> >  N, std::vector<int>  tN)
+static std::vector<int> findalphan(std::vector<std::vector<int> >  N, std::vector<int>  tN)
 {
   int i;std::vector<int> alset,vec;
@@ -2849 +2434 @@
   }
   //listprint(alset);
-    return alset;
-}
-
-
-
+  return alset;
+}
 
 //subspace of T^2 (nab method)
-std::vector<std::vector<int> > subspacetn(std::vector<std::vector<int> >  N, std::vector<int>   tN, std::vector<std::vector<int> > ntvs)
+static std::vector<std::vector<int> > subspacetn(std::vector<std::vector<int> >  N, std::vector<int>   tN, std::vector<std::vector<int> > ntvs)
 {
   int i;
@@ -2871 +2453 @@
 }
 
-
-
 //mts  Mabt
 //nts  Nabt
 //mvs Mab
 //nvs Nab
-std::vector<std::vector<int> > value2(std::vector<std::vector<int> > mvs, std::vector<std::vector<int> > nvs, std::vector<std::vector<int> > mts, std::vector<std::vector<int> > nts, std::vector<std::vector<int> > vecs,std::vector<int> av,   std::vector<int> bv)
+static std::vector<std::vector<int> > value2(std::vector<std::vector<int> > mvs, std::vector<std::vector<int> > nvs, std::vector<std::vector<int> > mts, std::vector<std::vector<int> > nts, std::vector<std::vector<int> > vecs,std::vector<int> av,   std::vector<int> bv)
 {
   int row,col,j;
@@ -2929 +2509 @@
 }
 
-
-
-
-ideal genst(ideal h, poly a, poly b)
+static ideal genst(ideal h, poly a, poly b)
 {
   std::vector<std::vector<int> > hvs=supports(h),mv,mts;
@@ -2949 +2526 @@
 }
 
-
-
-
-
-
-
-
-intvec * gradedpiece2n(ideal h,poly a,poly b)
+static intvec * gradedpiece2n(ideal h,poly a,poly b)
 {
   int i,j,t,n;
@@ -3034 +2604 @@
 }
 
-
-
-
-
-
 //for debugging
-void T2(ideal h)
+static void T2(ideal h)
 {
   ideal bi=findb(h),ai;
@@ -3046 +2611 @@
   poly a,b;
   int mm=0,gp=0;
-std::vector<int> bv,av;
+  std::vector<int> bv,av;
   std::vector<std::vector<int> > solve;
   for(int i=0;i<IDELEMS(bi);i++)
@@ -3080 +2645 @@
 }
 
-
-
-
-
 /*****************************for links*******************************************/
 //the image phi(pv)=pv minus av minus bv
-std::vector<int> phimagel(std::vector<int> fv,  std::vector<int> av, std::vector<int> bv)
+static std::vector<int> phimagel(std::vector<int> fv,  std::vector<int> av, std::vector<int> bv)
 {
   std::vector<int> nv;
@@ -3094 +2655 @@
 }
 
-
-
 //mvs and nvs are the supports of ideal Mab and Nab
 //vecs is the solution of nab
-std::vector<std::vector<int> > value1l(std::vector<std::vector<int> > mvs, std::vector<std::vector<int> > lks, std::vector<std::vector<int> > vecs,std::vector<int> av, std::vector<int> bv)
+static std::vector<std::vector<int> > value1l(std::vector<std::vector<int> > mvs, std::vector<std::vector<int> > lks, std::vector<std::vector<int> > vecs,std::vector<int> av, std::vector<int> bv)
 {
   int j;
@@ -3123 +2682 @@
       usleep(1000000);
       assert(false);
-
-    }
-
+    }
     bases.push_back(base);
     base.clear();
@@ -3135 +2692 @@
 VAR clock_t t_begin, t_mark, t_start, t_construct=0, t_solve=0, t_value=0, t_total=0;
 /**************************************************/
-
 
 static void TimeShow(clock_t t_construct, clock_t t_solve, clock_t t_value ,clock_t t_total)
@@ -3146 +2702 @@
 }
 
-
-
-std::vector<std::vector<int> > gpl(ideal h,poly a,poly b)
+static std::vector<std::vector<int> > gpl(ideal h,poly a,poly b)
 {
   int i,j,co;
@@ -3210 +2764 @@
 }
 
-
 //T^1
 //only need to consider the links of a, and reduce a to empty set
-intvec * gradedpiece1nl(ideal h,poly a,poly b, int set)
+static intvec * gradedpiece1nl(ideal h,poly a,poly b, int set)
 {
   t_start=clock();
@@ -3236 +2789 @@
 }
 
-
-
-
 //for finding values of T^2
-std::vector<std::vector<int> > value2l(std::vector<std::vector<int> > mvs, std::vector<std::vector<int> > lks, std::vector<std::vector<int> > mts, std::vector<std::vector<int> > lkts, std::vector<std::vector<int> > vecs,std::vector<int> av,   std::vector<int> bv)
+static std::vector<std::vector<int> > value2l(std::vector<std::vector<int> > mvs, std::vector<std::vector<int> > lks, std::vector<std::vector<int> > mts, std::vector<std::vector<int> > lkts, std::vector<std::vector<int> > vecs,std::vector<int> av,   std::vector<int> bv)
 {
   std::vector<int> pv,qv,base;
@@ -3293 +2843 @@
 }
 
-
-std::vector<std::vector<int> > gpl2(ideal h,poly a,poly b)
+static std::vector<std::vector<int> > gpl2(ideal h,poly a,poly b)
 {
   int i,j,t,n;
@@ -3362 +2911 @@
 }
 
-
-
-
-
-
-intvec * gradedpiece2nl(ideal h,poly a,poly b)
+static intvec * gradedpiece2nl(ideal h,poly a,poly b)
 {
   poly e=pOne();
@@ -3390 +2934 @@
   return sl;
 }
-
-
 
 //for debugging
@@ -3422 +2964 @@
 */
 
-
-
 /******************************for triangulation***********************************/
 
-
-
 //returns all the faces which are triangles
-ideal trisets(ideal h)
+static ideal trisets(ideal h)
 {
   int i;
@@ -3444 +2982 @@
 }
 
-
-
-
 // case 1 new faces
-std::vector<std::vector<int> > triface(poly p, int vert)
+static std::vector<std::vector<int> > triface(poly p, int vert)
 {
   std::vector<int> vec, fv=support1(p);
@@ -3467 +3002 @@
 // the size of p's support must be 3
 //returns the new complex which is a triangulation based on the face p
-ideal triangulations1(ideal h, poly p, int vert)
+static ideal triangulations1(ideal h, poly p, int vert)
 {
   std::vector<int> vec, pv=support1(p);
@@ -3477 +3012 @@
   //PrintS("is:\n");
   //listsprint(vecs);
-
   ideal re=idMaken(vecs);
-
   return re;
 }
 
-
-
-
 /*
-ideal triangulations1(ideal h)
+static ideal triangulations1(ideal h)
 {
   int i,vert=currRing->N+1;
@@ -3510 +3040 @@
 }*/
 
-
-std::vector<int> commonedge(poly p, poly q)
+static std::vector<int> commonedge(poly p, poly q)
 {
   std::vector<int> ev, fv1= support1(p), fv2= support2(q);
@@ -3522 +3051 @@
 }
 
-
-intvec *edgemat(poly p, poly q)
+static intvec *edgemat(poly p, poly q)
 {
   intvec *m;
@@ -3542 +3070 @@
 
 // case 2 the new face
-std::vector<std::vector<int> > tetraface(poly p, poly q, int vert)
+static std::vector<std::vector<int> > tetraface(poly p, poly q, int vert)
 {
   std::vector<int> ev=commonedge(p, q), vec, fv1=support1(p), fv2=support1(q);
@@ -3563 +3091 @@
 }
 
-
 //if p and q have  a common edge
-ideal triangulations2(ideal h, poly p, poly q, int vert)
+static ideal triangulations2(ideal h, poly p, poly q, int vert)
 {
   std::vector<int> ev, fv1=support1(p), fv2=support1(q);
@@ -3579 +3106 @@
 }
 
-
-
-
 // case 2 the new face
-std::vector<std::vector<int> > penface(poly p, poly q, poly g, int vert)
+static std::vector<std::vector<int> > penface(poly p, poly q, poly g, int vert)
 {
   int en=0;
@@ -3627 +3151 @@
 }
 
-
-
-ideal triangulations3(ideal h, poly p, poly q, poly g, int vert)
+static ideal triangulations3(ideal h, poly p, poly q, poly g, int vert)
 {
   std::vector<int> ev1=commonedge(p, q), ev2=commonedge(p, g), ev3=commonedge(q, g), fv1=support1(p), fv2=support1(q), fv3=support1(g);
@@ -3652 +3174 @@
 }
 
-
 //returns p's valency in h
 //p must be a vertex
-int valency(ideal h, poly p)
+static int valency(ideal h, poly p)
 {
   int val=0;
@@ -3702 +3223 @@
 }*/
 
-
-
 /*********************************For computation of X_n***********************************/
-std::vector<std::vector<int> > vsMinusvs(std::vector<std::vector<int> > vs1, std::vector<std::vector<int> > vs2)
+static std::vector<std::vector<int> > vsMinusvs(std::vector<std::vector<int> > vs1, std::vector<std::vector<int> > vs2)
 {
   std::vector<std::vector<int> > vs=vs1;
@@ -3715 +3234 @@
 }
 
-
-std::vector<std::vector<int> > vs_subsets(std::vector<std::vector<int> > vs)
+static std::vector<std::vector<int> > vs_subsets(std::vector<std::vector<int> > vs)
 {
   std::vector<std::vector<int> >  sset, bv;
@@ -3727 +3245 @@
 }
 
-
-
-std::vector<std::vector<int> > p_constant(ideal Xo,  ideal Sigma)
+static std::vector<std::vector<int> > p_constant(ideal Xo,  ideal Sigma)
 {
   std::vector<std::vector<int> > xs=supports(idCopy(Xo)), ss=supports(idCopy(Sigma)), fvs1;
@@ -3737 +3253 @@
 }
 
-
-std::vector<std::vector<int> > p_change(ideal Sigma)
+static std::vector<std::vector<int> > p_change(ideal Sigma)
 {
   std::vector<std::vector<int> > ss=supports(idCopy(Sigma)), fvs;
@@ -3745 +3260 @@
 }
 
-
-
-std::vector<std::vector<int> > p_new(ideal Xo, ideal Sigma)
+static std::vector<std::vector<int> > p_new(ideal Xo, ideal Sigma)
 {
   int vert=0;
@@ -3778 +3291 @@
 }
 
-
-
-
-ideal c_New(ideal Io, ideal sig)
+static ideal c_New(ideal Io, ideal sig)
 {
   std::vector<std::vector<int> > vs1=p_constant(Io, sig), vs2=p_change(sig), vs3=p_new(Io, sig), vsig=supports(sig), vs;
@@ -3816 +3326 @@
 }
 
-
-
-
-std::vector<std::vector<int> > phi1(poly a,  ideal Sigma)
+static std::vector<std::vector<int> > phi1(poly a,  ideal Sigma)
 {
   std::vector<std::vector<int> > ss=supports(idCopy(Sigma)), fvs;
@@ -3835 +3342 @@
 }
 
-
-
 static std::vector<std::vector<int> > phi2(poly a, ideal Xo, ideal Sigma)
 {
@@ -3854 +3359 @@
 }
 
-
-std::vector<std::vector<int> > links_new(poly a, ideal Xo, ideal Sigma, int vert, int ord)
+static std::vector<std::vector<int> > links_new(poly a, ideal Xo, ideal Sigma, int vert, int ord)
 {
   std::vector<int> av=support1(a);
@@ -3879 +3383 @@
 }
 
-
-
-
 //returns 1 if there is a real divisor of b not in Xs
-int existIn(poly b, ideal Xs)
+static int existIn(poly b, ideal Xs)
 {
   std::vector<int> bv=support1(pCopy(b));
@@ -3898 +3399 @@
 }
 
-
-int isoNum(poly p, ideal I, poly a, poly b)
+static int isoNum(poly p, ideal I, poly a, poly b)
 {
   int i;
@@ -3916 +3416 @@
 }
 
-
-
-
-int ifIso(poly p, poly q, poly f, poly g, poly a, poly b)
+static int ifIso(poly p, poly q, poly f, poly g, poly a, poly b)
 {
   std::vector<int> va=support1(a), vb=support1(b), vp=support1(p),  vq=support1(q), vf=support1(f), vg=support1(g);
@@ -3930 +3427 @@
 }
 
-
-
-
-ideal idMinusp(ideal I, poly p)
+static ideal idMinusp(ideal I, poly p)
 {
   ideal h=idInit(1,1);
@@ -3948 +3442 @@
 }
 
-
 /****************************for the interface of .lib*********************************/
 
-ideal makemab(ideal h, poly a, poly b)
-{
-  std::vector<std::vector<int> > mv=Mabv(h,a,b);
-  ideal M=idMaken(mv);
-  return M;
-}
-
-
-std::vector<int> v_minus(std::vector<int> v1, std::vector<int> v2)
+static std::vector<int> v_minus(std::vector<int> v1, std::vector<int> v2)
 {
   std::vector<int> vec;
@@ -3969 +3454 @@
 }
 
-
-std::vector<int> gdegree(poly a, poly b)
+static std::vector<int> gdegree(poly a, poly b)
 {
   int i;
@@ -3985 +3469 @@
 }
 
-
-
-
-
-
 /********************************for stellar subdivision******************************/
 
-
-std::vector<std::vector<int> > star(poly a, ideal h)
+static std::vector<std::vector<int> > star(poly a, ideal h)
 {
   int i;
@@ -4009 +3487 @@
 }
 
-
-std::vector<std::vector<int> > boundary(poly a)
+static std::vector<std::vector<int> > boundary(poly a)
 {
   std::vector<int> av=support1(a), vec;
@@ -4020 +3497 @@
 }
 
-
-
-
-
-
-std::vector<std::vector<int> > stellarsub(poly a, ideal h)
+static std::vector<std::vector<int> > stellarsub(poly a, ideal h)
 {
   std::vector<std::vector<int> > vecs_minus, vecs_plus, lk=links(a,h), hvs=supports(h), sub, bys=boundary(a);
@@ -4058 +3530 @@
 }
 
-
-std::vector<std::vector<int> > bsubsets_1(poly b)
+static std::vector<std::vector<int> > bsubsets_1(poly b)
 {
   std::vector<int>  bvs=support1(b), vs;
@@ -4075 +3546 @@
 }
 
-
-
 /***************************for time testing******************************/
-ideal T_1h(ideal h)
+static ideal T_1h(ideal h)
 {
   int i, j;
@@ -4100 +3569 @@
   TimeShow(t_construct, t_solve, t_value, t_total);
   return h;
-
-}
+}
+
 /**************************************interface T1****************************************/
 /*
-BOOLEAN makeqring(leftv res, leftv args)
+static BOOLEAN makeqring(leftv res, leftv args)
 {
   leftv h=args;
@@ -4129 +3598 @@
 }*/
 
-
-
-
-
-BOOLEAN SRideal(leftv res, leftv args)
+static BOOLEAN SRideal(leftv res, leftv args)
 {
   leftv h=args;
@@ -4145 +3610 @@
 }
 
-
-
-
-
-
-BOOLEAN idcomplement(leftv res, leftv args)
+static BOOLEAN idcomplement(leftv res, leftv args)
 {
   leftv h=args;
@@ -4163 +3623 @@
 }
 
-
-
-
-
-BOOLEAN t1h(leftv res, leftv args)
+static BOOLEAN t1h(leftv res, leftv args)
 {
   leftv h=args;
@@ -4179 +3635 @@
 }
 
-
-BOOLEAN idsr(leftv res, leftv args)
+static BOOLEAN idsr(leftv res, leftv args)
 {
   leftv h=args;
@@ -4202 +3657 @@
 }
 
-intvec *dmat(poly a, poly b)
+static intvec *dmat(poly a, poly b)
 {
   intvec *m;
@@ -4220 +3675 @@
 }
 
-
-
-BOOLEAN gd(leftv res, leftv args)
+static BOOLEAN gd(leftv res, leftv args)
 {
   leftv h=args;
@@ -4239 +3692 @@
 }
 
-
-
-BOOLEAN comedg(leftv res, leftv args)
+static BOOLEAN comedg(leftv res, leftv args)
 {
   leftv h=args;
@@ -4258 +3709 @@
 }
 
-
-
-
-BOOLEAN fb(leftv res, leftv args)
+static BOOLEAN fb(leftv res, leftv args)
 {
   leftv h=args;
@@ -4273 +3721 @@
 }
 
-
-BOOLEAN pa(leftv res, leftv args)
+static BOOLEAN pa(leftv res, leftv args)
 {
   leftv h=args;
@@ -4286 +3733 @@
 }
 
-
-
-BOOLEAN makeSimplex(leftv res, leftv args)
+static BOOLEAN makeSimplex(leftv res, leftv args)
 {
   leftv h=args;
@@ -4300 +3745 @@
 }
 
-
-BOOLEAN pb(leftv res, leftv args)
+static BOOLEAN pb(leftv res, leftv args)
 {
   leftv h=args;
@@ -4318 +3762 @@
 }
 
-
-
-BOOLEAN fa(leftv res, leftv args)
+static BOOLEAN fa(leftv res, leftv args)
 {
   leftv h=args;
@@ -4342 +3784 @@
 }
 
-
-BOOLEAN fgp(leftv res, leftv args)
+static BOOLEAN fgp(leftv res, leftv args)
 {
   leftv h=args;
@@ -4365 +3806 @@
 }
 
-
-BOOLEAN fgpl(leftv res, leftv args)
+static BOOLEAN fgpl(leftv res, leftv args)
 {
   leftv h=args;
@@ -4393 +3833 @@
 }
 
-
-
-BOOLEAN genstt(leftv res, leftv args)
+static BOOLEAN genstt(leftv res, leftv args)
 {
   leftv h=args;
@@ -4417 +3855 @@
 }
 
-
-BOOLEAN sgp(leftv res, leftv args)
+static BOOLEAN sgp(leftv res, leftv args)
 {
   leftv h=args;
@@ -4440 +3877 @@
 }
 
-
-BOOLEAN sgpl(leftv res, leftv args)
+static BOOLEAN sgpl(leftv res, leftv args)
 {
   leftv h=args;
@@ -4463 +3899 @@
 }
 
-
-BOOLEAN Links(leftv res, leftv args)
+static BOOLEAN Links(leftv res, leftv args)
 {
   leftv h=args;
@@ -4482 +3917 @@
 }
 
-BOOLEAN isSim(leftv res, leftv args)
+static BOOLEAN isSim(leftv res, leftv args)
 {
   leftv h=args;
@@ -4493 +3928 @@
   return false;
 }
-
 
 BOOLEAN nfaces1(leftv res, leftv args)
@@ -4517 +3951 @@
 }
 
-
-BOOLEAN nfaces2(leftv res, leftv args)
+static BOOLEAN nfaces2(leftv res, leftv args)
 {
   leftv h=args;
@@ -4545 +3978 @@
 }
 
-
-BOOLEAN nfaces3(leftv res, leftv args)
+static BOOLEAN nfaces3(leftv res, leftv args)
 {
   leftv h=args;
@@ -4578 +4010 @@
 }
 
-
-
-
-
-BOOLEAN eqsolve1(leftv res, leftv args)
+static BOOLEAN eqsolve1(leftv res, leftv args)
 {
   leftv h=args;int i;
@@ -4623 +4051 @@
 }
 
-
-BOOLEAN tsets(leftv res, leftv args)
+static BOOLEAN tsets(leftv res, leftv args)
 {
   leftv h=args;
@@ -4636 +4063 @@
 }
 
-
-
-
-
-BOOLEAN Valency(leftv res, leftv args)
+static BOOLEAN Valency(leftv res, leftv args)
 {
   leftv h=args;
@@ -4657 +4080 @@
 }
 
-
-
-
-BOOLEAN nabvl(leftv res, leftv args)
+static BOOLEAN nabvl(leftv res, leftv args)
 {
   leftv h=args;
@@ -4684 +4104 @@
 }
 
-
-
-BOOLEAN tnabvl(leftv res, leftv args)
+static BOOLEAN tnabvl(leftv res, leftv args)
 {
   leftv h=args;
@@ -4718 +4136 @@
 }
 
-
-BOOLEAN vsIntersec(leftv res, leftv args)
+static BOOLEAN vsIntersec(leftv res, leftv args)
 {
   leftv h=args;
@@ -4737 +4154 @@
 }
 
-
-BOOLEAN mabvl(leftv res, leftv args)
+static BOOLEAN mabvl(leftv res, leftv args)
 {
   leftv h=args;
@@ -4760 +4176 @@
 }
 
-
-
-BOOLEAN nabtvl(leftv res, leftv args)
+static BOOLEAN nabtvl(leftv res, leftv args)
 {
   leftv h=args;
@@ -4796 +4210 @@
 }
 
-
-BOOLEAN linkn(leftv res, leftv args)
+static BOOLEAN linkn(leftv res, leftv args)
 {
   leftv h=args;
@@ -4829 +4242 @@
 }
 
-
-
-BOOLEAN existsub(leftv res, leftv args)
+static BOOLEAN existsub(leftv res, leftv args)
 {
   leftv h=args;
@@ -4848 +4259 @@
 }
 
-
-BOOLEAN pConstant(leftv res, leftv args)
+static BOOLEAN pConstant(leftv res, leftv args)
 {
   leftv h=args;
@@ -4866 +4276 @@
 }
 
-BOOLEAN pChange(leftv res, leftv args)
+static BOOLEAN pChange(leftv res, leftv args)
 {
   leftv h=args;
@@ -4878 +4288 @@
 }
 
-
-
-BOOLEAN p_New(leftv res, leftv args)
+static BOOLEAN p_New(leftv res, leftv args)
 {
   leftv h=args;
@@ -4897 +4305 @@
 }
 
-
-
-
-BOOLEAN support(leftv res, leftv args)
+static BOOLEAN support(leftv res, leftv args)
 {
   leftv h=args;
@@ -4912 +4317 @@
 }
 
-
-
-
-
-
-BOOLEAN bprime(leftv res, leftv args)
+static BOOLEAN bprime(leftv res, leftv args)
 {
   leftv h=args;
@@ -4929 +4329 @@
 }
 
-
-
-BOOLEAN psMinusp(leftv res, leftv args)
+static BOOLEAN psMinusp(leftv res, leftv args)
 {
   leftv h=args;
@@ -4948 +4346 @@
 }
 
-
-
-BOOLEAN stellarremain(leftv res, leftv args)
+static BOOLEAN stellarremain(leftv res, leftv args)
 {
   leftv h=args;
@@ -4970 +4366 @@
 }
 
-
-BOOLEAN cNew(leftv res, leftv args)
+static BOOLEAN cNew(leftv res, leftv args)
 {
   leftv h=args;
@@ -4988 +4383 @@
 }
 
-
-
-
-BOOLEAN stars(leftv res, leftv args)
+static BOOLEAN stars(leftv res, leftv args)
 {
   leftv h=args;
@@ -5008 +4400 @@
 }
 
-
-
-
-BOOLEAN stellarsubdivision(leftv res, leftv args)
+static BOOLEAN stellarsubdivision(leftv res, leftv args)
 {
   leftv h=args;
@@ -5028 +4417 @@
 }
 
-
-
-BOOLEAN idModulo(leftv res, leftv args)
+static BOOLEAN idModulo(leftv res, leftv args)
 {
   leftv h=args;
@@ -5047 +4434 @@
 }
 
-
-BOOLEAN idminus(leftv res, leftv args)
+static BOOLEAN idminus(leftv res, leftv args)
 {
   leftv h=args;
@@ -5065 +4451 @@
 }
 
-
-
-BOOLEAN isoNumber(leftv res, leftv args)
+static BOOLEAN isoNumber(leftv res, leftv args)
 {
   leftv h=args;
@@ -5094 +4478 @@
 }
 
-
-
-BOOLEAN ifIsomorphism(leftv res, leftv args)
+static BOOLEAN ifIsomorphism(leftv res, leftv args)
 {
   leftv h=args;
@@ -5133 +4515 @@
 }
 
-
-BOOLEAN newDegree(leftv res, leftv args)
+static BOOLEAN newDegree(leftv res, leftv args)
 {
   leftv h=args;
@@ -5151 +4532 @@
 }
 
-
-
-BOOLEAN nonf2f(leftv res, leftv args)
+static BOOLEAN nonf2f(leftv res, leftv args)
 {
   leftv h=args;
@@ -5165 +4544 @@
 }
 
-
-
-BOOLEAN dimsim(leftv res, leftv args)
+static BOOLEAN dimsim(leftv res, leftv args)
 {
   leftv h=args;
@@ -5179 +4556 @@
 }
 
-
-
-BOOLEAN numdim(leftv res, leftv args)
+static BOOLEAN numdim(leftv res, leftv args)
 {
   leftv h=args;
@@ -5200 +4575 @@
 /**************************************interface T2****************************************/
 
-
-
-void firstorderdef_setup(SModulFunctions* p)
+static void firstorderdef_setup(SModulFunctions* p)
 {
   p->iiAddCproc("","mg",FALSE,idsr);
@@ -5253 +4626 @@
   p->iiAddCproc("","idminus",FALSE,idminus);
   p->iiAddCproc("","time1",FALSE,t1h);
-
-}
-
-
+}
 
 extern "C" int SI_MOD_INIT(cohomo)(SModulFunctions* p)
@@ -5265 +4635 @@
 #endif
 #endif
-
-

Singular/dyn_modules/cohomo/cohomo.h

@@ -11 +11 @@
 #include "libpolys/misc/intvec.h"
 
-
-void gradedpiece1(ideal h,poly a,poly b);
-void gradedpiece2(ideal h,poly a,poly b);
-intvec *gradedpiece1n(ideal h,poly a,poly b);
-//void gradedpiece2n(ideal h,poly a,poly b);
-void Tlink(ideal h,poly a,poly b,int n);
-void T1(ideal h);
-void T2(ideal h);
-//void Gpt2(ideal h,poly a,poly b);
-//intvec *T1mat(int a,int b);
-ideal idsrRing(ideal h);
-BOOLEAN idsr(leftv res, leftv args);
-BOOLEAN gd(leftv res, leftv args);
-
-//void firstorderdef_setup(SModulFunctions* p);
 #endif