Changeset c0f614 in git

Timestamp:

Feb 16, 2024, 1:57:37 PM (3 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4bd32dfef92ec9f5ed8dceee82d14318ae147107')

Children:

be27df299776fa013655436294fca9fa5ec69a32

Parents:

ed6cce7a3936eb40676c2649aaa5fc9749dc2fea

Message:

cohomo.cc p5

File:

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

Singular/dyn_modules/cohomo/cohomo.cc

@@ -46 +46 @@
 
 /***************************print(only for debugging)***********************************************/
+#if 0
 //print vector of integers.
 static void listprint(std::vector<int> vec)
@@ -60 +61 @@
   }
 }
-
+#endif
+
+#if 0
 //print vector of vectors of integers.
 static void listsprint(std::vector<std::vector<int> > posMat)
@@ -77 +80 @@
   }
 }
-
-
+#endif
+
+#if 0
 //print ideal.
 static void id_print(ideal h)
@@ -89 +93 @@
   }
 }
-
+#endif
+
+#if 0
 //only for T^2,
 //print vector of polynomials.
@@ -105 +111 @@
   }
 }
-
+#endif
+
+#if 0
 //print vector of vectors of polynomials.
 static void lpsprint(std::vector<std::vector<poly> > pvs)
@@ -122 +130 @@
   }
 }
+#endif
 
 /*************operations for vectors (regard vectors as sets)*********/
@@ -1641 +1650 @@
   for(i=0; i <num; i++)
   {
-    tt[i] = (char*)omalloc(10); //if required enlarge it later
-    snprintf (tt[i],10, "t(%d)", i+1);
+    tt[i] = (char*)omalloc(16);
+    snprintf (tt[i],16, "t(%d)", i+1);
   }
   ring R=rDefault(cf,num,tt,ringorder_lp);
@@ -1650 +1659 @@
 }
 
+#if 0
 //returns the trivial case of T^1
 //b must only contain one variable
@@ -1665 +1675 @@
   return base;
 }
+#endif
 
 /***************************only for T^2*************************************/
@@ -1703 +1714 @@
 //return the graded pieces of cohomology T^1 according to a,b
 //original method (only for debugging)
+#if 0
 static void gradedpiece1(ideal h,poly a,poly b)
 {
@@ -1761 +1773 @@
   }
 }
-
+#endif
+
+#if 0
 //Returns true if b can divide p*q
 static bool condition1for2(std::vector<int > pv,std::vector<int > qv,std::vector<int > bv)
@@ -1774 +1788 @@
   return false;
 }
-
+#endif
+
+#if 0
 //Returns true if support(p) union support(q) union support(s) union support(a) minus support(b) is face
 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)
@@ -1788 +1804 @@
   return (false);
 }
-
+#endif
+
+#if 0
 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)
 {
@@ -1805 +1823 @@
   return(false);
 }
+#endif
 
 /****************solve the equations got from T^2*********************/
@@ -1938 +1957 @@
 /**************************************************************************/
 
+#if 0
 //subspace of T2(find all the possible values of alpha)
 static std::vector<int> findalpha(std::vector<std::vector<int> > mv, std::vector<int> bv)
@@ -1953 +1973 @@
   return alset;
 }
+#endif
 
 static std::vector<int> subspacet1(int num, std::vector<std::vector<int> > ntvs)
@@ -1980 +2001 @@
 }
 
+#if 0
 //subspace for T^2(mab method)
 static std::vector<std::vector<int> > subspacet(std::vector<std::vector<int> > mv, std::vector<int> bv,std::vector<std::vector<int> > ntvs)
@@ -1994 +2016 @@
   return subases;
 }
+#endif
 
 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)
@@ -2016 +2039 @@
 }
 
+#if 0
 //fix the problem of the number of the new variables
 //original method for T^2(only for debugging)
@@ -2099 +2123 @@
   }
 }
+#endif
 
 /**********************************************************************/
@@ -2251 +2276 @@
  //vtm(solve);
   intvec *m;
