Changeset f152c5 in git for libfac

Timestamp:

Jun 24, 2011, 5:20:59 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

5e1226f141996c2f2151d550d0e897ad75686b2b

Parents:

fcf7587e9d782e98bec5f1ff1852bb6a0d383f83

Message:

removed Factorize2

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

Location:

libfac

Files:

• charset/alg_factor.cc (modified) (1 diff)
• charset/charset.cc (modified) (1 diff)
• charset/csutil.cc (modified) (2 diffs)
• factor.h (modified) (1 diff)
• factor/Factor.cc (modified) (6 diffs)
• factor/homogfactor.cc (modified) (2 diffs)
• test.cc (modified) (1 diff)

libfac/charset/alg_factor.cc

@@ -178 +178 @@
       }
       else
-        testlist= Factorize(R);
+        testlist= factorize(R);
       DEBOUTLN(CERR, "testlist= ", testlist);
       testlist.removeFirst();

libfac/charset/charset.cc

@@ -494 +494 @@
     if ( degree(elem) > 1 ) // linear poly's are irreduzible
     {
-      qs = Factorize(elem);
+      qs = factorize(elem);
       // remove a constant
       if (qs.getFirst().factor().degree()==0) qs.removeFirst();

libfac/charset/csutil.cc

@@ -395 +395 @@
   else
   {
-    sqrfreelist = Factorize(init);
+    sqrfreelist = factorize(init);
     //sqrfreelist.removeFirst();
   }
@@ -498 +498 @@
   for ( CFListIterator i=ps; i. hasItem(); i++ )
   {
-    q=Factorize(i.getItem());
+    q=factorize(i.getItem());
     q.removeFirst();
     // Next can be simplified ( first (already removed) elem in q is the only constant

libfac/factor.h

@@ -17 +17 @@
 extern const char * libfac_author;
 
-//// Note: second argument for Factorize is for internal use only.
-CFFList Factorize( const CanonicalForm & F, int is_SqrFree=0 ) ;
 CFFList Factorize( const CanonicalForm & F, const CanonicalForm & mipo, int is_SqrFree=0 ) ;
-CFFList Factorize2(CanonicalForm F, const CanonicalForm & minpoly );
 CFFList newfactoras( const CanonicalForm & f, const CFList & as, int &success);
 CFFList newcfactor( const CanonicalForm & f, const CFList & as, int &success);

libfac/factor/Factor.cc

@@ -58 +58 @@
   if (alpha.level() <0)
   {
-    if (f.isUnivariate())
-      return factorize(f,alpha);
-    else
-    {
-      return Factorize(f,mipo);
-    }
+    return factorize(f,alpha);
   }
   else
@@ -626 +621 @@
                 Extension.level());
       TIMING_START(evaluate_time);
-     #if 1
-     Outputlist = factorize2(F,Extension,alpha);
-     #else
-      Variable X;
-      CanonicalForm mipo=getMipo(Extension,X);
-      CFList as(mipo);
-      Outputlist = newfactoras( F, as, 1);
-     #endif
+      Outputlist = factorize2(F,Extension,alpha);
       TIMING_END(evaluate_time);
       return Outputlist;
@@ -742 +730 @@
       DEBOUTLN(CERR, "Univ. Factorization over extension of degree ",
                degree(getMipo(Extension,'x')) );
-     #if 1
       UnivariateFactorlist = factorize2(ffuni,Extension,alpha);
-     #else
-      Variable X;
-      CanonicalForm mipo=getMipo(Extension,X);
-      CFList as(mipo);
-      UnivariateFactorlist = newfactoras( ffuni, as, 1);
-     #endif
     }
   }
@@ -999 +980 @@
    return fdivides(F,G);
 }
