Changeset 21263cf in git


Ignore:
Timestamp:
Aug 1, 2012, 5:56:22 PM (10 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '96ce329119711a2b80858c8365abd29f8460bbfa')
Children:
18368851c078420078f8f9bd4ca3c74977a6c3a8
Parents:
5ab7d6cc38ed01ca8113b42dcf789145642047c0
git-author:
Martin Lee <martinlee84@web.de>2012-08-01 17:56:22+02:00
git-committer:
Martin Lee <martinlee84@web.de>2012-08-03 10:03:18+02:00
Message:
chg: replaced hack by setMipo
File:
1 edited

Legend:

Unmodified
Added
Removed
  • factory/libfac/factor/Factor.cc

    r5ab7d6 r21263cf  
    392392generate_mipo( int degree_of_Extension , const Variable & Extension ){
    393393  FFRandom gen;
    394   if ( degree(Extension) > 0 ) GFRandom gen;
    395   else {
    396     if ( degree(Extension) == 0 ) FFRandom gen;
    397     else
    398     {
    399       factoryError("libfac: evaluate: Extension not inFF() or inGF() !");
    400     }
    401   }
     394  if (degree (Extension) < 0)
     395    factoryError("libfac: evaluate: Extension not inFF() or inGF() !");
    402396  return find_irreducible( degree_of_Extension, gen, Variable(1) );
    403397}
     
    480474    if ( ! working_over_extension )
    481475    {
    482       minpoly= rootOf(generate_mipo( extended,Extension ));
     476      if (!hasMipo(Extension))
     477        minpoly= rootOf (generate_mipo (extended, Extension));
     478      else
     479      {
     480        setReduce (Extension, false);
     481        setMipo (minpoly, generate_mipo ( extended, Extension));
     482        setReduce (Extension, true);
     483      }
    483484      Extension= minpoly;
    484485      ok= try_specializePoly(f,minpoly,deg,Substitutionlist,i,j);
    485486      if (!ok)
    486       {
    487487        Substitutionlist=origS;
    488         // very bad hack: TODO
    489         // we want to remove the newly created variable minpoly:
    490         extern char *var_names_ext;
    491         var_names_ext[strlen(var_names_ext)]='\0';
    492       }
    493488    }
    494489    else
Note: See TracChangeset for help on using the changeset viewer.