-  int i,j, a=vecs.size();
+  unsigned a=vecs.size();
   if(a==0)
   {
@@ -2260 +2285 @@
     int b=vecs[0].size();
     m=new intvec(a,b,0);
-    for(i=1;i<=a;i++)
-    {
-      for(j=1;j<=b;j++)
-      {
-        IMATELEM(*m,i,j)=vecs[i-1][j-1];
+    for(unsigned i=1;i<=a;i++)
+    {
+      for(unsigned j=1;j<=b;j++)
+      {
+        IMATELEM((*m),i,j)=vecs[i-1][j-1];
       }
     }
@@ -2327 +2352 @@
 static intvec * gradedpiece1n(ideal h,poly a,poly b)
 {
-  int i,j,co,n;
+  int co;
   std::vector<std::vector<int> > hvs=supports(h),mv=Mabv(h,a,b),sbv,nv,good,solve;
   std::vector<int> av=support1(a), bv=support1(b), bad, tnv, index;
@@ -2335 +2360 @@
   M=idMaken(mv);
   index = gensindex(M, idsrRing(h));
-  n=nv.size();
+  unsigned n=nv.size();
   ring r=currRing;
   if(n > 0)
   {
     tnv=tnab(hvs,nv,sbv);
-    for(i=0;i<tnv.size();i++)
+    for(unsigned i=0;i<tnv.size();i++)
     {
       co=tnv[i];
       bad.push_back(co+1);
     }
-    for(i=0;i<n;i++)
-    {
-      for(j=i+1;j<n;j++)
+    for(unsigned i=0;i<n;i++)
+    {
+      for(unsigned j=i+1;j<n;j++)
       {
         if(nabtconditionv(hvs,nv[i],nv[j]))
@@ -2391 +2416 @@
 }
 
+#if 0
 //for debugging
 static void T1(ideal h)
@@ -2421 +2447 @@
   Print("Finished %d!\n",mm);
 }
+#endif
 
 static bool condition2for2nv(std::vector<std::vector<int> > hvs, std::vector<int> pv, std::vector<int> qv,  std::vector<int> fv)
@@ -2573 +2600 @@
         vec.clear();
       }
-      for(int t1=t0+1;t1<ntvs.size();t1++)
-      {
-        for(int t2=t1+1;t2<ntvs.size();t2++)
+      for(unsigned t1=t0+1;t1<ntvs.size();t1++)
+      {
+        for(unsigned t2=t1+1;t2<ntvs.size();t2++)
         {
           if(ntvs[t0][0]==ntvs[t1][0]&&ntvs[t1][1]==ntvs[t2][1]&&ntvs[t0][1]==ntvs[t2][0])
@@ -2618 +2645 @@
 }
 
+#if 0
 //for debugging
 static void T2(ideal h)
@@ -2658 +2686 @@
   Print("There are %d graded pieces in total.\n",gp);
 }
+#endif
 
 /*****************************for links*******************************************/
@@ -2673 +2702 @@
 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;
   std::vector<int> pv;
   std::vector<int> base;
@@ -2682 +2710 @@
     {
       pv=phimagel(mvs[i], av, bv);
-      for(j=0;j<lks.size();j++)
+      for(unsigned j=0;j<lks.size();j++)
       {
         if(vEvl(pv,lks[j]))
@@ -2718 +2746 @@
 static std::vector<std::vector<int> > gpl(ideal h,poly a,poly b)
 {
-  int i,j,co;
+  int co;
   std::vector<std::vector<int> > hvs=supports(h),sbv,nv,mv,good,solve;
   std::vector<int> av=support1(a), bv=support1(b),index,bad,tnv;
@@ -2727 +2755 @@
   ideal M=idMaken(mv);
   index = gensindex(M, idsrRing(h));
-  int n=nv.size();
+  unsigned n=nv.size();
   ring r=currRing;
   t_begin=clock();
@@ -2733 +2761 @@
   {
     tnv=tnab(hvs,nv,sbv);
-    for(i=0;i<tnv.size();i++)
+    for(unsigned i=0;i<tnv.size();i++)
     {
       co=tnv[i];
       bad.push_back(co+1);
     }
-    for(i=0;i<n;i++)
-    {
-      for(j=i+1;j<n;j++)
+    for(unsigned i=0;i<n;i++)
+    {
+      for(unsigned j=i+1;j<n;j++)
       {
         if(nabtconditionv(hvs,nv[i],nv[j]))
@@ -2807 +2835 @@
 {
   std::vector<int> pv,qv,base;
-  int row,col,j;
+  int row,col;
   std::vector<std::vector<int> > bases;
   if(vecs.size()==0)
@@ -2825 +2853 @@
       else
       {
-        for(j=0;j<lkts.size();j++)
+        for(unsigned j=0;j<lkts.size();j++)
         {
           row=lkts[j][0];
@@ -2886 +2914 @@
           vec.clear();
         }
-        for(int t1=t0+1;t1<ntvs.size();t1++)
+        for(unsigned t1=t0+1;t1<ntvs.size();t1++)
         {
-          for(int t2=t1+1;t2<ntvs.size();t2++)
+          for(unsigned t2=t1+1;t2<ntvs.size();t2++)
           {
             if(ntvs[t0][0]==ntvs[t1][0]&&ntvs[t1][1]==ntvs[t2][1]&&ntvs[t0][1]==ntvs[t2][0])
@@ -3487 +3515 @@
 static std::vector<std::vector<int> > star(poly a, ideal h)
 {
-  int i;
   std::vector<std::vector<int> > st,X=supports(h);
   std::vector<int> U,av=support1(a);
-  for(i=0;i<X.size();i++)
+  for(unsigned i=0;i<X.size();i++)
   {
     U=vecUnion(av,X[i]);
@@ -3515 +3542 @@
   std::vector<std::vector<int> > vecs_minus, vecs_plus, lk=links(a,h), hvs=supports(h), sub, bys=boundary(a);
   std::vector<int> av=support1(a), vec, vec_n;
-  int i,j,vert=0;
-  for(i=1;i<=currRing->N;i++)
-  {
-    for(j=0;j<IDELEMS(h);j++)
+  int vert=0;
+  for(int i=1;i<=currRing->N;i++)
+  {
+    for(int j=0;j<IDELEMS(h);j++)
     {
       if(pGetExp(h->m[j],i)>0)
@@ -3528 +3555 @@
   }
   vec_n.push_back(vert);
-  for(i=0;i<lk.size();i++)
+  for(unsigned i=0;i<lk.size();i++)
   {
     vec=vecUnion(av, lk[i]);
     vecs_minus.push_back(vec);
-    for(j=0;j<bys.size();j++)
+    for(unsigned j=0;j<bys.size();j++)
     {
       vec=vecUnion(lk[i], vec_n);
@@ -3550 +3577 @@
   for(unsigned i=0;i<bvs.size();i++)
   {
-    for(int j=0;j!=i; j++)
+    for(unsigned j=0;j!=i; j++)
     {
       vs.push_back(bvs[j]);
@@ -3620 +3647 @@
      res->rtyp =IDEAL_CMD;
      res->data =idsrRing(hh);
+     return FALSE;
    }
-  return false;
+  return TRUE;
 }
 
@@ -3633 +3661 @@
      res->rtyp =IDEAL_CMD;
      res->data =h2;
+     return FALSE;
    }
-  return false;
+  return TRUE;
 }
 
@@ -3645 +3674 @@
      res->rtyp =IDEAL_CMD;
      res->data =T_1h(hh);
+     return FALSE;
    }
-  return false;
+  return TRUE;
 }
 
@@ -3665 +3695 @@
          res->rtyp =IDEAL_CMD;
          res->data =mingens(h1,p,q);
+         return FALSE;
        }
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -3701 +3732 @@
        res->rtyp =INTVEC_CMD;
        res->data =dmat(p,q);
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -3718 +3750 @@
        res->rtyp =INTVEC_CMD;
        res->data =edgemat(p,q);
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -3731 +3764 @@
      res->rtyp =IDEAL_CMD;
      res->data =findb(h1);
-  }
-  return false;
+     return FALSE;
+  }
+  return TRUE;
 }
 
@@ -3743 +3777 @@
      res->rtyp =IDEAL_CMD;
      res->data =p_a(h1);
-  }
-  return false;
+     return FALSE;
+  }
+  return TRUE;
 }
 
@@ -3755 +3790 @@
      res->rtyp =IDEAL_CMD;
      res->data =complementsimplex(h1);
-  }
-  return false;
+     return FALSE;
+  }
+  return TRUE;
 }
 
@@ -3771 +3807 @@
        res->rtyp =IDEAL_CMD;
        res->data =p_b(h1,p);
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -3792 +3829 @@
          res->rtyp =IDEAL_CMD;
          res->data =finda(h1,q,d);
+         return FALSE;
        }
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -3814 +3852 @@
          res->rtyp =INTVEC_CMD;
          res->data =gradedpiece1n(h1,p,q);
-         return FALSE;
+         return FALSE;
        }
      }
@@ -3841 +3879 @@
            res->rtyp =INTVEC_CMD;
            res->data =gradedpiece1nl(h1,p,q,d);
+           return FALSE;
          }
        }
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -3864 +3903 @@
          res->rtyp =IDEAL_CMD;
          res->data =genst(h1,p,q);
+         return FALSE;
        }
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -3886 +3926 @@
          res->rtyp =INTVEC_CMD;
          res->data =gradedpiece2n(h1,p,q);
+         return FALSE;
        }
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -3908 +3949 @@
          res->rtyp =INTVEC_CMD;
          res->data =gradedpiece2nl(h1,p,q);
+         return FALSE;
        }
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -3927 +3969 @@
        std::vector<std::vector<int> > vecs=links(p,h1);
        res->data =idMaken(vecs);
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -3940 +3983 @@
      res->rtyp =IDEAL_CMD;
      res->data =IsSimplex(h1);
-  }
-  return false;
+     return FALSE;
+  }
+  return TRUE;
 }
 
