Changeset 30664c in git

Timestamp:

Nov 22, 2012, 10:19:29 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

6fcddc9d1ce61bb4b060ffc6ead86cd70694c9a8

Parents:

e12d106a70736a96de005699524e86b37b9e9c98

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-11-22 22:19:29+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-11-26 17:18:46+01:00

Message:

Warning elimination + cosmetics

Files:

• kernel/ideals.cc (modified) (2 diffs)
• kernel/kstd1.cc (modified) (1 diff)
• kernel/kstdfac.cc (modified) (1 diff)
• kernel/kutil.cc (modified) (5 diffs)
• libpolys/polys/monomials/ring.cc (modified) (2 diffs)
• libpolys/polys/nc/ncSACache.h (modified) (1 diff)
• libpolys/polys/nc/summator.cc (modified) (1 diff)
• libpolys/polys/sbuckets.h (modified) (1 diff)
• libpolys/polys/simpleideals.cc (modified) (2 diffs)

kernel/ideals.cc

@@ -751 +751 @@
 ideal idLiftStd (ideal  h1, matrix* ma, tHomog hi, ideal * syz)
 {
-  int   i, j, k, t, inputIsIdeal=id_RankFreeModule(h1,currRing);
+  int  i, j, t, inputIsIdeal=id_RankFreeModule(h1,currRing);
+  long k;
   poly  p=NULL, q;
   intvec *w=NULL;
@@ -778 +779 @@
   SI_SAVE_OPT2(save2);
 
-  k=si_max(1,(int)id_RankFreeModule(h1,currRing));
+  k=si_max((long)1,id_RankFreeModule(h1,currRing));
 
   if ((k==1) && (!lift3)) si_opt_2 |=Sy_bit(V_IDLIFT);

kernel/kstd1.cc

@@ -2156 +2156 @@
     w = &temp_w;
   }
-  if ((h==testHomog)
-  )
+  if (h==testHomog)
   {
     if (strat->ak == 0)

kernel/kstdfac.cc

@@ -905 +905 @@
   strat->LazyDegree = 1;
   strat->ak = id_RankFreeModule(F,currRing);
-  if ((h==testHomog))
+  if (h==testHomog)
   {
     if (strat->ak==0)

kernel/kutil.cc

@@ -5963 +5963 @@
     strat->syzl       = strat->syzmax = ps;
     strat->syzidxmax  = comp;
-#ifdef DEBUGF5 || DEBUGF51
+#if defined(DEBUGF5) || defined(DEBUGF51)
     printf("------------- GENERATING SYZ RULES NEW ---------------\n");
 #endif
@@ -8104 +8104 @@
       return r;
     }
-      ring res = rCopy0(r, FALSE, TRUE);
-      for (int i=1; i<n-1; i++)
-      {
-        res->order[i] = res->order[i-1];
-        res->block0[i] = res->block0[i-1];
-        res->block1[i] = res->block1[i-1];
-        res->wvhdl[i] = res->wvhdl[i-1];
-      }
+    ring res = rCopy0(r, FALSE, TRUE);
+    for (int i=1; i<n-1; i++)
+    {
+      res->order[i] = res->order[i-1];
+      res->block0[i] = res->block0[i-1];
+      res->block1[i] = res->block1[i-1];
+      res->wvhdl[i] = res->wvhdl[i-1];
+    }
 
     // new 1st block
@@ -8137 +8137 @@
     }
 #endif
-  strat->tailRing = res;
-  return (res);
-  }
+    strat->tailRing = res;
+    return (res);
+  }
+  
   // not incremental => use Schreyer order
   // this is done by a trick when initializing the signatures
@@ -8148 +8149 @@
   // => we do not need to change the underlying polynomial ring at all!
 
+  // UPDATE/NOTE/TODO: use induced Schreyer ordering 'IS'!!!!????
 
   /*
@@ -8244 +8246 @@
   }
   */
+  
+  assume(FALSE);
+  return(NULL);
 }
 

libpolys/polys/monomials/ring.cc

@@ -4205 +4205 @@
       pFDeg_CASE(p_Deg); else
 #undef pFDeg_CASE
-      Print("(%p)", (void*)(r->pFDeg)); // default case
+      Print("(%p)", r->pFDeg); // default case
 
     PrintLn();
-    Print("pLDeg   : (%p)", (void*)(r->pLDeg));
+    Print("pLDeg   : (%p)", r->pLDeg);
     PrintLn();
   }
@@ -4220 +4220 @@
   else if (r->p_Setm==p_Setm_TotalDegree) PrintS("p_Setm_Totaldegree\n");
   else if (r->p_Setm==p_Setm_WFirstTotalDegree) PrintS("p_Setm_WFirstTotalDegree\n");
-  else Print("%x\n",r->p_Setm);
+  else Print("%p\n",r->p_Setm);
 }
 

libpolys/polys/nc/ncSACache.h

@@ -25 +25 @@
     CCacheHash(ring r): m_basering(r), m_NVars(r->N){};
 
-    const ring GetBasering() const { return m_basering; };
+    ring GetBasering() const { return m_basering; };
     inline int NVars() const { return m_NVars; }
     

libpolys/polys/nc/summator.cc

@@ -33 +33 @@
 
 CPolynomialSummator::CPolynomialSummator(const ring& rBaseRing, bool bUsePolynomial):
-    m_basering(rBaseRing), m_bUsePolynomial(bUsePolynomial)
+    m_bUsePolynomial(bUsePolynomial), m_basering(rBaseRing)
 {
 #ifdef RDEBUG

libpolys/polys/sbuckets.h

@@ -74 +74 @@
 
 //////////////////////////////////////////////////////////////////////////
-///
+
 /// Merges p into Spoly: assumes Bpoly and p have no common monoms
-///
+/// destroys p!
 void sBucket_Merge_p(sBucket_pt bucket, poly p, int lp);
-// adds poly p to bucket
+
+/// adds poly p to bucket
+/// destroys p!
 void sBucket_Add_p(sBucket_pt bucket, poly p, int lp);
 

libpolys/polys/simpleideals.cc

@@ -720 +720 @@
   if (s!=NULL)
   {
-    int  j=0;
+    long  j=0;
 
     if (rRing_has_Comp(tailRing) && rRing_has_Comp(lmRing))
     {
-      int  l=IDELEMS(s);
       poly *p=s->m;
-      int  k;
-      for (; l != 0; l--)
+      for (unsigned int l=IDELEMS(s); l != 0; --l, ++p)
       {
         if (*p!=NULL)
         {
           pp_Test(*p, lmRing, tailRing);
-          k = p_MaxComp(*p, lmRing, tailRing);
+          const long k = p_MaxComp(*p, lmRing, tailRing);
           if (k>j) j = k;
         }
-        p++;
       }
     }
@@ -1206 +1203 @@
 {
   matrix result = mpNew(mod->rank,IDELEMS(mod));
-  long i,cp;
+  long i; long cp;
   poly p,h;