Changeset a5d181c in git


Ignore:
Timestamp:
Oct 25, 2011, 11:26:50 AM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
0033111f9b9caf502a298c422c3cbea31cee1927
Parents:
a82001e491202d6564ebdf4f187241737b315ec6
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-10-25 11:26:50+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:14:09+01:00
Message:
fix to tr. 379 (weight.cc::iv2array)
fix to tr. 380 (ideals.cc::idLift)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/ideals.cc

    ra82001e ra5d181c  
    277277
    278278  ideal res=idElimination(h,t);
    279   // cleanup 
     279  // cleanup
    280280  idDelete(&h);
    281   res=idrMoveR(res,r,origRing);
     281  if (res!=NULL) res=idrMoveR(res,r,origRing);
    282282  rChangeCurrRing(origRing);
    283283  rDelete(r);
     
    10431043  {
    10441044    WerrorS("2nd module does not lie in the first");
    1045     #if 0
    1046     if (unit!=NULL)
    1047     {
    1048       i=IDELEMS(submod);
    1049       *unit=mpNew(i,i);
    1050       for (j=i;j>0;j--)
    1051       {
    1052         MATELEM(*unit,j,j)=pOne();
    1053       }
    1054     }
    1055     if (rest!=NULL)
    1056     {
    1057       *rest=idCopy(submod);
    1058     }
    1059     return idInit(1,mod->rank);
    1060     #endif
    1061     return idInit(IDELEMS(submod),submod->rank);
     1045    return NULL;
    10621046  }
    10631047  if (unit!=NULL)
     
    15181502  {
    15191503    WerrorS("cannot eliminate in a qring");
    1520     return idCopy(h1);
     1504    return NULL;
    15211505  }
    15221506  if (idIs0(h1)) return idInit(1,h1->rank);
     
    15311515      {
    15321516        WerrorS("no elimination is possible: subalgebra is not admissible");
    1533         return idCopy(h1);
     1517        return NULL;
    15341518      }
    15351519    }
     
    16731657      if (w!=NULL)
    16741658        delete w;
    1675       return idCopy(h1);
     1659      return NULL;
    16761660    }
    16771661  }
     
    24842468  intvec *w = NULL;
    24852469
    2486   ring save_r = currRing; rChangeCurrRing(r); ideal S=idSyzygies(I,testHomog,&w); rChangeCurrRing(save_r);   
    2487    
     2470  ring save_r = currRing; rChangeCurrRing(r); ideal S=idSyzygies(I,testHomog,&w); rChangeCurrRing(save_r);
     2471
    24882472  if (w!=NULL) delete w;
    24892473  poly gg=p_TakeOutComp(&(S->m[0]), 2, r);
     
    24912475  poly gcd_p=singclap_pdivide(f,gg, r);
    24922476  p_Delete(&gg, r);
    2493    
     2477
    24942478  return gcd_p;
    24952479}
     
    26082592          x[j]=n_Init(0, R->cf); // is R->cf really n_Q???, yes!
    26092593      }
    2610        
     2594
    26112595      number n=nChineseRemainder(x,q,rl, R->cf);
    26122596
Note: See TracChangeset for help on using the changeset viewer.