Changeset 55e308 in git

Timestamp:

Dec 15, 2004, 6:45:10 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1d5418b9bdcc715becec9d153116793ed3147e8f

Parents:

f52c2f15d099bc31d05b503118331f2993543f2e

Message:

*hannes: fixed extgc(1,x)-error


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

File:

• kernel/clapsing.cc (modified) (4 diffs)

kernel/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.2 2004-02-17 17:40:33 Singular Exp $
+// $Id: clapsing.cc,v 1.3 2004-12-15 17:45:10 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -397 +397 @@
     setCharacteristic( nGetChar() );
     CanonicalForm F( convSingPClapP( f ) ), G( convSingPClapP( g ) );
-    if (!F.isUnivariate() || !G.isUnivariate() || F.mvar()!=G.mvar())
+    CanonicalForm FpG=F+G;
+    if (!(FpG.isUnivariate()|| FpG.inCoeffDomain()))
+    //if (!F.isUnivariate() || !G.isUnivariate() || F.mvar()!=G.mvar())
     {
       Off(SW_RATIONAL);
@@ -422 +424 @@
       Variable a=rootOf(mipo);
       CanonicalForm F( convSingAPClapAP( f,a ) ), G( convSingAPClapAP( g,a ) );
-      if (!F.isUnivariate() || !G.isUnivariate() || F.mvar()!=G.mvar())
+      CanonicalForm FpG=F+G;
+      if (!(FpG.isUnivariate()|| FpG.inCoeffDomain()))
+      //if (!F.isUnivariate() || !G.isUnivariate() || F.mvar()!=G.mvar())
       {
         WerrorS("not univariate");
@@ -434 +438 @@
     {
       CanonicalForm F( convSingTrPClapP( f ) ), G( convSingTrPClapP( g ) );
-      if (!F.isUnivariate() || !G.isUnivariate() || F.mvar()!=G.mvar())
+      CanonicalForm FpG=F+G;
+      if (!(FpG.isUnivariate()|| FpG.inCoeffDomain()))
+      //if (!F.isUnivariate() || !G.isUnivariate() || F.mvar()!=G.mvar())
       {
         Off(SW_RATIONAL);