@@ -3960 +4004 @@
          res->rtyp =IDEAL_CMD;
          res->data =triangulations1(h1, p, d);
+         return FALSE;
        }
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -3986 +4031 @@
            res->rtyp =IDEAL_CMD;
            res->data =triangulations2(h1,p,q,d);
+           return FALSE;
          }
        }
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4017 +4063 @@
              res->rtyp =IDEAL_CMD;
              res->data =triangulations3(h1,p,q,g,d);
+             return FALSE;
            }
          }
@@ -4022 +4069 @@
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4060 +4107 @@
          std::vector<std::vector<int> > vecs=eli2(n,bset,gset);
          res->data =Tmat(vecs);
+         return FALSE;
        }
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4074 +4122 @@
      res->rtyp =IDEAL_CMD;
      res->data =trisets(h1);
-  }
-  return false;
+     return FALSE;
+  }
+  return TRUE;
 }
 
@@ -4090 +4139 @@
        res->rtyp =INT_CMD;
        res->data =(void *)(long)valency(h1,p);
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4113 +4163 @@
          std::vector<int> pv=support1(p), qv=support1(q);
          res->data =idMaken(Nabv(vecs,pv,qv));
+         return FALSE;
        }
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4133 +4184 @@
        {
          poly q= (poly)h->Data();
-         res->rtyp =IDEAL_CMD;
          std::vector<std::vector<int> > vecs=supports(h1), sbv,tnbr;
          std::vector<int> pv=support1(p), qv=support1(q);
@@ -4144 +4194 @@
            tnbr.push_back(nvs[tnv[i]]);
          }
