Changeset 0f7ce1 in git


Ignore:
Timestamp:
Apr 26, 2005, 10:59:10 AM (18 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
dda2fd472582bc5fdf1e2052d1c46f9c9e7023d8
Parents:
5d00520a016f7e7089be25484b5cc41e3b897fd4
Message:
*hannes: scDegree prints...


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

Legend:

Unmodified
Added
Removed

  • Singular/iparith.cc

    r5d0052 r0f7ce1  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: iparith.cc,v 1.345 2005-04-18 15:10:04 Singular Exp $ */
     4/* $Id: iparith.cc,v 1.346 2005-04-26 08:59:10 Singular Exp $ */
    55
    66/*
    … …  
    29742974{
    29752975  assumeStdFlag(v);
    2976   scDegree((ideal)v->Data(),currQuotient);
     2976  intvec *module_w=(intvec*)atGet(v,"isHomog");
     2977  scDegree((ideal)v->Data(),module_w,currQuotient);
    29772978  return FALSE;
    29782979}

  • kernel/hdegree.cc

    r5d0052 r0f7ce1  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: hdegree.cc,v 1.3 2004-10-05 11:25:39 pohl Exp $ */
     4/* $Id: hdegree.cc,v 1.4 2005-04-26 08:57:54 Singular Exp $ */
    55/*
    66*  ABSTRACT -  dimension, multiplicity, HC, kbase
    … …  
    807807}
    808808
    809 int scDegree(ideal S, ideal Q)
    810 {
    811   hDegree(S, Q);
    812   int di = pVariables-hCo;
    813   if (di!=0) return hMu;
    814   else /*variety is empty or not projective*/ return 0;
     809void scDegree(ideal S, intvec *modulweight, ideal Q)
     810{
     811  int co, mu, l;
     812  intvec *hseries2;
     813  intvec *hseries1 = hFirstSeries(S, modulweight, Q);
     814  l = hseries1->length()-1;
     815  if (l > 1)
     816    hseries2 = hSecondSeries(hseries1);
     817  else
     818    hseries2 = hseries1;
     819  hDegreeSeries(hseries1, hseries2, &co, &mu);
     820  if ((l == 1) &&(mu == 0))
     821    scPrintDegree(pVariables+1, 0);
     822  else
     823    scPrintDegree(co, mu);
     824  if (l>1)
     825    delete hseries1;
     826  delete hseries2;
    815827}
    816828

  • kernel/hilb.cc

    r5d0052 r0f7ce1  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: hilb.cc,v 1.1.1.1 2003-10-06 12:15:53 Singular Exp $ */
     4/* $Id: hilb.cc,v 1.2 2005-04-26 08:58:13 Singular Exp $ */
    55/*
    66*  ABSTRACT -  Hilbert series
    … …  
    403403}
    404404
    405 static void hDegreeSeries(intvec *s1, intvec *s2, int *co, int *mu)
     405void hDegreeSeries(intvec *s1, intvec *s2, int *co, int *mu)
    406406{
    407407  int m, i, j, k;

  • kernel/hutil.h

    r5d0052 r0f7ce1  
    6363void hIndAllMult(scmon pure, int Npure, scfmon rad, int Nrad,
    6464 varset var, int Nvar);
    65 
     65void hDegreeSeries(intvec *s1, intvec *s2, int *co, int *mu);
    6666
    6767#endif

  • kernel/stairc.h

    r5d0052 r0f7ce1  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: stairc.h,v 1.1.1.1 2003-10-06 12:16:03 Singular Exp $ */
     6/* $Id: stairc.h,v 1.2 2005-04-26 08:58:13 Singular Exp $ */
    77/*
    88* ABSTRACT
    … …  
    1919int scMult0Int(ideal  s,ideal Q=NULL);
    2020void scPrintDegree(int co, int mu);
    21 int scDegree(ideal  s,ideal Q=NULL);
     21void scDegree(ideal  s,intvec *modulweight,ideal Q=NULL);
    2222
    2323ideal scKBase(int deg, ideal  s, ideal Q=NULL);
Note: See TracChangeset for help on using the changeset viewer.