Changeset fd5b3a in git


Ignore:
Timestamp:
Jun 28, 2010, 1:35:53 PM (14 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
6720a11e15dfab1542b96233c960ac929f64c058
Parents:
408edb3114918e2d3fc0bbcaae6914f6245af886
Message:
fixed logarithm


git-svn-id: file:///usr/local/Singular/svn/trunk@12929 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
factory
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • factory/facFqBivar.cc

    r408edb rfd5b3a  
    932932  // the recombination process
    933933  int factorNums= 5;
    934   if (factorNums < (int) ilog2 (totaldegree (A)))
    935     factorNums= (int) ilog2 (totaldegree (A));
     934  double logarithm= (double) ilog2 (totaldegree (A));
     935  logarithm /= log2exp;
     936  logarithm= ceil (logarithm);
     937  if (factorNums < (int) logarithm)
     938    factorNums= (int) logarithm;
    936939  for (int i= 0; i < factorNums; i++)
    937940  {
  • factory/facFqBivar.h

    r408edb rfd5b3a  
    3131#include "facFqSquarefree.h"
    3232
     33extern const double log2exp= 1.442695041;
     34
    3335/// Factorization of a squarefree bivariate polynomials over an arbitrary finite
    3436/// field, information on the current field we work over is in @a info. @a info
  • factory/facFqFactorize.cc

    r408edb rfd5b3a  
    505505
    506506  int factorNums= 5;
    507   if (factorNums < (int) ilog2 (totaldegree (A)))
    508     factorNums= (int) ilog2 (totaldegree (A));
     507  double logarithm= (double) ilog2 (totaldegree (A));
     508  logarithm /= log2exp;
     509  logarithm= ceil (logarithm);
     510  if (factorNums < (int) logarithm)
     511    factorNums= (int) logarithm;
    509512  for (int i= 0; i < factorNums; i++)
    510513  {
     
    17741777  CanonicalForm evalPoly;
    17751778  int lift, bufLift;
    1776   if (factorNums < (int) ilog2 (totaldegree (A)))
    1777     factorNums= (int) ilog2 (totaldegree (A));
     1779  double logarithm= (double) ilog2 (totaldegree (A));
     1780  logarithm /= log2exp;
     1781  logarithm= ceil (logarithm);
     1782  if (factorNums < (int) logarithm)
     1783    factorNums= (int) logarithm;
    17781784  // several bivariate factorizations
    17791785  for (int i= 0; i < factorNums; i++)
  • factory/facFqFactorize.h

    r408edb rfd5b3a  
    2727#include "facFqSquarefree.h"
    2828#include "facFqBivarUtil.h"
     29
     30extern const double log2exp;
    2931
    3032/// Factorization over a finite field
Note: See TracChangeset for help on using the changeset viewer.