+         res->rtyp =IDEAL_CMD;
          res->data =idMaken(tnbr);
+         return FALSE;
        }
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4161 +4213 @@
      {
        ideal h2= (ideal)h->Data();
+       std::vector<std::vector<int> > vs1=supports(h1), vs2=supports(h2);
        res->rtyp =INT_CMD;
-       std::vector<std::vector<int> > vs1=supports(h1), vs2=supports(h2);
        res->data =(void *)(long)(vsIntersection(vs1, vs2).size());
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4185 +4238 @@
          res->rtyp =IDEAL_CMD;
          res->data =idMaken(Mabv(h1,p,q));
+         return FALSE;
        }
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4219 +4273 @@
          res->rtyp =IDEAL_CMD;
          res->data =gens;
+         return FALSE;
        }
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4249 +4304 @@
             res->rtyp =IDEAL_CMD;
             res->data =idMaken(links_new(a,  Xo,  Sigma,  vert,  ord));
+            return FALSE;
           }
         }
@@ -4254 +4310 @@
     }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4269 +4325 @@
        res->rtyp =INT_CMD;
        res->data =(void *)(long)existIn(p, h1);
+       return FALSE;
      }
    }
-  return false;
+  return TRUE;
 }
 
@@ -4286 +4343 @@
        res->rtyp =IDEAL_CMD;
        res->data =idMaken(p_constant(h1,h2));
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4299 +4357 @@
      res->rtyp =IDEAL_CMD;
      res->data =idMaken(p_change(h1));
