Changeset 5fe834 in git


Ignore:
Timestamp:
Aug 26, 2011, 10:42:30 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')
Children:
96808051cc040577fa581782fb8007fbe635d585
Parents:
737a6818d978503b25a6d61c5cfca9f03239756e
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-26 22:42:30+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:28+01:00
Message:
FIX: libpolys and kernel should use rDelete instead of rKill!
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • kernel/ideals.cc

    r737a68 r5fe834  
    281281  res=idrMoveR(res,r,origRing);
    282282  rChangeCurrRing(origRing);
    283   rKill(r);
     283  rDelete(r);
    284284  return res;
    285285}
    … …  
    401401    idDelete(&temp1);
    402402    rChangeCurrRing(orig_ring);
    403     rKill(syz_ring);
     403    rDelete(syz_ring);
    404404  }
    405405  else
    … …  
    530530  {
    531531    rChangeCurrRing(orig_ring);
    532     rKill(syz_ring);
     532    rDelete(syz_ring);
    533533  }
    534534  idSkipZeroes(result);
    … …  
    708708    rChangeCurrRing(orig_ring);
    709709    s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
    710     rKill(syz_ring);
     710    rDelete(syz_ring);
    711711    #ifdef HAVE_PLURAL
    712712    if (rIsPluralRing(currRing))
    … …  
    766766    {
    767767      rChangeCurrRing(syz_ring);
    768       rKill(dp_C_ring);
     768      rDelete(dp_C_ring);
    769769    }
    770770  }
    … …  
    819819    rChangeCurrRing(orig_ring);
    820820    s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
    821     rKill(syz_ring);
     821    rDelete(syz_ring);
    822822    idTest(s_h3);
    823823    return s_h3;
    … …  
    982982  }
    983983
    984   if (syz_ring!=orig_ring) rKill(syz_ring);
     984  if (syz_ring!=orig_ring) rDelete(syz_ring);
    985985  verbose = save_verbose;
    986986  return s_h3;
    … …  
    11851185    s_result = idrMoveR_NoSort(s_result, syz_ring, orig_ring);
    11861186    s_rest = idrMoveR_NoSort(s_rest, syz_ring, orig_ring);
    1187     rKill(syz_ring);
     1187    rDelete(syz_ring);
    11881188  }
    11891189  if (rest!=NULL)
    … …  
    14891489    rChangeCurrRing(orig_ring);
    14901490    s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
    1491     rKill(syz_ring);
     1491    rDelete(syz_ring);
    14921492  }
    14931493  idSkipZeroes(s_h3);
    … …  
    20932093    idDelete(&s_temp1);
    20942094    rChangeCurrRing(orig_ring);
    2095     rKill(syz_ring);
     2095    rDelete(syz_ring);
    20962096  }
    20972097
    … …  
    22362236    rChangeCurrRing(orig_ring);
    22372237    s_temp1 = idrMoveR_NoSort(s_temp1, syz_ring, orig_ring);
    2238     rKill(syz_ring);
     2238    rDelete(syz_ring);
    22392239    // Hmm ... here seems to be a memory leak
    22402240    // However, simply deleting it causes memory trouble

  • kernel/nc.cc

    r737a68 r5fe834  
    359359        //  s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
    360360        s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
    361         rKill(syz_ring);
     361        rDelete(syz_ring);
    362362      }
    363363      idTest(s_h3);

  • kernel/preimage.cc

    r737a68 r5fe834  
    166166  id_Delete(&temp2, tmpR);
    167167  idSkipZeroes(temp1);
    168   rKill(tmpR);
     168  rDelete(tmpR);
    169169  return temp1;
    170170}

  • kernel/syz.cc

    r737a68 r5fe834  
    611611      res[i] = idrMoveR_NoSort(res[i], syz_ring, origR);
    612612    }
    613     rKill(syz_ring);
     613    rDelete(syz_ring);
    614614  }
    615615  return res;

  • kernel/syz0.cc

    r737a68 r5fe834  
    976976    }
    977977//    j = 0; while (currRing->order[j]!=0) j++; // What was this for???!
    978     rKill(syRing);
     978    rDelete(syRing);
    979979  }
    980980  else

  • kernel/syz1.cc

    r737a68 r5fe834  
    16471647        rChangeSComps(NULL, NULL, 0, syzstr->syRing);
    16481648
    1649       rKill(syzstr->syRing);
     1649      rDelete(syzstr->syRing);
    16501650    }
    16511651    omFreeSize((ADDRESS)syzstr, sizeof(ssyStrategy));

  • kernel/syz3.cc

    r737a68 r5fe834  
    18921892          idDelete(&initial);
    18931893          rChangeCurrRing(syzstr->syRing);
    1894           rKill(dp_C_ring);
     1894          rDelete(dp_C_ring);
    18951895        }
    18961896#endif
    … …  
    20222022  delete syzstr->Tl;
    20232023  syzstr->Tl = NULL;
    2024   rKill(syzstr->syRing);
     2024  rDelete(syzstr->syRing);
    20252025  syzstr->syRing = NULL;
    20262026  omFreeSize((ADDRESS)totake,(*length+1)*sizeof(ideal));

  • kernel/tgb.cc

    r737a68 r5fe834  
    36123612    idTest (result);
    36133613    //rChangeCurrRing(new_ring);
    3614     rKill (new_ring);
     3614    rDelete(new_ring);
    36153615    //rChangeCurrRing(orig_ring);
    36163616  }

  • kernel/walkMain.cc

    r737a68 r5fe834  
    185185
    186186  ideal nextG=idrMoveR(G,oldRing,currRing);
    187   rKill(oldRing);
     187  rDelete(oldRing);
    188188
    189189  matrix nextGmat=(matrix)nextG;

  • libpolys/polys/monomials/ring.h

    r737a68 r5fe834  
    345345int    r_IsRingVar(const char *n, ring r);
    346346void   rWrite(ring r);
    347 //void   rKill(idhdl h);
    348 void   rKill(ring r);
     347// void   rKill(idhdl h);
     348// void   rKill(ring r);
    349349ring   rCopy(ring r);
    350350ring   rCopy0(const ring r, BOOLEAN copy_qideal = TRUE, BOOLEAN copy_ordering = TRUE);
    … …  
    741741BOOLEAN rCheckIV(intvec *iv);
    742742int rTypeOfMatrixOrder(intvec * order);
    743 void rDelete(ring r);
     743
     744void rDelete(ring r); // To be used instead of rKill!
    744745
    745746extern omBin sip_sring_bin;
Note: See TracChangeset for help on using the changeset viewer.