Changeset 7f14f2 in git for Singular

Timestamp:

Jul 20, 2004, 5:42:58 PM (20 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

47228711837a0a74205d021c040da7f645546089

Parents:

773b743b8a1135d53075d8bd12d781b876d0b0f8

Message:

*hannes: jjBETTI2


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

Location:

Singular

Files:

• iparith.cc (modified) (2 diffs)
• ipshell.cc (modified) (3 diffs)
• ipshell.h (modified) (2 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.322 2004-07-20 15:27:57 Singular Exp $ */
+/* $Id: iparith.cc,v 1.323 2004-07-20 15:42:58 Singular Exp $ */
 
 /*
@@ -2511 +2511 @@
 ,{atATTRIB2,   ATTRIB_CMD,     NONE/*set by p*/,DEF_CMD,   STRING_CMD ALLOW_PLURAL}
 ,{jjWRONG2,    BAREISS_CMD,    0,              DEF_CMD,    DEF_CMD ALLOW_PLURAL}
+,{jjBETTI2,    BETTI_CMD,      INTMAT_CMD,     LIST_CMD,   INT_CMD ALLOW_PLURAL}
 ,{syBetti2,    BETTI_CMD,      INTMAT_CMD,     RESOLUTION_CMD, INT_CMD ALLOW_PLURAL}
 #ifdef HAVE_PLURAL

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.90 2004-05-25 16:46:28 levandov Exp $ */
+/* $Id: ipshell.cc,v 1.91 2004-07-20 15:41:00 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -849 +849 @@
 }
 
-BOOLEAN jjBETTI(leftv res, leftv v)
+BOOLEAN jjBETTI(leftv res, leftv u)
+{
+  sleftv tmp;
+  memset(&tmp,0,sizeof(tmp));
+  tmp.rtyp=INT_CMD;
+  tmp.data=(void *)1;  
+  return jjBETTI2(res,u,&tmp);
+}
+
+BOOLEAN jjBETTI2(leftv res, leftv u, leftv v)
 {
   resolvente r;
   int len;
   int reg,typ0;
-
-  r=liFindRes((lists)v->Data(),&len,&typ0);
+  lists l=(lists)u->Data();
+
+  intvec *weights=(intvec *)atGet(&(l->m[0]),"isHomog",INTVEC_CMD); 
+  //Print("attr:%x\n",weights);
+
+  r=liFindRes(l,&len,&typ0);
   if (r==NULL) return TRUE;
-  res->data=(char *)syBetti(r,len,&reg);
+  res->data=(char *)syBetti(r,len,&reg,weights,(int)v->Data());
   omFreeSize((ADDRESS)r,(len)*sizeof(ideal));
   return FALSE;
@@ -1776 +1789 @@
   BOOLEAN minim=(int)w->Data();
   int row_shift=0;
-
-  res->data=(void *)syBettiOfComputation(syzstr,minim,&row_shift);
-  atSet(res,omStrDup("rowShift"),(void*)row_shift,INT_CMD);
+  int add_row_shift=0;
+  intvec *weights=NULL;
+  intvec *ww=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
+  if (ww!=NULL)
+  {
+     weights=ivCopy(ww);
+     add_row_shift = ww->min_in();
+     (*weights) -= add_row_shift;
+  }
+  res->data=(void *)syBettiOfComputation(syzstr,minim,&row_shift,weights);
+  //row_shift += add_row_shift;
+  //Print("row_shift=%d, add_row_shift=%d\n",row_shift,add_row_shift);
+  atSet(res,omStrDup("rowShift"),(void*)add_row_shift,INT_CMD);
   return FALSE;
 }
 BOOLEAN syBetti1(leftv res, leftv u)
 {
-  syStrategy syzstr=(syStrategy)u->Data();
-
-  res->data=(void *)syBettiOfComputation(syzstr);
-  return FALSE;
+  sleftv tmp;
+  memset(&tmp,0,sizeof(tmp));
+  tmp.rtyp=INT_CMD;
+  tmp.data=(void *)1;  
+  return syBetti2(res,u,&tmp);
 }
 

Singular/ipshell.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.h,v 1.33 2004-01-20 15:16:27 bricken Exp $ */
+/* $Id: ipshell.h,v 1.34 2004-07-20 15:40:43 Singular Exp $ */
 /*
 * ABSTRACT
@@ -69 +69 @@
 BOOLEAN jjMINRES(leftv res, leftv v);
 BOOLEAN jjBETTI(leftv res, leftv v);
+BOOLEAN jjBETTI2(leftv res, leftv u, leftv v);
+
 int     iiRegularity(lists L);
 leftv   singular_system(sleftv h);