Changeset 14b1e65 in git for libfac/factor/SqrFree.cc

Timestamp:

Aug 8, 2001, 1:59:13 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

456842ed1cd4bb0af35f859e0befe623c3991393

Parents:

c794a95c85e7ae1437369ab150d85b7c4ff17fd0

Message:

*hannes: Dan's NOSTREAMIO changes


git-svn-id: file:///usr/local/Singular/svn/trunk@5572 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• libfac/factor/SqrFree.cc (modified) (16 diffs)

libfac/factor/SqrFree.cc

@@ -2 +2 @@
 ///////////////////////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-static char * rcsid = "$Id: SqrFree.cc,v 1.4 1997-11-18 16:39:06 Singular Exp $";
+static char * rcsid = "$Id: SqrFree.cc,v 1.5 2001-08-08 11:59:13 Singular Exp $";
 static char * errmsg = "\nYou found a bug!\nPlease inform (Michael Messollen) michael@math.uni-sb.de .\n Please include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
 ///////////////////////////////////////////////////////////////////////////////
 // FACTORY - Includes
 #include<factory.h>
+#ifndef NOSTREAMIO
+#include <iostream.h>
+#endif
 // Factor - Includes
 #include "tmpl_inst.h"
@@ -30 +33 @@
 
 
-static inline CFFactor 
-Powerup( const CFFactor & F , int exp=1){ 
-  return CFFactor(F.factor(), exp*F.exp()) ; 
-}
-
-static CFFList 
+static inline CFFactor
+Powerup( const CFFactor & F , int exp=1){
+  return CFFactor(F.factor(), exp*F.exp()) ;
+}
+
+static CFFList
 Powerup( const CFFList & Inputlist , int exp=1 ){
   CFFList Outputlist;
@@ -49 +52 @@
 // Domain is q=p^m , f a uni/multivariate polynomial         //
 ///////////////////////////////////////////////////////////////
-static CanonicalForm 
+static CanonicalForm
 PthRoot( const CanonicalForm & f ){
   CanonicalForm RES, R = f;
   int n= max(level(R),getNumVars(R)), p= getCharacteristic();
-  
+
   if (n==0){ // constant
     if (R.inExtension()) // not in prime field; f over |F(q=p^k)
@@ -90 +93 @@
     g = mygcd(f,g);
     if ( g.isOne() || (-g).isOne() ) return 1;
-    else 
+    else
       if ( getNumVars(g) == 0 ) return 1;// <- totaldegree!!!
       else return 0 ;
@@ -99 +102 @@
       // g = 1 || -1 : sqr-free, g poly : not sqr-free, g number : opt helps
       if ( ! (g.isOne() || (-g).isOne() || getNumVars(g)==0 ) ) {
-        if ( opt==0 ) return 0;
-        else {
-          if ( SqrFreeTest(g,1) == 0 ) return 0;
-          g = swapvar(g,k,n);
-          f /=g ;
-        }
+        if ( opt==0 ) return 0;
+        else {
+          if ( SqrFreeTest(g,1) == 0 ) return 0;
+          g = swapvar(g,k,n);
+          f /=g ;
+        }
       }
     }
@@ -110 +113 @@
     n = level(f); // maybe less indeterminants
     //    if ( totaldegree(f) <= 1 ) return 1;
-    
+
     // Let`s look if it is a Pth root
     if ( getCharacteristic() > 0 )
       for (int k=1; k<=n; k++ ) {
-        g=swapvar(f,k,n); g=g.deriv();
-        if ( ! g.isZero() ) break ;
-        else if ( k==n) return 0 ; // really is Pth root
+        g=swapvar(f,k,n); g=g.deriv();
+        if ( ! g.isZero() ) break ;
+        else if ( k==n) return 0 ; // really is Pth root
       }
     g = f.deriv() ;
@@ -128 +131 @@
   WerrorS("libfac: ERROR: SqrFreeTest: we should never fall trough here!");
 #else
-  cerr << "\nlibfac: ERROR: SqrFreeTest: we should never fall trough here!\n" 
+  cerr << "\nlibfac: ERROR: SqrFreeTest: we should never fall trough here!\n"
        << rcsid << errmsg << endl;
 #endif
@@ -141 +144 @@
 // needs not to be 1 !!!!!                                   //
 ///////////////////////////////////////////////////////////////
-static CFFList 
+static CFFList
 SqrFreed( const CanonicalForm & r ){
   CanonicalForm h, g, f = r;
@@ -154 +157 @@
   }
 
-// We look if we do have a content; if so, SqrFreed the content 
+// We look if we do have a content; if so, SqrFreed the content
 // and continue computations with pp(f)
   for (int k=1; k<=n; k++) {
@@ -161 +164 @@
       g = swapvar(g,k,n);
       DEBOUTLN(cout, "We have a content: ", g);
-      Outputlist = myUnion(InternalSqrFree(g),Outputlist); // should we add a 
+      Outputlist = myUnion(InternalSqrFree(g),Outputlist); // should we add a
                                                 // SqrFreeTest(g) first ?
       DEBOUTLN(cout, "Outputlist is now: ", Outputlist);
@@ -177 +180 @@
       f /= g;
     }
-    Outputlist = Union(sqrFree(f),Outputlist) ; 
+    Outputlist = Union(sqrFree(f),Outputlist) ;
     DEBOUTLN(cout, "Outputlist after univ. sqrFree(f) = ", Outputlist);
     DEBDECLEVEL(cout, "SqrFreed");
@@ -197 +200 @@
       g=swapvar(f,k,n) ; g = g.deriv();
       if ( ! g.isZero() ){ // can`t be Pth root
-        CFFList Outputlist2= SqrFreed(swapvar(f,k,n)); 
-        for (CFFListIterator inter=Outputlist2; inter.hasItem(); inter++){
-          Outputlist= myappend(Outputlist, CFFactor(swapvar(inter.getItem().factor(),k,n), inter.getItem().exp()));
-        }
-        return Outputlist;
+        CFFList Outputlist2= SqrFreed(swapvar(f,k,n));
+        for (CFFListIterator inter=Outputlist2; inter.hasItem(); inter++){
+          Outputlist= myappend(Outputlist, CFFactor(swapvar(inter.getItem().factor(),k,n), inter.getItem().exp()));
+        }
+        return Outputlist;
       }
-      else 
-        if ( k==n ) { // really is Pth power
+      else
+        if ( k==n ) { // really is Pth power
           DEBOUTLN(cout, "f is a p'th root: ", f);
-          CFMap m;
+          CFMap m;
           g = compress(f,m);
-          f = m(PthRoot(g));
+          f = m(PthRoot(g));
           DEBOUTLN(cout, "  that is       : ", f);
-          // now : Outputlist union ( SqrFreed(f) )^getCharacteristic()
-          Outputlist=myUnion(Powerup(InternalSqrFree(f),getCharacteristic()),Outputlist);
-          DEBDECLEVEL(cout, "SqrFreed");
-          return Outputlist ;
-        }
+          // now : Outputlist union ( SqrFreed(f) )^getCharacteristic()
+          Outputlist=myUnion(Powerup(InternalSqrFree(f),getCharacteristic()),Outputlist);
+          DEBDECLEVEL(cout, "SqrFreed");
+          return Outputlist ;
+        }
     }
   }
