Changeset 4fc824e in git

Timestamp:

Mar 26, 2001, 11:15:26 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

bf4997b6efb6a0d9e3332369c2de3f6e6cee60d8

Parents:

355f86ae1e09b962323c4d49da60c5aa3a7eb6c5

Message:

hannes: syntax/package loading


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

Location:

Singular

Files:

• eigenval.cc (modified) (11 diffs)
• iparith.cc (modified) (3 diffs)
• ipid.cc (modified) (2 diffs)
• weight.cc (modified) (2 diffs)

Singular/eigenval.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: eigenval.cc,v 1.3 2001-03-22 19:10:59 Singular Exp $ */
+/* $Id: eigenval.cc,v 1.4 2001-03-26 21:15:26 Singular Exp $ */
 /*
 * ABSTRACT: eigenvalues of constant square matrices
@@ -43 +43 @@
   if(MATELEM(M,i,k)==NULL||MATELEM(M,j,k)==NULL)
     return M;
-  number n=nDiv(nCopy(pGetCoeff(MATELEM(M,i,k))),
-                nCopy(pGetCoeff(MATELEM(M,j,k))));
+  number n=nDiv(pGetCoeff(MATELEM(M,i,k)),
+                pGetCoeff(MATELEM(M,j,k)));
   for(int l=1;l<=MATCOLS(M);l++)
   {
@@ -61 +61 @@
   if(MATELEM(M,k,i)==NULL||MATELEM(M,k,j)==NULL)
     return M;
-  number n=nDiv(nCopy(pGetCoeff(MATELEM(M,k,i))),
-                nCopy(pGetCoeff(MATELEM(M,k,j))));
+  number n=nDiv(pGetCoeff(MATELEM(M,k,i)),
+                pGetCoeff(MATELEM(M,k,j)));
   for(int l=1;l<=MATROWS(M);l++)
   {
@@ -81 +81 @@
   {
     int j=k+1;
-    while(j<=n&&MATELEM(M,j,k)==NULL)
-    {
-      j++;
-    }
+    while(j<=n&&MATELEM(M,j,k)==NULL) j++;
     if(j<=n)
     {
@@ -94 +91 @@
     }
     j=k+1;
-    while(j<=n&&MATELEM(M,k,j)==NULL)
-    {
-      j++;
-    }
+    while(j<=n&&MATELEM(M,k,j)==NULL) j++;
     if(j<=n)
     {
@@ -182 +176 @@
       poly t=pOne();
       pSetExp(t,1,1);
+      pSetm(t);
       poly d0=pSub(MATELEM(M,j,j),t);
       MATELEM(M,j,j)=NULL;
@@ -193 +188 @@
         poly t=pOne();
         pSetExp(t,1,1);
+        pSetm(t);
         d0=pSub(pMult(d0,pSub(MATELEM(M,j,j),t)),
                 pMult(pMult(d2,MATELEM(M,j-1,j)),MATELEM(M,j,j-1)));
@@ -222 +218 @@
         {
           pp=p;
-          p=pNSet(nNeg(nDiv(nCopy(pGetCoeff(p0)),nCopy(pGetCoeff(p1)))));
+          p=pNSet(nNeg(nDiv(pGetCoeff(p0),pGetCoeff(p1))));
           pDelete(&pp);
         }
@@ -241 +237 @@
 BOOLEAN tridiag(leftv res,leftv h)
 {
-  if(h!=NULL&&h->Typ()==MATRIX_CMD)
+  if((h!=NULL) && (h->Typ()==MATRIX_CMD))
   {
     matrix M=(matrix)h->Data();
@@ -253 +249 @@
   }
   WerrorS("<matrix> expected");
+  return TRUE;
 }
 
 BOOLEAN eigenval(leftv res,leftv h)
 {
-  if(h!=NULL&&h->Typ()==MATRIX_CMD)
+  if((h!=NULL) && (h->Typ()==MATRIX_CMD))
   {
     matrix M=(matrix)h->Data();
@@ -269 +266 @@
   }
   WerrorS("<matrix> expected");
-}
-
+  return TRUE;
+}
 #endif

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.261 2001-03-26 19:30:20 Singular Exp $ */
+/* $Id: iparith.cc,v 1.262 2001-03-26 21:15:24 Singular Exp $ */
 
 /*
@@ -716 +716 @@
           return TRUE;
         }
+        syMake(u,u->name,NULL);
         // else: use next case !!! no break !!!
 
@@ -5249 +5250 @@
     while(v->next!=NULL)
     {
-      nok = iiInternalExport(v->next, 0, u->data);
+      nok = iiInternalExport(v->next, 0, (idhdl)u->data);
       if(nok) return nok;
       v = v->next;

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.47 2001-03-26 19:30:21 Singular Exp $ */
+/* $Id: ipid.cc,v 1.48 2001-03-26 21:15:23 Singular Exp $ */
 
 /*
@@ -955 +955 @@
 #ifdef HAVE_NAMESPACES
       *pck =namespaceroot->get(p, myynest, TRUE); // search in toplevel namespace
-      namespaceroot->push(IDPACKAGE(*pck), IDID(*pck));
-      *h =namespaceroot->get(i, myynest); // search in toplevel namespace
-      namespaceroot->pop();
+      if((*pck!=NULL)&&(IDTYP(*pck)==PACKAGE_CMD))
+      {
+        namespaceroot->push(IDPACKAGE(*pck), IDID(*pck));
+        *h =namespaceroot->get(i, myynest); // search in toplevel namespace
+        namespaceroot->pop();
+      }
 #else /* HAVE_NAMESPACES */
 #endif /* HAVE_NAMESPACES */

Singular/weight.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: weight.cc,v 1.19 2001-03-05 16:39:02 mschulze Exp $ */
+/* $Id: weight.cc,v 1.20 2001-03-26 21:15:26 Singular Exp $ */
 
 /*
@@ -245 +245 @@
   if(iv!=NULL)
     len=iv->length();
-  for(int i=pVariables;i>len;i--)
-    s[i]= 1;
-  for(;i>0;i--)
-    s[i]= (*iv)[i-1];
+  int i;
+  for(i=pVariables;i>len;i--) s[i]=1;
+  for(;i>0;i--)               s[i]=(*iv)[i-1];
   return s;
 }