Changeset 29d7683 in git

Timestamp:

Apr 18, 2005, 5:12:02 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c00e9bd260d0a0003533514dedab696c789b8a08

Parents:

c0eb11ed4b9c2fcf9078e34ece905585ee5ec7b2

Message:

*hannes: subst(par)


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

Files:

• Singular/iparith.cc (modified) (7 diffs)
• Singular/maps_ip.cc (modified) (2 diffs)
• Singular/maps_ip.h (added)
• doc/reference.doc (modified) (previous)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.344 2005-04-13 16:43:12 Singular Exp $ */
+/* $Id: iparith.cc,v 1.345 2005-04-18 15:10:04 Singular Exp $ */
 
 /*
@@ -35 +35 @@
 #include "stairc.h"
 #include "maps.h"
+#include "maps_ip.h"
 #include "syz.h"
 #include "weight.h"
@@ -45 +46 @@
 #include "units.h"
 #include "janet.h"
-#include "../kernel/GMPrat.h"
+#include "GMPrat.h"
 #ifdef HAVE_FACTORY
 #include "clapsing.h"
@@ -4781 +4782 @@
 {
   monomexpr=(poly)w->Data();
+  poly p=(poly)v->Data();
   #if 0
   if (pLength(monomexpr)>1)
@@ -4789 +4791 @@
   }
   #endif
-  if (!(ringvar=pVar((poly)v->Data())))
-  {
-    WerrorS("ringvar expected");
-    return TRUE;
+  if (!(ringvar=pVar(p)))
+  {
+    if (rField_is_Extension(currRing))
+    {
+      assume(currRing->algring!=NULL);
+      lnumber n=(lnumber)pGetCoeff(p);
+      ringvar=-p_Var(n->z,currRing->algring);
+    }
+    if(ringvar==0)
+    {
+      WerrorS("ringvar/par expected");
+      return TRUE;
+    }
   }
   return FALSE;
@@ -4802 +4813 @@
   BOOLEAN nok=jjSUBST_Test(v,w,ringvar,monomexpr);
   if (nok) return TRUE;
-  if ((monomexpr==NULL)||(pNext(monomexpr)==NULL))
-    res->data = pSubst((poly)u->CopyD(res->rtyp),ringvar,monomexpr);
+  if (ringvar>0)
+  {
+    if ((monomexpr==NULL)||(pNext(monomexpr)==NULL))
+      res->data = pSubst((poly)u->CopyD(res->rtyp),ringvar,monomexpr);
+    else
+      res->data= pSubstPoly((poly)u->Data(),ringvar,monomexpr);
+  }
   else
   {
-    res->data= pSubstPoly((poly)u->Data(),ringvar,monomexpr);
+    res->data=pSubstPar((poly)u->Data(),-ringvar,monomexpr);
   }
   return FALSE;
@@ -4816 +4832 @@
   BOOLEAN nok=jjSUBST_Test(v,w,ringvar,monomexpr);
   if (nok) return TRUE;
-  if ((monomexpr==NULL)||(pNext(monomexpr)==NULL))
-    res->data = idSubst((ideal)u->CopyD(res->rtyp),ringvar,monomexpr);
+  if (ringvar>0)
+  {
+    if ((monomexpr==NULL)||(pNext(monomexpr)==NULL))
+      res->data = idSubst((ideal)u->CopyD(res->rtyp),ringvar,monomexpr);
+    else
+      res->data = idSubstPoly((ideal)u->Data(),ringvar,monomexpr);
+  }
   else
-    res->data = idSubstPoly((ideal)u->Data(),ringvar,monomexpr);
+  {
+    res->data = idSubstPar((ideal)u->Data(),-ringvar,monomexpr);
+  }
   return FALSE;
 }

Singular/maps_ip.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: maps_ip.cc,v 1.6 2004-09-23 07:39:27 Singular Exp $ */
+/* $Id: maps_ip.cc,v 1.7 2005-04-18 15:10:06 Singular Exp $ */
 /*
 * ABSTRACT - the mapping of polynomials to other rings
@@ -20 +20 @@
 #include "lists.h"
 #include "maps.h"
+#include "maps_ip.h"
 #include "prCopy.h"