Changeset 1b9882 in git


Ignore:
Timestamp:
Aug 19, 1999, 5:51:30 PM (25 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')
Children:
ee0e99cdb0259cccfb04f6700a75f00b0ea53598
Parents:
6452fc3d903907774854bb4574c214a360565999
Message:
*hannes: TEMPORARY additional second argument to betti (_,minim)


git-svn-id: file:///usr/local/Singular/svn/trunk@3513 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    r6452fc3 r1b9882  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: iparith.cc,v 1.172 1999-08-19 11:28:08 obachman Exp $ */
     4/* $Id: iparith.cc,v 1.173 1999-08-19 15:51:29 Singular Exp $ */
    55
    66/*
     
    128128  { "attrib",      0, ATTRIB_CMD ,        CMD_123},
    129129  { "bareiss",     0, BAREISS_CMD ,       CMD_123},
    130   { "betti",       0, BETTI_CMD ,         CMD_1},
     130  { "betti",       0, BETTI_CMD ,         CMD_12},
    131131  { "break",       0, BREAK_CMD ,         BREAK_CMD},
    132132  { "char",        0, CHARACTERISTIC_CMD ,CMD_1},
     
    21772177,{atATTRIB2,   ATTRIB_CMD,     NONE/*set by p*/,DEF_CMD,   STRING_CMD PROFILER}
    21782178,{jjWRONG2,    BAREISS_CMD,    0,              DEF_CMD,    DEF_CMD PROFILER}
     2179,{syBetti2,    BETTI_CMD,      INTMAT_CMD,     RESOLUTION_CMD, INT_CMD PROFILER}
    21792180,{jjCOEF,      COEF_CMD,       MATRIX_CMD,     POLY_CMD,   POLY_CMD PROFILER}
    21802181,{jjCOEFFS_Id, COEFFS_CMD,     MATRIX_CMD,     IDEAL_CMD,  POLY_CMD PROFILER}
     
    31853186#define jjrParStr      (proc1)19
    31863187#define jjidMinEmbedding (proc1)20
    3187 #define jjBETTI_R        (proc1)21
    31883188#define jjCOUNT_R        (proc1)22
    31893189#define jjDIM_R          (proc1)23
     
    32243224        case (int)jjrParStr:      dArith1[i].p=(proc1)rParStr; break;
    32253225        case (int)jjidMinEmbedding: dArith1[i].p=(proc1)idMinEmbedding; break;
    3226         case (int)jjBETTI_R:      dArith1[i].p=(proc1)syBettiOfComputation; break;
    32273226        case (int)jjCOUNT_R:      dArith1[i].p=(proc1)syLength; break;
    32283227        case (int)jjDIM_R:        dArith1[i].p=(proc1)syDim; break;
     
    33343333{
    33353334  res->data = (char *)idMinEmbedding((ideal)v->Data());
    3336   return FALSE;
    3337 }
    3338 static BOOLEAN jjBETTI_R(leftv res, leftv v)
    3339 {
    3340   res->data=(char *)syBettiOfComputation((syStrategy)v->Data());
    33413335  return FALSE;
    33423336}
     
    33843378#define jjrParStr      (proc1)rParStr
    33853379#define jjidMinEmbedding (proc1)idMinEmbedding
    3386 #define jjBETTI_R        (proc1)syBettiOfComputation
    33873380#define jjCOUNT_R        (proc1)syLength
    33883381#define jjDIM_R        (proc1)syDim
     
    34213414,{jjBAREISS,    BAREISS_CMD,     LIST_CMD,       MODUL_CMD }
    34223415,{jjBETTI,      BETTI_CMD,       INTMAT_CMD,     LIST_CMD }
    3423 ,{jjBETTI_R,    BETTI_CMD,       XS(INTMAT_CMD), RESOLUTION_CMD }
     3416,{syBetti1,     BETTI_CMD,       INTMAT_CMD,    RESOLUTION_CMD }
    34243417,{jjCHAR,       CHARACTERISTIC_CMD, INT_CMD,     RING_CMD }
    34253418,{jjCHAR,       CHARACTERISTIC_CMD, INT_CMD,     QRING_CMD }
     
    43214314#ifdef HAVE_SPECTRUM
    43224315,{semicProc3,       SEMIC_CMD,  INT_CMD,    LIST_CMD,   LIST_CMD,   INT_CMD }
    4323 ,{spectrumOp3,      SPECTRUM_CMD, LIST_CMD, LIST_CMD,   STRING_CMD, INT_CMD } 
    4324 ,{spectrumOp3,      SPECTRUM_CMD, LIST_CMD, LIST_CMD,   STRING_CMD, LIST_CMD } 
     4316,{spectrumOp3,      SPECTRUM_CMD, LIST_CMD, LIST_CMD,   STRING_CMD, INT_CMD }
     4317,{spectrumOp3,      SPECTRUM_CMD, LIST_CMD, LIST_CMD,   STRING_CMD, LIST_CMD }
    43254318#endif
    43264319#ifdef OLD_RES
     
    47564749    memcpy(res,&tmp_res,sizeof(tmp_res));
    47574750    res->next=tmp_next;
    4758   } 
     4751  }
    47594752  u->next = v;
    47604753  v->next = w;
  • Singular/syz.h

    r6452fc3 r1b9882  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: syz.h,v 1.15 1999-08-19 11:56:46 siebert Exp $ */
     6/* $Id: syz.h,v 1.16 1999-08-19 15:51:30 Singular Exp $ */
    77/*
    88* ABSTRACT: Resolutions
     
    8383
    8484void syKillComputation(syStrategy syzstr);
    85 intvec * syBettiOfComputation(syStrategy syzstr);
     85intvec * syBettiOfComputation(syStrategy syzstr, BOOLEAN minim=TRUE);
     86BOOLEAN syBetti1(leftv res, leftv u);
     87BOOLEAN syBetti2(leftv res, leftv u, leftv w);
    8688int syLength(syStrategy syzstr);
    8789int sySize(syStrategy syzstr);
  • Singular/syz1.cc

    r6452fc3 r1b9882  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: syz1.cc,v 1.38 1999-07-16 16:07:22 Singular Exp $ */
     4/* $Id: syz1.cc,v 1.39 1999-08-19 15:51:30 Singular Exp $ */
    55/*
    66* ABSTRACT: resolutions
     
    20572057* (if not LaScala calls the traditional Betti procedure)
    20582058*/
    2059 intvec * syBettiOfComputation(syStrategy syzstr)
     2059intvec * syBettiOfComputation(syStrategy syzstr, BOOLEAN minim)
    20602060{
    20612061  int dummy;
     
    21032103  }
    21042104  else if (syzstr->fullres!=NULL)
    2105     return syBetti(syzstr->fullres,syzstr->length,&dummy);
     2105    return syBetti(syzstr->fullres,syzstr->length,&dummy,NULL,minim);
    21062106  else
    2107     return syBetti(syzstr->minres,syzstr->length,&dummy);
     2107    return syBetti(syzstr->minres,syzstr->length,&dummy,NULL,minim);
     2108}
     2109
     2110/*2
     2111* read out the Betti numbers from resolution
     2112* (interpreter interface)
     2113*/
     2114BOOLEAN syBetti2(leftv res, leftv u, leftv w)
     2115{
     2116  syStrategy syzstr=(syStrategy)u->Data();
     2117  BOOLEAN minim=(int)w->Data();
     2118 
     2119  res->data=(void *)syBettiOfComputation(syzstr,minim);
     2120  return FALSE;
     2121}
     2122BOOLEAN syBetti1(leftv res, leftv u)
     2123{
     2124  syStrategy syzstr=(syStrategy)u->Data();
     2125 
     2126  res->data=(void *)syBettiOfComputation(syzstr);
     2127  return FALSE;
    21082128}
    21092129
Note: See TracChangeset for help on using the changeset viewer.