Changeset d92d71 in git for factory/libfac/factor


Ignore:
Timestamp:
Dec 14, 2011, 5:19:14 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')
Children:
67c1dcaf5b5069c5df300f7898cff740290bf5f1
Parents:
dcccebd9b733616f7e8c8d888299aa4c3073a094
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-14 17:19:14+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:09:33+01:00
Message:
build libfac.a into factory

FIX: libfac builds and uses factory/factory.h
FIX: adaptation of Singular to use libfac staff
Location:
factory/libfac/factor
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • factory/libfac/factor/Factor.cc

    rdccceb rd92d71  
    3838#endif
    3939
    40 #include "debug.h"
     40#include <libfac/factor/debug.h>
    4141#include "timing.h"
    4242TIMING_DEFINE_PRINT(factorize_time);

  • factory/libfac/factor/MVMultiHensel.cc

    rdccceb rd92d71  
    3838#endif
    3939
    40 #include "debug.h"
     40#include <libfac/factor/debug.h>
    4141#include "interrupt.h"
    4242#include "timing.h"

  • factory/libfac/factor/SqrFree.cc

    rdccceb rd92d71  
    55///////////////////////////////////////////////////////////////////////////////
    66// FACTORY - Includes
    7 #include<factory.h>
     7
     8#include<factory/factory.h>
     9
    810#ifndef NOSTREAMIO
    911#ifdef HAVE_IOSTREAM
    … …  
    3335#endif
    3436
    35 #include "debug.h"
     37#include <libfac/factor/debug.h>
    3638#include "timing.h"
    3739TIMING_DEFINE_PRINT(squarefree_time);

  • factory/libfac/factor/Truefactor.cc

    rdccceb rd92d71  
    3232#endif
    3333
    34 #include "debug.h"
     34#include <libfac/factor/debug.h>
    3535#include "timing.h"
    3636

  • factory/libfac/factor/homogfactor.cc

    rdccceb rd92d71  
    3232#endif
    3333
    34 #include "debug.h"
     34#include <libfac/factor/debug.h>
    3535#include "timing.h"
    3636TIMING_DEFINE_PRINT(hfactorize_time);

  • factory/libfac/factor/tmpl_inst.cc

    rdccceb rd92d71  
    44////////////////////////////////////////////////////////////
    55
     6// #include <factory/templates/ftmpl_array.cc>
    67
    7 #include <templates/ftmpl_array.cc>
    8 #include <templates/ftmpl_factor.cc>
    9 #include <templates/ftmpl_list.cc>
    10 #include <templates/ftmpl_functions.h>
    11 #include <templates/ftmpl_matrix.cc>
     8#include <factory/factory.h>
    129
    13 #include <factory.h>
     10
     11
     12#include <factory/templates/ftmpl_array.cc>
     13#include <factory/templates/ftmpl_factor.cc>
     14#include <factory/templates/ftmpl_list.cc>
     15#include <factory/templates/ftmpl_functions.h>
     16#include <factory/templates/ftmpl_matrix.cc>
    1417
    1518template class Factor<CanonicalForm>;
    … …  
    4750
    4851// place here your own template stuff, not instantiated by factory
    49 #include "tmpl_inst.h"
    50 #include "class.cc"
     52#include <libfac/factor/tmpl_inst.h>
     53#include <libfac/factor/class.cc>
    5154
    5255template class List<int>;

  • factory/libfac/factor/tmpl_inst.h

    rdccceb rd92d71  
    55#ifndef TMPL_INST_H
    66#define TMPL_INST_H
    7 #include "class.h"
     7
     8#include <libfac/factor/class.h>
    89//typedef CanonicalForm CF;
    910//typedef List<CanonicalForm> CFList;

  • factory/libfac/factor/version.cc

    rdccceb rd92d71  
    33// $Id$
    44///////////////////////////////////////////////////////////////////////////////
     5
     6/*
    57#include "version.h"
    68
    … …  
    911const char * libfac_date = LIBFAC_DATE;
    1012const char * libfac_author = "M. Messollen";
     13*/
    1114
    12 int    libfac_interruptflag=0;
     15int    libfac_interruptflag = 0;
Note: See TracChangeset for help on using the changeset viewer.