-  }
-  return false;
+     return FALSE;
+  }
+  return TRUE;
 }
 
@@ -4315 +4374 @@
        res->rtyp =IDEAL_CMD;
        res->data =idMaken(p_new(h1,h2));
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4328 +4388 @@
      res->rtyp =INT_CMD;
      res->data =(void *)(long)(support1(p).size());
-  }
-  return false;
+     return FALSE;
+  }
+  return TRUE;
 }
 
@@ -4340 +4401 @@
      res->rtyp =IDEAL_CMD;
      res->data =idMaken(bsubsets_1(p));
-  }
-  return false;
+     return FALSE;
+  }
+  return TRUE;
 }
 
@@ -4356 +4418 @@
        res->rtyp =IDEAL_CMD;
        res->data =idMinusp(h1, p);
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4376 +4439 @@
        res->rtyp =IDEAL_CMD;
        res->data =idMaken(re);
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4393 +4457 @@
        res->rtyp =IDEAL_CMD;
        res->data =c_New(h1, h2);
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4410 +4475 @@
        res->rtyp =IDEAL_CMD;
        res->data =idMaken(star(p, h1));
+       return FALSE;
      }
    }
-  return false;
+  return TRUE;
 }
 
@@ -4427 +4493 @@
        res->rtyp =IDEAL_CMD;
        res->data =idMaken(stellarsub(p, h2));
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4444 +4511 @@
        res->rtyp =IDEAL_CMD;
        res->data =idmodulo(h1, h2);
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4461 +4529 @@
        res->rtyp =IDEAL_CMD;
        res->data =idMinus(h1, h2);
+       return FALSE;
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4486 +4555 @@
           res->rtyp =INT_CMD;
           res->data =(void *)(long)isoNum(p, h1, a, b);
+          return FALSE;
         }
       }
     }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4521 +4591 @@
                res->rtyp =INT_CMD;
                res->data =(void *)(long)ifIso(p,q,f,g, a, b);
+               return FALSE;
              }
            }
@@ -4527 +4598 @@
      }
   }
-  return false;
+  return TRUE;
 }
 
@@ -4542 +4613 @@
        res->rtyp =INT_CMD;
        res->data =(void *)(long)redefinedeg( p, num);
-    }
-  }
-  return false;
+       return FALSE;
+    }
+  }
+  return TRUE;
 }
 
@@ -4555 +4627 @@
      res->rtyp =IDEAL_CMD;
      res->data =complementsimplex(h1);
-  }
-  return false;
+     return FALSE;
+  }
+  return TRUE;
 }
 
@@ -4567 +4640 @@
      res->rtyp =INT_CMD;
      res->data =(void *)(long)dim_sim(h1);
-  }
-  return false;
+     return FALSE;
+  }
+  return TRUE;
 }
 
@@ -4583 +4657 @@
        res->rtyp =INT_CMD;
        res->data =(void *)(long)num4dim( h1, num);
-    }
-  }
-  return false;
+       return FALSE;
+    }
+  }
+  return TRUE;
 }