Changeset 29d7683 in git


Ignore:
Timestamp:
Apr 18, 2005, 5:12:02 PM (19 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4188d308699580d975efd0f6cca8dcb41c396f70')
Children:
c00e9bd260d0a0003533514dedab696c789b8a08
Parents:
c0eb11ed4b9c2fcf9078e34ece905585ee5ec7b2
Message:
*hannes: subst(par)


git-svn-id: file:///usr/local/Singular/svn/trunk@7844 2c84dea3-7e68-4137-9b89-c4e89433aadc
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    rc0eb11 r29d7683  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: iparith.cc,v 1.344 2005-04-13 16:43:12 Singular Exp $ */
     4/* $Id: iparith.cc,v 1.345 2005-04-18 15:10:04 Singular Exp $ */
    55
    66/*
     
    3535#include "stairc.h"
    3636#include "maps.h"
     37#include "maps_ip.h"
    3738#include "syz.h"
    3839#include "weight.h"
     
    4546#include "units.h"
    4647#include "janet.h"
    47 #include "../kernel/GMPrat.h"
     48#include "GMPrat.h"
    4849#ifdef HAVE_FACTORY
    4950#include "clapsing.h"
     
    47814782{
    47824783  monomexpr=(poly)w->Data();
     4784  poly p=(poly)v->Data();
    47834785  #if 0
    47844786  if (pLength(monomexpr)>1)
     
    47894791  }
    47904792  #endif
    4791   if (!(ringvar=pVar((poly)v->Data())))
    4792   {
    4793     WerrorS("ringvar expected");
    4794     return TRUE;
     4793  if (!(ringvar=pVar(p)))
     4794  {
     4795    if (rField_is_Extension(currRing))
     4796    {
     4797      assume(currRing->algring!=NULL);
     4798      lnumber n=(lnumber)pGetCoeff(p);
     4799      ringvar=-p_Var(n->z,currRing->algring);
     4800    }
     4801    if(ringvar==0)
     4802    {
     4803      WerrorS("ringvar/par expected");
     4804      return TRUE;
     4805    }
    47954806  }
    47964807  return FALSE;
     
    48024813  BOOLEAN nok=jjSUBST_Test(v,w,ringvar,monomexpr);
    48034814  if (nok) return TRUE;
    4804   if ((monomexpr==NULL)||(pNext(monomexpr)==NULL))
    4805     res->data = pSubst((poly)u->CopyD(res->rtyp),ringvar,monomexpr);
     4815  if (ringvar>0)
     4816  {
     4817    if ((monomexpr==NULL)||(pNext(monomexpr)==NULL))
     4818      res->data = pSubst((poly)u->CopyD(res->rtyp),ringvar,monomexpr);
     4819    else
     4820      res->data= pSubstPoly((poly)u->Data(),ringvar,monomexpr);
     4821  }
    48064822  else
    48074823  {
    4808     res->data= pSubstPoly((poly)u->Data(),ringvar,monomexpr);
     4824    res->data=pSubstPar((poly)u->Data(),-ringvar,monomexpr);
    48094825  }
    48104826  return FALSE;
     
    48164832  BOOLEAN nok=jjSUBST_Test(v,w,ringvar,monomexpr);
    48174833  if (nok) return TRUE;
    4818   if ((monomexpr==NULL)||(pNext(monomexpr)==NULL))
    4819     res->data = idSubst((ideal)u->CopyD(res->rtyp),ringvar,monomexpr);
     4834  if (ringvar>0)
     4835  {
     4836    if ((monomexpr==NULL)||(pNext(monomexpr)==NULL))
     4837      res->data = idSubst((ideal)u->CopyD(res->rtyp),ringvar,monomexpr);
     4838    else
     4839      res->data = idSubstPoly((ideal)u->Data(),ringvar,monomexpr);
     4840  }
    48204841  else
    4821     res->data = idSubstPoly((ideal)u->Data(),ringvar,monomexpr);
     4842  {
     4843    res->data = idSubstPar((ideal)u->Data(),-ringvar,monomexpr);
     4844  }
    48224845  return FALSE;
    48234846}
  • Singular/maps_ip.cc

    rc0eb11 r29d7683  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: maps_ip.cc,v 1.6 2004-09-23 07:39:27 Singular Exp $ */
     4/* $Id: maps_ip.cc,v 1.7 2005-04-18 15:10:06 Singular Exp $ */
    55/*
    66* ABSTRACT - the mapping of polynomials to other rings
     
    2020#include "lists.h"
    2121#include "maps.h"
     22#include "maps_ip.h"
    2223#include "prCopy.h"
    2324
Note: See TracChangeset for help on using the changeset viewer.