Changeset 1a2ca6 in git


Ignore:
Timestamp:
Jan 31, 2000, 3:57:34 PM (24 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
94f5652c6b8f440140551e85e69410fcb24baf1a
Parents:
f7227808a681b6a4913de0a93ee1d12ed8cd33ef
Message:
*hannes: pComp0 is now an inline function


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

Legend:

Unmodified
Added
Removed

  • Singular/polys.cc

    rf722780 r1a2ca6  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: polys.cc,v 1.52 1999-11-15 17:20:40 obachman Exp $ */
     4/* $Id: polys.cc,v 1.53 2000-01-31 14:57:32 Singular Exp $ */
    55
    66/*
    … …  
    3131/* the monomial ordering of the head monomials a and b */
    3232/* returns -1 if a comes before b, 0 if a=b, 1 otherwise */
    33 pCompProc pComp0;
    3433
    3534int pVariables;     // number of variables
    … …  
    6160/* -------------- static variables --------------------------------------- */
    6261/*is the basic comparing procedure during a computation of syzygies*/
    63 static pCompProc pCompOld;
     62//static pCompProc pCompOld;
    6463
    6564/*contains the headterms for the Schreyer orderings*/
    … …  
    285284      cP1=SchreyerOrd[CompP1-1],cP2=SchreyerOrd[CompP2-1];
    286285
    287   if (CompP1==CompP2) return pCompOld(p1,p2);
     286  //if (CompP1==CompP2) return pCompOld(p1,p2);
     287  if (CompP1==CompP2) return pComp0(p1,p2);
    288288  pSetComp(p1,cP1);
    289289  pSetComp(p2,cP2);
    290   result = pCompOld(p1,p2);
     290  //result = pCompOld(p1,p2);
     291  result = pComp0(p1,p2);
    291292  pSetComp(p1,CompP1);
    292293  pSetComp(p2,CompP2);
    … …  
    373374      for (i=indexShift;i<maxSchreyer;i++)
    374375        SchreyerOrd[i] = pGetComp(nextOrder[i-indexShift]);
    375       pCompOld = pComp0;
    376       pComp0 = mcompSchrM;
     376      //pCompOld = pComp0;
     377      //pComp0 = mcompSchrM;
    377378      pLDegOld = pLDeg;
    378379      pLDeg = ldegSchrM;
    … …  
    386387      maxSchreyer = 0;
    387388      indexShift = 0;
    388       pComp0 = pCompOld;
     389      //pComp0 = pCompOld;
    389390      pLDeg = pLDegOld;
    390391    }
    … …  
    793794    }
    794795    pSetm=rSetm;
    795     pComp0=rComp0;
    796796  }
    797797  if (pFDeg!=pWTotaldegree) pFDeg=pTotaldegree;

  • Singular/polys.h

    rf722780 r1a2ca6  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: polys.h,v 1.27 1999-11-15 17:20:41 obachman Exp $ */
     6/* $Id: polys.h,v 1.28 2000-01-31 14:57:33 Singular Exp $ */
    77/*
    88* ABSTRACT - all basic methods to manipulate polynomials
    99*/
     10#include "polys-comp.h"
    1011#include "polys-impl.h"
    1112#define pFetchCopy(r,p)     _pFetchCopy(r,p)
    … …  
    9697/*-----------the ordering of monomials:-------------*/
    9798extern pSetmProc pSetm;
    98 extern pCompProc pComp0;
     99#define pComp0 rComp0
    99100#define pSetmComp pSetm
    100 // this is needed here as long as monomials with negative exponents might be
    101 // compared (see in spolys.cc)
    102 extern pCompProc t_pComp0;
    103101int    pComp(poly p1,poly p2);
    104102extern pLDegProc pLDeg;

  • Singular/syz.h

    rf722780 r1a2ca6  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: syz.h,v 1.22 1999-11-15 17:20:53 obachman Exp $ */
     6/* $Id: syz.h,v 1.23 2000-01-31 14:57:34 Singular Exp $ */
    77/*
    88* ABSTRACT: Resolutions
    … …  
    111111syStrategy syMinimize(syStrategy syzstr);
    112112void syKillEmptyEntres(resolvente res,int length);
    113 #ifdef PDEBUG
    114 int syzcomp2dpc(poly p1, poly p2);
    115 #else
    116 #define syzcomp2dpc rComp0
    117 #endif
    118113
    119114extern int *  currcomponents;

  • Singular/syz1.cc

    rf722780 r1a2ca6  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: syz1.cc,v 1.52 2000-01-28 12:37:56 siebert Exp $ */
     4/* $Id: syz1.cc,v 1.53 2000-01-31 14:57:34 Singular Exp $ */
    55/*
    66* ABSTRACT: resolutions
    … …  
    279279  if (currcomponents[o1]>currcomponents[o2]) return 1;
    280280  return -1;
    281 }
    282 int syzcomp2dpc(poly p1, poly p2)
    283 {
    284   int test = syzcomp2dpc_test(p1, p2);
    285   int rc = rComp0(p1, p2);
    286   if (test != rc)
    287   {
    288     assume(0);
    289     syzcomp2dpc_test(p1, p2);
    290     rComp0(p1, p2);
    291   }
    292   return test;
    293281}
    294282#endif // PDEBUG
Note: See TracChangeset for help on using the changeset viewer.