-CFFList Factorize2(CanonicalForm F, const CanonicalForm & minpoly )
-{
-#ifndef NDEBUG
-  //printf("start Factorize2(int_flag=%d)\n",libfac_interruptflag);
-#endif
-  CFFList G,H;
-  CanonicalForm fac;
-  int d,e;
-  ListIterator<CFFactor> i,k;
-  libfac_interruptflag=0;
-  CFFList iF=Factorize(F,minpoly);
-  if ((libfac_interruptflag==0)&&(!iF.isEmpty()))
-    H=iF;
-  else
-  {
-#ifndef NDEBUG
-    //printf("variant 2(int_flag=%d)\n",libfac_interruptflag);
-#endif
-    libfac_interruptflag=0;
-    iF=Factorize(F);
-    if (libfac_interruptflag==0)
-    {
-      i = iF;
-      while( i.hasItem())
-      {
-        d = i.getItem().exp();
-        fac = i.getItem().factor();
-        if (fdivides(fac,F))
-        {
-          if ((getNumVars(fac)==0)||(fac.degree()<=1))
-          {
-#ifndef NOSTREAMIO
-#ifndef NDEBUG
-            //printf("append trivial factor\n");
-#endif
-#endif
-            H.append( CFFactor( fac, d));
-            do {F/=fac; d--; } while (d>0);
-          }
-          else
-          {
-            G = Factorize( fac, minpoly);
-            if (libfac_interruptflag!=0)
-            {
-              libfac_interruptflag=0;
-              k = G;
-              while( k.hasItem())
-              {
-                fac = k.getItem().factor();
-                int dd = k.getItem().exp()*d;
-                e=0;
-                while ((!fac.isZero())&& fdivides2(fac,F,minpoly) && (dd>0))
-                {
-#ifndef NOSTREAMIO
-#ifndef NDEBUG
-                  //out_cf("factor:",fac,"\n");
-#endif
-#endif
-                  e++;dd--;
-                  F/=fac;
-                }
-                if (e>0) H.append( CFFactor( fac , e ) );
-                ++k;
-              }
-            }
-          }
-        }
-        ++i;
-      }
-    }
-  }
-  //Outputlist = newfactoras( F, as, 1);
-  if((isOn(SW_USE_NTL_SORT))&&(!H.isEmpty())) H.sort(cmpCF);
-#ifndef NDEBUG
-  //printf("end Factorize2(%d)\n",libfac_interruptflag);
-#endif
-  return H;
-}
 
 CFFList
@@ -1119 +1022 @@
         //CFFList sqF=sqrFree(F); // sqrFreeZ
         CFFList sqF=SqrFreeMV(F,minpoly);
-        if (sqF.isEmpty()) sqF=sqrFree(F);
+        if (sqF.isEmpty()) sqF=sqrFree(F);
         CFFList G,H;
         CanonicalForm fac;
@@ -1137 +1040 @@
           }
         }
-        //Outputlist = newfactoras( F, as, 1);
         Outputlist = H;
       }

libfac/factor/homogfactor.cc

@@ -26 +26 @@
 void out_cf(char *s1,const CanonicalForm &f,char *s2);
 
-CFFList Factorize2(CanonicalForm F, const CanonicalForm & minpoly );
-
 #ifdef HFACTORDEBUG
 #  define DEBUGOUTPUT
@@ -152 +150 @@
   // should we do this for low degree polys g ? e.g. quadratic?
   // 
-  CFFList Intermediatelist;
   CFFList Homoglist;
   CFFListIterator j;
-  if ( getCharacteristic() > 0 )
-  {
-     CFMap n;
-     if (minpoly.isZero())
-       Intermediatelist = Factorize(compress(F,n), 1);
-     else
-       Intermediatelist = Factorized(compress(F,n), minpoly, Mainvar);
-     for ( j=Intermediatelist; j.hasItem(); j++ )
-       Homoglist.append(CFFactor( n(j.getItem().factor()), j.getItem().exp()) );
-  }
+  if (minpoly.isZero())
+    Homoglist = factorize(F, 1);
   else
   {
-     if (minpoly.isZero())
-       Homoglist = factorize(F);
-     else
-       Homoglist = Factorize2(F,minpoly);
+    CFFList Intermediatelist;
+    CFMap n;
+    Intermediatelist = Factorized(compress(F,n), minpoly, Mainvar);
+    for ( j=Intermediatelist; j.hasItem(); j++ )
+      Homoglist.append(CFFactor( n(j.getItem().factor()), j.getItem().exp()) );
   }
   // Now we have uncompressed factors in Homoglist

libfac/test.cc

@@ -48 +48 @@
 //////////////////////////////////////////////////////////////
 //    COUT << " f = "; 
-    CIN >> f;
-    COUT << f  << " mod " << charac << " = " ;
-    Factorlist= Factorize( f,0 );
-     COUT << Factorlist ;//<< "\n";
+//    CIN >> f;
+//    COUT << f  << " mod " << charac << " = " ;
+//    Factorlist= Factorize( f,0 );
+//     COUT << Factorlist ;//<< "\n";
 // Ueberpruefen:
-    g=1;
-    for ( CFFListIterator i=Factorlist ; i.hasItem(); i++){
-        copy = i.getItem();
-        if ( getNumVars(copy.factor()) > 0 )
-             for ( int j=1; j<=copy.exp(); j++)
-             g *= copy.factor();
-        else g *= copy.factor();
-    }
-    if ( (f-g) != f.genZero() ){
-        CERR << "\nList and f differ: f= " << f << "  g= " << g << "\n";
-    }
+//    g=1;
+//    for ( CFFListIterator i=Factorlist ; i.hasItem(); i++){
+//      copy = i.getItem();
+//      if ( getNumVars(copy.factor()) > 0 )
+//           for ( int j=1; j<=copy.exp(); j++)
+//           g *= copy.factor();
+//      else g *= copy.factor();
+ //   }
+//    if ( (f-g) != f.genZero() ){
+//      CERR << "\nList and f differ: f= " << f << "  g= " << g << "\n";
+ //   }
 }