Changeset ab9672 in git for Singular/kstd2.cc


Ignore:
Timestamp:
Nov 6, 2000, 3:47:36 PM (24 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')
Children:
764e0c23470afd33233b29dcadf3244456e39279
Parents:
d7dcee21af33990fe117bd4e5bf9702e20188d99
Message:
* as we go along: strat->R introduced


git-svn-id: file:///usr/local/Singular/svn/trunk@4696 2c84dea3-7e68-4137-9b89-c4e89433aadc
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Singular/kstd2.cc

    rd7dcee rab9672  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstd2.cc,v 1.57 2000-11-03 14:50:17 obachman Exp $ */
     4/* $Id: kstd2.cc,v 1.58 2000-11-06 14:47:34 obachman Exp $ */
    55/*
    66*  ABSTRACT -  Kernel: alg. of Buchberger
    … …  
    687687      poly m1 = NULL, m2 = NULL;
    688688      /* check that spoly creation is ok */
    689       if (strat->tailRing != currRing &&
    690           !kCheckSpolyCreation(strat, m1, m2))
     689      while (strat->tailRing != currRing &&
     690             !kCheckSpolyCreation(strat, m1, m2))
    691691      {
    692692        assume(m1 == NULL && m2 == NULL);
    … …  
    694694        // twice as large as current ones -- should be enough to
    695695        // get through ksCreateSpoly correctly
    696         kStratChangeTailRing(strat,
    697                              rModifyRing(currRing, strat->homog, ! strat->ak,
    698                                          strat->tailRing->bitmask << 1));
     696        kStratChangeTailRing(strat);
    699697      }
    700698      /* deletes the short spoly and computes */
    … …  
    764762        // put stuff into T-Set
    765763        enterT(strat->P, strat);
    766         enterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat);
     764        enterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
    767765        // posInS only depends on the leading term
    768766        strat->enterS(strat->P, pos, strat, strat->tl);
    … …  
    836834  if (strat->sevS != NULL)
    837835    omFreeSize((ADDRESS)strat->sevS,IDELEMS(strat->Shdl)*sizeof(unsigned long));
     836  omfree(strat->T);
     837  omfree(strat->sevT);
     838  omfree(strat->R);
     839  omfree(strat->S_2_R);
     840  omfree(strat->L);
     841  omfree(strat->B);
    838842  idDelete(&strat->Shdl);
    839843  test=save_test;
    … …  
    891895  if (strat->sevS != NULL)
    892896    omFreeSize((ADDRESS)strat->sevS,IDELEMS(strat->Shdl)*sizeof(unsigned long));
     897  omfree(strat->T);
     898  omfree(strat->sevT);
     899  omfree(strat->R);
     900  omfree(strat->S_2_R);
     901  omfree(strat->L);
     902  omfree(strat->B);
    893903  idDelete(&strat->Shdl);
    894904  test=save_test;
Note: See TracChangeset for help on using the changeset viewer.