Changeset b6484c in git for Singular/pcv.cc

Timestamp:

Jun 9, 1999, 1:53:12 PM (25 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3bf6849bf9f6ec5a2581bdf4b8e453a09cc12864

Parents:

8ef5750b7a3298e63ae583dd8949e9ec89e70622

Message:

*** empty log message ***


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

File:

• Singular/pcv.cc (modified) (8 diffs)

Singular/pcv.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: pcv.cc,v 1.20 1999-06-08 09:13:54 mschulze Exp $ */
+/* $Id: pcv.cc,v 1.21 1999-06-09 11:53:12 mschulze Exp $ */
 /*
 * ABSTRACT: conversion between polys and coef vectors
@@ -16 +16 @@
 #include "numbers.h"
 #include "polys.h"
+#include "ideals.h"
 #include "lists.h"
 #include "matpol.h"
@@ -27 +28 @@
 static unsigned** pcvIndex=NULL;
 
+lists pcvLAddL(lists l1,lists l2)
+{
+  lists l0=(lists)Alloc(sizeof(slists));
+  int i=l1->nr;
+  if(l1->nr<l2->nr) i=l2->nr;
+  l0->Init(i+1);
+  for(;i>=0;i--)
+  {
+    if(i<=l1->nr&&(l1->m[i].rtyp==POLY_CMD||l1->m[i].rtyp==VECTOR_CMD))
+    {
+      l0->m[i].rtyp=l1->m[i].rtyp;
+      l0->m[i].data=pCopy(l1->m[i].data);
+      if(i<=l2->nr&&l2->m[i].rtyp==l1->m[i].rtyp)
+        l0->m[i].data=pAdd(l0->m[i].data,pCopy(l2->m[i].data));
+    }
+    else
+    if(i<=l2->nr&&(l2->m[i].rtyp==POLY_CMD||l2->m[i].rtyp==VECTOR_CMD))
+    {
+      l0->m[i].rtyp=l2->m[i].rtyp;
+      l0->m[i].data=pCopy(l2->m[i].data);
+    }
+  }
+  return(l0);
+}
+
+lists pcvPMulL(poly p,lists l1)
+{
+  lists l0=(lists)Alloc(sizeof(slists));
+  l0->Init(l1->nr+1);
+  for(int i=l1->nr;i>=0;i--)
+  {
+    if(l1->m[i].rtyp==POLY_CMD)
+    {
+      l0->m[i].rtyp=POLY_CMD;
+      l0->m[i].data=pMult(pCopy(p),pCopy(l1->m[i].data));
+    }
+  }
+  return(l0);
+}
+
+BOOLEAN pcvLAddL(leftv res,leftv h)
+{
+  if(h&&h->Typ()==LIST_CMD)
+  {
+    lists l1=(lists)h->Data();
+    h=h->next;
+    if(h&&h->Typ()==LIST_CMD)
+    {
+      lists l2=(lists)h->Data();
+      res->rtyp=LIST_CMD;
+      res->data=(void*)pcvLAddL(l1,l2);
+      return FALSE;
+    }
+  }
+  WerrorS("<list>,<list> expected");
+  return TRUE;
+}
+
+BOOLEAN pcvPMulL(leftv res,leftv h)
+{
+  if(h&&h->Typ()==POLY_CMD)
+  {
+    poly p=(poly)h->Data();
+    h=h->next;
+    if(h&&h->Typ()==LIST_CMD)
+    {
+      lists l=(lists)h->Data();
+      res->rtyp=LIST_CMD;
+      res->data=(void*)pcvPMulL(p,l);
+      return FALSE;
+    }
+  }
+  WerrorS("<poly>,<list> expected");
+  return TRUE;
+}
+
 int pcvDeg(poly p)
 {
@@ -63 +140 @@
 }
 
-int pcvMaxDeg(poly p)
-{
-  if(!p) return -1;
-  int md=pcvDeg(p);
-  pIter(p);
-  while(p)
-  {
-    int d=pcvDeg(p);
-    if(d>md) md=d;
-    pIter(p);
-  }
-  return md;
-}
-
-int pcvMaxDeg(matrix m)
-{
-  int i,j,d;
-  int md=-1;
-  for(i=1;i<=MATROWS(m);i++)
-  {
-    for(j=1;j<=MATCOLS(m);j++)
-    {
-      d=pcvMinDeg(MATELEM(m,i,j));
-      if((d>=0&&md<d)||md==-1) md=d;
-    }
-  }
-  return(md);
-}
-
 BOOLEAN pcvMinDeg(leftv res,leftv h)
 {
@@ -110 +158 @@
     }
   }
-  WerrorS("<poly> or <matrix> expected");
-  return TRUE;
-}
-
-BOOLEAN pcvMaxDeg(leftv res,leftv h)
-{
-  if(h)
-  {
-    if(h->Typ()==POLY_CMD)
-    {
-      res->rtyp=INT_CMD;
-      res->data=(void*)pcvMaxDeg((poly)h->Data());
-      return FALSE;
-    }
-    else
-    if(h->Typ()==MATRIX_CMD)
-    {
-      res->rtyp=INT_CMD;
-      res->data=(void*)pcvMaxDeg((matrix)h->Data());      
-      return FALSE;
-    }
-  }
-  WerrorS("<poly> or <matrix> expected");
+  WerrorS("<poly> expected");
   return TRUE;
 }
@@ -288 +314 @@
     if(h&&h->Typ()==LIST_CMD)
     {
+      lists p=(lists)h->Data();
+      h=h->next;
+      if(h&&h->Typ()==INT_CMD)
+      {
+        int d0=(int)h->Data();
+        h=h->next;
+        if(h&&h->Typ()==INT_CMD)
+        {
+          int d1=(int)h->Data();
+          res->rtyp=LIST_CMD;
+          res->data=(void*)pcvP2CV(p,d0,d1);
+          return FALSE;
+        }
+      }
+    }
+    WerrorS("<list>,<int>,<int> expected");
+    return TRUE;
+  }
+  WerrorS("no ring active");
+  return TRUE;
+}
+
+BOOLEAN pcvCV2P(leftv res,leftv h)
+{
+  if(currRingHdl)
+  {
+    if(h&&h->Typ()==LIST_CMD)
+    {
       lists pl=(lists)h->Data();
       h=h->next;
@@ -298 +352 @@
           int d1=(int)h->Data();
           res->rtyp=LIST_CMD;
-          res->data=pcvP2CV(pl,d0,d1);
-          return FALSE;
-        }
-      }
-    }
-    WerrorS("<list>,<int>,<int> expected");
-    return TRUE;
-  }
-  WerrorS("no ring active");
-  return TRUE;
-}
-
-BOOLEAN pcvCV2P(leftv res,leftv h)
-{
-  if(currRingHdl)
-  {
-    if(h&&h->Typ()==LIST_CMD)
-    {
-      lists pl=(lists)h->Data();
-      h=h->next;
-      if(h&&h->Typ()==INT_CMD)
-      {
-        int d0=(int)h->Data();
-        h=h->next;
-        if(h&&h->Typ()==INT_CMD)
-        {
-          int d1=(int)h->Data();
-          res->rtyp=LIST_CMD;
-          res->data=pcvCV2P(pl,d0,d1);
+          res->data=(void*)pcvCV2P(pl,d0,d1);
           return FALSE;
         }
@@ -416 +442 @@
         int d1=(int)h->Data();
         res->rtyp=LIST_CMD;
-        res->data=pcvBasis(d0,d1);
+        res->data=(void*)pcvBasis(d0,d1);
         return FALSE;
       }