Changeset 93e7364 in git


Ignore:
Timestamp:
Mar 15, 2013, 3:19:20 PM (10 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '5a0dde71de01068fad5736a17555c993ecbbf495')
Children:
5e4636810908842f714d87ac378a9aa9c48ec33f
Parents:
d8a7daee3419d587cfa035cbf6890deb131d9e5f
git-author:
Martin Lee <martinlee84@web.de>2013-03-15 15:19:20+01:00
git-committer:
Martin Lee <martinlee84@web.de>2013-03-22 15:52:45+01:00
Message:
chg: compute minBound wrt different main variable
File:
1 edited

Legend:

Unmodified
Added
Removed
  • factory/facFqBivar.cc

    rd8a7da r93e7364  
    76157615  }
    76167616
     7617  int minBound= bounds[0];
     7618  for (int i= 1; i < boundsLength; i++)
     7619  {
     7620    if (bounds[i] != 0)
     7621      minBound= tmin (minBound, bounds[i]);
     7622  }
     7623
     7624  int boundsLength2;
     7625  int * bounds2= computeBoundsWrtDiffMainvar (A, boundsLength2, isIrreducible);
     7626  int minBound2= bounds2[0];
     7627  for (int i= 1; i < boundsLength2; i++)
     7628  {
     7629    if (bounds2[i] != 0)
     7630      minBound2= tmin (minBound2, bounds2[i]);
     7631  }
     7632
     7633
    76177634  bool fail= false;
    76187635  CanonicalForm Aeval, evaluation, bufAeval, bufEvaluation, buf, tmp;
     
    76817698                            swap, swap2, N);
    76827699      normalize (factors);
     7700      delete [] bounds;
     7701      delete [] bounds2;
    76837702      return factors;
    76847703    }
     
    77237742      if (!extension)
    77247743        normalize (factors);
     7744      delete [] bounds;
     7745      delete [] bounds2;
    77257746      return factors;
    77267747    }
     
    77427763          if (!extension)
    77437764            normalize (factors);
     7765          delete [] bounds;
     7766          delete [] bounds2;
    77447767          return factors;
    77457768        }
     
    77607783          if (!extension)
    77617784            normalize (factors);
     7785          delete [] bounds;
     7786          delete [] bounds2;
    77627787          return factors;
    77637788        }
     
    78117836  if (!derivXZero && !fail2 && !symmetric)
    78127837  {
    7813     if (uniFactors.length() > uniFactors2.length() ||
     7838    if ((uniFactors.length() > uniFactors2.length() && minBound2 <= minBound)||
    78147839        (uniFactors.length() == uniFactors2.length()
    7815          && degs.getLength() > degs2.getLength()))
     7840         && degs.getLength() > degs2.getLength() && minBound2 <= minBound))
    78167841    {
    78177842      degs= degs2;
     
    78377862    if (!extension)
    78387863      normalize (factors);
     7864    delete [] bounds;
     7865    delete [] bounds2;
    78397866    return factors;
    78407867  }
     
    78437870
    78447871  if (swap2)
    7845     bounds= computeBounds (A, boundsLength, isIrreducible);
    7846 
    7847   int minBound= bounds[0];
    7848   for (int i= 1; i < boundsLength; i++)
    7849   {
    7850     if (bounds[i] != 0)
    7851       minBound= tmin (minBound, bounds[i]);
     7872  {
     7873    delete [] bounds;
     7874    bounds= bounds2;
     7875    minBound= minBound2;
    78527876  }
    78537877
     
    80448068      factors= earlyFactors;
    80458069  }
     8070
     8071  if (!swap2)
     8072    delete [] bounds2;
    80468073  delete [] bounds;
    80478074  if (!extension)
Note: See TracChangeset for help on using the changeset viewer.