Changeset e57dd7 in git for Singular/pcv.cc

Timestamp:

Nov 18, 1998, 2:00:12 PM (25 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

8f9d571fb36c428311419e1af2ef2e68ba331ae0

Parents:

ce231a8f0acfcf9ed523fee24f2e3e3e5f4546fc

Message:

*mschulze: added iiPcvOrd


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

File:

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

Singular/pcv.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: pcv.cc,v 1.3 1998-11-12 13:34:48 hannes Exp $ */
+/* $Id: pcv.cc,v 1.4 1998-11-18 13:00:12 mschulze Exp $ */
 /*
 * ABSTRACT: conversion between polys and coeff vectors
@@ -306 +306 @@
     short* w=(short*)Alloc(currRing->N*sizeof(short));
     BOOLEAN defi1=FALSE,defw=FALSE;
-    while(hh!=NULL)
+    while(hh)
     {
       if(hh->Typ()==INT_CMD)
@@ -366 +366 @@
 * interface to interpreter
 */
-BOOLEAN iiPcvBasis(leftv res, leftv h)
-{
-  if(currRingHdl==NULL)
+BOOLEAN iiPcvDim(leftv res, leftv h)
+{
+  if(!currRingHdl)
   {
     WerrorS("no ring active");
@@ -376 +376 @@
   short* w=(short*)Alloc(currRing->N*sizeof(short));
   BOOLEAN defi1=FALSE,defw=FALSE;
-  while(h!=NULL)
+  while(h)
+  {
+    if(h->Typ()==INT_CMD)
+    {
+      if(defi1)
+      {
+        i0=i1;
+        i1=(int)h->Data();
+      }
+      else
+      {
+        i1=(int)h->Data();
+        defi1=TRUE;
+      }
+    }
+    else
+    if(h->Typ()==INTVEC_CMD)
+    {
+      intvec *iv=(intvec*)h->Data();
+      if(iv->rows()==currRing->N&&iv->cols()==1)
+      {
+        int i;
+        for(i=0;i<currRing->N;i++) w[i]=(*iv)[i];
+        defw=TRUE;
+      }
+    }
+    h=h->next;
+  }
+  if(!defw)
+  {
+    int i;
+    for(i=0;i<currRing->N;i++) w[i]=1;
+  }
+  if(defi1)
+  {
+    // "pcvDim"[,<int d0>],<int d1>[,<intvec w>]:
+    // number of monomials m with d0<=w-deg(m)<d1
+    res->rtyp=INT_CMD;
+    res->data=(void*)pcvDimW(i0,i1,w);
+    return FALSE;
+  }
+  Free((ADDRESS)w,(currRing->N)*sizeof(short));
+  WerrorS("[<int>],<int>[,<intvec>] expected");
+  return TRUE;
+}
+
+/*2
+* interface to interpreter
+*/
+BOOLEAN iiPcvBasis(leftv res, leftv h)
+{
+  if(!currRingHdl)
+  {
+    WerrorS("no ring active");
+    return TRUE;
+  }
+  int i0=0,i1;
+  short* w=(short*)Alloc(currRing->N*sizeof(short));
+  BOOLEAN defi1=FALSE,defw=FALSE;
+  while(h)
   {
     if(h->Typ()==INT_CMD)