Changeset f894fe in git for factory/canonicalform.cc

Timestamp:

Jul 30, 1997, 9:55:02 AM (27 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

257f751511c7fc8d664312e3e88cf8a49a117a05

Parents:

281760cd009d9463e865ca83f18012a15ee659dc

Message:

	* canonicalform.cc (initCanonicalForm): initialization of switches
	  removed since they are initialized by constructor

	* canonicalform.cc (fillVarsRec, getNumVars, getVars): moved to
	  cf_ops.cc


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

File:

• factory/canonicalform.cc (modified) (4 diffs)

factory/canonicalform.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: canonicalform.cc,v 1.10 1997-07-16 10:16:08 schmidt Exp $ */
+/* $Id: canonicalform.cc,v 1.11 1997-07-30 07:55:02 schmidt Exp $ */
 
 #include <config.h>
@@ -1156 +1156 @@
 #endif
 
-        Off( SW_RATIONAL );
-        Off( SW_QUOTIENT );
-        Off( SW_SYMMETRIC_FF );
-        Off( SW_BERLEKAMP );
-        Off( SW_FAC_USE_BIG_PRIMES );
-        Off( SW_FAC_QUADRATICLIFT );
-        Off( SW_USE_EZGCD );
-        Off( SW_USE_SPARSEMOD );
-
         (void)initializeCharacteristic();
         (void)initializeGMP();
@@ -1253 +1244 @@
 }
 
-static void
-fillVarsRec ( const CanonicalForm & f, int * vars )
-{
-    int n;
-    if ( (n = f.level()) > 0 ) {
-        vars[n] = 1;
-        CFIterator i;
-        for ( i = f; i.hasTerms(); ++i )
-            fillVarsRec( i.coeff(), vars );
-    }
-}
-
 CanonicalForm
 CanonicalForm::sqrt ( ) const
@@ -1318 +1297 @@
 //}}}
 
-int
-getNumVars( const CanonicalForm & f )
-{
-    int n;
-    if ( f.inCoeffDomain() )
-        return 0;
-    else  if ( (n = f.level()) == 1 )
-        return 1;
-    else {
-        int * vars = new int[ n+1 ];
-        int i;
-        for ( i = 0; i < n; i++ ) vars[i] = 0;
-        for ( CFIterator I = f; I.hasTerms(); ++I )
-            fillVarsRec( I.coeff(), vars );
-        int m = 0;
-        for ( i = 1; i < n; i++ )
-            if ( vars[i] != 0 ) m++;
-        delete [] vars;
-        return m+1;
-    }
-}
-
-CanonicalForm
-getVars( const CanonicalForm & f )
-{
-    int n;
-    if ( f.inCoeffDomain() )
-        return 1;
-    else  if ( (n = f.level()) == 1 )
-        return Variable( 1 );
-    else {
-        int * vars = new int[ n+1 ];
-        int i;
-        for ( i = 0; i <= n; i++ ) vars[i] = 0;
-        for ( CFIterator I = f; I.hasTerms(); ++I )
-            fillVarsRec( I.coeff(), vars );
-        CanonicalForm result = 1;
-        for ( i = n; i > 0; i-- )
-            if ( vars[i] != 0 ) result *= Variable( i );
-        delete [] vars;
-        return f.mvar() * result;
-    }
-}
-
 bool
 divides ( const CanonicalForm & f, const CanonicalForm & g )