Changeset 4508ce5 in git for Singular/longalg.cc

Timestamp:

Dec 15, 2000, 7:49:36 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a5f564c88c2600acb20b8afdd6dd84d9d3f715df

Parents:

d3bf0986c4b1a7bac5ffc43b873646317a0d91de

Message:

*hannes: nMap removed nSetMap returns now the routine


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

File:

• Singular/longalg.cc (modified) (3 diffs)

Singular/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.51 2000-12-08 16:20:33 Singular Exp $ */
+/* $Id: longalg.cc,v 1.52 2000-12-15 18:49:31 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -2412 +2412 @@
 }
 
-BOOLEAN naSetMap(ring r)
-{
-  if (rField_is_Q_a()) /* -> Q(a) */
-  {
-    if (rField_is_Q(r))
-    {
-      nMap = naMap00;   /*Q -> Q(a)*/
-      return TRUE;
-    }
-    if (rField_is_Zp(r))
-    {
-      naPrimeM = rChar(r);
-      nMap = naMapP0;  /* Z/p -> Q(a)*/
-      return TRUE;
-    }
-    if (rField_is_Q_a(r))
+nMapFunc naSetMap(ring src, ring dst)
+{
+  if (rField_is_Q_a(dst)) /* -> Q(a) */
+  {
+    if (rField_is_Q(src))
+    {
+      return naMap00;   /*Q -> Q(a)*/
+    }
+    if (rField_is_Zp(src))
+    {
+      naPrimeM = rChar(src);
+      return naMapP0;  /* Z/p -> Q(a)*/
+    }
+    if (rField_is_Q_a(src))
     {
       int i;
       naParsToCopy=0;
-      for(i=0;i<rPar(r);i++)
-      {
-        if ((i>=rPar(currRing))
-        ||(strcmp(r->parameter[i],currRing->parameter[i])!=0))
-           return FALSE;
+      for(i=0;i<rPar(src);i++)
+      {
+        if ((i>=rPar(dst))
+        ||(strcmp(src->parameter[i],dst->parameter[i])!=0))
+           return NULL;
         naParsToCopy++;
       }
       nacMap=nacCopy;
-      nMap=naMapQaQb;
-      return TRUE;   /* Q(a) -> Q(a) */
+      return naMapQaQb;   /* Q(a) -> Q(a) */
     }
   }
   /*-----------------------------------------------------*/
-  if (rField_is_Zp_a()) /* -> Z/p(a) */
-  {
-    if (rField_is_Q(r))
-    {
-      nMap = naMap0P;   /*Q -> Z/p(a)*/
-      return TRUE;
-    }
-    if (rField_is_Zp(r))
-    {
-      int c=rChar(r);
+  if (rField_is_Zp_a(dst)) /* -> Z/p(a) */
+  {
+    if (rField_is_Q(src))
+    {
+      return naMap0P;   /*Q -> Z/p(a)*/
+    }
+    if (rField_is_Zp(src))
+    {
+      int c=rChar(src);
       if (c==npPrimeM)
       {
-        nMap = naMapPP;  /* Z/p -> Z/p(a)*/
+        return naMapPP;  /* Z/p -> Z/p(a)*/
       }
       else
       {
         naPrimeM = c;
-        nMap = naMapPP1;  /* Z/p' -> Z/p(a)*/
-      }
-      return TRUE;
-    }
-    if (rField_is_Zp_a(r))
-    {
-      if (rChar(r)==rChar())
+        return naMapPP1;  /* Z/p' -> Z/p(a)*/
+      }
+    }
+    if (rField_is_Zp_a(src))
+    {
+      if (rChar(src)==rChar(dst))
       {
         nacMap=nacCopy;
@@ -2473 +2468 @@
       else
       {
-        npMapPrime=rChar(r);
+        npMapPrime=rChar(src);
         nacMap = npMapP;
       }
       int i;
       naParsToCopy=0;
-      for(i=0;i<rPar(r);i++)
-      {
-        if ((i>=rPar(currRing))
-        ||(strcmp(r->parameter[i],currRing->parameter[i])!=0))
-           return FALSE;
+      for(i=0;i<rPar(src);i++)
+      {
+        if ((i>=rPar(dst))
+        ||(strcmp(src->parameter[i],dst->parameter[i])!=0))
+           return NULL;
         naParsToCopy++;
       }
-      nMap=naMapQaQb;
-      return TRUE;   /* Z/p(a),Z/p'(a) -> Z/p(b)*/
-    }
-  }
-  return FALSE;      /* default */
+      return naMapQaQb;   /* Z/p(a),Z/p'(a) -> Z/p(b)*/
+    }
+  }
+  return NULL;      /* default */
 }