Changeset 625105 in git for libfac/charset

Timestamp:

Jul 8, 2005, 11:18:15 AM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f3a8c2e6db3e7e4362930d7c847a62d8453daf82

Parents:

90c1ebba9b0c011ddb3f041df9b6a41d78188230

Message:

*hannes: fixed call of resultant


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

File:

• libfac/charset/alg_factor.cc (modified) (4 diffs)

libfac/charset/alg_factor.cc

@@ -3 +3 @@
 // emacs edit mode for this file is -*- C++ -*-
 ////////////////////////////////////////////////////////////
-static char * rcsid = "$Id: alg_factor.cc,v 1.13 2004-12-10 10:15:05 Singular Exp $";
+static char * rcsid = "$Id: alg_factor.cc,v 1.14 2005-07-08 09:18:15 Singular Exp $";
 ////////////////////////////////////////////////////////////
 // FACTORY - Includes
@@ -109 +109 @@
 static CanonicalForm
 resultante( const CanonicalForm & f, const CanonicalForm& g, const Variable & v ){
-return resultant(f,g,v);
+  bool on_rational = isOn(SW_RATIONAL);
+  On(SW_RATIONAL);
+  CanonicalForm cd = bCommonDen( f );
+  CanonicalForm fz = f * cd;
+  cd = bCommonDen( g );
+  CanonicalForm gz = g * cd;
+  if (!on_rational)  Off(SW_RATIONAL);
+
+return resultant(fz,gz,v);
 
   CanonicalForm h, beta, help, F, G;
@@ -359 +367 @@
 gcd0( CanonicalForm f, CanonicalForm g ){
   int charac= getCharacteristic();
+  int save=isOn(SW_RATIONAL);
   setCharacteristic(0); Off(SW_RATIONAL);
   CanonicalForm ff= mapinto(f), gg= mapinto(g);
   CanonicalForm result= gcd(ff,gg);
-  setCharacteristic(charac); On(SW_RATIONAL);
+  setCharacteristic(charac); 
+  if (save) On(SW_RATIONAL);
   return mapinto(result);
 }
@@ -809 +819 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.13  2004/12/10 10:15:05  Singular
+*pohl: AlgExtGenerator etc.
+
 Revision 1.12  2003/02/18 11:09:25  Singular
 * hannes: alg_gcd(f,f'=0) get a special handling