Changeset 117ae9 in git

Timestamp:

Aug 26, 2016, 6:47:06 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

8c38af481ca33e7eabaf73ab8152d41b20ed8669

Parents:

f5e732af7572071c189ad8185ce830f96ababa46

Message:

opt: prefer unsigned over int in for loops

Files:

• Singular/iparith.cc (modified) (22 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (2 diffs)

Singular/iparith.cc

@@ -194 +194 @@
   struct sValCmd3 *psValCmd3;
   struct sValCmdM *psValCmdM;
-  int nCmdUsed;      /**< number of commands used */
-  int nCmdAllocated; /**< number of commands-slots allocated */
-  int nLastIdentifier; /**< valid indentifieres are slot 1..nLastIdentifier */
+  unsigned nCmdUsed;      /**< number of commands used */
+  unsigned nCmdAllocated; /**< number of commands-slots allocated */
+  unsigned nLastIdentifier; /**< valid indentifieres are slot 1..nLastIdentifier */
 } SArithBase;
 
@@ -242 +242 @@
 int iiTokType(int op)
 {
-  for (int i=0;i<sArithBase.nCmdUsed;i++)
+  for (unsigned i=0;i<sArithBase.nCmdUsed;i++)
   {
     if (sArithBase.sCmds[i].tokval==op)
@@ -1291 +1291 @@
   int c=m->cols();
   matrix mm=mpNew(r,c);
-  int i,j;
+  unsigned i,j;
   for(i=r;i>0;i--)
   {
@@ -2055 +2055 @@
   int vl= IDELEMS(vi);
   ideal ui=(ideal)u->Data();
-  int ul= IDELEMS(ui);
+  unsigned ul= IDELEMS(ui);
   ideal R; matrix U;
   ideal m = idLift(vi,ui,&R, FALSE,hasFlag(v,FLAG_STD),TRUE,&U);
@@ -2062 +2062 @@
   matrix T = id_Module2formatedMatrix(m,vl,ul,currRing);
   int i;
-  if (MATCOLS(U) != ul)
-  {
-    int mul=si_min(ul,MATCOLS(U));
+  if (MATCOLS(U) != (int)ul)
+  {
+    unsigned mul=si_min(ul,MATCOLS(U));
     matrix UU=mpNew(ul,ul);
-    int j;
+    unsigned j;
     for(i=mul;i>0;i--)
     {
@@ -2330 +2330 @@
       else
       {
-        int i;
+        unsigned i;
         if (par_perm_size!=0)
-          for(i=si_min(rPar(r),rPar(currRing))-1;i>=0;i--) par_perm[i]=-(i+1);
+          for(i=si_min(rPar(r),rPar(currRing));i>0;i--) par_perm[i-1]=-i;
         for(i=si_min(r->N,currRing->N);i>0;i--) perm[i]=i;
       }
@@ -2338 +2338 @@
     if ((iiOp==FETCH_CMD) &&(BVERBOSE(V_IMAP)))
     {
-      int i;
-      for(i=0;i<si_min(r->N,currRing->N);i++)
+      unsigned i;
+      for(i=0;i<(unsigned)si_min(r->N,currRing->N);i++)
       {
         Print("// var nr %d: %s -> %s\n",i,r->names[i],currRing->names[i]);
       }
-      for(i=0;i<si_min(rPar(r),rPar(currRing));i++) // possibly empty loop
+      for(i=0;i<(unsigned)si_min(rPar(r),rPar(currRing));i++) // possibly empty loop
       {
         Print("// par nr %d: %s -> %s\n",
@@ -2795 +2795 @@
   intvec *iv=(intvec *)v->Data();
   poly p=pOne();
-  int i,e;
+  int e;
   BOOLEAN err=FALSE;
-  for(i=si_min(currRing->N,iv->length()); i>0; i--)
+  for(unsigned i=si_min(currRing->N,iv->length()); i>0; i--)
   {
     e=(*iv)[i-1];
@@ -3623 +3623 @@
   int i;
   int ret = -1;
-  for(int nfinished = 0; nfinished < Lforks->nr+1; nfinished++)
+  for(unsigned nfinished = 0; nfinished < ((unsigned)Lforks->nr)+1; nfinished++)
   {
     i = slStatusSsiL(Lforks, timeout);
@@ -4011 +4011 @@
   else
   {
+    omFreeSize(r,sizeof(*r));
     Werror("det of %d x %d cmatrix",i,j);
     return TRUE;
   }
+  res->data=(void*)r;
   return FALSE;
 }
@@ -4082 +4084 @@
     //Anne's Idea for std(4,2x) = 0 bug
     long dcurr = d;
-    for(i=0;i<IDELEMS(vv);i++)
-    {
-      if(vv->m[i] != NULL && !n_IsUnit(pGetCoeff(vv->m[i]),currRing->cf))
+    for(unsigned ii=0;ii<(unsigned)IDELEMS(vv);ii++)
+    {
+      if(vv->m[ii] != NULL && !n_IsUnit(pGetCoeff(vv->m[ii]),currRing->cf))
       {
         ideal vc = idCopy(vv);
         poly c = pInit();
-        pSetCoeff0(c,nCopy(pGetCoeff(vv->m[i])));
+        pSetCoeff0(c,nCopy(pGetCoeff(vv->m[ii])));
         idInsertPoly(vc,c);
         idSkipZeroes(vc);
-        for(j = 0;j<IDELEMS(vc)-1;j++)
+        for(unsigned jj = 0;jj<(unsigned)IDELEMS(vc)-1;jj++)
         {
-          if((vc->m[j]!=NULL)
-          && (n_DivBy(pGetCoeff(vc->m[j]),pGetCoeff(c),currRing->cf)))
+          if((vc->m[jj]!=NULL)
+          && (n_DivBy(pGetCoeff(vc->m[jj]),pGetCoeff(c),currRing->cf)))
           {
-            pDelete(&vc->m[j]);
+            pDelete(&vc->m[jj]);
           }
         }
@@ -4856 +4858 @@
 {
   char *s= (char *)v->Data();
-  int i = 1;
-  for(i=0; i<sArithBase.nCmdUsed; i++)
+  for(unsigned i=0; i<sArithBase.nCmdUsed; i++)
   {
     //Print("test %d, >>%s<<, tab:>>%s<<\n",i,s,sArithBase.sCmds[i].name);
@@ -5453 +5454 @@
   return FALSE;
 }
+#if 0 // unused
 static BOOLEAN jjsyMinBase(leftv res, leftv v)
 {
@@ -5458 +5460 @@
   return FALSE;
 }
+#endif
 static BOOLEAN jjpMaxComp(leftv res, leftv v)
 {
@@ -6367 +6370 @@
 // <coeff>, par1, par2 -> number2
 {
-  coeffs cf=(coeffs)w->Data();
+  coeffs cf=(coeffs)u->Data();
   if ((cf==NULL) ||(cf->cfRandom==NULL))
   {
@@ -7657 +7660 @@
 static BOOLEAN jjRESERVED0(leftv, leftv)
 {
-  int i=1;
-  int nCount = (sArithBase.nCmdUsed-1)/3;
+  unsigned i=1;
+  unsigned nCount = (sArithBase.nCmdUsed-1)/3;
   if((3*nCount)<sArithBase.nCmdUsed) nCount++;
   //Print("CMDS: %d/%d\n", sArithBase.nCmdUsed,
@@ -8705 +8708 @@
  * then alphabetically */
 
+#if 0 // unused
 static BOOLEAN jjANY2LIST(leftv res, leftv v, int cnt)
 {
@@ -8719 +8723 @@
   return failed;
 }
+#endif
 
 BOOLEAN iiExprArithM(leftv res, leftv a, int op)
@@ -8970 +8975 @@
   #endif
   if (tok>MAX_TOK) return getBlackboxName(tok);
-  int i;
+  unsigned i;
   for(i=0; i<sArithBase.nCmdUsed; i++)
     //while (sArithBase.sCmds[i].tokval!=0)
@@ -9137 +9142 @@
 {
   if(nPos<0) return NULL;
-  if(nPos<sArithBase.nCmdUsed)
+  if(nPos<(int)sArithBase.nCmdUsed)
     return sArithBase.sCmds[nPos].name;
   return NULL;
@@ -9148 +9153 @@
 
   nIndex = iiArithFindCmd(szName);
-  if(nIndex<0 || nIndex>=sArithBase.nCmdUsed)
+  if(nIndex<0 || nIndex>=(int)sArithBase.nCmdUsed)
   {
     Print("'%s' not found (%d)\n", szName, nIndex);
@@ -9182 +9187 @@
   {
     // no checks: we rely on a correct generated code in iparith.inc
-    assume(nPos < sArithBase.nCmdAllocated);
+    assume((unsigned)nPos < sArithBase.nCmdAllocated);
     assume(szName!=NULL);
     sArithBase.sCmds[nPos].name    = omStrDup(szName);

libpolys/polys/monomials/p_polys.h

@@ -189 +189 @@
 static inline int pLength(poly a)
 {
-  int l = 0;
+  unsigned l = 0;
   while (a!=NULL)
   {
@@ -195 +195 @@
     l++;
   }
-  return l;
+  return (int)l;
 }