Changeset 709ab0 in git

Timestamp:

Oct 5, 2004, 3:00:51 PM (20 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bfcb41b1edf48a98eced6b2079c86b370807b920

Parents:

678128ae93a0fa4488f7ac619a423aa9593fda96

Message:

*hannes: betti sttuff from 2-0


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

Location:

Singular

Files:

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

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.327 2004-08-05 09:00:09 Singular Exp $ */
+/* $Id: iparith.cc,v 1.328 2004-10-05 13:00:29 Singular Exp $ */
 
 /*
@@ -2547 +2547 @@
 ,{jjBETTI2,    BETTI_CMD,      INTMAT_CMD,     LIST_CMD,   INT_CMD ALLOW_PLURAL}
 ,{syBetti2,    BETTI_CMD,      INTMAT_CMD,     RESOLUTION_CMD, INT_CMD ALLOW_PLURAL}
+,{jjBETTI2_ID, BETTI_CMD,      INTMAT_CMD,     IDEAL_CMD,  INT_CMD ALLOW_PLURAL}
+,{jjBETTI2_ID, BETTI_CMD,      INTMAT_CMD,     MODUL_CMD,  INT_CMD ALLOW_PLURAL}
 #ifdef HAVE_PLURAL
 ,{jjBRACKET,   BRACKET_CMD,    POLY_CMD,       POLY_CMD,   POLY_CMD ALLOW_PLURAL}
@@ -3878 +3880 @@
 ,{jjBETTI,      BETTI_CMD,       INTMAT_CMD,     LIST_CMD       ALLOW_PLURAL}
 ,{syBetti1,     BETTI_CMD,       INTMAT_CMD,     RESOLUTION_CMD ALLOW_PLURAL}
+,{jjBETTI,      BETTI_CMD,       INTMAT_CMD,     IDEAL_CMD      ALLOW_PLURAL}
+,{jjBETTI,      BETTI_CMD,       INTMAT_CMD,     MODUL_CMD      ALLOW_PLURAL}
 ,{jjCHAR,       CHARACTERISTIC_CMD, INT_CMD,     RING_CMD       ALLOW_PLURAL}
 ,{jjCHAR,       CHARACTERISTIC_CMD, INT_CMD,     QRING_CMD      ALLOW_PLURAL}

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.91 2004-07-20 15:41:00 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.92 2004-10-05 13:00:50 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -855 +855 @@
   tmp.rtyp=INT_CMD;
   tmp.data=(void *)1;  
-  return jjBETTI2(res,u,&tmp);
+  if ((u->Typ()==IDEAL_CMD)
+  || (u->Typ()==MODUL_CMD))
+    return jjBETTI2_ID(res,u,&tmp);
+  else
+    return jjBETTI2(res,u,&tmp);
+}
+
+BOOLEAN jjBETTI2_ID(leftv res, leftv u, leftv v)
+{
+  lists l=(lists) omAllocBin(slists_bin);
+  l->Init(1);
+  l->m[0].rtyp=u->Typ();
+  l->m[0].data=u->Data();
+  l->m[0].attribute=u->attribute;
+  sleftv tmp2;
+  memset(&tmp2,0,sizeof(tmp2));
+  tmp2.rtyp=LIST_CMD;
+  tmp2.data=(void *)l;
+  BOOLEAN r=jjBETTI2(res,&tmp2,v);
+  l->m[0].data=NULL;
+  l->m[0].attribute=NULL;
+  l->m[0].rtyp=DEF_CMD;
+  l->Clean();
+  return r;
 }
 
@@ -865 +888 @@
   lists l=(lists)u->Data();
 
-  intvec *weights=(intvec *)atGet(&(l->m[0]),"isHomog",INTVEC_CMD); 
+  intvec *weights=NULL;
+  int add_row_shift=0;
+  intvec *ww=(intvec *)atGet(&(l->m[0]),"isHomog",INTVEC_CMD); 
+  if (ww!=NULL)
+  {
+     weights=ivCopy(ww);
+     add_row_shift = ww->min_in();
+     (*weights) -= add_row_shift;
+  }
   //Print("attr:%x\n",weights);
 
@@ -872 +903 @@
   res->data=(char *)syBetti(r,len,&reg,weights,(int)v->Data());
   omFreeSize((ADDRESS)r,(len)*sizeof(ideal));
+  if (add_row_shift!=0) 
+    atSet(res,omStrDup("rowShift"),(void*)add_row_shift,INT_CMD);
+  if (weights!=NULL) delete weights;
   return FALSE;
 }

Singular/ipshell.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.h,v 1.34 2004-07-20 15:40:43 Singular Exp $ */
+/* $Id: ipshell.h,v 1.35 2004-10-05 13:00:51 Singular Exp $ */
 /*
 * ABSTRACT
@@ -70 +70 @@
 BOOLEAN jjBETTI(leftv res, leftv v);
 BOOLEAN jjBETTI2(leftv res, leftv u, leftv v);
+BOOLEAN jjBETTI2_ID(leftv res, leftv u, leftv v);
 
 int     iiRegularity(lists L);