@@ -254 +257 @@
   WerrorS("libfac: ERROR: SqrFreed: we should never fall trough here!");
 #else
-  cerr << "\nlibfac: ERROR: SqrFreed: we should never fall trough here!\n" 
+  cerr << "\nlibfac: ERROR: SqrFreed: we should never fall trough here!\n"
        << rcsid << errmsg << endl;
 #endif
@@ -265 +268 @@
 // Input can have a constant as content                      //
 ///////////////////////////////////////////////////////////////
-CFFList 
+CFFList
 InternalSqrFree( const CanonicalForm & r ){
   CanonicalForm g=icontent(r), f = r;
@@ -285 +288 @@
       f /= g;
       if ( getNumVars(f) != 0 ) // a real polynomial
-        Outputlist=myUnion(SqrFreed(f),Outputlist) ;
+        Outputlist=myUnion(SqrFreed(f),Outputlist) ;
   }
   DEBOUTLN(cout,"Outputlist = ", Outputlist);
@@ -331 +334 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.4  1997/11/18 16:39:06  Singular
+* hannes: moved WerrorS from C++ to C
+     (Factor.cc MVMultiHensel.cc SqrFree.cc Truefactor.cc)
+
 Revision 1.3  1997/09/12 07:19:50  Singular
 * hannes/michael: libfac-0.3.0