Changeset 634c98 in git

Timestamp:

Feb 20, 2001, 10:45:44 AM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

367e88ed423dc4fe709d7c0e9346e03ea9a03baa

Parents:

25c431d26faee1a17b854e49114f755c02aaf1ef

Message:

*hannes: imap error


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

Location:

Singular

Files:

• longalg.cc (modified) (3 diffs)
• numbers.cc (modified) (8 diffs)
• numbers.h (modified) (2 diffs)
• structs.h (modified) (2 diffs)

Singular/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.58 2001-01-20 12:38:41 Singular Exp $ */
+/* $Id: longalg.cc,v 1.59 2001-02-20 09:45:44 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -2679 +2679 @@
   poly p;
   napoly za=((lnumber)z)->z;
+  nMapFunc nMap=NULL;
+  if (currRing->parameter!=NULL)
+    nMap=currRing->algring->cf->cfSetMap(r->algring, currRing->algring);
+  else
+    nMap=currRing->cf->cfSetMap(r->algring, currRing);
+  if (nMap==NULL) return NULL; /* emergency exit only */
   do
   {
@@ -2691 +2697 @@
     if (currRing->parameter!=NULL)
     {
+      assume(r->algring!=NULL);
       pGetCoeff(p)=(number)omAlloc0Bin(rnumber_bin);
       ((lnumber)pGetCoeff(p))->s=2;
-      ((lnumber)pGetCoeff(p))->z=napInitz(nacCopy(napGetCoeff(za)));
+      ((lnumber)pGetCoeff(p))->z=napInitz(nMap(napGetCoeff(za)));
       pa=((lnumber)pGetCoeff(p))->z;
     }
     else
     {
-      pGetCoeff(p)=nCopy(napGetCoeff(za));
+      pGetCoeff(p)=nMap(napGetCoeff(za));
     }
     for(i=0;i<P;i++)

Singular/numbers.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: numbers.cc,v 1.39 2001-01-30 13:37:04 Singular Exp $ */
+/* $Id: numbers.cc,v 1.40 2001-02-20 09:45:43 Singular Exp $ */
 
 /*
@@ -254 +254 @@
     r->cf->nGcd        = naGcd;
     r->cf->nLcm        = naLcm;
-    r->cf->nSetMap     = naSetMap;
+    r->cf->cfSetMap    = naSetMap;
     r->cf->nName       = naName;
     r->cf->nSize       = naSize;
@@ -290 +290 @@
     r->cf->nGcd  = nlGcd;
     r->cf->nLcm  = nlLcm;
-    r->cf->nSetMap = nlSetMap;
+    r->cf->cfSetMap = nlSetMap;
     r->cf->nSize  = nlSize;
     r->cf->nGetDenom = nlGetDenom;
@@ -325 +325 @@
     r->cf->nGcd  = ndGcd;
     r->cf->nLcm  = ndGcd; /* tricky, isn't it ?*/
-    r->cf->nSetMap = npSetMap;
+    r->cf->cfSetMap = npSetMap;
     /* nName= ndName; */
     /*nSize  = ndSize;*/
@@ -362 +362 @@
     r->cf->nGcd  = ndGcd;
     r->cf->nLcm  = ndGcd; /* tricky, isn't it ?*/
-    r->cf->nSetMap = nfSetMap;
+    r->cf->cfSetMap = nfSetMap;
     r->cf->nName= nfName;
     /*nSize  = ndSize;*/
@@ -397 +397 @@
     r->cf->nGcd  = ndGcd;
     r->cf->nLcm  = ndGcd; /* tricky, isn't it ?*/
-    r->cf->nSetMap=nrSetMap;
+    r->cf->cfSetMap=nrSetMap;
     /* nName= ndName; */
     /*nSize  = ndSize;*/
@@ -433 +433 @@
     r->cf->nGcd  = ndGcd;
     r->cf->nLcm  = ndGcd; /* tricky, isn't it ?*/
-    r->cf->nSetMap=ngfSetMap;
+    r->cf->cfSetMap=ngfSetMap;
     r->cf->nName= ndName;
     r->cf->nSize  = ndSize;
@@ -469 +469 @@
     r->cf->nGcd  = ndGcd;
     r->cf->nLcm  = ndGcd; /* tricky, isn't it ?*/
-    r->cf->nSetMap=ngcSetMap;
+    r->cf->cfSetMap=ngcSetMap;
     r->cf->nPar=ngcPar;
     r->cf->nRePart=ngcRePart;

Singular/numbers.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: numbers.h,v 1.25 2001-01-18 16:54:19 Singular Exp $ */
+/* $Id: numbers.h,v 1.26 2001-02-20 09:45:44 Singular Exp $ */
 /*
 * ABSTRACT: interface to coefficient aritmetics
@@ -64 +64 @@
 #define nDelete(A) (currRing)->cf->cfDelete(A,currRing)
 
-#define nSetMap(R) (currRing->cf->nSetMap(R,currRing))
+#define nSetMap(R) (currRing->cf->cfSetMap(R,currRing))
 extern char *  (*nName)(number n);
 

Singular/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.56 2001-02-01 21:19:54 obachman Exp $ */
+/* $Id: structs.h,v 1.57 2001-02-20 09:45:43 Singular Exp $ */
 /*
 * ABSTRACT
@@ -250 +250 @@
    number  (*nLcm)(number a, number b, const ring r);
    void    (*cfDelete)(number * a, const ring r);
-   nMapFunc (*nSetMap)(ring src, ring dst);
+   nMapFunc (*cfSetMap)(ring src, ring dst);
    char *  (*nName)(number n);
 //extern number  (*nMap)(number from);