Changeset e3198f in git

Timestamp:

Feb 17, 2012, 6:56:06 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

db349803eb432fe57368fae5b8e4ab74d05fb613

Parents:

26acab557e4ad73e2c8ba02fa1ad998773365fff

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-02-17 18:56:06+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-02-17 18:56:56+01:00

Message:

chg: use template instatiation from factory/libfac

Files:

• Singular/claptmpl.cc (modified) (1 diff)
• factory/libfac/factor/tmpl_inst.cc (modified) (1 diff)

Singular/claptmpl.cc

@@ -16 +16 @@
   #include <factory/templates/ftmpl_list.cc>
   #include <kernel/fglm.h>
-
-  #include <factory/templates/ftmpl_array.cc>
-  #include <factory/templates/ftmpl_factor.cc>
-  #include <factory/templates/ftmpl_functions.h>
-  #include <factory/templates/ftmpl_matrix.cc>
-
-  template class Factor<CanonicalForm>;
-  template class List<CFFactor>;
-  template class ListItem<CFFactor>;
-  template class ListItem<CanonicalForm>;
-  template class ListIterator<CFFactor>;
-  template class List<CanonicalForm>;
-  template class List<List<CanonicalForm> >;
-  template class ListIterator<CanonicalForm>;
-  template class Array<CanonicalForm>;
-  template class List<MapPair>;
-  template class ListItem<MapPair>;
-  template class ListIterator<MapPair>;
-  template class Matrix<CanonicalForm>;
-  template class SubMatrix<CanonicalForm>;
-  template class Array<REvaluation>;
-  template bool find ( const List<CanonicalForm> &, const CanonicalForm&);
-
-  //template class vector<poly>;
-  #ifndef NOSTREAMIO
-  template OSTREAM & operator<<(OSTREAM &, const List<Factor<CanonicalForm> > &);
-  template OSTREAM & operator<<(OSTREAM &, const List<List<CanonicalForm> > &);
-  template OSTREAM & operator<<(OSTREAM &, const List<Variable> &);
-  template OSTREAM & operator<<(OSTREAM &, const Matrix<Variable> &);
-  #endif
-
-  template List<CFFactor> Union ( const List<CFFactor>&, const List<CFFactor>& );
-  template int operator == ( const Factor<CanonicalForm>&, const Factor<CanonicalForm>& );
-
-  template CanonicalForm tmax ( const CanonicalForm&, const CanonicalForm& );
-  template CanonicalForm tmin ( const CanonicalForm&, const CanonicalForm& );
-
-  template Variable tmax ( const Variable&, const Variable& );
-  template Variable tmin ( const Variable&, const Variable& );
-
-  template int tmax ( const int&, const int& );
-  template int tmin ( const int&, const int& );
-  template int tabs ( const int& );
-
-  template CanonicalForm prod ( const List<CanonicalForm> & );
-
-// place here your own template stuff, not instantiated by factory
-  // libfac:
-#ifdef HAVE_LIBFAC
-# include <factory/libfac/libfac.h>
-#endif
-
-// class.h:
-template <class T>
-class Substitution
-{
-private:
-    T _factor;
-    T _exp;
-public:
-    Substitution() : _factor(1), _exp(0) {}
-    Substitution( const Substitution<T> & f ) : _factor(f._factor), _exp(f._exp) {}
-    Substitution( const T & f, const T & e ) : _factor(f), _exp(e) {}
-    Substitution( const T & f ) : _factor(f), _exp(1) {}
-    ~Substitution() {}
-    Substitution<T>& operator= ( const Substitution<T>& );
-    Substitution<T>& operator= ( const T& );
-    T factor() const { return _factor; }
-    T exp() const { return _exp; }
-#ifndef NOSTREAMIO
-    //friend OSTREAM & operator <<<>(OSTREAM &, Substitution<T> &);
-    void print ( OSTREAM& s ) const
-    {
-      s << "("  << factor() << ")^" << exp();
-    }
-#endif
-};
-template <class T>
-int operator== ( const Substitution<T>&, const Substitution<T>& );
-
-// class.cc
-template <class T>
-Substitution<T>& Substitution<T>::operator= ( const Substitution<T>& f )
-{
-    if ( this != &f ) {
-        _factor = f._factor;
-        _exp = f._exp;
-    }
-    return *this;
-}
-
-template <class T>
-Substitution<T>& Substitution<T>::operator= ( const T & f )
-{
-    _factor = f;
-    _exp = 1;
-    return *this;
-}
-
-#ifndef NOSTREAMIO
-template <class T>
-OSTREAM & operator <<(OSTREAM & os, Substitution<T> &a)
-{
-  a.print(os);
-  return os;
-}
-template OSTREAM & operator <<(OSTREAM &, Substitution<CanonicalForm> &);
-template OSTREAM & operator <<(OSTREAM &, const List<CanonicalForm> &);
-template OSTREAM & operator <<(OSTREAM &, const Array<CanonicalForm> &);
-template OSTREAM & operator<<(OSTREAM &, const List<Substitution<CanonicalForm> > &);
-#endif
-
-template <class T>
-int operator== ( const Substitution<T> &f1, const Substitution<T> &f2 )
-{
-    return (f1.exp() == f2.exp()) && (f1.factor() == f2.factor());
-}
-
-    template class List<int>;
-    template class ListIterator<int>;
-
-#ifdef HAVE_LIBFAC
-    template class List<IntList>;
-    template class ListIterator<IntList>;
-#endif
-
-    template class Substitution<CanonicalForm>;
-    template class Array<Variable>;
-    template class Array<int>;
-    typedef Substitution<CanonicalForm> SForm ;
-    template class List<SForm>;
-    template class ListIterator<SForm>;
-    template class List<Variable>;
-    template class ListIterator<Variable> ;
-
-    template List<Variable> Union ( const List<Variable>&, const List<Variable>& );
-    template List<Variable> Difference ( const List<Variable>&, const List<Variable>& );
-
-    template List<CanonicalForm> Union ( const List<CanonicalForm>&, const List<CanonicalForm>& );
-    template List<CanonicalForm> Difference ( const List<CanonicalForm>&, const List<CanonicalForm>& );
-
-// for charsets:
-    template class ListIterator<CFList>;
 
 // templates for fglm:

factory/libfac/factor/tmpl_inst.cc

@@ -1 +1 @@
 ////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-// $Id$
 ////////////////////////////////////////////////////////////