Changeset 448d06 in git

Timestamp:

Feb 21, 2013, 5:40:49 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c2400cea086b85043ee8187be4765842d83ecac4

Parents:

e5aab035dcd0b56379d1af420d8c6fbac1c5f73ee29bd5c03a53b919fe8180547ab8722b6031b41e

Message:

Merge pull request #293 from mmklee/fix_sw_warnings

fix: some warnings in libfac

Files:

• factory/libfac/charset/alg_factor.cc (modified) (2 diffs)
• factory/libfac/charset/algfactor.cc (modified) (2 diffs)
• factory/libfac/factor/Factor.cc (modified) (3 diffs)
• factory/libfac/factor/MVMultiHensel.cc (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (2 diffs)

factory/libfac/charset/alg_factor.cc

@@ -378 +378 @@
       // muessen wir die Nachfolger aendern, wenn s != 0 ?
       DEBOUTLN(CERR, "simpleextension: g= ", g);
-      if ( s != 0 ) DEBOUTLN(CERR, "simpleextension: s= ", s);
-      else DEBOUTLN(CERR, "simpleextension: s= ", s);
+      DEBOUTLN(CERR, "simpleextension: s= ", s);
       DEBOUTLN(CERR, "simpleextension: R= ", R);
       Returnlist.insert(s);
@@ -684 +683 @@
   CanonicalForm Fgcd;
           Fgcd= alg_gcd(f,f.deriv(),Astar);
-  if ( Fgcd == 0 ) DEBOUTMSG(CERR, "WARNING: p'th root ?");
+  if ( Fgcd == 0 ) {DEBOUTMSG(CERR, "WARNING: p'th root ?");}
   if (( degree(Fgcd, f.mvar()) > 0) && (!(f.deriv().isZero())) ){
     DEBOUTLN(CERR, "Nontrivial GCD found of ", f);

factory/libfac/charset/algfactor.cc

@@ -29 +29 @@
 int hasVar(const CanonicalForm &f, const Variable &v);
 
+/* unused functions:
 static CFFList
 myminus( const CFFList & Inputlist, const CFFactor & TheFactor){
@@ -43 +44 @@
 }
 
-/* unused functions:
 static CFFList
 myDifference(const CFFList & Inputlist1,const CFFList & Inputlist2){

factory/libfac/factor/Factor.cc

@@ -620 +620 @@
     {
       if (Extension.level()<0)
-      DEBOUTLN(CERR, "Univ. Factorization over extension of degree ",
-               degree(getMipo(Extension,'x')) );
+      {
+        DEBOUTLN(CERR, "Univ. Factorization over extension of degree ",
+                 degree(getMipo(Extension,'x')) );
+      }
       else
-      DEBOUTLN(CERR, "Univ. Factorization over extension of level ??",
-                Extension.level());
+      {
+        DEBOUTLN(CERR, "Univ. Factorization over extension of level ??",
+                 Extension.level());
+      }
       TIMING_START(evaluate_time);
       Outputlist = factorize2(F,Extension,alpha);
@@ -964 +968 @@
 //           * ensuring poly is sqrfree (n.y.i.)             //
 ///////////////////////////////////////////////////////////////
-static bool fdivides2(const CanonicalForm &F, const CanonicalForm &G, const CanonicalForm &minpoly)
+/*static bool fdivides2(const CanonicalForm &F, const CanonicalForm &G, const CanonicalForm &minpoly)
 {
   if (!minpoly.isZero())
@@ -985 +989 @@
   else
    return fdivides(F,G);
-}
+}*/
 
 CFFList

factory/libfac/factor/MVMultiHensel.cc

@@ -72 +72 @@
     return *this;
   }
-  RememberForm() : poly(0), calculated(false) {}
+  RememberForm() : calculated(false), poly(0) {}
   Boolean calculated;
   CanonicalForm poly;

libpolys/polys/monomials/p_polys.cc

@@ -697 +697 @@
   if( p == NULL ) // TODO: ???
      return -1;
-   
-  long r = totaldegreeWecart_IV(p, R, w); pIter(p);
-
-  for ( ; p!=NULL; pIter(p) )
-  {
-    const long t = totaldegreeWecart_IV(p, R, w);
+  long r=~0L;
+  loop
+  {
+    long t = totaldegreeWecart_IV(p, R, w); pIter(p);
     if (t > r) r = t;
-  }
-   
+    pIter(p);
+    if (p==NULL) break;
+  }
   return r;
 }
@@ -728 +727 @@
     j+=p_GetExp(p, i, r)*r->firstwv[i-1];
 
-  for (;i<=r->N;i++)
+  for (;i<=rVar(r);i++)
     j+=p_GetExp(p,i, r)*p_Weight(i, r);