Changeset 493cf3d in git


Ignore:
Timestamp:
Nov 29, 2013, 3:48:37 PM (9 years ago)
Author:
Christian Eder
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
Children:
2b691ca17a06c424cb7ee82c9d8dddbb88cc51cc
Parents:
be300e72dd08e74a482eee2b4526085e1e8c45f5
git-author:
Christian Eder <ederc@mathematik.uni-kl.de>2013-11-29 15:48:37+01:00
git-committer:
Christian Eder <ederc@mathematik.uni-kl.de>2013-12-12 13:51:27+01:00
Message:
fixes signature computation in TOP for sba
Location:
kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/kspoly.cc

    rbe300e r493cf3d  
    201201   * TODO:
    202202   * --------------------------------------------
    203    * if strat->incremental
     203   * if strat->sbaOrder == 1
    204204   * Since we are subdividing lower index and
    205205   * current index reductions it is enough to
     
    207207   * for a check. This should speed-up checking
    208208   * a lot!
    209    * if !strat->incremental
     209   * if !strat->sbaOrder == 0
    210210   * We are not subdividing lower and current index
    211211   * due to the fact that we are using the induced
  • kernel/kstd2.cc

    rbe300e r493cf3d  
    5555#define SBA_TAIL_RED                        1
    5656#define SBA_PRODUCT_CRITERION               0
    57 #define SBA_PRINT_ZERO_REDUCTIONS           0
    58 #define SBA_PRINT_REDUCTION_STEPS           0
    59 #define SBA_PRINT_OPERATIONS                0
    60 #define SBA_PRINT_SIZE_G                    0
    61 #define SBA_PRINT_SIZE_SYZ                  0
     57#define SBA_PRINT_ZERO_REDUCTIONS           1
     58#define SBA_PRINT_REDUCTION_STEPS           1
     59#define SBA_PRINT_OPERATIONS                1
     60#define SBA_PRINT_SIZE_G                    1
     61#define SBA_PRINT_SIZE_SYZ                  1
    6262#define SBA_PRINT_PRODUCT_CRITERION         0
    6363
     
    16981698#endif
    16991699
    1700   ideal F = F0;
     1700  ideal F1 = F0;
    17011701  ring sRing, currRingOld;
    17021702  currRingOld  = currRing;
     
    17071707    {
    17081708      rChangeCurrRing (sRing);
    1709       F = idrMoveR (F0, currRingOld, currRing);
    1710     }
    1711   }
     1709      F1 = idrMoveR (F0, currRingOld, currRing);
     1710    }
     1711  }
     1712  // sort ideal F
     1713  ideal F       = idInit(IDELEMS(F1),F1->rank);
     1714  intvec *sort  = idSort(F1);
     1715  for (int i=0; i<sort->length();++i)
     1716    F->m[i] = F1->m[(*sort)[i]-1];
    17121717#if 0
    17131718  printf("SBA COMPUTATIONS DONE IN THE FOLLOWING RING:\n");
     
    18881893#ifdef DEBUGF5
    18891894      Print("Poly before red: ");
    1890       pWrite(strat->P.p);
     1895      pWrite(pHead(strat->P.p));
     1896      pWrite(strat->P.sig);
    18911897#endif
    18921898      /* reduction of the element choosen from L */
     
    20172023      // enter into S, L, and T
    20182024      //if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
    2019       if(strat->sbaOrder != 1)
     2025      if(strat->sbaOrder == 0)
    20202026      {
    20212027        BOOLEAN overwrite = TRUE;
     
    22332239  {
    22342240    rChangeCurrRing (currRingOld);
    2235     F0          = idrMoveR (F, sRing, currRing);
     2241    F0          = idrMoveR (F1, sRing, currRing);
    22362242    strat->Shdl = idrMoveR_NoSort (strat->Shdl, sRing, currRing);
    22372243    rDelete (sRing);
Note: See TracChangeset for help on using the changeset viewer.