Changeset b1a453 in git

Timestamp:

Feb 19, 2014, 2:49:08 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ace936d6dc5d51a34013b39f57841e36db382b01

Parents:

607d8449052875a7ec694f015644148d54da45b5

git-author:

Martin Lee <martinlee84@web.de>2014-02-19 14:49:08+01:00

git-committer:

Martin Lee <martinlee84@web.de>2014-03-06 11:04:13+01:00

Message:

removed isSqrFree

Files:

• Singular/extra.cc (modified) (1 diff)
• factory/cf_algorithm.h (modified) (1 diff)
• factory/cf_factor.cc (modified) (1 diff)
• factory/fac_sqrfree.cc (modified) (2 diffs)
• factory/fac_sqrfree.h (modified) (1 diff)
• libpolys/polys/clapsing.cc (modified) (1 diff)
• libpolys/polys/clapsing.h (modified) (1 diff)

Singular/extra.cc

@@ -2679 +2679 @@
 //       }
 //       else
-  /*==================== isSqrFree =============================*/
-      if(strcmp(sys_cmd,"isSqrFree")==0)
-      {
-        if ((h!=NULL) &&(h->Typ()==POLY_CMD))
-        {
-          res->rtyp=INT_CMD;
-          res->data=(void *)(long) singclap_isSqrFree((poly)h->Data(), currRing);
-          return FALSE;
-        }
-        else
-          WerrorS("poly expected");
-      }
-      else
   /*==================== pDivStat =============================*/
   #if defined(PDEBUG) || defined(PDIV_DEBUG)

factory/cf_algorithm.h

@@ -71 +71 @@
 CFFList sqrFree ( const CanonicalForm & f, bool sort= false );
 
-bool isSqrFree ( const CanonicalForm & f );
-
 CanonicalForm homogenize( const CanonicalForm & f, const Variable & x);
 CanonicalForm homogenize( const CanonicalForm & f, const Variable & x,

factory/cf_factor.cc

@@ -780 +780 @@
 }
 
-bool isSqrFree ( const CanonicalForm & f )
-{
-//    ASSERT( f.isUnivariate(), "multivariate factorization not implemented" );
-    if ( getCharacteristic() == 0 )
-        return isSqrFreeZ( f );
-    else
-        return isSqrFreeFp( f );
-}
-

factory/fac_sqrfree.cc

@@ -11 +11 @@
 #include "cf_map.h"
 #include "cf_algorithm.h"
-
-static int divexp = 1;
-
-static void divexpfunc ( CanonicalForm &, int & e )
-{
-    e /= divexp;
-}
 
 static int
@@ -49 +42 @@
     return result;
 }
-
-CFFList sqrFreeFp ( const CanonicalForm & f )
-{
-    CanonicalForm t0 = f, t, v, w, h;
-    CanonicalForm leadcf = t0.lc();
-    Variable x = f.mvar();
-    CFFList F;
-    int p = getCharacteristic();
-    int k, e = 1;
-
-    if ( ! leadcf.isOne() )
-        t0 /= leadcf;
-
-    divexp = p;
-    while ( t0.degree(x) > 0 )
-    {
-        t = gcd( t0, t0.deriv() );
-        v = t0 / t;
-        k = 0;
-        while ( v.degree(x) > 0 )
-        {
-            k = k+1;
-            if ( k % p == 0 )
-            {
-                t /= v;
-                k = k+1;
-            }
-            w = gcd( t, v );
-            h = v / w;
-            v = w;
-            t /= v;
-            if ( h.degree(x) > 0 )
-                F.append( CFFactor( h/h.lc(), e*k ) );
-        }
-        t0 = apply( t, divexpfunc );
-        e = p * e;
-    }
-    if ( ! leadcf.isOne() )
-    {
-        if ( !F.isEmpty() && (F.getFirst().exp() == 1) )
-        {
-            leadcf = F.getFirst().factor() * leadcf;
-            F.removeFirst();
-        }
-        F.insert( CFFactor( leadcf, 1 ) );
-    }
-    return F;
-}
-
-bool isSqrFreeFp( const CanonicalForm & f )
-{
-  CFFList F = sqrFreeFp( f );
-  return ( F.length() == 1 && F.getFirst().exp() == 1 );
-}
-
-bool isSqrFreeZ ( const CanonicalForm & f )
-{
-    return gcd( f, f.deriv() ).degree() == 0;
-}
-
-/*
-
-CFFList sqrFreeZ ( const CanonicalForm & a )
-{
-    CanonicalForm b = a.deriv(), c = gcd( a, b );
-    CanonicalForm y, z, w = a / c;
-    int i = 1;
-    CFFList F;
-
-    while ( ! c.degree() == 0 )
-    {
-        y = gcd( w, c ); z = w / y;
-        if ( degree( z ) > 0 )
-            if ( lc( z ).sign() < 0 )
-                F.append( CFFactor( -z, i ) );
-            else
-                F.append( CFFactor( z, i ) );
-        i++;
-        w = y; c = c / y;
-    }
-    if ( degree( w ) > 0 )
-        if ( lc( w ).sign() < 0 )
-            F.append( CFFactor( -w, i ) );
-        else
-            F.append( CFFactor( w, i ) );
-    return F;
-}
-*/
 
 CFFList sqrFreeZ ( const CanonicalForm & a )

factory/fac_sqrfree.h

@@ -10 +10 @@
 CFFList sortCFFList ( CFFList & F );
 
-CFFList sqrFreeFp ( const CanonicalForm & f );
-
-bool isSqrFreeFp ( const CanonicalForm & f );
-
 CFFList sqrFreeZ ( const CanonicalForm & f );
-
-bool isSqrFreeZ ( const CanonicalForm & f );
 
 /// squarefree part of a poly

libpolys/polys/clapsing.cc

@@ -1550 +1550 @@
 }
 
-BOOLEAN singclap_isSqrFree(poly f, const ring r)
-{
-  BOOLEAN b=FALSE;
-  CanonicalForm F( convSingPFactoryP( f,r ) );
-  if((r->cf->type==n_Zp)&&(!F.isUnivariate()))
-      goto err;
-  b=(BOOLEAN)isSqrFree(F);
-  Off(SW_RATIONAL);
-  return b;
-err:
-  WerrorS( feNotImplemented );
-  return 0;
-}
-
 poly singclap_det( const matrix m, const ring s )
 {

libpolys/polys/clapsing.h

@@ -60 +60 @@
 # endif
 
-BOOLEAN singclap_isSqrFree(poly f, const ring r);
-
  matrix singclap_irrCharSeries ( ideal I, const ring r);
  char* singclap_neworder ( ideal I, const ring r);