Changeset 5589c0 in git

Timestamp:

Mar 22, 2001, 8:11:09 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

8d00695ab431dc1599790b2d6e83c18c4b67069c

Parents:

ec7299504b1d2ac3aec79da0344f1272b0c51265

Message:

*hannes: 2-1-patches


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

Location:

Singular

Files:

• eigenval.cc (modified) (4 diffs)
• gnumpc.cc (modified) (2 diffs)
• gnumpc.h (modified) (2 diffs)
• gnumpfl.cc (modified) (2 diffs)
• gnumpfl.h (modified) (2 diffs)
• grammar.y (modified) (2 diffs)
• ipshell.cc (modified) (2 diffs)
• libparse.l (modified) (2 diffs)
• longalg.cc (modified) (3 diffs)
• longalg.h (modified) (2 diffs)
• longrat.cc (modified) (2 diffs)
• longrat.h (modified) (3 diffs)
• numbers.cc (modified) (10 diffs)
• numbers.h (modified) (3 diffs)
• p_Numbers.h (modified) (2 diffs)
• structs.h (modified) (2 diffs)
• subexpr.cc (modified) (2 diffs)

Singular/eigenval.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: eigenval.cc,v 1.2 2001-03-14 10:25:11 mschulze Exp $ */
+/* $Id: eigenval.cc,v 1.3 2001-03-22 19:10:59 Singular Exp $ */
 /*
 * ABSTRACT: eigenvalues of constant square matrices
@@ -211 +211 @@
         poly pp=p;
         while(pp!=NULL&&pGetExp(pp,1)<=1)
-        {
+        {
           if(pGetExp(pp,1)==0)
             p0=pp;
@@ -218 +218 @@
             p1=pp;
           pp=pNext(pp);
-        }
+        }
         if(pp==NULL)
-        {
-          pp=p;
+        {
+          pp=p;
           p=pNSet(nNeg(nDiv(nCopy(pGetCoeff(p0)),nCopy(pGetCoeff(p1)))));
           pDelete(&pp);
         }
         else
-        {
+        {
           p=pMult_nn(p,pGetCoeff(e0->m[0]));
-        }
+        }
         l=addval(l,p,(*m0)[i]);
       }
@@ -263 +263 @@
     {
       WerrorS("square matrix expected");
-    } 
+    }
     res->rtyp=LIST_CMD;
     res->data=(void*)eigenval(mpCopy(M));

Singular/gnumpc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpc.cc,v 1.19 2001-01-30 11:45:47 pohl Exp $ */
+/* $Id: gnumpc.cc,v 1.20 2001-03-22 19:10:59 Singular Exp $ */
 /*
 * ABSTRACT: computations with GMP complex floating-point numbers
@@ -143 +143 @@
 */
 number ngcCopy(number a)
