Changeset c6caf1 in git for factory

Timestamp:

Mar 12, 1998, 3:31:13 PM (26 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', '2fa36c576e6a4ddbb1093b43c7f8e9835e17e52a')

Children:

195424a9a77b57c412c3492fea3a288b9e27eb68

Parents:

17ce9d288ac1fc0cdd5ff71f3681357576be06a3

Message:

	* fac_util.cc (maxCoeff): function removed.  Declarations
	  adapted.  All references replaced by `maxNorm()'.


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

Location:

factory

Files:

• fac_ezgcd.cc (modified) (3 diffs)
• fac_multivar.cc (modified) (2 diffs)
• fac_util.cc (modified) (3 diffs)
• fac_util.h (modified) (2 diffs)
• sm_sparsemod.cc (modified) (2 diffs)

factory/fac_ezgcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: fac_ezgcd.cc,v 1.10 1998-03-10 14:48:24 schmidt Exp $ */
+/* $Id: fac_ezgcd.cc,v 1.11 1998-03-12 14:30:50 schmidt Exp $ */
 
 #include <config.h>
@@ -247 +247 @@
 
     CanonicalForm limit = power( CanonicalForm(2), degree( Db ) ) *
-        tmax( maxCoeff( Lb ), tmax( maxCoeff( Db ), maxCoeff( F ) ) );
+        tmax( maxNorm( Lb ), tmax( maxNorm( Db ), maxNorm( F ) ) );
     int p = pk.getp();
     int k = pk.getk();
@@ -264 +264 @@
 {
     CanonicalForm limit = power( CanonicalForm(2), tmin( degF, degG ) ) *
-        gcd( icontent( lcF ), icontent( lcG ) ) * tmin( maxCoeff( F ), maxCoeff( G ) );
+        gcd( icontent( lcF ), icontent( lcG ) ) * tmin( maxNorm( F ), maxNorm( G ) );
     int p, i = 0;
     do {

factory/fac_multivar.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: fac_multivar.cc,v 1.7 1997-08-29 08:38:28 schmidt Exp $ */
+/* $Id: fac_multivar.cc,v 1.8 1998-03-12 14:30:55 schmidt Exp $ */
 
 #include <config.h>
@@ -69 +69 @@
     for ( i = 1; i <= k; i++ )
         M += degs[i];
-    CanonicalForm b = 2 * maxCoeff( f ) * power( CanonicalForm( 3 ), M );
+    CanonicalForm b = 2 * maxNorm( f ) * power( CanonicalForm( 3 ), M );
     CanonicalForm B = p;
     k = 1;

factory/fac_util.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: fac_util.cc,v 1.7 1998-03-12 10:27:15 schmidt Exp $ */
+/* $Id: fac_util.cc,v 1.8 1998-03-12 14:31:02 schmidt Exp $ */
 
 #include <config.h>
@@ -8 +8 @@
 #include "cf_defs.h"
 #include "canonicalform.h"
-#include "cf_algorithm.h"
 #include "cf_iter.h"
 #include "fac_util.h"
@@ -143 +142 @@
 
 CanonicalForm
-maxCoeff( const CanonicalForm & f )
-{
-    if ( f.inCoeffDomain() )
-        return abs( f );
-    else {
-        CanonicalForm M = 0, m;
-        for ( CFIterator i = f; i.hasTerms(); i++ )
-            if ( (m = maxCoeff( i.coeff() )) > M )
-                M = m;
-        return M;
-    }
-}
-
-
-CanonicalForm
 mappksymmetric ( const CanonicalForm & f )
 {

factory/fac_util.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: fac_util.h,v 1.5 1997-06-19 12:23:08 schmidt Exp $ */
+/* $Id: fac_util.h,v 1.6 1998-03-12 14:31:07 schmidt Exp $ */
 
 #ifndef INCL_FAC_UTIL_H
@@ -39 +39 @@
 void divremainder( const CanonicalForm & f, const CanonicalForm & g, CanonicalForm & quot, CanonicalForm & rem, const modpk & pk );
 
-CanonicalForm maxCoeff( const CanonicalForm & f );
-
 bool Hensel ( const CanonicalForm & U, CFArray & G, const CFArray & lcG, const Evaluation & A, const modpk & bound, const Variable & x );
 

factory/sm_sparsemod.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: sm_sparsemod.cc,v 1.6 1998-03-10 14:48:29 schmidt Exp $ */
+/* $Id: sm_sparsemod.cc,v 1.7 1998-03-12 14:31:13 schmidt Exp $ */
 
 //{{{ docu
@@ -474 +474 @@
     deg = 1;
   CanonicalForm B, L, Bound, lcF = Leitkoeffizient( primif); //lc( primif ) ;
-  B =  2 * maxCoeff( primif ) * maxCoeff( g ) ;
+  B =  2 * maxNorm( primif ) * maxNorm( g ) ;
   L = lcF ;
   Bound = abs( 2 * B * L + 1 );