Changeset 55e308 in git


Ignore:
Timestamp:
Dec 15, 2004, 6:45:10 PM (20 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/clapsing.cc

    rf52c2f r55e308  
    33*  Computer Algebra System SINGULAR     *
    44****************************************/
    5 // $Id: clapsing.cc,v 1.2 2004-02-17 17:40:33 Singular Exp $
     5// $Id: clapsing.cc,v 1.3 2004-12-15 17:45:10 Singular Exp $
    66/*
    77* ABSTRACT: interface between Singular and factory
     
    397397    setCharacteristic( nGetChar() );
    398398    CanonicalForm F( convSingPClapP( f ) ), G( convSingPClapP( g ) );
    399     if (!F.isUnivariate() || !G.isUnivariate() || F.mvar()!=G.mvar())
     399    CanonicalForm FpG=F+G;
     400    if (!(FpG.isUnivariate()|| FpG.inCoeffDomain()))
     401    //if (!F.isUnivariate() || !G.isUnivariate() || F.mvar()!=G.mvar())
    400402    {
    401403      Off(SW_RATIONAL);
     
    422424      Variable a=rootOf(mipo);
    423425      CanonicalForm F( convSingAPClapAP( f,a ) ), G( convSingAPClapAP( g,a ) );
    424       if (!F.isUnivariate() || !G.isUnivariate() || F.mvar()!=G.mvar())
     426      CanonicalForm FpG=F+G;
     427      if (!(FpG.isUnivariate()|| FpG.inCoeffDomain()))
     428      //if (!F.isUnivariate() || !G.isUnivariate() || F.mvar()!=G.mvar())
    425429      {
    426430        WerrorS("not univariate");
     
    434438    {
    435439      CanonicalForm F( convSingTrPClapP( f ) ), G( convSingTrPClapP( g ) );
    436       if (!F.isUnivariate() || !G.isUnivariate() || F.mvar()!=G.mvar())
     440      CanonicalForm FpG=F+G;
     441      if (!(FpG.isUnivariate()|| FpG.inCoeffDomain()))
     442      //if (!F.isUnivariate() || !G.isUnivariate() || F.mvar()!=G.mvar())
    437443      {
    438444        Off(SW_RATIONAL);
Note: See TracChangeset for help on using the changeset viewer.