Changeset 3a3393b in git


Ignore:
Timestamp:
Feb 11, 2013, 11:22:59 AM (11 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '45e267b9942dec9429fe249ce3e5e44ab80a6a3a')
Children:
21526f3a3a8893e6482d468ed91fc1c149fd5a8a
Parents:
c495caf38df6b3d6e99fe5e19ec696c49630e639
git-author:
Martin Lee <martinlee84@web.de>2013-02-11 11:22:59+01:00
git-committer:
Martin Lee <martinlee84@web.de>2013-02-18 15:16:28+01:00
Message:
chg: switched off search for new main variable
File:
1 edited

Legend:

Unmodified
Added
Removed
  • factory/facFqFactorize.cc

    rc495ca r3a3393b  
    28652865  bool fail= false;
    28662866  int swapLevel2= 0;
    2867   int level;
     2867  //int level;
    28682868  int factorNums= 3;
    28692869  CFList biFactors, bufBiFactors;
     
    28942894    if (fail && (i == 0))
    28952895    {
    2896       if (!swapLevel)
     2896      /*if (!swapLevel) //uncomment to reenable search for new main variable
    28972897        level= 2;
    28982898      else
    2899         level= swapLevel + 1;
    2900 
    2901       CanonicalForm g;
    2902       swapLevel2= newMainVariableSearch (A, Aeval, evaluation, alpha, level, g);
    2903 
    2904       if (!swapLevel2) // need to pass to an extension
    2905       {
     2899        level= swapLevel + 1;*/
     2900
     2901      //CanonicalForm g;
     2902      //swapLevel2= newMainVariableSearch (A, Aeval, evaluation, alpha, level, g);
     2903
     2904      /*if (!swapLevel2) // need to pass to an extension
     2905      {*/
    29062906        factors= extFactorize (A, info);
    29072907        appendSwapDecompress (factors, contentAFactors, N, swapLevel, x);
     
    29102910        delete [] Aeval2;
    29112911        return factors;
    2912       }
     2912      /*}
    29132913      else
    29142914      {
     
    29292929        bufA= A;
    29302930        bufEvaluation= evaluation;
    2931       }
     2931      }*/ //end uncomment
    29322932    }
    29332933    else if (fail && (i > 0))
Note: See TracChangeset for help on using the changeset viewer.