Changeset c623e3e in git for factory


Ignore:
Timestamp:
Sep 23, 2013, 5:53:14 PM (11 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
Children:
f3578ca799eb3281349a0cad2114dda790f33762
Parents:
a50d4f89f885272382caccea3229e260e694f5af
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-09-23 17:53:14+02:00
git-committer:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-09-25 09:32:05+02:00
Message:
fix: mac osx port: need extern int in a c file (D, not C code part)
Location:
factory/libfac
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed

  • factory/libfac/Makefile.am

    ra50d4f8 rc623e3e  
    2828FACTORSRC1 =    factor/SqrFree.cc factor/Factor.cc \
    2929                factor/MVMultiHensel.cc factor/Truefactor.cc \
    30                 factor/helpstuff.cc factor/homogfactor.cc factor/version.cc
     30                factor/helpstuff.cc factor/homogfactor.cc factor/version.c
    3131
    3232FACTORSRC2 =    factor/tmpl_inst.cc 

  • factory/libfac/factor/MVMultiHensel.cc

    ra50d4f8 rc623e3e  
    2222#include "tmpl_inst.h"
    2323#include "helpstuff.h"
     24#include "interrupt.h"
    2425// some CC's need this:
    2526#include "MVMultiHensel.h"
    … …  
    2829void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
    2930#endif
    30 
    31 extern int libfac_interruptflag;
    3231
    3332#ifdef HENSELDEBUG

  • factory/libfac/factor/interrupt.h

    ra50d4f8 rc623e3e  
    1010/*BEGINPUBLIC*/
    1111// Set this to a nonzero value to interrupt the computation
    12 extern int libfac_interruptflag;
     12extern "C" int libfac_interruptflag;
    1313/*ENDPUBLIC*/
    1414

  • factory/libfac/header.tpl

    ra50d4f8 rc623e3e  
    55#define FACTOR_H
    66
    7 #include <factory.h>
     7#include <factory/factory.h>
    88
    99.INCLUDE factor/interrupt.h

  • factory/libfac/libfac.h

    ra50d4f8 rc623e3e  
    88
    99// Set this to a nonzero value to interrupt the computation
    10 extern int libfac_interruptflag;
     10extern "C" int libfac_interruptflag;
    1111
    12 /*
    1312// some values you can ask for:
    1413extern const char * libfac_name;
    … …  
    1615extern const char * libfac_date;
    1716extern const char * libfac_author;
    18 */
    1917
    20 /*
    21 CFFList Factorize( const CanonicalForm & F, const CanonicalForm & mipo, int is_SqrFree=0 ) ;
    22 CFFList newfactoras( const CanonicalForm & f, const CFList & as, int &success);
    23 CFFList newcfactor( const CanonicalForm & f, const CFList & as, int &success);
    24 */
    25 
     18//// Note: second argument for Factorize is for internal use only.
     19CFFList Factorize( const CanonicalForm & F, int is_SqrFree=0 ) ;
     20CFFList Factorize( const CanonicalForm & F, const CanonicalForm & mi, int is_SqrFree=0 ) ;
    2621
    2722//// Note: InternalSqrFree does only the work needed for factorization.
    2823// CFFList SqrFree( const CanonicalForm & f ) ;
     24CFFList SqrFreeMV( const CanonicalForm & f , const CanonicalForm & mipo=0) ;
    2925
    3026typedef List<CFList> ListCFList;
    3127typedef List<int> IntList ;
    32 
    33 // typedef ListIterator<int> IntListIterator ;
    34 // typedef List<Variable> Varlist;
    35 // typedef ListIterator<Variable> VarlistIterator;
     28typedef ListIterator<int> IntListIterator ;
     29typedef List<Variable> Varlist;
     30typedef ListIterator<Variable> VarlistIterator;
    3631
    3732////////////////////////////////////////
    3833/// from charsets:
    39 /*
     34
    4035class PremForm {
    4136public:
    … …  
    5146};
    5247
    53 
    5448CanonicalForm  Prem( const CanonicalForm &f, const CanonicalForm &g );
    5549CanonicalForm  Prem( const CanonicalForm &f, const CFList &L );
    5650CFList         Prem( const CFList &AS, const CFList &L );
     51CanonicalForm alg_gcd(const CanonicalForm &, const CanonicalForm &, const CFList &);
    5752CFList     MCharSetN( const CFList &PS, PremForm & Remembern );
    58 */
    59 
    60 
    61 /// Char. set
    6253ListCFList IrrCharSeries( const CFList &PS, int opt=0 );
    6354
    64 /*
    6555// the next three give you a heuristically optimal reorderd list of the
    6656// variables. For internal and external (e.g. Singular/Macaulay2) library use.
    … …  
    7464// (i.e. the variables as CanonicalForms)
    7565CFList   newordercf(const CFList & PolyList );
    76 */
    77 
    78 /// the same as neworder(...) only returning a list of int 's (i.e. the levels)
     66// the same as neworder(...) only returning a list of int 's (i.e. the levels)
    7967IntList  neworderint(const CFList & PolyList );
    8068
    81 /*
    8269// for library internal use only:
    8370// next function reorders the variables in PS:
    … …  
    9582CFFList reorder( const Varlist & betterorder, const CFFList & PS);
    9683ListCFList reorder(const Varlist & betterorder, const ListCFList & Q);
    97 */
     84
     85int hasVar(const CanonicalForm &f, const Variable &v);
    9886
    9987#endif /* FACTOR_H */
Note: See TracChangeset for help on using the changeset viewer.