+{
+  gmp_complex* b= NULL;
+  if ( a !=  NULL )
+  {
+    b= new gmp_complex( *(gmp_complex*)a );
+  }
+  return (number)b;
+}
+number ngc_Copy(number a, ring r)
 {
   gmp_complex* b= NULL;

Singular/gnumpc.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpc.h,v 1.9 2001-01-18 16:53:55 Singular Exp $ */
+/* $Id: gnumpc.h,v 1.10 2001-03-22 19:11:00 Singular Exp $ */
 /*
 * ABSTRACT: computations with GMP floating-point numbers
@@ -28 +28 @@
 void     ngcPower(number x, int exp, number *lu);
 number   ngcCopy(number a);
+number   ngc_Copy(number a, ring r);
 char *   ngcRead (char *s, number *a);
 void     ngcWrite(number &a);

Singular/gnumpfl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpfl.cc,v 1.20 2001-01-30 11:45:47 pohl Exp $ */
+/* $Id: gnumpfl.cc,v 1.21 2001-03-22 19:11:01 Singular Exp $ */
 /*
 * ABSTRACT: computations with GMP floating-point numbers
@@ -137 +137 @@
 */
 number ngfCopy(number a)
+{
+  gmp_float* b= NULL;
+  if ( a !=  NULL )
+  {
+    b= new gmp_float( *(gmp_float*)a );
+  }
+  return (number)b;
+}
+
+number ngf_Copy(number a, ring r)
 {
   gmp_float* b= NULL;

Singular/gnumpfl.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpfl.h,v 1.10 2001-01-18 16:53:56 Singular Exp $ */
+/* $Id: gnumpfl.h,v 1.11 2001-03-22 19:11:03 Singular Exp $ */
 /*
 * ABSTRACT: computations with GMP floating-point numbers
@@ -27 +27 @@
 void     ngfPower(number x, int exp, number *lu);
 number   ngfCopy(number a);
+number   ngf_Copy(number a, ring r);
 char *   ngfRead (char *s, number *a);
 void     ngfWrite(number &a);

Singular/grammar.y

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: grammar.y,v 1.87 2000-12-06 11:03:10 Singular Exp $ */
+/* $Id: grammar.y,v 1.88 2001-03-22 19:11:03 Singular Exp $ */
 /*
 * ABSTRACT: SINGULAR shell grammatik
@@ -1088 +1088 @@
           {
 #ifdef HAVE_NAMESPACES
-            if ($4.Typ()==PACKAGE_CMD) {
-              if (iiExport(&$2,0,(idhdl)$4.data))
-                YYERROR;
-            }
-            else
+            if (($4.Typ()==PACKAGE_CMD)
+            && (iiExport(&$2,0,(idhdl)$4.data)))
+              YYERROR;
+#else            
+            printf("String: %s;\n", (char *)$4.data);
 #endif /* HAVE_NAMESPACES */
-            {
-             printf("String: %s;\n", (char *)$4.data);
-            }
           }
         }

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.63 2001-02-09 14:22:56 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.64 2001-03-22 19:11:04 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -862 +862 @@
     //if(name->req_packhdl != NULL /*&& !isring*/) {
     if(name->req_packhdl != NULL && !isring &&
-       IDPACKAGE(name->req_packhdl) != root) {
+       IDPACKAGE(name->req_packhdl)->idroot != (*root)) {
       //Print("iiDeclCommand: PUSH(%s)\n",IDID(name->req_packhdl));
       namespaceroot->push( IDPACKAGE(name->req_packhdl) ,

Singular/libparse.l

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: libparse.l,v 1.44 2000-12-19 18:31:43 obachman Exp $ */
+/* $Id: libparse.l,v 1.45 2001-03-22 19:11:05 Singular Exp $ */
 #include <stdio.h>
 #include <string.h>
@@ -297 +297 @@
                  printf("Version:%s;\n", libnamebuf);
                #else
-               #ifdef HAVE_NAMESPACES
-               h0 = enterid( omStrDup("version"), myynest, STRING_CMD,
-                                  &IDPACKAGE(pl)->idroot, FALSE );
-               if (h0!=NULL)
-               {
-                  IDSTRING(h0) = omStrDup(libnamebuf);
-               }
-               #else /* HAVE_NAMESPACES */
+               //#ifdef HAVE_NAMESPACES
+               //h0 = enterid( omStrDup("version"), myynest, STRING_CMD,
+               //                   &IDPACKAGE(pl)->idroot, FALSE );
+               //if (h0!=NULL)
+               //{
+               //   IDSTRING(h0) = omStrDup(libnamebuf);
+               //}
+               //#else /* HAVE_NAMESPACES */
                if (text_buffer!=NULL) omFree((ADDRESS)text_buffer);
                text_buffer = omStrDup(libnamebuf);
                omMarkAsStaticAddr(text_buffer);
-               #endif /* HAVE_NAMESPACES */
+               //#endif /* HAVE_NAMESPACES */
                #endif
              }

Singular/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.59 2001-02-20 09:45:44 Singular Exp $ */
+/* $Id: longalg.cc,v 1.60 2001-03-22 19:11:05 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -197 +197 @@
 #define napDelete1(p)    p_LmDelete((poly *)p, currRing->algring)
 #define napCopy(p)       (napoly)p_Copy((poly)p,currRing->algring)
+#define nap_Copy(p,r)       (napoly)p_Copy((poly)p,r->algring)
 #define napComp(p,q)     p_LmCmp((poly)p,(poly)q, currRing->algring)
 #define napMultT(A,E)    A=(napoly)p_Mult_mm((poly)A,(poly)E,currRing->algring)
@@ -1377 +1378 @@
   erg->z = napCopy(src->z);
   erg->n = napCopy(src->n);
+  erg->s = src->s;
+  return (number)erg;
+}
+number na_Copy(number p, ring r)
+{
+  if (p==NULL) return NULL;
+  lnumber erg;
+  lnumber src = (lnumber)p;
+  erg = (lnumber)omAlloc0Bin(rnumber_bin);
+  erg->z = nap_Copy(src->z,r);
+  erg->n = nap_Copy(src->n,r);
   erg->s = src->s;
   return (number)erg;

Singular/longalg.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.h,v 1.26 2001-01-20 11:39:14 Singular Exp $ */
+/* $Id: longalg.h,v 1.27 2001-03-22 19:11:06 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -69 +69 @@
 BOOLEAN naGreaterZero(number a);
 number  naCopy(number p);                              /* erg:= p */
+number  na_Copy(number p, ring r);                     /* erg:= p */
 number  naAdd(number la, number li);               /* lu := la+li */
 number  naMult(number la, number li);              /* lo := la*li */

Singular/longrat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.cc,v 1.37 2001-01-18 16:53:54 Singular Exp $ */
+/* $Id: longrat.cc,v 1.38 2001-03-22 19:11:06 Singular Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
@@ -2266 +2266 @@
 }
 
+LINLINE number nl_Copy(number a, ring r)
+{
+  if ((SR_HDL(a) & SR_INT)||(a==NULL))
+  {
+    return a;
+  }
+  return _nlCopy_NoImm(a);
+}
+
 
 LINLINE void nlNew (number * r)

Singular/longrat.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.h,v 1.22 2001-01-18 16:53:54 Singular Exp $ */
+/* $Id: longrat.h,v 1.23 2001-03-22 19:11:07 Singular Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers
@@ -41 +41 @@
 struct snumber;
 typedef struct snumber rnumber;
-typedef rnumber * number;
 struct snumber
 {
@@ -66 +65 @@
 LINLINE BOOLEAN  nlIsZero(number za);
 LINLINE number   nlCopy(number a);
+LINLINE number   nl_Copy(number a, ring r);
 LINLINE void     nlNew(number *r);
 LINLINE void     nlDelete(number *a, const ring r);

Singular/numbers.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: numbers.cc,v 1.40 2001-02-20 09:45:43 Singular Exp $ */
+/* $Id: numbers.cc,v 1.41 2001-03-22 19:11:07 Singular Exp $ */
 
 /*
@@ -90 +90 @@
 
 number ndCopy(number a) { return a; }
+number nd_Copy(number a, ring r) { return a; }
 
 /*2
@@ -223 +224 @@
   r->cf->cfDelete= ndDelete;
   r->cf->nNew=nDummy1;
+  r->cf->nCopy  = ndCopy;
+  r->cf->cfCopy  = nd_Copy;
   if (rField_is_Extension(r))
   {
@@ -243 +246 @@
     r->cf->nInvers     = naInvers;
     r->cf->nCopy       = naCopy;
+    r->cf->cfCopy      = na_Copy;
     r->cf->nGreater    = naGreater;
     r->cf->nEqual      = naEqual;
@@ -279 +283 @@
     r->cf->nInvers= nlInvers;
     r->cf->nCopy  = nlCopy;
+    r->cf->cfCopy  = nl_Copy;
     r->cf->nGreater = nlGreater;
     r->cf->nEqual = nlEqual;
@@ -313 +318 @@
     r->cf->nNeg   = npNeg;
     r->cf->nInvers= npInvers;
-    r->cf->nCopy  = ndCopy;
     r->cf->nGreater = npGreater;
     r->cf->nEqual = npEqual;
@@ -350 +354 @@
     r->cf->nNeg   = nfNeg;
     r->cf->nInvers= nfInvers;
-    r->cf->nCopy  = ndCopy;
     r->cf->nGreater = nfGreater;
     r->cf->nEqual = nfEqual;
@@ -385 +388 @@
     r->cf->nNeg   = nrNeg;
     r->cf->nInvers= nrInvers;
-    r->cf->nCopy  = ndCopy;
     r->cf->nGreater = nrGreater;
     r->cf->nEqual = nrEqual;
@@ -422 +424 @@
     r->cf->nInvers= ngfInvers;
     r->cf->nCopy  = ngfCopy;
+    r->cf->cfCopy  = ngf_Copy;
     r->cf->nGreater = ngfGreater;
     r->cf->nEqual = ngfEqual;
@@ -458 +461 @@
     r->cf->nInvers= ngcInvers;
     r->cf->nCopy  = ngcCopy;
+    r->cf->cfCopy = ngc_Copy;
     r->cf->nGreater = ngcGreater;
     r->cf->nEqual = ngcEqual;

Singular/numbers.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: numbers.h,v 1.26 2001-02-20 09:45:44 Singular Exp $ */
+/* $Id: numbers.h,v 1.27 2001-03-22 19:11:08 Singular Exp $ */
 /*
 * ABSTRACT: interface to coefficient aritmetics
@@ -10 +10 @@
 #include "structs.h"
 
-#define n_Copy(n, r)          (r)->cf->nCopy(n)
+#define n_Copy(n, r)          (r)->cf->cfCopy(n,r)
 #define n_Delete(n, r)        (r)->cf->cfDelete(n,r)
 #define n_Mult(n1, n2, r)     (r)->cf->nMult(n1, n2)
@@ -72 +72 @@
 number ndGcd(number a, number b);
 number ndCopy(number a);
+number nd_Copy(number a, ring r);
 
 #ifdef LDEBUG

Singular/p_Numbers.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Numbers.h,v 1.6 2001-01-09 15:40:12 Singular Exp $
+ *  Version: $Id: p_Numbers.h,v 1.7 2001-03-22 19:11:08 Singular Exp $
  *******************************************************************/
 #ifndef P_NUMBERS_H
@@ -13 +13 @@
 
 #include "numbers.h"
-#define n_Copy_FieldGeneral(n, r)           (r)->cf->nCopy(n)
+#define n_Copy_FieldGeneral(n, r)           (r)->cf->cfCopy(n,r)
 #define n_Delete_FieldGeneral(n, r)         (r)->cf->cfDelete(n,r)
 #define n_Mult_FieldGeneral(n1, n2, r)      (r)->cf->nMult(n1, n2)

Singular/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.58 2001-02-26 15:08:45 levandov Exp $ */
+/* $Id: structs.h,v 1.59 2001-03-22 19:11:08 Singular Exp $ */
 /*
 * ABSTRACT
@@ -234 +234 @@
    number  (*nInvers)(number a);
    number  (*nCopy)(number a);
+   number  (*cfCopy)(number a, ring r);
    number  (*nRePart)(number a);
    number  (*nImPart)(number a);

Singular/subexpr.cc

@@ -5 +5 @@
 * ABSTRACT: handling of leftv
 */
-/* $Id: subexpr.cc,v 1.72 2001-02-09 14:22:57 Singular Exp $ */
+/* $Id: subexpr.cc,v 1.73 2001-03-22 19:11:09 Singular Exp $ */
 
 #include <stdlib.h>
@@ -1655 +1655 @@
 #ifdef HAVE_NAMESPACES
   char *name;
-  if(v->packhdl != NULL) {
+  if((v->packhdl != NULL)&&(IDPACKAGE(v->packhdl)!=namespaceroot->pack))
+  {
+    // MEMORY LEAK ??
     name = (char *)omAlloc(strlen(v->name) + strlen(IDID(v->packhdl)) + 3);
     sprintf(name, "%s::%s", IDID(v->packhdl), v->name);