Changeset 6f1610 in git


Ignore:
Timestamp:
Nov 17, 1999, 1:09:27 PM (25 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
Children:
d6b035db0aca74c2dfaa450b41b81d9ef4adfe0b
Parents:
59f0d2fa7d5c7132b992bffd6be3a4a07eeb4b9b
Message:
* ideals: fix in idModulo
* k* fix initSSpecial
* mmbt: don't track on new


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

Legend:

Unmodified
Added
Removed
  • Singular/ideals.cc

    r59f0d2f r6f1610  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ideals.cc,v 1.74 1999-11-16 12:39:27 obachman Exp $ */
     4/* $Id: ideals.cc,v 1.75 1999-11-17 12:09:24 obachman Exp $ */
    55/*
    66* ABSTRACT - all basic methods to manipulate ideals
     
    29182918  if (syz_ring != orig_ring)
    29192919  {
    2920     s_temp = idrCopyR_NoSort(temp, orig_ring);
     2920    s_temp = idrMoveR_NoSort(temp, orig_ring);
    29212921  }
    29222922  else
     
    29252925  }
    29262926 
     2927  idTest(s_temp);
    29272928  ideal s_temp1 = kStd(s_temp,currQuotient,testHomog,&w,NULL,length);
    29282929  if (w!=NULL) delete w;
     
    29462947  {
    29472948    rChangeCurrRing(orig_ring,TRUE);
    2948     s_temp = idrMoveR_NoSort(s_temp, syz_ring);
     2949    s_temp1 = idrMoveR_NoSort(s_temp1, syz_ring);
     2950    rKill(syz_ring);
     2951  }
     2952  else
     2953  {
    29492954    idDelete(&temp);
    2950     rKill(syz_ring);
    2951   }
     2955  }
     2956  idTest(s_temp1);
    29522957  return s_temp1;
    29532958}
  • Singular/kstd2.cc

    r59f0d2f r6f1610  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstd2.cc,v 1.39 1999-11-15 17:20:15 obachman Exp $ */
     4/* $Id: kstd2.cc,v 1.40 1999-11-17 12:09:25 obachman Exp $ */
    55/*
    66*  ABSTRACT -  Kernel: alg. of Buchberger
     
    582582  reduc = olddeg = lrmax = 0;
    583583  /* compute------------------------------------------------------- */
     584  kTest_TS(strat);
    584585  while (strat->Ll >= 0)
    585586  {
     
    617618              &olddeg,&reduc,strat);
    618619
     620    kTest_TS(strat);
    619621    /* reduction of the element choosen from L */
    620622    red_result = strat->red(&strat->P,strat);
     
    623625    if (red_result == 1)
    624626    {
     627      kTest_TS(strat);
    625628      /* statistic */
    626629      if (TEST_OPT_PROT) PrintS("s");
  • Singular/kstdfac.cc

    r59f0d2f r6f1610  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstdfac.cc,v 1.30 1999-11-15 17:20:15 obachman Exp $ */
     4/* $Id: kstdfac.cc,v 1.31 1999-11-17 12:09:25 obachman Exp $ */
    55/*
    66*  ABSTRACT -  Kernel: factorizing alg. of Buchberger
     
    102102      if(i>o->tl)
    103103      {
    104         PrintS("poly p1 not found in T:");wrp(p);PrintLn();
     104        Warn("poly p1 not found in T:");wrp(p);PrintLn();
    105105        l[j].p1=pCopy(p);
    106106        break;
     
    122122      if(i>o->tl)
    123123      {
    124         PrintS("poly p2 not found in T:");wrp(p);PrintLn();
     124        Warn("poly p2 not found in T:");wrp(p);PrintLn();
    125125        l[j].p2=pCopy(p);
    126126        break;
     
    149149kStrategy kStratCopy(kStrategy o)
    150150{
     151  kTest_TS(o);
    151152  kStrategy s=(kStrategy)Alloc0SizeOf(skStrategy);
    152153  s->next=NULL;
     
    220221  s->fromT=o->fromT;
    221222  s->noetherSet=o->noetherSet;
     223  kTest_TS(s);
    222224  return s;
    223225}
     
    251253    int facdeg=pFDeg(strat->S[si]);
    252254
    253     kTest(strat);
    254255    ideal fac=singclap_factorize(strat->S[si],NULL,1);
    255     kTest(strat);
    256256#ifndef HAVE_LIBFAC_P
    257257    if (fac==NULL)
     
    462462    if (TEST_OPT_REDSB) completeReduceFac(strat,FL);
    463463  }
     464  kTest_TS(strat);
    464465  while (strat->Ll >= 0)
    465466  {
     
    484485    strat->P = strat->L[strat->Ll];
    485486    strat->Ll--;
    486     kTest(strat);
    487487    if (pNext(strat->P.p) == strat->tail)
    488488    {
     
    741741        }
    742742      } /* for */
    743     kTest(strat);
    744743      for(i=0;i<IDELEMS(fac);i++) fac->m[i]=NULL;
    745744      idDelete(&fac);
     
    753752      if (TEST_OPT_REDSB) completeReduceFac(strat,FL);
    754753    }
    755     kTest(strat);
     754    kTest_TS(strat);
    756755  }
    757756  if (TEST_OPT_DEBUG) messageSets(strat);
  • Singular/kutil.cc

    r59f0d2f r6f1610  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.49 1999-11-15 17:20:16 obachman Exp $ */
     4/* $Id: kutil.cc,v 1.50 1999-11-17 12:09:26 obachman Exp $ */
    55/*
    66* ABSTRACT: kernel: utils for kStd
     
    309309  BOOLEAN ret = TRUE;
    310310  // test P
    311 #ifdef MDEBUG
    312   if (pref >= 2) mmStartReferenceWatch();
    313 #endif
    314311  ret = K_Test_L(f, l, &(strat->P),
    315312                 (strat->P.p != NULL && pNext(strat->P.p) != strat->tail),
     
    324321  if (strat->T != NULL)
    325322  {
    326 #ifdef MDEBUG
    327     if (pref && pref <= 1) mmStartReferenceWatch();
    328 #endif
    329323    for (i=0; i<=strat->tl; i++)
    330324    {
     
    335329    }
    336330  }
    337 #ifdef MDEBUG
    338   if (pref) mmStopReferenceWatch();
    339 #endif
    340331  // test L
    341332  if (strat->L != NULL)
     
    403394
    404395
     396int kFindInT(poly p, TSet T, int tlength)
     397{
     398  int i;
     399 
     400  for (i=0; i<=tlength; i++)
     401  {
     402    if (T[i].p == p) return i;
     403  }
     404  return -1;
     405}
     406
    405407
    406408BOOLEAN K_Test_TS(char *f, int l, kStrategy strat)
     
    415417    for (i=0; i<=strat->sl; i++)
    416418    {
    417       for (j=0; j<=strat->tl; j++)
    418         if (strat->S[i] == strat->T[j].p) break;
    419       if (j > strat->tl)
     419      if (kFindInT(strat->S[i], strat->T, strat->tl) < 0)
    420420      {
    421421        Warn("S[%d] not in T", i);
     
    593593void enterOnePair (int i,poly p,int ecart, int isFromQ,kStrategy strat)
    594594{
     595  assume(i<=strat->sl);
     596
    595597  int      l,j,compare;
    596598  LObject  Lp;
     
    601603  /*- computes the lcm(s[i],p) -*/
    602604  Lp.lcm = pInit();
     605
    603606  pLcm(p,strat->S[i],Lp.lcm);
    604607  pSetm(Lp.lcm);
     
    27062709          h.sev = pGetShortExpVector(h.p);
    27072710          strat->enterS(h,pos,strat);
     2711          enterT(h, strat);
    27082712          strat->fromQ[pos]=1;
    27092713        }
  • Singular/kutil.h

    r59f0d2f r6f1610  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: kutil.h,v 1.22 1999-11-15 17:20:17 obachman Exp $ */
     6/* $Id: kutil.h,v 1.23 1999-11-17 12:09:27 obachman Exp $ */
    77/*
    88* ABSTRACT: kernel: utils for kStd
     
    179179#ifdef KDEBUG
    180180#define kTest(A) K_Test(__FILE__,__LINE__,A)
    181 #define kTest_TS(A) K_Test(__FILE__,__LINE__,A)
     181#define kTest_TS(A) K_Test_TS(__FILE__,__LINE__,A)
    182182#define kTest_T(T) K_Test_T(__FILE__,__LINE__,T)
    183183#define kTest_L(L) K_Test_L(__FILE__,__LINE__,L)
  • Singular/mmbt.c

    r59f0d2f r6f1610  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: mmbt.c,v 1.21 1999-11-15 17:20:23 obachman Exp $ */
     4/* $Id: mmbt.c,v 1.22 1999-11-17 12:09:27 obachman Exp $ */
    55/*
    66* ABSTRACT: backtrace: part of memory subsystem (for linux/elf)
     
    111111}
    112112
     113int mm_no_mtrack = 0;
     114
    113115void mmTrack (unsigned long *bt_stack)
    114116{
     
    121123
    122124  if (mm_lowpc==0) mmTrackInit();
    123 
    124   while ((fp!=NULL) && ((unsigned long)fp>4095)
    125   && ((unsigned long)fp < ((unsigned long)0xff000000))
    126   && *fp && (pc = getpc (fp))
    127   && !entrypc (pc) && (i<BT_MAXSTACK))
    128   {
    129     if ( mmTrack_sig11_caught) break;
    130     bt_stack[i]=pc; i++;
    131     fp = (unsigned long *) *fp;
     125 
     126  if (! mm_no_mtrack)
     127  {
     128    while ((fp!=NULL) && ((unsigned long)fp>4095)
     129           && ((unsigned long)fp < ((unsigned long)0xff000000))
     130           && *fp && (pc = getpc (fp))
     131           && !entrypc (pc) && (i<BT_MAXSTACK))
     132    {
     133      if ( mmTrack_sig11_caught) break;
     134      bt_stack[i]=pc; i++;
     135      fp = (unsigned long *) *fp;
     136    }
    132137  }
    133138/*  signal(SIGSEGV, (si_hdl_typ) sig11_handler); */
  • Singular/mminit.cc

    r59f0d2f r6f1610  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: mminit.cc,v 1.17 1999-11-15 17:20:25 obachman Exp $ */
     4/* $Id: mminit.cc,v 1.18 1999-11-17 12:09:27 obachman Exp $ */
    55/*
    66* ABSTRACT: init of memory management
     
    2929{
    3030#ifdef MDEBUG
    31   return mmDBAlloc( size, "new",0);
     31  extern int mm_no_mtrack;
     32  void* addr;
     33  mm_no_mtrack = 1;
     34  addr = mmDBAlloc( size, "new",0);
     35  mm_no_mtrack = 0;
     36  return addr;
    3237#else
    3338  return AllocL( size );
Note: See TracChangeset for help on using the changeset viewer.