Changeset a1c44e in git


Ignore:
Timestamp:
May 14, 1998, 3:04:23 PM (26 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b21a664aa22dc6e196223af8a74ad4885e83547c')
Children:
e366d8a3a79662b9793927e004392d992de92a92
Parents:
5011fdf7a5b0459e72d817bd63956318480c1739
Message:
* hannes: renamed std to kStd, stdfac to kStdfac


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

Legend:

Unmodified
Added
Removed
  • Singular/extra.cc

    r5011fd ra1c44e  
    22*  Computer Algebra System SINGULAR      *
    33*****************************************/
    4 /* $Id: extra.cc,v 1.46 1998-05-11 13:19:58 obachman Exp $ */
     4/* $Id: extra.cc,v 1.47 1998-05-14 13:04:12 Singular Exp $ */
    55/*
    66* ABSTRACT: general interface to internals of Singular ("system" command)
     
    412412      {
    413413        res->rtyp=IDEAL_CMD;
    414         res->data=(void *)stdred((ideal)h->next->Data(),NULL,testHomog,NULL);
     414        res->data=(void *)kStdred((ideal)h->next->Data(),NULL,testHomog,NULL);
    415415        setFlag(res,FLAG_STD);
    416416        return FALSE;
  • Singular/ideals.cc

    r5011fd ra1c44e  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ideals.cc,v 1.24 1998-05-04 11:38:57 obachman Exp $ */
     4/* $Id: ideals.cc,v 1.25 1998-05-14 13:04:13 Singular Exp $ */
    55/*
    66* ABSTRACT - all basic methods to manipulate ideals
     
    606606  pEnlargeSet(&(e->m),IDELEMS(e),15);
    607607  IDELEMS(e) = 16;
    608   h2 = std(h1,currQuotient,isNotHomog,NULL);
     608  h2 = kStd(h1,currQuotient,isNotHomog,NULL);
    609609  h3 = idMaxIdeal();
    610610  h4=idMult(h2,h3);
    611611  idDelete(&h3);
    612   h3=std(h4,currQuotient,isNotHomog,NULL);
     612  h3=kStd(h4,currQuotient,isNotHomog,NULL);
    613613  k = IDELEMS(h3);
    614614  while ((k > 0) && (h3->m[k-1] == NULL)) k--;
     
    10211021  }
    10221022  pSetSyzComp(length);
    1023   temp1 = std(temp,currQuotient,testHomog,&w,NULL,length);
     1023  temp1 = kStd(temp,currQuotient,testHomog,&w,NULL,length);
    10241024  if (w!=NULL) delete w;
    10251025  pSetSyzComp(0);
     
    11241124  }
    11251125  /* std computation --------------------------------------------*/
    1126   tempstd = std(bigmat,currQuotient,testHomog,&w,NULL,syzComp);
     1126  tempstd = kStd(bigmat,currQuotient,testHomog,&w,NULL,syzComp);
    11271127  if (w!=NULL) delete w;
    11281128  idDelete(&bigmat);
     
    12431243  for(j=0;j<IDELEMS(h2);j++) pTest(h2->m[j]);
    12441244#endif
    1245   h3=std(h2,quot,h,w,NULL,*syzcomp);
    1246   //h3->rank = h2->rank; done by std -> initBuchMora -> initS
     1245  h3=kStd(h2,quot,h,w,NULL,*syzcomp);
     1246  //h3->rank = h2->rank; done by kStd -> initBuchMora -> initS
    12471247  h3->rank-=*syzcomp;
    12481248  idDelete(&h2);
     
    17151715    }
    17161716  }
    1717   h3 = std(h4,currQuotient,(tHomog)FALSE,NULL,NULL,kmax-1);
     1717  h3 = kStd(h4,currQuotient,(tHomog)FALSE,NULL,NULL,kmax-1);
    17181718  pSetSyzComp(0);
    17191719  idDelete(&h4);
     
    18101810  kkk = IDELEMS(h4);
    18111811  if (addOnlyOne && (!h1IsStb))
    1812     temph1 = std(h1,currQuotient,hom,&weights,NULL);
     1812    temph1 = kStd(h1,currQuotient,hom,&weights,NULL);
    18131813  else
    18141814    temph1 = h1;
     
    18531853  if (addOnlyOne)
    18541854  {
    1855     h3 = std(h4,currQuotient,hom,&weights1,NULL,kmax-1,IDELEMS(h4)-1);
     1855    h3 = kStd(h4,currQuotient,hom,&weights1,NULL,kmax-1,IDELEMS(h4)-1);
    18561856  }
    18571857  else
    18581858  {
    1859     h3 = std(h4,currQuotient,hom,&weights1,NULL,kmax-1);
     1859    h3 = kStd(h4,currQuotient,hom,&weights1,NULL,kmax-1);
    18601860  }
    18611861  idTest(h3);
     
    21542154  // fetch data from the old ring
    21552155  for (k=0;k<IDELEMS(h1);k++) h->m[k] = pFetchCopy(origR, h1->m[k]);
    2156   // compute std
    2157   hh = std(h,NULL,hom,&w,hilb);
     2156  // compute kStd
     2157  hh = kStd(h,NULL,hom,&w,hilb);
    21582158  idDelete(&h);
    21592159
     
    27982798  }
    27992799  pSetSyzComp(length);
    2800   temp1 = std(temp,currQuotient,testHomog,&w,NULL,length);
     2800  temp1 = kStd(temp,currQuotient,testHomog,&w,NULL,length);
    28012801  pSetSyzComp(0);
    28022802  idDelete(&temp);
  • Singular/iparith.cc

    r5011fd ra1c44e  
    13691369static BOOLEAN jjFACSTD2(leftv res, leftv v, leftv w)
    13701370{
    1371   res->data=(void *)stdfac((ideal)v->Data(),NULL,testHomog,NULL,
     1371  res->data=(void *)kStdfac((ideal)v->Data(),NULL,testHomog,NULL,
    13721372           (ideal)w->Data());
    13731373  setFlag(res,FLAG_STD);
     
    17891789    hom=isHomog;
    17901790  }
    1791   result=std((ideal)(u->Data()),currQuotient,hom,&w,(intvec *)v->Data());
     1791  result=kStd((ideal)(u->Data()),currQuotient,hom,&w,(intvec *)v->Data());
    17921792  idSkipZeroes(result);
    17931793  res->data = (char *)result;
     
    18141814  BITSET save_test=test;
    18151815  test|=Sy_bit(OPT_SB_1);
    1816   result=std(i1,currQuotient,hom,&w);
     1816  result=kStd(i1,currQuotient,hom,&w);
    18171817  test=save_test;
    18181818  idDelete(&i1);
     
    23552355static BOOLEAN jjFACSTD(leftv res, leftv v)
    23562356{
    2357   res->data=(void *)stdfac((ideal)v->Data(),NULL,testHomog,NULL);
     2357  res->data=(void *)kStdfac((ideal)v->Data(),NULL,testHomog,NULL);
    23582358  setFlag(res,FLAG_STD);
    23592359  return FALSE;
     
    27052705  //  result=stdred((ideal)v->Data(),currQuotient,hom,&w);
    27062706  //else
    2707     result=std((ideal)(v->Data()),currQuotient,hom,&w);
     2707    result=kStd((ideal)(v->Data()),currQuotient,hom,&w);
    27082708  idSkipZeroes(result);
    27092709  res->data = (char *)result;
  • Singular/khstd.cc

    r5011fd ra1c44e  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: khstd.cc,v 1.5 1997-11-25 15:29:57 pohl Exp $ */
     4/* $Id: khstd.cc,v 1.6 1998-05-14 13:04:15 Singular Exp $ */
    55/*
    6 * ABSTRACT:utils for hilbert driven std
     6* ABSTRACT:utils for hilbert driven kStd
    77*/
    88
     
    2525  /* ideal S=strat->Shdl, poly p=strat->P.p */
    2626/*
    27 * compute the number eledeg of elements with a degree >= deg(p) going into std,
     27* compute the number eledeg of elements with a degree >= deg(p) going into kStd,
    2828* p is already in S and for all further q going into S yields deg(q) >= deg(p),
    2929* the real computation is only done if the degree has changed,
  • Singular/kstd1.cc

    r5011fd ra1c44e  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstd1.cc,v 1.20 1998-04-23 09:52:09 Singular Exp $ */
     4/* $Id: kstd1.cc,v 1.21 1998-05-14 13:04:16 Singular Exp $ */
    55/*
    66* ABSTRACT:
     
    773773* reduces h with elements from T choosing first possible
    774774* element in T with respect to the given ecart
    775 * used for computing normal forms outside std
     775* used for computing normal forms outside kStd
    776776*/
    777777static poly redMoraNF (poly h,kStrategy strat)
     
    18241824  return o+(*kModW)[i-1];
    18251825}
    1826 ideal std(ideal F, ideal Q, tHomog h,intvec ** w, intvec *hilb,int syzComp,
     1826ideal kStd(ideal F, ideal Q, tHomog h,intvec ** w, intvec *hilb,int syzComp,
    18271827          int newIdeal)
    18281828{
  • Singular/kstd1.h

    r5011fd ra1c44e  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: kstd1.h,v 1.4 1997-08-05 13:04:04 Singular Exp $ */
     6/* $Id: kstd1.h,v 1.5 1998-05-14 13:04:17 Singular Exp $ */
    77/*
    88* ABSTRACT
     
    2323ideal kNF(ideal F, ideal Q, ideal p,int syzComp=0, int lazyReduce=0);
    2424
    25 ideal std(ideal F, ideal Q, tHomog h, intvec ** w,intvec *hilb=NULL,
     25ideal kStd(ideal F, ideal Q, tHomog h, intvec ** w,intvec *hilb=NULL,
    2626          int syzComp=0,int newIdeal=0);
    2727#ifdef STDTRACE
     
    767627 stop at HC (finiteDeterminacyTest)
    777728 minimizes directly during the mres command
    78 29 std + 1 new element
     7829 kStd + 1 new element
    797930 noRedSyz
    808031 weight
  • Singular/kstdfac.cc

    r5011fd ra1c44e  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstdfac.cc,v 1.17 1998-04-22 07:49:00 Singular Exp $ */
     4/* $Id: kstdfac.cc,v 1.18 1998-05-14 13:04:17 Singular Exp $ */
    55/*
    66*  ABSTRACT -  Kernel: factorizing alg. of Buchberger
     
    739739#endif
    740740
    741 lists stdfac(ideal F, ideal Q, tHomog h,intvec ** w,ideal D)
     741lists kStdfac(ideal F, ideal Q, tHomog h,intvec ** w,ideal D)
    742742{
    743743#ifdef HAVE_FACTORY
  • Singular/kstdfac.h

    r5011fd ra1c44e  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: kstdfac.h,v 1.3 1997-04-09 12:19:53 Singular Exp $ */
     6/* $Id: kstdfac.h,v 1.4 1998-05-14 13:04:18 Singular Exp $ */
    77/*
    88*  ABSTRACT -  Kernel: factorizing alg. of Buchberger
     
    1010#include "structs.h"
    1111
    12 lists stdfac(ideal F, ideal Q, tHomog h,intvec ** w, ideal D=NULL);
     12lists kStdfac(ideal F, ideal Q, tHomog h,intvec ** w, ideal D=NULL);
    1313#endif
    1414
  • Singular/kutil.cc

    r5011fd ra1c44e  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.19 1998-04-27 16:08:44 Singular Exp $ */
     4/* $Id: kutil.cc,v 1.20 1998-05-14 13:04:19 Singular Exp $ */
    55/*
    6 * ABSTRACT: kernel: utils for std
     6* ABSTRACT: kernel: utils for kStd
    77*/
    88
  • Singular/kutil.h

    r5011fd ra1c44e  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: kutil.h,v 1.9 1998-04-27 16:09:37 Singular Exp $ */
     6/* $Id: kutil.h,v 1.10 1998-05-14 13:04:20 Singular Exp $ */
    77/*
    8 * ABSTRACT: kernel: utils for std
     8* ABSTRACT: kernel: utils for kStd
    99*/
    1010#include "structs.h"
  • Singular/maps.cc

    r5011fd ra1c44e  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: maps.cc,v 1.9 1998-04-24 16:39:21 Singular Exp $ */
     4/* $Id: maps.cc,v 1.10 1998-05-14 13:04:20 Singular Exp $ */
    55/*
    66* ABSTRACT - the mapping of polynomials to other rings
     
    240240  }
    241241  // we ignore here homogenity - may be changed later:
    242   temp2 = std(temp1,NULL,isNotHomog,NULL);
     242  temp2 = kStd(temp1,NULL,isNotHomog,NULL);
    243243  idDelete(&temp1);
    244244  for (i=0;i<IDELEMS(temp2);i++)
  • Singular/syz1.cc

    r5011fd ra1c44e  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: syz1.cc,v 1.27 1998-04-29 16:28:19 Singular Exp $ */
     4/* $Id: syz1.cc,v 1.28 1998-05-14 13:04:21 Singular Exp $ */
    55/*
    66* ABSTRACT: resolutions
     
    10391039* reduces all pairs of degree deg in the module index
    10401040* put the reduced generators to the resolvente which contains
    1041 * the truncated std
     1041* the truncated kStd
    10421042*/
    10431043static void syRedNextPairs(SSet nextPairs, syStrategy syzstr,
Note: See TracChangeset for help on using the changeset viewer.