Changeset fea2af in git


Ignore:
Timestamp:
Dec 19, 2011, 3:54:56 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4188d308699580d975efd0f6cca8dcb41c396f70')
Children:
bd795d65c1de21a3593013aca57c80f6128ba318
Parents:
76f3a18e5ce9a6a62d719dfb53dd5439883be370
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-19 15:54:56+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-27 19:28:00+01:00
Message:
SW cannot be built without factory

FIX: fixed libpolys and Singular/eigenval_ip.cc (quick and dirty)

TODO: make check in libpolys/tests -> all dynamic tests are missing SearchPATH :(
TODO: undefined reference to strat_fac_debug & strat_nr?

TODO: kernel? Singular?
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Singular/eigenval_ip.cc

    r76f3a18 rfea2af  
    180180
    181181      intvec *m0;
     182#ifdef HAVE_FACTORY     
    182183      ideal e0=singclap_factorize(mp_DetBareiss(M,currRing),&m0,2, currRing);
     184#else
     185      WarnS("cannot factorize due to missing module 'factory'");
     186      ideal e0=NULL;
     187#endif
     188     
    183189      if (e0==NULL)
    184190      {
  • libpolys/coeffs/longrat.cc

    r76f3a18 rfea2af  
    26172617#else
    26182618  WerrorS("not implemented");
    2619   return nlInit(0);
     2619  return nlInit(0, C);
    26202620#endif
    26212621}
  • libpolys/polys/clapconv.cc

    r76f3a18 rfea2af  
    1111#include "config.h"
    1212#include <misc/auxiliary.h>
     13
    1314#ifdef HAVE_FACTORY
    1415#define SI_DONT_HAVE_GLOBAL_VARS
     
    432433
    433434#endif
    434 #endif
     435#endif /* HAVE_FACTORY */
  • libpolys/polys/clapconv.h

    r76f3a18 rfea2af  
    3535poly convFactoryPSingTrP ( const CanonicalForm & f, const ring r );
    3636
    37 // HAVE_FACTORY
    38 #endif
     37#endif /* HAVE_FACTORY */
    3938
    4039#endif /* INCL_SINGCONV_H */
  • libpolys/polys/clapsing.cc

    r76f3a18 rfea2af  
    1414#ifdef HAVE_FACTORY
    1515#define SI_DONT_HAVE_GLOBAL_VARS
     16
    1617#include <factory/factory.h>
     18
    1719#ifdef HAVE_LIBFAC
    1820#include <factory/libfac/factor.h>
    1921#endif
    20 #endif
     22
    2123
    2224#include <omalloc/omalloc.h>
     
    15581560#endif
    15591561
     1562
     1563#endif /* HAVE_FACTORY */
  • libpolys/polys/clapsing.h

    r76f3a18 rfea2af  
    1111#ifndef INCL_FACTORYSING_H
    1212#define INCL_FACTORYSING_H
     13
     14
     15#ifdef HAVE_FACTORY
    1316
    1417#include <polys/monomials/p_polys.h>
     
    6265number   nChineseRemainder(number *x, number *q,int rl, const coeffs r);
    6366
     67
     68#endif /* HAVE_FACTORY */
     69
     70
    6471#endif /* INCL_FACTORYSING_H */
    6572
Note: See TracChangeset for help on using the changeset viewer.