Changeset d97184a in git for factory


Ignore:
Timestamp:
Oct 10, 2013, 2:50:16 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
fc0e63951ced2a7acdcbd2c7db9ee7ae4fb84d0b
Parents:
f51434bec7fe9322fca45e898f4552bae3a5afa0a866f19be92c02efc6aa0a5a7e4960e099d932f1
Message:
Merge pull request #395 from mmklee/bug_fac_sw

fix: possible seg fault in factorization
Location:
factory
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • factory/Makefile.am

    ra866f1 rd97184a  
    310310check_PROGRAMS = $(TESTS)
    311311
    312 AMLDFLAGS =  -L${builddir}
     312AM_LDFLAGS =  -L${builddir}
    313313
    314314TESTSSOURCES = test.cc
    … …  
    329329test_s_r_LDADD = -lfactory $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(TESTADDLIB)
    330330
    331 test_s_r_LDFLAGS = -static ${AMLDFLAGS}
    332 # test_s_g_LDFLAGS = -static ${AMLDFLAGS}
     331test_s_r_LDFLAGS = -static ${AM_LDFLAGS}
     332# test_s_g_LDFLAGS = -static ${AM_LDFLAGS}
    333333
    334334# test_d_g_SOURCES = $(TESTSSOURCES)
    … …  
    342342test_d_r_LDADD = -lfactory $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(TESTADDLIB)
    343343
    344 test_d_r_LDFLAGS = ${AMLDFLAGS}
    345 # test_d_g_LDFLAGS = ${AMLDFLAGS}
     344test_d_r_LDFLAGS = ${AM_LDFLAGS}
     345# test_d_g_LDFLAGS = ${AM_LDFLAGS}

  • factory/facFactorize.cc

    rf51434b rd97184a  
    384384  else if (biFactors.length() > minFactorsLength)
    385385    refineBiFactors (A, biFactors, Aeval2, evaluation, minFactorsLength);
     386  minFactorsLength= tmin (minFactorsLength, biFactors.length());
    386387
    387388  if (differentSecondVar == lengthAeval2)
Note: See TracChangeset for help on using the changeset viewer.