Changeset dc4782 in git for libpolys/polys


Ignore:
Timestamp:
Nov 25, 2013, 4:49:42 PM (10 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
Children:
98e588265496a69b639a1e37bf39d39134a6df5f
Parents:
7bb7da5db82ebe13b1923654fb861e84c6c3ec65
Message:
chg: factory/libfac is not optional, removing HAVE_FACTORY/HAVE_LIBFAC
Location:
libpolys/polys
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • libpolys/polys/clapconv.cc

    r7bb7da5 rdc4782  
    1313#include <misc/auxiliary.h>
    1414
    15 #ifdef HAVE_FACTORY
    1615#define SI_DONT_HAVE_GLOBAL_VARS
    1716#include <factory/factory.h>
    … …  
    452451
    453452#endif
    454 #endif /* HAVE_FACTORY */

  • libpolys/polys/clapconv.h

    r7bb7da5 rdc4782  
    1010#ifndef INCL_SINGCONV_H
    1111#define INCL_SINGCONV_H
    12 
    13 #ifdef HAVE_FACTORY
    1412
    1513#include <polys/monomials/ring.h>
    … …  
    3432poly convFactoryPSingTrP ( const CanonicalForm & f, const ring r );
    3533
    36 #endif /* HAVE_FACTORY */
    37 
    3834#endif /* INCL_SINGCONV_H */

  • libpolys/polys/clapsing.cc

    r7bb7da5 rdc4782  
    1515#include <misc/auxiliary.h>
    1616
    17 #ifdef HAVE_FACTORY
    18 
    1917#define SI_DONT_HAVE_GLOBAL_VARS
    2018
    … …  
    2422#include <factory/factory.h>
    2523
    26 #ifdef HAVE_LIBFAC
    2724#    include <factory/libfac/libfac.h>
    28 #endif
    2925
    3026
    … …  
    767763}
    768764
    769 #ifdef HAVE_FACTORY
    770765int singclap_factorize_retry;
    771 #endif
    772766
    773767ideal singclap_factorize ( poly f, intvec ** v , int with_exps, const ring r)
    … …  
    13851379}
    13861380
    1387 #ifdef HAVE_LIBFAC
    13881381matrix singclap_irrCharSeries ( ideal I, const ring r)
    13891382{
    … …  
    15601553  return s;
    15611554}
    1562 #endif /*HAVE_LIBFAC*/
    15631555
    15641556BOOLEAN singclap_isSqrFree(poly f, const ring r)
    … …  
    18371829#endif /* HAVE_NTL */
    18381830
    1839 
    1840 #endif /* HAVE_FACTORY */

  • libpolys/polys/clapsing.h

    r7bb7da5 rdc4782  
    99#ifndef INCL_FACTORYSING_H
    1010#define INCL_FACTORYSING_H
    11 
    12 #ifdef HAVE_FACTORY
    1311
    1412class bigintmat;
    … …  
    6462BOOLEAN singclap_isSqrFree(poly f, const ring r);
    6563
    66 # ifdef HAVE_LIBFAC
    6764 matrix singclap_irrCharSeries ( ideal I, const ring r);
    6865 char* singclap_neworder ( ideal I, const ring r);
    69 # endif
    7066
    7167poly singclap_det( const matrix m, const ring r );
    … …  
    7672
    7773
    78 #endif /* HAVE_FACTORY */
    79 
    8074#endif /* INCL_FACTORYSING_H */
    8175

  • libpolys/polys/ext_fields/algext.cc

    r7bb7da5 rdc4782  
    4848#include <polys/PolyEnumerator.h>
    4949
    50 #ifdef HAVE_FACTORY
    5150#include <factory/factory.h>
    5251#include <polys/clapconv.h>
    5352#include <polys/clapsing.h>
    54 #endif
    55 
    5653
    5754#include <polys/ext_fields/algext.h>
    … …  
    800797}
    801798
    802 #ifdef HAVE_FACTORY
    803799number naConvFactoryNSingN( const CanonicalForm n, const coeffs cf)
    804800{
    … …  
    814810  return convSingPFactoryP((poly)n,naRing);
    815811}
    816 #endif
    817 
    818812
    819813/* IMPORTANT NOTE: Since an algebraic field extension is again a field,
    … …  
    14091403  cf->cfInvers       = naInvers;
    14101404  cf->cfIntDiv       = naDiv; // ???
    1411 #ifdef HAVE_FACTORY
    14121405  cf->convFactoryNSingN=naConvFactoryNSingN;
    14131406  cf->convSingNFactoryN=naConvSingNFactoryN;
    1414 #endif
    14151407  cf->cfParDeg = naParDeg;
    14161408

  • libpolys/polys/ext_fields/transext.cc

    r7bb7da5 rdc4782  
    5757#include <polys/simpleideals.h>
    5858
    59 #ifdef HAVE_FACTORY
    6059#include <polys/clapsing.h>
    6160#include <polys/clapconv.h>
    6261#include <factory/factory.h>
    63 #endif
    6462
    6563#include <polys/ext_fields/transext.h>
    … …  
    13761374  }*/
    13771375
    1378 #ifdef HAVE_FACTORY
    13791376  /* here we assume: NUM(f), DEN(f) !=NULL, in Z_a reqp. Z/p_a */
    13801377  poly pGcd = singclap_gcd_and_divide(NUM(f), DEN(f), ntRing);
    … …  
    14441441      }
    14451442    }
    1446 #endif /* HAVE_FACTORY */
    1447 
    14481443  ntTest(a); // !!!!
    14491444}
    … …  
    15561551  fraction fb = (fraction)b;
    15571552  if ((b==NULL)||(DEN(fb)==NULL)) return ntCopy(a,cf);
    1558 #ifdef HAVE_FACTORY
    15591553  fraction fa = (fraction)a;
    15601554  /* singclap_gcd destroys its arguments; we hence need copies: */
    … …  
    16361630    return (number)result;
    16371631
    1638 #else
    1639   Print("// factory needed: transext.cc:ntLcm\n");
    1640   return NULL;
    1641 #endif /* HAVE_FACTORY */
    16421632  return NULL;
    16431633}
    … …  
    16491639  if (a==NULL) return ntCopy(b,cf);
    16501640  if (b==NULL) return ntCopy(a,cf);
    1651 #ifdef HAVE_FACTORY
    16521641  fraction fa = (fraction)a;
    16531642  fraction fb = (fraction)b;
    … …  
    17121701  ntTest((number)result); // !!!!
    17131702  return (number)result;
    1714 #else
    1715   Print("// factory needed: transext.cc:ntGcd\n");
    1716   return NULL;
    1717 #endif /* HAVE_FACTORY */
    17181703}
    17191704
    … …  
    20452030    rDelete(cf->extRing);
    20462031}
    2047 #ifdef HAVE_FACTORY
    20482032number ntConvFactoryNSingN( const CanonicalForm n, const coeffs cf)
    20492033{
    … …  
    20662050  return convSingPFactoryP(NUM(f),ntRing);
    20672051}
    2068 #endif
    20692052
    20702053static int ntParDeg(number a, const coeffs cf)
    … …  
    24262409    cf->cfWriteShort = ntWriteLong;
    24272410
    2428 #ifndef HAVE_FACTORY
    2429   PrintS("// Warning: The 'factory' module is not available.\n");
    2430   PrintS("//          Hence gcd's cannot be cancelled in any\n");
    2431   PrintS("//          computed fraction!\n");
    2432 #else
    24332411  cf->convFactoryNSingN =ntConvFactoryNSingN;
    24342412  cf->convSingNFactoryN =ntConvSingNFactoryN;
    2435 #endif
    24362413  cf->cfParDeg = ntParDeg;
    24372414

  • libpolys/polys/monomials/p_polys.cc

    r7bb7da5 rdc4782  
    5757
    5858#include "coeffrings.h"
    59 #ifdef HAVE_FACTORY
    6059#include "clapsing.h"
    61 #endif
    6260
    6361#define ADIDEBUG 0
    … …  
    24162414//    }
    24172415//    nDelete(&h);
    2418 //#ifdef HAVE_FACTORY
    24192416//    if ( (nGetChar() == 1) || (nGetChar() < 0) ) /* Q[a],Q(a),Zp[a],Z/p(a) */
    24202417//    {
    … …  
    24232420//      pTest(ph);
    24242421//    }
    2425 //#endif
    24262422//  }
    24272423//}
    … …  
    24752471    }
    24762472    n_Delete(&h,r->cf);
    2477 #ifdef HAVE_FACTORY
    24782473    //if ( (n_GetChar(r) == 1) || (n_GetChar(r) < 0) ) /* Q[a],Q(a),Zp[a],Z/p(a) */
    24792474    //{
    … …  
    24812476    //  if(!n_GreaterZero(pGetCoeff(ph),r)) ph = p_Neg(ph,r);
    24822477    //}
    2483 #endif
    24842478  }
    24852479}

  • libpolys/polys/operations/p_Mult_q.cc

    r7bb7da5 rdc4782  
    1313#include <misc/auxiliary.h>
    1414
    15 #ifdef HAVE_FACTORY
    1615#include <factory/factory.h>
    17 #endif
    1816
    1917#include <misc/options.h>

  • libpolys/polys/templates/p_Procs_Dynamic.cc

    r7bb7da5 rdc4782  
    1313#include <misc/auxiliary.h>
    1414
    15 #ifdef HAVE_FACTORY
    1615#include <factory/factory.h>
    17 #endif
    1816
    1917#include <reporter/reporter.h>

  • libpolys/polys/templates/p_Procs_Lib.cc

    r7bb7da5 rdc4782  
    2020#include <misc/auxiliary.h>
    2121
    22 #ifdef HAVE_FACTORY
    2322#include <factory/factory.h>
    24 #endif
    2523
    2624#include <polys/monomials/p_polys.h>

  • libpolys/polys/templates/p_Procs_Static.cc

    r7bb7da5 rdc4782  
    1313#include <misc/auxiliary.h>
    1414
    15 #ifdef HAVE_FACTORY
    1615#include <factory/factory.h>
    17 #endif
    1816
    1917// #include <polys/structs.h>
Note: See TracChangeset for help on using the changeset viewer.